diff --git a/packages/canvas/DesignCanvas/index.js b/packages/canvas/DesignCanvas/index.js
index db70c726d7..04d2cc3d7d 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 87c8714d9f..2ac1eb9d3d 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 455020b061..1cc5930465 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 b5859d583e..9d5a3f201a 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 265c74e15c..32a34eb1af 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 0000000000..9a3382240d
--- /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 0000000000..5d429a5074
--- /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 0000000000..9523b1bcd1
--- /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 7717f6338d..f0e0f3f38a 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 c9a49717e3..3ceeef4543 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 c5d2174be8..5ced9ced65 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 b2b2d1d14a..6d98cb97d2 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 d4554db722..afacc37d59 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 3fc45bd530..21d79b799e 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/entry/src/common.js b/packages/entry/src/common.js
index f93cee1e39..d55a0c18f0 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/index.js b/packages/layout/index.js
index 4a3ecac872..0fd60be682 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 af7714ec69..b530d81c0a 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 598c9e753f..38557ebf42 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 402bbeec64..ac20fc3444 100644
--- a/packages/settings/props/src/components/inputs/CodeEditor.vue
+++ b/packages/settings/props/src/components/inputs/CodeEditor.vue
@@ -34,7 +34,7 @@