diff --git a/designer-demo/package.json b/designer-demo/package.json index b02fb54f9..421f4f68f 100644 --- a/designer-demo/package.json +++ b/designer-demo/package.json @@ -1,7 +1,7 @@ { "name": "designer-demo", "private": true, - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "type": "module", "scripts": { "dev": "cross-env VITE_THEME=light vite", diff --git a/designer-demo/registry.js b/designer-demo/registry.js index 72bcf8296..88a463480 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -41,16 +41,15 @@ import { Styles, Layout, Canvas, - EditorInfoService, - AppService, - GenerateCodeService + GenerateCodeService, + GlobalService } from '@opentiny/tiny-engine' import engineConfig from './engine.config' export default { root: { id: 'engine.root', - metas: [EditorInfoService, AppService, GenerateCodeService] + metas: [GenerateCodeService, GlobalService] }, config: engineConfig, layout: { diff --git a/designer-demo/src/main.js b/designer-demo/src/main.js index 19d563cb0..6f29317b2 100644 --- a/designer-demo/src/main.js +++ b/designer-demo/src/main.js @@ -17,4 +17,8 @@ import { configurators } from './configurators/' import 'virtual:svg-icons-register' import '@opentiny/tiny-engine-theme' -init({ registry, configurators }) +init({ + registry, + configurators, + createAppSignal: ['global_service_init_finish'] +}) diff --git a/mockServer/package.json b/mockServer/package.json index e3f5dd4e0..b603f5aca 100644 --- a/mockServer/package.json +++ b/mockServer/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-mock", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, @@ -32,7 +32,6 @@ }, "dependencies": { "@babel/runtime": "^7.9.2", - "@opentiny/tiny-engine-dsl-vue": "^2.0.0-alpha.3", "@seald-io/nedb": "^4.0.2", "fs-extra": "^11.1.1", "glob": "^10.3.4", diff --git a/mockServer/src/services/schema2code.js b/mockServer/src/services/schema2code.js index f4171e53f..7b83844a8 100644 --- a/mockServer/src/services/schema2code.js +++ b/mockServer/src/services/schema2code.js @@ -10,104 +10,9 @@ * */ -import { pageService } from '../routes/main-routes' -import appInfo from '../assets/json/appinfo.json' - export default class Schema2CodeServcice { - constructor() { - this.blockHistories = appInfo.blockHistories - this.components = appInfo.materialHistory.components - } - + constructor() {} schema2code(pageInfo, type = 'page') { - const { schema, name } = pageInfo - return this.translateSchema({ - schema, - name, - type - }) - } - - /** - * 通过dsl 将页面/区块schema数据生成对应代码 - * @param { I_TranslateSchemaParam } params - * @return {Promise} dsl函数返回数据 - */ - translateSchema(params) { - const { schema, name, type, blockHistories = this.blockHistories, components = this.components } = params - // 页面/区块 预览只需将页面、区块路径和区块构建产物路径统一设置为 ./components 即可 - const defaultMain = './components' - let componentsMap = this.getComponentSchema(components) - componentsMap = componentsMap.concat(this.getBlockSchema(blockHistories)) - componentsMap.forEach((component) => { - if (component.main !== undefined) { - component.main = defaultMain - } - }) - - componentsMap.push({ - componentName: name, - main: defaultMain - }) - - const { generateCode } = require('@opentiny/tiny-engine-dsl-vue') - let code - try { - code = generateCode({ - pageInfo: { schema, name }, - blocksData: [], - componentsMap - }) - } catch (e) { - this.getResponseData(null, e) - } - - return this.getResponseData(code) - } - - getResponseData(data, error) { - const res = { - data - } - - if (error) { - const err_code = error.code || '' - res.error = { - code: err_code, - message: error.message || '' - } - } - return res - } - - getComponentSchema(components) { - return components.map((component) => { - const { - component: componentName, - npm: { package: packageName, exportName, version, destructuring } = {} - } = component - return { - componentName, - package: packageName, - exportName, - destructuring, - version - } - }) - } - - // 将区块组装成schema数据 - getBlockSchema(blockHistories) { - return blockHistories.map((blockHistory) => { - const { path, version } = blockHistory - // 每个区块历史记录必有content - const { fileName: componentName } = blockHistory.content - return { - componentName, - main: path || '', - destructuring: false, - version: version || 'N/A' - } - }) + return { data: null, code: 410, message: 'deprecated api, please use `@opentiny/tiny-engine-dsl-vue` directly.' } } } diff --git a/packages/blockToWebComponentTemplate/package.json b/packages/blockToWebComponentTemplate/package.json index 34bf98cc6..b2a1d9c01 100644 --- a/packages/blockToWebComponentTemplate/package.json +++ b/packages/blockToWebComponentTemplate/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-block-build", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "description": "translate block to webcomponent template", "main": "./dist/web-components.es.js", "type": "module", diff --git a/packages/build/vite-config/package.json b/packages/build/vite-config/package.json index 032d802d5..cef775b03 100644 --- a/packages/build/vite-config/package.json +++ b/packages/build/vite-config/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-config", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "description": "", "type": "module", "main": "./index.js", diff --git a/packages/build/vite-plugin-meta-comments/package.json b/packages/build/vite-plugin-meta-comments/package.json index c0f55cbab..f8c527130 100644 --- a/packages/build/vite-plugin-meta-comments/package.json +++ b/packages/build/vite-plugin-meta-comments/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-vite-plugin-meta-comments", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "description": "", "type": "module", "main": "dist/index.cjs", diff --git a/packages/builtinComponent/package.json b/packages/builtinComponent/package.json index 359545cb3..c277285a7 100644 --- a/packages/builtinComponent/package.json +++ b/packages/builtinComponent/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-builtin-component", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "description": "", "main": "dist/index.js", "module": "dist/index.js", diff --git a/packages/canvas/package.json b/packages/canvas/package.json index 07aaf69dc..9386abf8c 100644 --- a/packages/canvas/package.json +++ b/packages/canvas/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-canvas", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/common/component/BindI18n.vue b/packages/common/component/BindI18n.vue index 703417bdf..c0f99ce0e 100644 --- a/packages/common/component/BindI18n.vue +++ b/packages/common/component/BindI18n.vue @@ -169,11 +169,10 @@ export default { diff --git a/packages/common/component/BlockHistoryList.vue b/packages/common/component/BlockHistoryList.vue index 00a57ad9a..22622cce4 100644 --- a/packages/common/component/BlockHistoryList.vue +++ b/packages/common/component/BlockHistoryList.vue @@ -91,7 +91,6 @@ defineEmits(['preview', 'restore']) } .empty { - margin-left: 12px; color: var(--ti-lowcode-common-empty-text-color); } diff --git a/packages/common/component/BlockLinkField.vue b/packages/common/component/BlockLinkField.vue index b2ff541cb..a10bae958 100644 --- a/packages/common/component/BlockLinkField.vue +++ b/packages/common/component/BlockLinkField.vue @@ -1,14 +1,27 @@ diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue index 43e98d1c1..3a76ac523 100644 --- a/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue +++ b/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue @@ -1,24 +1,24 @@ @@ -26,14 +26,14 @@ + diff --git a/packages/plugins/state/src/StateTips.vue b/packages/plugins/state/src/StateTips.vue new file mode 100644 index 000000000..8599ba91b --- /dev/null +++ b/packages/plugins/state/src/StateTips.vue @@ -0,0 +1,24 @@ + + + diff --git a/packages/plugins/tree/package.json b/packages/plugins/tree/package.json index 54b3578d1..840c36c83 100644 --- a/packages/plugins/tree/package.json +++ b/packages/plugins/tree/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tree", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/plugins/tutorial/package.json b/packages/plugins/tutorial/package.json index 0e6ee9152..ea0d36c12 100644 --- a/packages/plugins/tutorial/package.json +++ b/packages/plugins/tutorial/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-plugin-tutorial", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/register/package.json b/packages/register/package.json index f075e5963..953759c56 100644 --- a/packages/register/package.json +++ b/packages/register/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-meta-register", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "description": "", "type": "module", "main": "dist/index.js", diff --git a/packages/register/src/common.js b/packages/register/src/common.js index 2b733b339..33fa0e960 100644 --- a/packages/register/src/common.js +++ b/packages/register/src/common.js @@ -46,7 +46,7 @@ export const templateHashMap = {} */ export const layoutHashMap = {} -export const metasHashMap = {} +export const metaHashMap = {} export const apisMap = {} export const optionsMap = {} @@ -166,7 +166,7 @@ export const generateRegistry = (registry) => { // 如果匹配到了id，说明是元服务配置，对元服务配置做读取和写入 if (id && key !== 'metaData') { handleRegistryProp(id, value) - metasHashMap[id] = value + metaHashMap[id] = value } else { // TODO: 其他类型配置处理 } @@ -177,5 +177,5 @@ export const generateRegistry = (registry) => { } export const getMergeMeta = (id) => { - return metasHashMap[id] + return metaHashMap[id] } diff --git a/packages/register/src/constants.js b/packages/register/src/constants.js index e4fddd73b..03db83897 100644 --- a/packages/register/src/constants.js +++ b/packages/register/src/constants.js @@ -1,4 +1,5 @@ export const META_SERVICE = { + GlobalService: 'engine.service.globalService', EditorInfo: 'engine.service.editorInfo', App: 'engine.service.app', GenerateCode: 'engine.service.generateCode', diff --git a/packages/register/src/hooks.js b/packages/register/src/hooks.js index 8deafd8ec..07826248b 100644 --- a/packages/register/src/hooks.js +++ b/packages/register/src/hooks.js @@ -1,13 +1,11 @@ export const HOOK_NAME = { useLayout: 'layout', - useApp: 'app', useCanvas: 'canvas', useResource: 'resource', useHistory: 'history', useProperties: 'properties', useProperty: 'property', useSaveLocal: 'saveLocal', - useEditorInfo: 'editorInfo', useBlock: 'block', useTranslate: 'translate', usePage: 'page', @@ -24,14 +22,12 @@ export const HOOK_NAME = { const hooksState = { [HOOK_NAME.useLayout]: {}, - [HOOK_NAME.useApp]: {}, [HOOK_NAME.useCanvas]: {}, [HOOK_NAME.useResource]: {}, [HOOK_NAME.useHistory]: {}, [HOOK_NAME.useProperties]: {}, [HOOK_NAME.useProperty]: {}, [HOOK_NAME.useSaveLocal]: {}, - [HOOK_NAME.useEditorInfo]: {}, [HOOK_NAME.useBlock]: {}, [HOOK_NAME.useTranslate]: {}, [HOOK_NAME.usePage]: {}, @@ -55,12 +51,10 @@ const getHook = (hookName, args) => { export const useLayout = (...args) => getHook(HOOK_NAME.useLayout, args) export const useCanvas = (...args) => getHook(HOOK_NAME.useCanvas, args) -export const useApp = (...args) => getHook(HOOK_NAME.useApp, args) export const useResource = (...args) => getHook(HOOK_NAME.useResource, args) export const useHistory = (...args) => getHook(HOOK_NAME.useHistory, args) export const useProperties = (...args) => getHook(HOOK_NAME.useProperties, args) export const useSaveLocal = (...args) => getHook(HOOK_NAME.useSaveLocal, args) -export const useEditorInfo = (...args) => getHook(HOOK_NAME.useEditorInfo, args) export const useBlock = (...args) => getHook(HOOK_NAME.useBlock, args) export const useTranslate = (...args) => getHook(HOOK_NAME.useTranslate, args) export const usePage = (...args) => getHook(HOOK_NAME.usePage, args) diff --git a/packages/register/src/index.js b/packages/register/src/index.js index 3faa004ef..c1bac3b6b 100644 --- a/packages/register/src/index.js +++ b/packages/register/src/index.js @@ -15,7 +15,7 @@ export { useCompile } from './templateHash' export { defineEntry, callEntry, beforeCallEntry, afterCallEntry, mergeRegistry, getMergeRegistry } from './entryHash' export { getLayoutComponent } from './layoutHash' export { default as useMessage } from './useMessage' -export { useState, useStore } from './useState' export { getConfigurator, addConfigurator } from './configurators' export * from './hooks' export { META_APP, META_SERVICE } from './constants' +export { defineService, initServices } from './service' diff --git a/packages/register/src/service.js b/packages/register/src/service.js new file mode 100644 index 000000000..11b53796d --- /dev/null +++ b/packages/register/src/service.js @@ -0,0 +1,100 @@ +import { reactive, readonly } from 'vue' +import { metaHashMap } from './common' + +/** + * @template T + * @template K + * @typedef {Object} Context + * @property {(import 'vue').UnwrapNestedRefs} state + * @property {K} options + */ + +/** + * @template T + * @template K + * @typedef {Object} ServiceOptions + * @property {string} id + * @property {'MetaService'} type + * @property {T} initialState + * @property {K} options + * @property {(context: Context) => void} init + * @property {Record | (context: Context) => Record} apis + */ + +/** + * @template T + * @template K + * @typedef {()=> (import 'vue').DeepReadonly<(import 'vue').UnwrapNestedRefs>} GetState + * @typedef {(kv: Partial) => void} SetState + * @typedef {Pick, 'id' | 'type' | 'options'> & { + * apis: { getState: GetState; setState: SetState } & Record + * }} Service + */ + +/** + * @template T + * @template K + * @type {WeakMap, {state: T} & Pick, 'init'>>} + */ +const servicesMap = new WeakMap() + +/** + * @template T + * @template K + * @param {ServiceOptions} serviceOptions + * @returns {Service} + */ +export const defineService = (serviceOptions) => { + const { id, type, initialState, options, init, apis } = serviceOptions + + if (!id || !type) { + throw new Error('Service id and type are required') + } + + if (type !== 'MetaService') { + throw new Error('Invalid service type. Expected: MetaService') + } + + /** + * @type {Service} + */ + const resultService = { + id, + type, + options, + apis: {} + } + + const state = reactive(initialState || {}) + + if (typeof apis === 'object' && apis) { + resultService.apis = apis + } else if (typeof apis === 'function') { + resultService.apis = apis({ state }) + } + + resultService.apis.getState = () => readonly(state) + resultService.apis.setState = (kv) => { + Object.assign(state, kv) + } + + servicesMap.set(resultService, { + state, + init: typeof init === 'function' ? init : () => {} + }) + + return resultService +} + +export const initServices = () => { + const services = Object.values(metaHashMap).filter((service) => service.type === 'MetaService') + + services.forEach((service) => { + const context = servicesMap.get(service) + if (context) { + const { state, init } = context + const { options } = service + init({ state, options }) + } + }) +} diff --git a/packages/register/src/useState.js b/packages/register/src/useState.js deleted file mode 100644 index 522823c9e..000000000 --- a/packages/register/src/useState.js +++ /dev/null @@ -1,43 +0,0 @@ -import { computed, isReactive, reactive } from 'vue' - -/** - * @type {Record>} - */ -const stores = {} - -/** - * @param {string} name - * @returns - */ -export const useStore = (name) => { - if (!isReactive(stores[name])) { - stores[name] = reactive({}) - } - - const store = stores[name] - - return { - store, - /** - * @param {Record} kv - * @returns - */ - patchStore: (kv) => { - return Object.assign(store, kv) - }, - /** - * @param {string} key - * @returns {[(import 'vue').ComputedRef, (value: any) => void]} - */ - useState: (key) => { - return [ - computed(() => store[key]), - (value) => { - store[key] = value - } - ] - } - } -} - -export const { useState } = useStore('_defaultGlobal') diff --git a/packages/register/test/useState.test.js b/packages/register/test/useState.test.js deleted file mode 100644 index 42c63efd0..000000000 --- a/packages/register/test/useState.test.js +++ /dev/null @@ -1,66 +0,0 @@ -import { describe, expect, it } from 'vitest' -import { useState, useStore } from '../src/useState' - -describe.concurrent('useState Key-based Access', () => { - it('accesses shared state using a key', () => { - const [state, setState] = useState('sharedKey') - expect(state.value).toBeUndefined() // Assuming no initial value set - - setState('new value') - expect(state.value).toEqual('new value') - - // Simulate another component accessing the same key - const [state2] = useState('sharedKey') - expect(state2.value).toEqual('new value') - }) - - it('handles non-existent keys gracefully', () => { - const [state] = useState('nonExistentKey') - expect(state.value).toBeUndefined() - }) - - it('ensures state consistency across components', () => { - const [, setState] = useState('consistentKey') - setState('consistent value') - - // Simulate another component accessing the same key - const [state2] = useState('consistentKey') - expect(state2.value).toEqual('consistent value') - }) -}) - -describe.concurrent('useStore', () => { - it('patch store correctly', () => { - const { store, patchStore } = useStore('foo') - - expect(store).toEqual({}) - - patchStore({ hello: 'world', foo: 'bar' }) - - expect(store).toEqual({ hello: 'world', foo: 'bar' }) - - patchStore({ hello: 'univese' }) - - expect(store).toEqual({ hello: 'univese', foo: 'bar' }) - }) - - it('patch store and set state correctly', () => { - const { store, patchStore, useState } = useStore('hello') - - patchStore({ hello: 'world' }) - - const [state, setState] = useState('hello') - - expect(state.value).toEqual('world') - - setState('world 2') - - expect(state.value).toEqual('world 2') - expect(store).toEqual({ hello: 'world 2' }) - - patchStore({ hello: 'world 3' }) - - expect(state.value).toEqual('world 3') - expect(store).toEqual({ hello: 'world 3' }) - }) -}) diff --git a/packages/settings/design/package.json b/packages/settings/design/package.json index 7c3c97cee..155a1ea8c 100644 --- a/packages/settings/design/package.json +++ b/packages/settings/design/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-design", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/settings/events/package.json b/packages/settings/events/package.json index c8de2f6cb..17c9dbbaf 100644 --- a/packages/settings/events/package.json +++ b/packages/settings/events/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-events", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/settings/panel/package.json b/packages/settings/panel/package.json index 4992e3da3..7d38fb34f 100644 --- a/packages/settings/panel/package.json +++ b/packages/settings/panel/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-settings-panel", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/settings/props/package.json b/packages/settings/props/package.json index 1e6d19159..da9185a2c 100644 --- a/packages/settings/props/package.json +++ b/packages/settings/props/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-props", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/settings/props/src/Main.vue b/packages/settings/props/src/Main.vue index 3d4e81ede..3b64f75aa 100644 --- a/packages/settings/props/src/Main.vue +++ b/packages/settings/props/src/Main.vue @@ -43,6 +43,6 @@ export default { diff --git a/packages/settings/styles/package.json b/packages/settings/styles/package.json index 8381762ea..c4d3779d0 100644 --- a/packages/settings/styles/package.json +++ b/packages/settings/styles/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-setting-styles", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/svgs/package.json b/packages/svgs/package.json index 78a6c53e4..da11c19d8 100644 --- a/packages/svgs/package.json +++ b/packages/svgs/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-svgs", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/theme/base/package.json b/packages/theme/base/package.json index 178d2fe4b..f68cab28d 100644 --- a/packages/theme/base/package.json +++ b/packages/theme/base/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-base", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/theme/base/src/base.less b/packages/theme/base/src/base.less index 51e840293..3eb22af2b 100644 --- a/packages/theme/base/src/base.less +++ b/packages/theme/base/src/base.less @@ -370,6 +370,7 @@ --te-base-dark-bg-5: #000; --te-base-dark-bg-6: #a6a6a61a; --te-base-dark-bg-7: rgba(255, 255, 255, 0.1); + --te-base-dark-bg-8: rgba(0, 0, 0, 0.16); // 文本色 --te-base-text-color: #191919; diff --git a/packages/theme/base/src/component-common.less b/packages/theme/base/src/component-common.less index 89db37718..673b3601f 100644 --- a/packages/theme/base/src/component-common.less +++ b/packages/theme/base/src/component-common.less @@ -109,7 +109,7 @@ color: var(--te-common-text-primary); font-weight: var(--te-base-font-weight-7); background-color: var(--te-common-bg-default); - padding: 0 8px 0 12px; + padding: 0 12px; border: 0px; border-bottom-style: none; @@ -177,6 +177,11 @@ } } } + .tiny-tree__empty-block { + .tiny-tree__empty-text { + color: var(--te-common-text-weaken); + } + } } // 5、页签tabs @@ -535,6 +540,7 @@ background-color: var(--te-common-bg-default); box-shadow: 0 2px 12px 0 var(--te-base-rgba-24); .tiny-notify__icon-zone { + height: 24px; .tiny-notify__icon-status { width: 16px; height: 16px; @@ -550,6 +556,8 @@ .tiny-notify__message-zone { margin: 0 0 0 8px; .tiny-notify__title-wrapper { + margin-bottom: 0; + line-height: 24px; font-size: var(--te-base-font-size-1); font-weight: var(--te-base-font-weight-4); color: var(--te-common-text-primary); @@ -557,9 +565,11 @@ } .tiny-notify__close-zone { padding: 0; - &.tiny-notify__icon-close { + .tiny-notify__icon-close { width: 16px; height: 16px; + top: 0; + right: 0; } } &.tiny-notify--error { @@ -590,13 +600,12 @@ // 17、tooltip文字提示 .tiny-tooltip.tiny-tooltip { &.tiny-tooltip__popper { - box-shadow: 0 4px 16px 0 var(--te-base-rgba-23); + box-shadow: 0 2px 12px 0 var(--te-base-dark-bg-8); &[class*='is-'] { background: var(--te-common-bg-default); color: var(--te-common-text-primary); font-size: var(--te-base-font-size-base); padding: 12px; - border: 1px solid var(--te-common-border-default); &[x-placement^='top'] { .popper__arrow { &.popper__arrow::after { @@ -606,6 +615,7 @@ } &[x-placement^='bottom'] { .popper__arrow { + border-bottom-width: 0; &.popper__arrow::after { border-bottom-color: var(--te-common-text-inverse); } diff --git a/packages/theme/base/src/page/base-config-page.less b/packages/theme/base/src/page/base-config-page.less index b295912f1..90f204b7d 100644 --- a/packages/theme/base/src/page/base-config-page.less +++ b/packages/theme/base/src/page/base-config-page.less @@ -23,7 +23,7 @@ body { *, .lowcode-scrollbar { &::-webkit-scrollbar { - width: 8px; + width: 4px; height: 8px; } } diff --git a/packages/theme/dark/package.json b/packages/theme/dark/package.json index 8af1ff737..7e09bbf6e 100644 --- a/packages/theme/dark/package.json +++ b/packages/theme/dark/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-dark", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/theme/light/gpt-dialog.less b/packages/theme/light/gpt-dialog.less index d05ee3774..14abccd65 100644 --- a/packages/theme/light/gpt-dialog.less +++ b/packages/theme/light/gpt-dialog.less @@ -31,6 +31,8 @@ --ti-lowcode-chat-model-common-icon: #8a887b; // chatGPT聊天窗输入框背景 --ti-lowcode-chat-model-input-bg: #eeeeee; + // chatGPT聊天窗输入框背景 + --ti-lowcode-chat-model-input-border: rgb(129, 168, 255); // chatGPT聊天窗发送按钮背景渐变色 --ti-lowcode-chat-model-button-bg-1: rgba(96, 140, 255, 0.8); --ti-lowcode-chat-model-button-bg-2: rgba(169, 117, 255, 0.8); diff --git a/packages/theme/light/package.json b/packages/theme/light/package.json index f98aaf66b..bfe932512 100644 --- a/packages/theme/light/package.json +++ b/packages/theme/light/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-theme-light", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/theme/light/variable.less b/packages/theme/light/variable.less index 9d1d8a562..e2e11dd55 100644 --- a/packages/theme/light/variable.less +++ b/packages/theme/light/variable.less @@ -119,7 +119,7 @@ // 头部工具栏更多more图标颜色 --ti-lowcode-toolbar-more-color: #000; // 头部工具栏更多more图标hover颜色 - --ti-lowcode-toolbar-more-hover-color: #666; + --ti-lowcode-toolbar-more-hover-color: var(--te-common-icon-secondary); // 头部工具栏面包屑字体颜色 --ti-lowcode-toolbar-breadcrumb-color: var(--ti-lowcode-base-gray-60); diff --git a/packages/toolbars/breadcrumb/package.json b/packages/toolbars/breadcrumb/package.json index a2e6a5a4c..791d622e2 100644 --- a/packages/toolbars/breadcrumb/package.json +++ b/packages/toolbars/breadcrumb/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-breadcrumb", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/breadcrumb/src/Main.vue b/packages/toolbars/breadcrumb/src/Main.vue index 70b882fd6..b3312d5ce 100644 --- a/packages/toolbars/breadcrumb/src/Main.vue +++ b/packages/toolbars/breadcrumb/src/Main.vue @@ -173,9 +173,11 @@ export default { } .publish { - margin-left: 8px; - height: 28px; - line-height: 28px; + margin: 0 8px; + height: 24px; + line-height: 24px; + min-width: 40px; + font-size: 12px; } } diff --git a/packages/toolbars/clean/package.json b/packages/toolbars/clean/package.json index 47237f2a2..dcc0a69fc 100644 --- a/packages/toolbars/clean/package.json +++ b/packages/toolbars/clean/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-clean", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/collaboration/package.json b/packages/toolbars/collaboration/package.json index 374e4f33d..ccdb4f039 100644 --- a/packages/toolbars/collaboration/package.json +++ b/packages/toolbars/collaboration/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-collaboration", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/fullscreen/package.json b/packages/toolbars/fullscreen/package.json index 3c5ab6169..0e32a95f4 100644 --- a/packages/toolbars/fullscreen/package.json +++ b/packages/toolbars/fullscreen/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-fullscreen", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/generate-code/package.json b/packages/toolbars/generate-code/package.json index 0eb45b883..52239ed62 100644 --- a/packages/toolbars/generate-code/package.json +++ b/packages/toolbars/generate-code/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-generate-code", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/generate-code/src/Main.vue b/packages/toolbars/generate-code/src/Main.vue index aa5e0ca6d..640a9fbdf 100644 --- a/packages/toolbars/generate-code/src/Main.vue +++ b/packages/toolbars/generate-code/src/Main.vue @@ -18,10 +18,10 @@ import { useCanvas, useNotify, useLayout, - useEditorInfo, getMetaApi, META_APP, - getMergeMeta + getMergeMeta, + META_SERVICE } from '@opentiny/tiny-engine-meta-register' import { fs } from '@opentiny/tiny-engine-utils' import { useHttp } from '@opentiny/tiny-engine-http' @@ -102,7 +102,7 @@ export default { const getPreGenerateInfo = async () => { const params = getParams() - const { id } = useEditorInfo().useInfo() + const { id } = getMetaApi(META_SERVICE.GlobalService).getBaseInfo() const promises = [ useHttp().get(`/app-center/v1/api/apps/schema/${id}`), fetchMetaData(params), diff --git a/packages/toolbars/lang/package.json b/packages/toolbars/lang/package.json index 086babbb6..e3eb1dc42 100644 --- a/packages/toolbars/lang/package.json +++ b/packages/toolbars/lang/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lang", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/layout/package.json b/packages/toolbars/layout/package.json index a4964d4c2..0772412df 100644 --- a/packages/toolbars/layout/package.json +++ b/packages/toolbars/layout/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-layout", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/lock/package.json b/packages/toolbars/lock/package.json index f073828c0..41a0041c5 100644 --- a/packages/toolbars/lock/package.json +++ b/packages/toolbars/lock/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-lock", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logo/package.json b/packages/toolbars/logo/package.json index f893dc7d6..760704d4d 100644 --- a/packages/toolbars/logo/package.json +++ b/packages/toolbars/logo/package.json @@ -1,6 +1,6 @@ { "name": "@opentiny/tiny-engine-toolbar-logo", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.5", "publishConfig": { "access": "public" }, diff --git a/packages/toolbars/logo/src/AppList.vue b/packages/toolbars/logo/src/AppList.vue index f834d026c..65138b53b 100644 --- a/packages/toolbars/logo/src/AppList.vue +++ b/packages/toolbars/logo/src/AppList.vue @@ -1,7 +1,7 @@