From 0a77c0b5412a63f8359c19918b4588ecbd083c55 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Thu, 27 Jun 2024 01:29:27 -0700 Subject: [PATCH 1/2] refactor: meta components migration phase II --- packages/common/component/ConfigItem.vue | 5 +- packages/common/component/MetaInput.vue | 72 ------ packages/common/component/MetaSelect.vue | 122 ---------- .../common/component/MultiTypeSelector.vue | 6 +- packages/common/index.js | 113 +-------- packages/common/package.json | 1 - packages/configurator/package.json | 3 +- .../ArrayItemConfigurator.vue} | 35 ++- .../code-configurator/CodeConfigurator.vue | 2 +- .../CodeListConfigurator.vue | 2 +- .../configurator/src/components/BindI18n.vue | 227 ------------------ .../configurator/src/components/SvgButton.vue | 68 ------ .../configurator/src/components/VueMonaco.vue | 196 --------------- packages/configurator/src/components/index.js | 4 - .../ContainerConfigurator.vue} | 2 +- .../form-configurator/FormConfigurator.vue | 82 ------- .../GroupItemConfigurator.vue} | 4 +- .../i18n-configurator/I18nConfigurator.vue | 2 +- packages/configurator/src/index.js | 123 ++++++++-- .../LayoutGridConfigurator.vue} | 9 +- .../RelatedColumnsConfigurator.vue} | 8 +- .../RelatedEditorConfigurator.vue} | 3 +- .../TableColumnsConfigurator.vue} | 4 +- .../VariableConfigurator.vue | 2 +- .../design-core/src/registerConfigurators.js | 3 - .../src/components/ArrayConfigItemForm.vue | 11 +- .../design/src/components/widgets/index.js | 8 - .../events/src/components/AdvanceConfig.vue | 22 +- .../settings/props/src/components/index.js | 4 +- .../styles/src/components/layout/FlexBox.vue | 8 +- .../styles/src/components/layout/GridBox.vue | 17 +- .../src/components/layout/LayoutGroup.vue | 6 +- .../src/components/position/PositionGroup.vue | 29 ++- .../styles/src/components/size/SizeGroup.vue | 11 +- 34 files changed, 212 insertions(+), 1002 deletions(-) delete mode 100644 packages/common/component/MetaInput.vue delete mode 100644 packages/common/component/MetaSelect.vue rename packages/{common/component/MetaArrayItem.vue => configurator/src/array-item-configurator/ArrayItemConfigurator.vue} (95%) delete mode 100644 packages/configurator/src/components/BindI18n.vue delete mode 100644 packages/configurator/src/components/SvgButton.vue delete mode 100644 packages/configurator/src/components/VueMonaco.vue delete mode 100644 packages/configurator/src/components/index.js rename packages/{common/component/MetaContainer.vue => configurator/src/container-configurator/ContainerConfigurator.vue} (97%) delete mode 100644 packages/configurator/src/form-configurator/FormConfigurator.vue rename packages/{common/component/MetaGroupItem.vue => configurator/src/group-item-configurator/GroupItemConfigurator.vue} (92%) rename packages/{common/component/MetaLayoutGrid.vue => configurator/src/layout-grid-configurator/LayoutGridConfigurator.vue} (97%) rename packages/{common/component/MetaRelatedColumns.vue => configurator/src/related-columns-configurator/RelatedColumnsConfigurator.vue} (90%) rename packages/{common/component/MetaRelatedEditor.vue => configurator/src/related-editor-configurator/RelatedEditorConfigurator.vue} (95%) rename packages/{common/component/MetaTableColumns.vue => configurator/src/table-columns-configurator/TableColumnsConfigurator.vue} (80%) diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue index c3dded76e3..84b0eef04a 100644 --- a/packages/common/component/ConfigItem.vue +++ b/packages/common/component/ConfigItem.vue @@ -104,7 +104,6 @@ import { Popover, Tooltip } from '@opentiny/vue' import { IconWriting, IconHelpCircle, IconPlusCircle } from '@opentiny/vue-icon' import { typeOf } from '@opentiny/vue-renderless/common/type' import i18n from '@opentiny/tiny-engine-controller/js/i18n' -import { CodeConfigurator, VariableConfigurator } from '@opentiny/tiny-engine-configurator' import MultiTypeSelector from './MultiTypeSelector.vue' import { useHistory, useProperties, useResource, useLayout, useCanvas } from '@opentiny/tiny-engine-controller' import { SCHEMA_DATA_TYPE, PAGE_STATUS, TYPES } from '@opentiny/tiny-engine-controller/js/constants' @@ -123,8 +122,8 @@ const hasRule = (required, rules) => { export default { components: { MultiTypeSelector, - CodeConfigurator, - VariableConfigurator, + CodeConfigurator: getConfigurator('CodeConfigurator'), + VariableConfigurator: getConfigurator('VariableConfigurator'), TinyPopover: Popover, TinyTooltip: Tooltip, IconWriting: IconWriting(), diff --git a/packages/common/component/MetaInput.vue b/packages/common/component/MetaInput.vue deleted file mode 100644 index f44e0bc9fa..0000000000 --- a/packages/common/component/MetaInput.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - diff --git a/packages/common/component/MetaSelect.vue b/packages/common/component/MetaSelect.vue deleted file mode 100644 index d9a59b8f97..0000000000 --- a/packages/common/component/MetaSelect.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - diff --git a/packages/common/component/MultiTypeSelector.vue b/packages/common/component/MultiTypeSelector.vue index 2e3649a80a..3f836e8907 100644 --- a/packages/common/component/MultiTypeSelector.vue +++ b/packages/common/component/MultiTypeSelector.vue @@ -12,7 +12,7 @@
import { reactive } from 'vue' import { Tooltip, Popover, Radio, RadioGroup } from '@opentiny/vue' -import { MetaComponents } from '../index' +import { getConfigurator } from '@opentiny/tiny-engine-entry' export default { name: 'MultiTypeSelector', @@ -113,7 +113,7 @@ export default { TYPE_MAP, change, handleChange, - MetaComponents + getConfigurator } } } diff --git a/packages/common/index.js b/packages/common/index.js index cf545e02df..5f979a2e51 100644 --- a/packages/common/index.js +++ b/packages/common/index.js @@ -10,34 +10,6 @@ * */ -import { - ButtonGroupConfigurator, - CascaderConfigurator, - CheckBoxConfigurator, - CheckboxGroupConfigurator, - CodeConfigurator, - CodeListConfigurator, - CollectionConfigurator, - ColorConfigurator, - DatePickerConfigurator, - FormConfigurator, - HtmlAttributesConfigurator, - HtmlTextConfigurator, - I18nConfigurator, - InputConfigurator, - IpSectionConfigurator, - JsSlotConfigurator, - NumberConfigurator, - RadioConfigurator, - RadioGroupConfigurator, - SelectConfigurator, - SelectIconConfigurator, - SliderConfigurator, - SlotConfigurator, - SwitchConfigurator, - VariableConfigurator -} from '@opentiny/tiny-engine-configurator' - import PluginSetting from './component/PluginSetting.vue' import PluginPanel from './component/PluginPanel.vue' import SvgButton from './component/SvgButton.vue' @@ -48,17 +20,15 @@ import ConfigGroup from './component/ConfigGroup.vue' import ConfigItem from './component/ConfigItem.vue' import ConfigRender from './component/ConfigRender.vue' -import MetaArrayItem from './component/MetaArrayItem.vue' +import MetaForm from './component/MetaForm.vue' import MetaListActions from './component/MetaListActions.vue' -import MetaGroupItem from './component/MetaGroupItem.vue' -import MetaLayoutGrid from './component/MetaLayoutGrid.vue' import MetaListTitle from './component/MetaListTitle.vue' import MetaListItems from './component/MetaListItems.vue' import MetaListItem from './component/MetaListItem.vue' import MetaModal, { useModal } from './component/MetaModal.vue' +import MetaModalItem from './component/MetaModalItem.vue' import MetaPopover from './component/MetaPopover.vue' import VideoGuide from './component/VideoGuide.vue' -import MetaContainer from './component/MetaContainer.vue' import MonacoEditor from './component/MonacoEditor.vue' import BlockHistoryList from './component/BlockHistoryList.vue' import BlockHistoryTemplate from './component/BlockHistoryTemplate.vue' @@ -75,14 +45,14 @@ import VueMonaco, { setGlobalMonacoEditorTheme } from './component/VueMonaco.vue import PublicIcon from './component/PublicIcon.vue' import SaveNewBlock from './component/SaveNewBlock.vue' import BindI18n from './component/BindI18n.vue' -import MetaRelatedEditor from './component/MetaRelatedEditor.vue' -import MetaRelatedColumns from './component/MetaRelatedColumns.vue' import BlockDeployDialog from './component/BlockDeployDialog.vue' import ProgressBar from './component/ProgressBar.vue' -import MetaTableColumns from './component/MetaTableColumns.vue' import SearchEmpty from './component/SearchEmpty.vue' import MetaDescription from './component/MetaDescription.vue' import MetaList from './component/MetaList.vue' +import MetaChildItem from './component/MetaChildItem.vue' +import SplitPanes from './component/SplitPanes.vue' +import Pane from './component/Pane.vue' import i18n, { i18nKeyMaps } from '@opentiny/tiny-engine-controller/js/i18n' @@ -108,77 +78,18 @@ export const injectGlobalComponents = { } } -// TODO: 后面由各自所需代码各自引入,然后删除 -export const MetaComponents = { - MetaArrayItem, - MetaBindI18n: I18nConfigurator, - MetaBindVariable: VariableConfigurator, - MetaButtonGroup: ButtonGroupConfigurator, - MetaCheckBox: CheckBoxConfigurator, - MetaCascader: CascaderConfigurator, - MetaCodeEditor: CodeConfigurator, - MetaCodeEditorList: CodeListConfigurator, - MetaColor: ColorConfigurator, - MetaDatePicker: DatePickerConfigurator, - MetaGroupItem, - MetaInput: InputConfigurator, - MetaLayoutGrid, - MetaList, - MetaModal, - MetaNumber: NumberConfigurator, - MetaNumeric: NumberConfigurator, - MetaPopover, - MetaRadio: RadioConfigurator, - MetaSelect: SelectConfigurator, - MetaSelectIcon: SelectIconConfigurator, - MetaSlider: SliderConfigurator, - MetaSwitch: SwitchConfigurator, - MetaListTitle, - MetaListActions, - MetaListItems, - MetaListItem, - MetaForm: FormConfigurator, - MetaCollection: CollectionConfigurator, - MetaContainer, - MetaJsSlot: JsSlotConfigurator, - MetaSlot: SlotConfigurator, - MetaHtmlText: HtmlTextConfigurator, - MetaHtmlAttributes: HtmlAttributesConfigurator, - MetaRadioGroup: RadioGroupConfigurator, - MetaCheckboxGroup: CheckboxGroupConfigurator, - MetaIpSection: IpSectionConfigurator, - MetaRelatedEditor, - MetaRelatedColumns, - MetaTableColumns -} - export { - I18nConfigurator as MetaBindI18n, - VariableConfigurator as MetaBindVariable, - CheckBoxConfigurator as MetaCheckBox, - CodeConfigurator as MetaCodeEditor, - CodeListConfigurator as MetaCodeEditorList, - ColorConfigurator as MetaColor, - DatePickerConfigurator as MetaDatePicker, MetaDescription, - InputConfigurator as MetaInput, MetaList, MetaModal, - NumberConfigurator as MetaNumber, + MetaModalItem, MetaPopover, - RadioConfigurator as MetaRadio, - SelectConfigurator as MetaSelect, - SelectIconConfigurator as MetaSelectIcon, - SliderConfigurator as MetaSlider, - SwitchConfigurator as MetaSwitch, MetaListTitle, MetaListActions, MetaListItems, MetaListItem, - JsSlotConfigurator as MetaJsSlot, - SlotConfigurator as MetaSlot, - HtmlTextConfigurator as MetaHtmlText, - FormConfigurator as MetaForm, + MetaChildItem, + MetaForm, ConfigCollapse, ConfigGroup, ConfigItem, @@ -195,15 +106,12 @@ export { BlockLinkEvent, BlockDescription, PluginBlockList, - CollectionConfigurator as MetaCollection, ButtonGroup, CloseIcon, LifeCycles, EmptyTip, - MetaContainer, MonacoEditor, MaskModal, - HtmlAttributesConfigurator as MetaHtmlAttributes, VueMonaco, setGlobalMonacoEditorTheme, PublicIcon, @@ -211,8 +119,9 @@ export { BindI18n, BlockDeployDialog, ProgressBar, - MetaTableColumns, - SearchEmpty + SearchEmpty, + SplitPanes, + Pane } export { default as Modal } from './component/Modal' diff --git a/packages/common/package.json b/packages/common/package.json index 75118b0691..884f4a15fd 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -27,7 +27,6 @@ "license": "MIT", "homepage": "https://opentiny.design/tiny-engine", "dependencies": { - "@opentiny/tiny-engine-configurator": "workspace:*", "@opentiny/tiny-engine-controller": "workspace:*", "@opentiny/tiny-engine-entry": "workspace:*", "@opentiny/tiny-engine-http": "workspace:*", diff --git a/packages/configurator/package.json b/packages/configurator/package.json index 85adcdd569..854384b88a 100644 --- a/packages/configurator/package.json +++ b/packages/configurator/package.json @@ -29,7 +29,8 @@ "@opentiny/tiny-engine-http": "workspace:*", "@opentiny/tiny-engine-utils": "workspace:*", "@vue/shared": "^3.3.4", - "monaco-editor": "0.33.0" + "monaco-editor": "0.33.0", + "vue-draggable-next": "2.1.0" }, "publishConfig": { "access": "public" diff --git a/packages/common/component/MetaArrayItem.vue b/packages/configurator/src/array-item-configurator/ArrayItemConfigurator.vue similarity index 95% rename from packages/common/component/MetaArrayItem.vue rename to packages/configurator/src/array-item-configurator/ArrayItemConfigurator.vue index b6ea09ba00..d7efd83f49 100644 --- a/packages/common/component/MetaArrayItem.vue +++ b/packages/configurator/src/array-item-configurator/ArrayItemConfigurator.vue @@ -48,15 +48,12 @@ - - diff --git a/packages/configurator/src/components/SvgButton.vue b/packages/configurator/src/components/SvgButton.vue deleted file mode 100644 index e46650d35a..0000000000 --- a/packages/configurator/src/components/SvgButton.vue +++ /dev/null @@ -1,68 +0,0 @@ - - - - - diff --git a/packages/configurator/src/components/VueMonaco.vue b/packages/configurator/src/components/VueMonaco.vue deleted file mode 100644 index d102449425..0000000000 --- a/packages/configurator/src/components/VueMonaco.vue +++ /dev/null @@ -1,196 +0,0 @@ - - diff --git a/packages/configurator/src/components/index.js b/packages/configurator/src/components/index.js deleted file mode 100644 index 2b0dbafb93..0000000000 --- a/packages/configurator/src/components/index.js +++ /dev/null @@ -1,4 +0,0 @@ -// TODO components 文件夹下的组件是从 @opentiny/tiny-engine-common 复制过来的临时文件,防止循环依赖 -export { default as BindI18n } from './BindI18n.vue' -export { default as SvgButton } from './SvgButton.vue' -export { default as VueMonaco } from './VueMonaco.vue' diff --git a/packages/common/component/MetaContainer.vue b/packages/configurator/src/container-configurator/ContainerConfigurator.vue similarity index 97% rename from packages/common/component/MetaContainer.vue rename to packages/configurator/src/container-configurator/ContainerConfigurator.vue index be0e300b4f..2f0d787569 100644 --- a/packages/common/component/MetaContainer.vue +++ b/packages/configurator/src/container-configurator/ContainerConfigurator.vue @@ -21,7 +21,7 @@ - - diff --git a/packages/common/component/MetaGroupItem.vue b/packages/configurator/src/group-item-configurator/GroupItemConfigurator.vue similarity index 92% rename from packages/common/component/MetaGroupItem.vue rename to packages/configurator/src/group-item-configurator/GroupItemConfigurator.vue index 6833289dd1..1f866c3cc3 100644 --- a/packages/common/component/MetaGroupItem.vue +++ b/packages/configurator/src/group-item-configurator/GroupItemConfigurator.vue @@ -8,10 +8,10 @@