diff --git a/docs/package.json b/docs/package.json index c2334341..7189dd43 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,7 +8,7 @@ "build": "npm run clean:top && vuepress build src -d dist" }, "dependencies": { - "@element-plus/icons-vue": "^2.0.6", + "@element-plus/icons-vue": "^2.0.9", "@tmagic/form": "1.1.0-beta.12", "@tmagic/schema": "1.1.0-beta.12", "@tmagic/utils": "1.1.0-beta.12", diff --git a/packages/editor/package.json b/packages/editor/package.json index 654a87b3..71437c50 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -44,7 +44,7 @@ ], "dependencies": { "@babel/core": "^7.18.0", - "@element-plus/icons-vue": "^2.0.6", + "@element-plus/icons-vue": "^2.0.9", "@tmagic/core": "1.1.0-beta.12", "@tmagic/form": "1.1.0-beta.12", "@tmagic/schema": "1.1.0-beta.12", diff --git a/packages/editor/src/Editor.vue b/packages/editor/src/Editor.vue index c2f14a1f..ba12f1b4 100644 --- a/packages/editor/src/Editor.vue +++ b/packages/editor/src/Editor.vue @@ -64,7 +64,7 @@ import historyService from './services/history'; import propsService from './services/props'; import storageService from './services/storage'; import uiService from './services/ui'; -import type { ComponentGroup, MenuBarData, MenuItem, Services, SideBarData, StageRect } from './type'; +import type { ComponentGroup, MenuBarData, MenuButton, MenuComponent, Services, SideBarData, StageRect } from './type'; export default defineComponent({ name: 'm-editor', @@ -97,12 +97,12 @@ export default defineComponent({ }, layerContentMenu: { - type: Array as PropType, + type: Array as PropType<(MenuButton | MenuComponent)[]>, default: () => [], }, stageContentMenu: { - type: Array as PropType, + type: Array as PropType<(MenuButton | MenuComponent)[]>, default: () => [], }, diff --git a/packages/editor/src/components/ContentMenu.vue b/packages/editor/src/components/ContentMenu.vue index 52e130b5..ca53e4c7 100644 --- a/packages/editor/src/components/ContentMenu.vue +++ b/packages/editor/src/components/ContentMenu.vue @@ -25,13 +25,13 @@ diff --git a/packages/editor/src/components/ToolButton.vue b/packages/editor/src/components/ToolButton.vue index f9eeb7f7..123d3912 100644 --- a/packages/editor/src/components/ToolButton.vue +++ b/packages/editor/src/components/ToolButton.vue @@ -2,169 +2,80 @@