From 4b061775f83b2b40aa04b541864ae4f2ecedacb5 Mon Sep 17 00:00:00 2001 From: hexqi Date: Wed, 19 Jun 2024 12:08:36 +0800 Subject: [PATCH] feat: move hooks --- designer-demo/registry.js | 24 +-- packages/canvas/breadcrumb/index.js | 6 +- .../VariableConfigurator.vue | 4 +- packages/controller/adapter.js | 37 ----- packages/controller/js/comment.js | 16 ++ packages/controller/{src => js}/example.js | 3 +- packages/controller/meta.js | 3 - packages/controller/src/composable/index.js | 23 +++ .../src/{hooks => composable}/useApp.js | 6 +- .../{hooks => composable}/useEditorInfo.js | 0 packages/controller/src/hooks/index.js | 132 ----------------- packages/controller/src/index.js | 13 +- packages/controller/src/useData.js | 20 --- packages/controller/src/useMessage.js | 138 ------------------ packages/controller/utils.js | 58 ++++++-- packages/design-core/index.js | 34 ++--- .../engine-cli/template/designer/registry.js | 24 +-- packages/layout/index.js | 10 +- packages/layout/src/composable/index.js | 11 ++ .../src/{hooks => composable}/useLayout.js | 0 packages/plugins/block/index.js | 6 +- .../plugins/block/src/composable/index.js | 11 ++ .../block/src/composable}/useBlock.js | 6 +- packages/plugins/data/src/Main.vue | 3 +- packages/plugins/datasource/index.js | 8 +- .../datasource/src/DataSourceRemotePanel.vue | 2 +- .../datasource/src/composable/index.js | 11 ++ .../src/composable}/useDataSource.js | 0 packages/plugins/help/index.js | 6 +- packages/plugins/help/src/composable/index.js | 11 ++ .../help/src/composable}/useHelp.js | 0 packages/plugins/i18n/index.js | 6 +- packages/plugins/i18n/src/composable/index.js | 11 ++ .../i18n/src/composable}/useTranslate.js | 6 +- packages/plugins/materials/index.js | 6 +- .../plugins/materials/src/composable/index.js | 11 ++ .../materials/src/composable}/useResource.js | 2 +- packages/plugins/page/index.js | 6 +- packages/plugins/page/src/composable/index.js | 11 ++ .../page/src/composable}/usePage.js | 0 packages/plugins/schema/src/Main.vue | 3 +- .../events/src/components/AdvanceConfig.vue | 3 +- packages/settings/props/index.js | 10 +- .../src/components/inputs/CodeEditor.vue | 3 +- .../settings/props/src/composable/index.js | 21 +++ .../{hooks => composable}/useProperties.js | 0 .../src/{hooks => composable}/useProperty.js | 0 packages/toolbars/generate-vue/index.js | 6 +- .../generate-vue/src/composable/index.js | 11 ++ .../src/composable}/useSaveLocal.js | 0 packages/toolbars/redoundo/index.js | 6 +- .../toolbars/redoundo/src/composable/index.js | 11 ++ .../redoundo/src/composable}/useHistory.js | 0 packages/toolbars/save/index.js | 1 - 54 files changed, 294 insertions(+), 466 deletions(-) create mode 100644 packages/controller/js/comment.js rename packages/controller/{src => js}/example.js (98%) delete mode 100644 packages/controller/meta.js create mode 100644 packages/controller/src/composable/index.js rename packages/controller/src/{hooks => composable}/useApp.js (89%) rename packages/controller/src/{hooks => composable}/useEditorInfo.js (100%) delete mode 100644 packages/controller/src/hooks/index.js delete mode 100644 packages/controller/src/useData.js delete mode 100644 packages/controller/src/useMessage.js create mode 100644 packages/layout/src/composable/index.js rename packages/layout/src/{hooks => composable}/useLayout.js (100%) create mode 100644 packages/plugins/block/src/composable/index.js rename packages/{controller/src/hooks => plugins/block/src/composable}/useBlock.js (98%) create mode 100644 packages/plugins/datasource/src/composable/index.js rename packages/{controller/src/hooks => plugins/datasource/src/composable}/useDataSource.js (100%) create mode 100644 packages/plugins/help/src/composable/index.js rename packages/{controller/src/hooks => plugins/help/src/composable}/useHelp.js (100%) create mode 100644 packages/plugins/i18n/src/composable/index.js rename packages/{controller/src/hooks => plugins/i18n/src/composable}/useTranslate.js (96%) create mode 100644 packages/plugins/materials/src/composable/index.js rename packages/{controller/src/hooks => plugins/materials/src/composable}/useResource.js (99%) create mode 100644 packages/plugins/page/src/composable/index.js rename packages/{controller/src/hooks => plugins/page/src/composable}/usePage.js (100%) create mode 100644 packages/settings/props/src/composable/index.js rename packages/settings/props/src/{hooks => composable}/useProperties.js (100%) rename packages/settings/props/src/{hooks => composable}/useProperty.js (100%) create mode 100644 packages/toolbars/generate-vue/src/composable/index.js rename packages/toolbars/{save/src/hooks => generate-vue/src/composable}/useSaveLocal.js (100%) create mode 100644 packages/toolbars/redoundo/src/composable/index.js rename packages/{controller/src/hooks => toolbars/redoundo/src/composable}/useHistory.js (100%) diff --git a/designer-demo/registry.js b/designer-demo/registry.js index dc2ef6b0b..d4554db72 100644 --- a/designer-demo/registry.js +++ b/designer-demo/registry.js @@ -43,18 +43,7 @@ import { Layout, Canvas, EditorInfoService, - HelpService, AppService, - BlockService, - BreadcrumbService, - DataSourceService, - PageService, - ResourceService, - PropertiesService, - PropertyService, - SaveLocalService, - TranslateService, - HistoryService, } from '@opentiny/tiny-engine' export default { @@ -62,18 +51,7 @@ export default { id: 'engine.root', metas: [ EditorInfoService, - HelpService, - AppService, - BreadcrumbService, - BlockService, - DataSourceService, - PageService, - ResourceService, - PropertiesService, - PropertyService, - SaveLocalService, - TranslateService, - HistoryService, + AppService ] }, config: { diff --git a/packages/canvas/breadcrumb/index.js b/packages/canvas/breadcrumb/index.js index 143fe9c3e..4d330c414 100644 --- a/packages/canvas/breadcrumb/index.js +++ b/packages/canvas/breadcrumb/index.js @@ -1,3 +1,4 @@ +import { HOOK_NAME } from '@opentiny/tiny-engine-entry' import CanvasBreadcrumb from './src/CanvasFooter.vue' import metaData from './meta' import useBreadcrumb from './src/useBreadcrumb' @@ -5,5 +6,8 @@ import useBreadcrumb from './src/useBreadcrumb' export default { ...metaData, apis: useBreadcrumb(), - entry: CanvasBreadcrumb + entry: CanvasBreadcrumb, + composable: { + name: HOOK_NAME.useBreadcrumb + } } diff --git a/packages/configurator/src/variable-configurator/VariableConfigurator.vue b/packages/configurator/src/variable-configurator/VariableConfigurator.vue index a0d6b6070..76bd92d16 100644 --- a/packages/configurator/src/variable-configurator/VariableConfigurator.vue +++ b/packages/configurator/src/variable-configurator/VariableConfigurator.vue @@ -121,7 +121,8 @@