From 56cf39812cca9bcc39bca9b2e8a37d1207b48009 Mon Sep 17 00:00:00 2001 From: Hexqi Date: Wed, 26 Jun 2024 16:05:26 +0800 Subject: [PATCH 1/4] fix: useModal error (#597) --- packages/design-core/src/init.js | 4 +-- packages/entry/src/hooks.js | 47 ++++++++++++++++++-------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/packages/design-core/src/init.js b/packages/design-core/src/init.js index 99406d686..968a792c6 100644 --- a/packages/design-core/src/init.js +++ b/packages/design-core/src/init.js @@ -36,8 +36,8 @@ const defaultLifeCycles = { defineEntry(newRegistry) initHook(HOOK_NAME.useEnv, import.meta.env) - initHook(HOOK_NAME.useNotify, () => Notify) - initHook(HOOK_NAME.useModal, () => Modal) + initHook(HOOK_NAME.useNotify, Notify, { useDefaultExport: true }) + initHook(HOOK_NAME.useModal, Modal) // 加载主题样式，尽早加载 // import(`./theme/${newRegistry.config.theme}.js`) diff --git a/packages/entry/src/hooks.js b/packages/entry/src/hooks.js index 560ffc328..9d8d14ab5 100644 --- a/packages/entry/src/hooks.js +++ b/packages/entry/src/hooks.js @@ -44,26 +44,33 @@ const hooksState = { [HOOK_NAME.useCustom]: {} // 自定义 } -export const useLayout = () => hooksState[HOOK_NAME.useLayout] -export const useCanvas = () => hooksState[HOOK_NAME.useCanvas] -export const useApp = () => hooksState[HOOK_NAME.useApp] -export const useResource = () => hooksState[HOOK_NAME.useResource] -export const useHistory = () => hooksState[HOOK_NAME.useHistory] -export const useProperties = () => hooksState[HOOK_NAME.useProperties] -export const useSaveLocal = () => hooksState[HOOK_NAME.useSaveLocal] -export const useEditorInfo = () => hooksState[HOOK_NAME.useEditorInfo] -export const useBlock = () => hooksState[HOOK_NAME.useBlock] -export const useTranslate = () => hooksState[HOOK_NAME.useTranslate] -export const usePage = () => hooksState[HOOK_NAME.usePage] -export const useDataSource = () => hooksState[HOOK_NAME.useDataSource] -export const useBreadcrumb = () => hooksState[HOOK_NAME.useBreadcrumb] -export const useProperty = () => hooksState[HOOK_NAME.useProperty] -export const useHelp = () => hooksState[HOOK_NAME.useHelp] -export const useHttp = () => hooksState[HOOK_NAME.useHttp] -export const useEnv = () => hooksState[HOOK_NAME.useEnv] -export const useModal = () => hooksState[HOOK_NAME.useModal] -export const useNotify = () => hooksState[HOOK_NAME.useNotify] -export const useCustom = () => hooksState[HOOK_NAME.useCustom] +const getHook = (hookName, args) => { + if (typeof hooksState[hookName] === 'function') { + return hooksState[hookName](...args) + } + return hooksState[hookName] +} + +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) +export const useDataSource = (...args) => getHook(HOOK_NAME.useDataSource, args) +export const useBreadcrumb = (...args) => getHook(HOOK_NAME.useBreadcrumb, args) +export const useProperty = (...args) => getHook(HOOK_NAME.useProperty, args) +export const useHelp = (...args) => getHook(HOOK_NAME.useHelp, args) +export const useHttp = (...args) => getHook(HOOK_NAME.useHttp, args) +export const useEnv = (...args) => getHook(HOOK_NAME.useEnv, args) +export const useModal = (...args) => getHook(HOOK_NAME.useModal, args) +export const useNotify = (...args) => getHook(HOOK_NAME.useNotify, args) +export const useCustom = (...args) => getHook(HOOK_NAME.useCustom, args) export function initHook(hookName, hookContent, { useDefaultExport } = {}) { if (!Object.keys(hooksState).includes(hookName)) { From 681f03e8010fb6f4d62296c84cbd340769ed227f Mon Sep 17 00:00:00 2001 From: wenmine Date: Wed, 26 Jun 2024 16:19:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(material):=20=E7=89=A9=E6=96=99?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=8F=92=E4=BB=B6=E5=85=83=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=8B=86=E5=88=86=20(#545)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(toolbars): 工具栏增加meta.js * feat(toolbars): 工具栏增加vite-plugin-generate-comments * feat(toolbars): 工具栏增加@opentiny/tiny-engine-entry * refactor(material): 物料管理插件元应用拆分 * refactor(materials): 物料管理插件review * refactor(materials): 物料管理插件review * refactor(materials): 物料管理插件review * refactor(materials): 物料管理插件review * component->entry * refactor(material): review 意见修改 * refactor(materials): review意见修改 --- packages/entry/src/common.js | 2 +- packages/layout/src/Main.vue | 2 +- packages/plugins/materials/index.js | 19 ++- packages/plugins/materials/src/Main.vue | 114 ++---------------- .../materials/src/components/header/Main.vue | 33 +++++ .../plugins/materials/src/meta/block/index.js | 14 +++ .../plugins/materials/src/meta/block/meta.js | 4 + .../{block => meta/block/src}/BlockDetail.vue | 0 .../{block => meta/block/src}/BlockGroup.vue | 0 .../block/src}/BlockGroupArrange.vue | 0 .../block/src}/BlockGroupFilters.vue | 0 .../block/src}/BlockGroupPanel.vue | 0 .../block/src}/BlockGroupSort.vue | 0 .../block/src}/BlockGroupTransfer.vue | 0 .../block/src}/BlockGroupTransferPanel.vue | 0 .../{block => meta/block/src}/BlockList.vue | 0 .../block/src}/BlockVersionSelect.vue | 0 .../src/{block => meta/block/src}/Main.vue | 28 ++++- .../src/{block => meta/block/src}/http.js | 0 .../{block => meta/block/src}/js/usePanel.js | 20 +-- .../materials/src/meta/component/index.js | 10 ++ .../materials/src/meta/component/meta.js | 4 + .../component/src}/Main.vue | 0 .../materials/src/meta/layout/index.js | 7 ++ .../plugins/materials/src/meta/layout/meta.js | 4 + .../materials/src/meta/layout/src/Main.vue | 110 +++++++++++++++++ packages/settings/styles/src/js/useStyle.js | 8 +- 27 files changed, 255 insertions(+), 124 deletions(-) create mode 100644 packages/plugins/materials/src/components/header/Main.vue create mode 100644 packages/plugins/materials/src/meta/block/index.js create mode 100644 packages/plugins/materials/src/meta/block/meta.js rename packages/plugins/materials/src/{block => meta/block/src}/BlockDetail.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroup.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupArrange.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupFilters.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupPanel.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupSort.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupTransfer.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockGroupTransferPanel.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockList.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/BlockVersionSelect.vue (100%) rename packages/plugins/materials/src/{block => meta/block/src}/Main.vue (85%) rename packages/plugins/materials/src/{block => meta/block/src}/http.js (100%) rename packages/plugins/materials/src/{block => meta/block/src}/js/usePanel.js (70%) create mode 100644 packages/plugins/materials/src/meta/component/index.js create mode 100644 packages/plugins/materials/src/meta/component/meta.js rename packages/plugins/materials/src/{component => meta/component/src}/Main.vue (100%) create mode 100644 packages/plugins/materials/src/meta/layout/index.js create mode 100644 packages/plugins/materials/src/meta/layout/meta.js create mode 100644 packages/plugins/materials/src/meta/layout/src/Main.vue diff --git a/packages/entry/src/common.js b/packages/entry/src/common.js index f93cee1e3..d55a0c18f 100644 --- a/packages/entry/src/common.js +++ b/packages/entry/src/common.js @@ -10,7 +10,7 @@ * */ -import { initHook } from "./hooks" +import { initHook } from './hooks' const vueLifeHook = [ 'onMounted', diff --git a/packages/layout/src/Main.vue b/packages/layout/src/Main.vue index 6c6fee120..c10ac3d8a 100644 --- a/packages/layout/src/Main.vue +++ b/packages/layout/src/Main.vue @@ -50,7 +50,7 @@ import { constants } from '@opentiny/tiny-engine-utils' const { message } = useModal() const { requestInitBlocks } = blockPlugin.api -const { fetchGroups } = materials.api +const { fetchGroups } = materials.apis const { BROADCAST_CHANNEL } = constants export default { diff --git a/packages/plugins/materials/index.js b/packages/plugins/materials/index.js index 13ff9b5ee..13a773932 100644 --- a/packages/plugins/materials/index.js +++ b/packages/plugins/materials/index.js @@ -10,15 +10,28 @@ * */ -import entry, { api } from './src/Main.vue' +import entry from './src/Main.vue' import metaData from './meta.js' +import MaterialLayout from './src/meta/layout' +import MaterialBlock from './src/meta/block' +import MaterialComponent from './src/meta/component' +import MaterialHeader from './src/components/header/Main.vue' import { ResourceService } from './src/composable' export default { ...metaData, entry, - api, - metas: [ResourceService] + layout: MaterialLayout, + options: { + defaultTabId: 'engine.plugins.materials.component', + tabComponentIds: ['engine.plugins.materials.component', 'engine.plugins.materials.block'] + }, + components: { + header: MaterialHeader + }, + apis: { ...MaterialBlock.apis }, + api: { ...MaterialBlock.apis }, + metas: [MaterialBlock, MaterialComponent, ResourceService] } export { entry, ResourceService } diff --git a/packages/plugins/materials/src/Main.vue b/packages/plugins/materials/src/Main.vue index 3239ecb9d..305919fae 100644 --- a/packages/plugins/materials/src/Main.vue +++ b/packages/plugins/materials/src/Main.vue @@ -1,116 +1,18 @@ - - diff --git a/packages/plugins/materials/src/components/header/Main.vue b/packages/plugins/materials/src/components/header/Main.vue new file mode 100644 index 000000000..8b734be7a --- /dev/null +++ b/packages/plugins/materials/src/components/header/Main.vue @@ -0,0 +1,33 @@ + + + diff --git a/packages/plugins/materials/src/meta/block/index.js b/packages/plugins/materials/src/meta/block/index.js new file mode 100644 index 000000000..b801a21b5 --- /dev/null +++ b/packages/plugins/materials/src/meta/block/index.js @@ -0,0 +1,14 @@ +import entry from './src/Main.vue' +import metaData from './meta' +import { fetchGroups } from './src/http' + +export default { + ...metaData, + entry, + apis: { + fetchGroups + }, + options: { + title: '区块' + } +} diff --git a/packages/plugins/materials/src/meta/block/meta.js b/packages/plugins/materials/src/meta/block/meta.js new file mode 100644 index 000000000..2acb872cf --- /dev/null +++ b/packages/plugins/materials/src/meta/block/meta.js @@ -0,0 +1,4 @@ +export default { + id: 'engine.plugins.materials.block', + type: 'plugins' +} diff --git a/packages/plugins/materials/src/block/BlockDetail.vue b/packages/plugins/materials/src/meta/block/src/BlockDetail.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockDetail.vue rename to packages/plugins/materials/src/meta/block/src/BlockDetail.vue diff --git a/packages/plugins/materials/src/block/BlockGroup.vue b/packages/plugins/materials/src/meta/block/src/BlockGroup.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroup.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroup.vue diff --git a/packages/plugins/materials/src/block/BlockGroupArrange.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupArrange.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupArrange.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupArrange.vue diff --git a/packages/plugins/materials/src/block/BlockGroupFilters.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupFilters.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupFilters.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupFilters.vue diff --git a/packages/plugins/materials/src/block/BlockGroupPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupPanel.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupPanel.vue diff --git a/packages/plugins/materials/src/block/BlockGroupSort.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupSort.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupSort.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupSort.vue diff --git a/packages/plugins/materials/src/block/BlockGroupTransfer.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupTransfer.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupTransfer.vue diff --git a/packages/plugins/materials/src/block/BlockGroupTransferPanel.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupTransferPanel.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockGroupTransferPanel.vue rename to packages/plugins/materials/src/meta/block/src/BlockGroupTransferPanel.vue diff --git a/packages/plugins/materials/src/block/BlockList.vue b/packages/plugins/materials/src/meta/block/src/BlockList.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockList.vue rename to packages/plugins/materials/src/meta/block/src/BlockList.vue diff --git a/packages/plugins/materials/src/block/BlockVersionSelect.vue b/packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue similarity index 100% rename from packages/plugins/materials/src/block/BlockVersionSelect.vue rename to packages/plugins/materials/src/meta/block/src/BlockVersionSelect.vue diff --git a/packages/plugins/materials/src/block/Main.vue b/packages/plugins/materials/src/meta/block/src/Main.vue similarity index 85% rename from packages/plugins/materials/src/block/Main.vue rename to packages/plugins/materials/src/meta/block/src/Main.vue index e27165635..dc5706dff 100644 --- a/packages/plugins/materials/src/block/Main.vue +++ b/packages/plugins/materials/src/meta/block/src/Main.vue @@ -6,6 +6,10 @@ + + + + + + diff --git a/packages/settings/styles/src/js/useStyle.js b/packages/settings/styles/src/js/useStyle.js index ebc9fdd12..95dcbcb12 100644 --- a/packages/settings/styles/src/js/useStyle.js +++ b/packages/settings/styles/src/js/useStyle.js @@ -134,7 +134,13 @@ const getClassNameAndIdList = (schema) => { } watch( - () => [useCanvas().getCurrentSchema?.(), state.schemaUpdateKey, useProps().propsUpdateKey?.value, useCanvas().canvasApi?.value?.getSchema?.(), schemaLength], + () => [ + useCanvas().getCurrentSchema?.(), + state.schemaUpdateKey, + useProps().propsUpdateKey?.value, + useCanvas().canvasApi?.value?.getSchema?.(), + schemaLength + ], ([curSchema], [oldCurSchema] = []) => { const { getCurrentSchema, canvasApi } = useCanvas() let schema = getCurrentSchema() From 7cf169d734477092377d4d1ffa126e7031e027eb Mon Sep 17 00:00:00 2001 From: rhlin Date: Wed, 26 Jun 2024 01:20:17 -0700 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20canvas=20=E5=85=83=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E6=94=B9=E9=80=A02=20=EF=BC=88=E6=8A=BD=E5=8F=96Canva?= =?UTF-8?q?sLayout=EF=BC=8C=E9=9D=A2=E5=8C=85=E5=B1=91=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=85=83=E5=BA=94=E7=94=A8=EF=BC=8Capi?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0engine.canvas=E9=A1=B6=E5=B1=82=20?= =?UTF-8?q?=EF=BC=89=20(#590)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: canvas 元应用改造2 （抽取CanvasLayout，面包屑导航去除元应用，api移动到engine.canvas顶层 ） * fix: 解决code check问题 * fix: 修正引用路径错误 * fix: 解决解决merge过程中文件修改丢失 --- packages/canvas/DesignCanvas/index.js | 9 ++++- .../canvas/DesignCanvas/src/DesignCanvas.vue | 38 +++++++------------ .../src/api/index.js | 0 .../src/api/useCanvas.js | 0 packages/canvas/breadcrumb/index.js | 2 +- ...{CanvasFooter.vue => CanvasBreadcrumb.vue} | 15 ++++++-- packages/canvas/container/index.js | 8 +--- .../canvas/drag-drop/src/CanvasDragItem.vue | 2 +- packages/canvas/index.js | 9 ++++- packages/canvas/layout/index.js | 7 ++++ packages/canvas/layout/meta.js | 3 ++ packages/canvas/layout/src/CanvasLayout.vue | 20 ++++++++++ packages/controller/js/constants.js | 22 +++++------ packages/controller/js/example.js | 20 +++++----- packages/controller/src/composable/index.js | 1 - packages/engine-cli/src/commands/create.js | 1 + .../engine-cli/template/designer/registry.js | 7 +--- .../template/designer/src/preview.js | 2 +- packages/layout/index.js | 2 +- .../plugins/block/src/composable/useBlock.js | 8 +--- packages/plugins/datasource/index.js | 4 +- .../src/components/inputs/CodeEditor.vue | 2 +- .../src/components/modal/ModalContent.vue | 2 +- packages/utils/src/utils/index.js | 2 +- 24 files changed, 104 insertions(+), 82 deletions(-) rename packages/canvas/{container => DesignCanvas}/src/api/index.js (100%) rename packages/canvas/{container => DesignCanvas}/src/api/useCanvas.js (100%) rename packages/canvas/breadcrumb/src/{CanvasFooter.vue => CanvasBreadcrumb.vue} (83%) create mode 100644 packages/canvas/layout/index.js create mode 100644 packages/canvas/layout/meta.js create mode 100644 packages/canvas/layout/src/CanvasLayout.vue diff --git a/packages/canvas/DesignCanvas/index.js b/packages/canvas/DesignCanvas/index.js index db70c726d..04d2cc3d7 100644 --- a/packages/canvas/DesignCanvas/index.js +++ b/packages/canvas/DesignCanvas/index.js @@ -1,7 +1,12 @@ +import { HOOK_NAME } from '@opentiny/tiny-engine-entry' import DesignCanvas from './src/DesignCanvas.vue' import metaData from './meta' - +import api from './src/api' export default { ...metaData, - entry: DesignCanvas + entry: DesignCanvas, + apis: api(), + composable: { + name: HOOK_NAME.useCanvas + } } diff --git a/packages/canvas/DesignCanvas/src/DesignCanvas.vue b/packages/canvas/DesignCanvas/src/DesignCanvas.vue index 87c8714d9..2ac1eb9d3 100644 --- a/packages/canvas/DesignCanvas/src/DesignCanvas.vue +++ b/packages/canvas/DesignCanvas/src/DesignCanvas.vue @@ -1,6 +1,6 @@ diff --git a/packages/canvas/container/index.js b/packages/canvas/container/index.js index 455020b06..1cc593046 100644 --- a/packages/canvas/container/index.js +++ b/packages/canvas/container/index.js @@ -1,13 +1,7 @@ -import { HOOK_NAME } from '@opentiny/tiny-engine-entry' import CanvasContainer from './src/CanvasContainer.vue' import metaData from './meta' -import api from './src/api' export default { ...metaData, - entry: CanvasContainer, - apis: api(), - composable: { - name: HOOK_NAME.useCanvas - } + entry: CanvasContainer } diff --git a/packages/canvas/drag-drop/src/CanvasDragItem.vue b/packages/canvas/drag-drop/src/CanvasDragItem.vue index b5859d583..9d5a3f201 100644 --- a/packages/canvas/drag-drop/src/CanvasDragItem.vue +++ b/packages/canvas/drag-drop/src/CanvasDragItem.vue @@ -16,7 +16,7 @@ export default { }, emits: ['click'], setup(props, { emit }) { - const canvasApi = getPluginApi('engine.canvas.container').canvasApi + const canvasApi = getPluginApi('engine.canvas').canvasApi const dragstart = (e) => { if (props.data && canvasApi.value?.dragStart) { const data = deepClone(props.data) diff --git a/packages/canvas/index.js b/packages/canvas/index.js index 265c74e15..32a34eb1a 100644 --- a/packages/canvas/index.js +++ b/packages/canvas/index.js @@ -9,15 +9,22 @@ * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. * */ +import CanvasBreadcrumb from './breadcrumb' export { createRender } from './render' export { CanvasDragItem } from './drag-drop' // meta app -import CanvasBreadcrumb from './breadcrumb' import CanvasContainer from './container' +import CanvasLayout from './layout' import DesignCanvas from './DesignCanvas' +export { CanvasContainer, CanvasLayout, DesignCanvas } + export default { ...DesignCanvas, + components: { + CanvasBreadcrumb: CanvasBreadcrumb.entry + }, + layout: CanvasLayout, metas: [CanvasContainer, CanvasBreadcrumb] } diff --git a/packages/canvas/layout/index.js b/packages/canvas/layout/index.js new file mode 100644 index 000000000..9a3382240 --- /dev/null +++ b/packages/canvas/layout/index.js @@ -0,0 +1,7 @@ +import CanvasLayout from './src/CanvasLayout.vue' +import metaData from './meta' + +export default { + ...metaData, + entry: CanvasLayout +} diff --git a/packages/canvas/layout/meta.js b/packages/canvas/layout/meta.js new file mode 100644 index 000000000..5d429a507 --- /dev/null +++ b/packages/canvas/layout/meta.js @@ -0,0 +1,3 @@ +export default { + id: 'engine.canvas.layout' +} diff --git a/packages/canvas/layout/src/CanvasLayout.vue b/packages/canvas/layout/src/CanvasLayout.vue new file mode 100644 index 000000000..9523b1bcd --- /dev/null +++ b/packages/canvas/layout/src/CanvasLayout.vue @@ -0,0 +1,20 @@ + + diff --git a/packages/controller/js/constants.js b/packages/controller/js/constants.js index 7717f6338..f0e0f3f38 100644 --- a/packages/controller/js/constants.js +++ b/packages/controller/js/constants.js @@ -1,14 +1,14 @@ /** -* Copyright (c) 2023 - present TinyEngine Authors. -* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. -* -* Use of this source code is governed by an MIT-style license. -* -* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, -* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR -* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. -* -*/ + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ export const COMPONENT_NAME = { Page: 'Page', @@ -94,4 +94,4 @@ export const PROP_DATA_TYPE = { JSEXPRESSION: 'JSExpression', JSRESOURCE: 'JSResource', JSSLOT: 'JSSlot' -} \ No newline at end of file +} diff --git a/packages/controller/js/example.js b/packages/controller/js/example.js index c9a49717e..3ceeef454 100644 --- a/packages/controller/js/example.js +++ b/packages/controller/js/example.js @@ -1,14 +1,14 @@ /** -* Copyright (c) 2023 - present TinyEngine Authors. -* Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. -* -* Use of this source code is governed by an MIT-style license. -* -* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, -* BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR -* A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. -* -*/ + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ // 编辑器输入示例 const exampleMap = { diff --git a/packages/controller/src/composable/index.js b/packages/controller/src/composable/index.js index c5d2174be..5ced9ced6 100644 --- a/packages/controller/src/composable/index.js +++ b/packages/controller/src/composable/index.js @@ -20,4 +20,3 @@ export const EditorInfoService = { name: HOOK_NAME.useEditorInfo } } - diff --git a/packages/engine-cli/src/commands/create.js b/packages/engine-cli/src/commands/create.js index b2b2d1d14..6d98cb97d 100644 --- a/packages/engine-cli/src/commands/create.js +++ b/packages/engine-cli/src/commands/create.js @@ -19,6 +19,7 @@ export default function (name) { const sourcePath = path.join(__dirname, '../template/designer/') const destPath = path.join(cwd(), name) fs.copySync(sourcePath, destPath) + // eslint-disable-next-line no-console console.log( chalk.green(`create finish, run the follow command to start project: \ncd ${name} && npm install && npm run dev`) ) diff --git a/packages/engine-cli/template/designer/registry.js b/packages/engine-cli/template/designer/registry.js index d4554db72..afacc37d5 100644 --- a/packages/engine-cli/template/designer/registry.js +++ b/packages/engine-cli/template/designer/registry.js @@ -43,16 +43,13 @@ import { Layout, Canvas, EditorInfoService, - AppService, + AppService } from '@opentiny/tiny-engine' export default { root: { id: 'engine.root', - metas: [ - EditorInfoService, - AppService - ] + metas: [EditorInfoService, AppService] }, config: { id: 'engine.config', diff --git a/packages/engine-cli/template/designer/src/preview.js b/packages/engine-cli/template/designer/src/preview.js index 3fc45bd53..21d79b799 100644 --- a/packages/engine-cli/template/designer/src/preview.js +++ b/packages/engine-cli/template/designer/src/preview.js @@ -21,7 +21,7 @@ const beforeAppCreate = () => { initPreview({ registry: { - config: { id : 'engine.config', theme: 'light' }, + config: { id: 'engine.config', theme: 'light' } }, lifeCycles: { beforeAppCreate diff --git a/packages/layout/index.js b/packages/layout/index.js index 4a3ecac87..0fd60be68 100644 --- a/packages/layout/index.js +++ b/packages/layout/index.js @@ -5,7 +5,7 @@ import { LayoutService } from './src/composable' export default { ...metaData, component, - metas: [LayoutService], + metas: [LayoutService] } export { LayoutService } diff --git a/packages/plugins/block/src/composable/useBlock.js b/packages/plugins/block/src/composable/useBlock.js index af7714ec6..b530d81c0 100644 --- a/packages/plugins/block/src/composable/useBlock.js +++ b/packages/plugins/block/src/composable/useBlock.js @@ -20,13 +20,7 @@ import { getMergeMeta } from '@opentiny/tiny-engine-entry' import { getCanvasStatus } from '@opentiny/tiny-engine-controller/js/canvas' import { ast2String, parseExpression } from '@opentiny/tiny-engine-controller/js/ast' import { getCssObjectFromStyleStr } from '@opentiny/tiny-engine-controller/js/css' -import { - useCanvas, - useTranslate, - useEditorInfo, - useBreadcrumb, - useLayout -} from '@opentiny/tiny-engine-entry' +import { useCanvas, useTranslate, useEditorInfo, useBreadcrumb, useLayout } from '@opentiny/tiny-engine-entry' const { SORT_TYPE, SCHEMA_DATA_TYPE, BLOCK_OPENNESS } = constants diff --git a/packages/plugins/datasource/index.js b/packages/plugins/datasource/index.js index 598c9e753..38557ebf4 100644 --- a/packages/plugins/datasource/index.js +++ b/packages/plugins/datasource/index.js @@ -18,9 +18,7 @@ import { DataSourceService } from './src/composable' export default { ...metaData, entry, - metas: [ - DataSourceService - ] + metas: [DataSourceService] } export { fetchDataSourceList, fetchDataSourceDetail, DataSourceService } diff --git a/packages/settings/props/src/components/inputs/CodeEditor.vue b/packages/settings/props/src/components/inputs/CodeEditor.vue index 402bbeec6..ac20fc344 100644 --- a/packages/settings/props/src/components/inputs/CodeEditor.vue +++ b/packages/settings/props/src/components/inputs/CodeEditor.vue @@ -34,7 +34,7 @@