From dd4ceb7c53bf05878ab6b033f3c4c3bae0faa4b3 Mon Sep 17 00:00:00 2001 From: gene9831 Date: Thu, 27 Jun 2024 05:02:57 -0700 Subject: [PATCH] refactor: rename meta components --- designer-demo/public/mock/bundle.json | 112 +++++----- mockServer/assets/json/bundle.json | 72 +++---- mockServer/src/services/appinfo.json | 196 +++++++++--------- packages/canvas/test/jsslot.json | 6 +- packages/common/component/ConfigItem.vue | 11 +- packages/common/component/MetaChildItem.vue | 3 +- packages/common/component/MetaModalItem.vue | 1 - packages/common/component/MetaPopover.vue | 5 +- packages/configurator/src/index.js | 2 +- .../number-configurator/NumberConfigurator.md | 2 +- .../RelatedColumnsConfigurator.vue | 2 +- .../template/designer/public/mock/bundle.json | 10 +- .../plugins/block/src/BlockPropertyForm.vue | 12 +- .../plugins/block/src/js/blockPropertyForm.js | 8 +- .../plugins/block/src/js/blockSetting.jsx | 52 ++--- .../src/assets/materials/ng-bundle.json | 4 +- .../assets/materials/ng-components/table.json | 2 +- .../design/src/components/SettingPanel.vue | 4 +- .../settings/design/src/convertToSchema.js | 10 +- .../settings/design/src/schemas/button.json | 4 +- .../design/src/schemas/checkboxgroup.json | 4 +- .../settings/design/src/schemas/form.json | 6 +- .../settings/design/src/schemas/grid.json | 28 +-- .../design/src/schemas/gridcolumn.json | 8 +- .../settings/design/src/schemas/input.json | 2 +- .../settings/design/src/schemas/pager.json | 2 +- .../design/src/schemas/popeditor.json | 6 +- .../settings/design/src/schemas/popover.json | 4 +- .../settings/design/src/schemas/select.json | 2 +- .../settings/design/src/schemas/tabs.json | 2 +- .../design/src/schemas/time-line.json | 2 +- .../settings/design/src/schemas/tooltip.json | 2 +- .../settings/design/src/schemas/tree.json | 8 +- packages/settings/design/src/store/index.js | 40 ++-- .../props/src/composable/useProperties.js | 8 +- .../case1_normal/input/blocks.schema.json | 4 +- .../testcases/sfc/case01/blocks.schema.json | 4 +- 37 files changed, 325 insertions(+), 325 deletions(-) diff --git a/designer-demo/public/mock/bundle.json b/designer-demo/public/mock/bundle.json index da15069b4..6cd511432 100644 --- a/designer-demo/public/mock/bundle.json +++ b/designer-demo/public/mock/bundle.json @@ -158,7 +158,7 @@ "labelPosition": "top", "type": "string", "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "device": [] @@ -680,7 +680,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -703,7 +703,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -1221,7 +1221,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -1487,7 +1487,7 @@ "labelPosition": "top", "type": "array", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -1559,7 +1559,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -1722,7 +1722,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -1741,7 +1741,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -1762,7 +1762,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -1804,7 +1804,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSFunction" } @@ -1956,7 +1956,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -1996,7 +1996,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -2057,7 +2057,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -2077,7 +2077,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -2087,7 +2087,7 @@ } ], "widget": { - "component": "MetaTableColumns", + "component": "TableColumnsConfigurator", "props": { "type": "object", "textField": "label", @@ -2352,7 +2352,7 @@ "cols": 12, "labelPosition": "top", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "device": [] @@ -2955,7 +2955,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -4635,7 +4635,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -4790,7 +4790,7 @@ }, "cols": 12, "widget": { - "component": "MetaLayoutGrid", + "component": "LayoutGridConfigurator", "props": {} }, "description": { @@ -5082,7 +5082,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -5102,7 +5102,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -5716,7 +5716,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -6053,7 +6053,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -6117,7 +6117,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -6806,7 +6806,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -8095,7 +8095,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8559,7 +8559,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -8955,7 +8955,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -9413,7 +9413,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -9450,7 +9450,7 @@ } }, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} } }, @@ -9559,7 +9559,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSFunction" } @@ -9634,7 +9634,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -9656,7 +9656,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -9705,7 +9705,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", @@ -9733,7 +9733,7 @@ "onChange": "this.delProp('data')", "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "fetchData", "dataType": "JSExpression" @@ -9760,7 +9760,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "pager", "dataType": "JSExpression" @@ -9824,7 +9824,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSExpression" } @@ -9846,7 +9846,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -9866,7 +9866,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -9885,7 +9885,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10041,7 +10041,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10081,7 +10081,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10375,7 +10375,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10679,7 +10679,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10699,7 +10699,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10719,7 +10719,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -10968,7 +10968,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11049,7 +11049,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11069,7 +11069,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11117,7 +11117,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11366,7 +11366,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -12008,7 +12008,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12193,7 +12193,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -12251,7 +12251,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -12608,7 +12608,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -12628,7 +12628,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { diff --git a/mockServer/assets/json/bundle.json b/mockServer/assets/json/bundle.json index ee85b4c81..bd886eaba 100644 --- a/mockServer/assets/json/bundle.json +++ b/mockServer/assets/json/bundle.json @@ -241,7 +241,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -1914,7 +1914,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -2067,7 +2067,7 @@ }, "cols": 12, "widget": { - "component": "MetaLayoutGrid", + "component": "LayoutGridConfigurator", "props": {} }, "description": { @@ -2359,7 +2359,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -2379,7 +2379,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -2993,7 +2993,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -3330,7 +3330,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -3394,7 +3394,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -4083,7 +4083,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -5372,7 +5372,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -5836,7 +5836,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -6232,7 +6232,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -6688,7 +6688,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -6725,7 +6725,7 @@ } }, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} } }, @@ -6834,7 +6834,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSFunction" } @@ -6909,7 +6909,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -6931,7 +6931,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -6980,7 +6980,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", @@ -7008,7 +7008,7 @@ "onChange": "this.delProp('data')", "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "fetchData", "dataType": "JSExpression" @@ -7035,7 +7035,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "pager", "dataType": "JSExpression" @@ -7099,7 +7099,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSExpression" } @@ -7121,7 +7121,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7141,7 +7141,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7160,7 +7160,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7316,7 +7316,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7356,7 +7356,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7650,7 +7650,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7954,7 +7954,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7974,7 +7974,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7994,7 +7994,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8243,7 +8243,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8302,7 +8302,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8322,7 +8322,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8370,7 +8370,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -8619,7 +8619,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -9237,7 +9237,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/mockServer/src/services/appinfo.json b/mockServer/src/services/appinfo.json index a288c43d4..72f1bf068 100644 --- a/mockServer/src/services/appinfo.json +++ b/mockServer/src/services/appinfo.json @@ -4534,7 +4534,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -4593,7 +4593,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -4613,7 +4613,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -4661,7 +4661,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -5183,7 +5183,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -6223,7 +6223,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -6865,7 +6865,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -7630,7 +7630,7 @@ }, "cols": 12, "widget": { - "component": "MetaLayoutGrid", + "component": "LayoutGridConfigurator", "props": {} }, "description": { @@ -8591,7 +8591,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -8663,7 +8663,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -10683,7 +10683,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11584,7 +11584,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11604,7 +11604,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -11910,7 +11910,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -11947,7 +11947,7 @@ } }, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} } }, @@ -12056,7 +12056,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSFunction" } @@ -12131,7 +12131,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -12153,7 +12153,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12200,7 +12200,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", @@ -12228,7 +12228,7 @@ "onChange": "this.delProp('data')", "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "fetchData" } @@ -12254,7 +12254,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "pager" } @@ -12317,7 +12317,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSExpression" } @@ -12339,7 +12339,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12359,7 +12359,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12378,7 +12378,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12530,7 +12530,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -12570,7 +12570,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -13503,7 +13503,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -13855,7 +13855,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -14253,7 +14253,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15006,7 +15006,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15026,7 +15026,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15046,7 +15046,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15330,7 +15330,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15519,7 +15519,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15686,7 +15686,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -15820,7 +15820,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16069,7 +16069,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16513,7 +16513,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16532,7 +16532,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16551,7 +16551,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16608,7 +16608,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -16838,7 +16838,7 @@ "labelPosition": "top", "type": "string", "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "device": [] @@ -17360,7 +17360,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -17383,7 +17383,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -17901,7 +17901,7 @@ "labelPosition": "top", "type": "object", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18167,7 +18167,7 @@ "labelPosition": "top", "type": "array", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18239,7 +18239,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -18402,7 +18402,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -18421,7 +18421,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18442,7 +18442,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18484,7 +18484,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -18634,7 +18634,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -18674,7 +18674,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18735,7 +18735,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -18755,7 +18755,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -18765,7 +18765,7 @@ } ], "widget": { - "component": "MetaTableColumns", + "component": "TableColumnsConfigurator", "props": { "type": "object", "textField": "title", @@ -19030,7 +19030,7 @@ "cols": 12, "labelPosition": "top", "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "device": [] @@ -19633,7 +19633,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -21306,7 +21306,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -21461,7 +21461,7 @@ }, "cols": 12, "widget": { - "component": "MetaLayoutGrid", + "component": "LayoutGridConfigurator", "props": {} }, "description": { @@ -21753,7 +21753,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -21773,7 +21773,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -22387,7 +22387,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -22724,7 +22724,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -22788,7 +22788,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -23477,7 +23477,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -24766,7 +24766,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -25230,7 +25230,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -25626,7 +25626,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -26082,7 +26082,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -26119,7 +26119,7 @@ } }, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} } }, @@ -26228,7 +26228,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSFunction" } @@ -26303,7 +26303,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -26325,7 +26325,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -26374,7 +26374,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", @@ -26402,7 +26402,7 @@ "onChange": "this.delProp('data')", "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "fetchData", "dataType": "JSExpression" @@ -26429,7 +26429,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "name": "pager", "dataType": "JSExpression" @@ -26493,7 +26493,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "dataType": "JSExpression" } @@ -26515,7 +26515,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -26535,7 +26535,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -26554,7 +26554,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -26710,7 +26710,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -26750,7 +26750,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27044,7 +27044,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27348,7 +27348,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27368,7 +27368,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27388,7 +27388,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27637,7 +27637,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27696,7 +27696,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27716,7 +27716,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -27764,7 +27764,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -28013,7 +28013,7 @@ ], "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "language": "json" } @@ -28633,7 +28633,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -28818,7 +28818,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -28876,7 +28876,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -29233,7 +29233,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -29253,7 +29253,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { diff --git a/packages/canvas/test/jsslot.json b/packages/canvas/test/jsslot.json index 8a6cf5b66..12a57b3ee 100644 --- a/packages/canvas/test/jsslot.json +++ b/packages/canvas/test/jsslot.json @@ -30,7 +30,7 @@ "zh_CN": "是否编辑配置项" }, "widget": { - "component": "MetaCodeEditor" + "component": "CodeConfigurator" }, "cols": 12, "rules": [], @@ -55,7 +55,7 @@ "zh_CN": "表格数据配置项" }, "widget": { - "component": "MetaCodeEditor" + "component": "CodeConfigurator" }, "cols": 12, "rules": [], @@ -79,7 +79,7 @@ "zh_CN": "下拉框数据配置项" }, "widget": { - "component": "MetaCodeEditor" + "component": "CodeConfigurator" }, "cols": 12, "rules": [], diff --git a/packages/common/component/ConfigItem.vue b/packages/common/component/ConfigItem.vue index 84b0eef04..be0127ba1 100644 --- a/packages/common/component/ConfigItem.vue +++ b/packages/common/component/ConfigItem.vue @@ -192,7 +192,9 @@ export default { !props.onlyEdit && propLabel.value && (isBindingState.value || - !['MetaGroupItem', 'MetaArrayItem', 'MetaRelatedColumns'].includes(widget.value.component)) && + !['GroupItemConfigurator', 'ArrayItemConfigurator', 'RelatedColumnsConfigurator'].includes( + widget.value.component + )) && !multiType.value ) const propDescription = computed( @@ -237,7 +239,7 @@ export default { return props.property.labelPosition } - if (['MetaSwitch', 'SwitchConfigurator'].includes(props.property.widget?.component)) { + if (['SwitchConfigurator', 'SwitchConfigurator'].includes(props.property.widget?.component)) { return 'left' } @@ -275,7 +277,7 @@ export default { if ( property !== 'name' && - ['SelectIconConfigurator', 'MetaSelectIcon'].includes(props.property.widget.component) + ['SelectIconConfigurator', 'SelectIconConfigurator'].includes(props.property.widget.component) ) { // icon以组件形式传入，实现类似:icon="IconPlus"的图标配置（排除Icon组件本身） value = { @@ -451,7 +453,8 @@ export default { } } - const isRelatedComponents = (component) => ['MetaRelatedEditor', 'MetaRelatedColumns'].includes(component) + const isRelatedComponents = (component) => + ['RelatedEditorConfigurator', 'RelatedColumnsConfigurator'].includes(component) const showBindState = computed( () => !props.onlyEdit && (isBindingState.value || isLinked.value) && !isRelatedComponents(widget.value.component) diff --git a/packages/common/component/MetaChildItem.vue b/packages/common/component/MetaChildItem.vue index 3c8a6a82e..1278de0e2 100644 --- a/packages/common/component/MetaChildItem.vue +++ b/packages/common/component/MetaChildItem.vue @@ -20,7 +20,6 @@ import { computed } from 'vue' import ConfigItem from './ConfigItem.vue' export default { - name: 'MetaChildItem', components: { ConfigItem }, @@ -41,7 +40,7 @@ export default { }, setup(props, { emit }) { const properties = computed(() => { - const result = [...props.meta?.properties?.[0]?.content] + const result = [...(props.meta?.properties?.[0]?.content || [])] const propsModelValue = props.meta.widget.props?.modelValue if (result.length && propsModelValue) { diff --git a/packages/common/component/MetaModalItem.vue b/packages/common/component/MetaModalItem.vue index e7343bb63..9347f06e2 100644 --- a/packages/common/component/MetaModalItem.vue +++ b/packages/common/component/MetaModalItem.vue @@ -32,7 +32,6 @@ import { reactive, computed } from 'vue' import MetaChildItem from './MetaChildItem.vue' export default { - name: 'MetaModalItem', components: { MetaChildItem, TinyButton: Button, diff --git a/packages/common/component/MetaPopover.vue b/packages/common/component/MetaPopover.vue index d396c2f92..fca51a973 100644 --- a/packages/common/component/MetaPopover.vue +++ b/packages/common/component/MetaPopover.vue @@ -17,7 +17,6 @@ import { Popover, Button } from '@opentiny/vue' import MetaChildItem from './MetaChildItem.vue' export default { - name: 'MetaPopover', components: { MetaChildItem, TinyPopover: Popover, @@ -27,10 +26,10 @@ export default { props: { meta: { type: Object, - default: {} + default: () => ({}) } }, - setup(props, { attrs, emit }) { + setup(props, { emit }) { const title = computed(() => `编辑${props.meta.label?.text?.zh_CN || props.meta.property || '属性'}`) const onValueChange = ({ propertyKey, propertyValue }) => { const newPropertyValue = { ...props.meta.widget?.props?.modelValue, [propertyKey]: propertyValue } diff --git a/packages/configurator/src/index.js b/packages/configurator/src/index.js index 829640247..77f5787bc 100644 --- a/packages/configurator/src/index.js +++ b/packages/configurator/src/index.js @@ -62,7 +62,7 @@ export { SwitchConfigurator, TableColumnsConfigurator, VariableConfigurator, - // TODO Meta别名，后续删除 + // 暂时保留Meta开头的旧组件名 ArrayItemConfigurator as MetaArrayItem, I18nConfigurator as MetaBindI18n, VariableConfigurator as MetaBindVariable, diff --git a/packages/configurator/src/number-configurator/NumberConfigurator.md b/packages/configurator/src/number-configurator/NumberConfigurator.md index 4826bcdf7..3b627ff79 100644 --- a/packages/configurator/src/number-configurator/NumberConfigurator.md +++ b/packages/configurator/src/number-configurator/NumberConfigurator.md @@ -1,4 +1,4 @@ -# MetaNumber +# NumberConfigurator ## 属性 diff --git a/packages/configurator/src/related-columns-configurator/RelatedColumnsConfigurator.vue b/packages/configurator/src/related-columns-configurator/RelatedColumnsConfigurator.vue index 1c0165004..3159c06f9 100644 --- a/packages/configurator/src/related-columns-configurator/RelatedColumnsConfigurator.vue +++ b/packages/configurator/src/related-columns-configurator/RelatedColumnsConfigurator.vue @@ -36,7 +36,7 @@ export default { const CONSTANTS = { FIELD: 'field', - COMPONENT: 'MetaSelect' + COMPONENT: 'SelectConfigurator' } const saveValue = (value) => emit('update:modelValue', value) diff --git a/packages/engine-cli/template/designer/public/mock/bundle.json b/packages/engine-cli/template/designer/public/mock/bundle.json index e082730a0..6cd511432 100644 --- a/packages/engine-cli/template/designer/public/mock/bundle.json +++ b/packages/engine-cli/template/designer/public/mock/bundle.json @@ -2087,7 +2087,7 @@ } ], "widget": { - "component": "MetaTableColumns", + "component": "TableColumnsConfigurator", "props": { "type": "object", "textField": "label", @@ -2955,7 +2955,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -4790,7 +4790,7 @@ }, "cols": 12, "widget": { - "component": "MetaLayoutGrid", + "component": "LayoutGridConfigurator", "props": {} }, "description": { @@ -8559,7 +8559,7 @@ "cols": 12, "bindState": false, "widget": { - "component": "MetaContainer", + "component": "ContainerConfigurator", "props": {} }, "description": { @@ -9705,7 +9705,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", diff --git a/packages/plugins/block/src/BlockPropertyForm.vue b/packages/plugins/block/src/BlockPropertyForm.vue index 855647463..56c02f7c0 100644 --- a/packages/plugins/block/src/BlockPropertyForm.vue +++ b/packages/plugins/block/src/BlockPropertyForm.vue @@ -18,7 +18,7 @@ @change="handleChangeWidgetComponent" >
- 区块发布后使用当前区块时，会在属性面板中使用当前选择的组件（例如MetaSelect），来配置该属性 + 区块发布后使用当前区块时，会在属性面板中使用当前选择的组件（例如SelectConfigurator），来配置该属性
@@ -172,15 +172,15 @@ export default { ...property.value.widget.props }, component: - property.value.widget.component === META_COMPONENTS_ENUM.MetaArrayItem - ? META_COMPONENTS_ENUM.MetaCodeEditor + property.value.widget.component === META_COMPONENTS_ENUM.ArrayItemConfigurator + ? META_COMPONENTS_ENUM.CodeConfigurator : property.value.widget.component } }) const componentPropsTips = ref({ title: '该选项用于配置，当前选择的属性面板组件，其对应的props参数', - demo: '例如MetaSelect的props参数可以是 { options: [{ "label": "xx", "value": "xx"}, ...] }' + demo: '例如SelectConfigurator的props参数可以是 { options: [{ "label": "xx", "value": "xx"}, ...] }' }) watch( () => getEditProperty(), @@ -203,7 +203,9 @@ export default { modelValue: defaultValue }, component: - component === META_COMPONENTS_ENUM.MetaArrayItem ? META_COMPONENTS_ENUM.MetaCodeEditor : component + component === META_COMPONENTS_ENUM.ArrayItemConfigurator + ? META_COMPONENTS_ENUM.CodeConfigurator + : component } } diff --git a/packages/plugins/block/src/js/blockPropertyForm.js b/packages/plugins/block/src/js/blockPropertyForm.js index 09e3b268f..5e1ea5c90 100644 --- a/packages/plugins/block/src/js/blockPropertyForm.js +++ b/packages/plugins/block/src/js/blockPropertyForm.js @@ -88,13 +88,13 @@ export const type = computed({ export const widgetComponent = computed({ get() { const property = getEditProperty() - return property?.widget?.component || 'MetaInput' + return property?.widget?.component || 'InputConfigurator' }, set(value) { const property = getEditProperty() property.widget = property.widget || {} property.widget.component = value - showArrayItemConfig.value = type.value === META_TYPES.array && value === META_COMPONENTS_ENUM.MetaArrayItem + showArrayItemConfig.value = type.value === META_TYPES.array && value === META_COMPONENTS_ENUM.ArrayItemConfigurator initSubProperties() } @@ -192,7 +192,7 @@ export const handleAddItem = () => { arrayConfig.value.push({ property: 'customProperty', type: 'string', - component: 'MetaInput', + component: 'InputConfigurator', props: {}, defaultValue: '', description: '' @@ -289,7 +289,7 @@ watch( })) showArrayItemConfig.value = - type.value === META_TYPES.array && widgetComponent.value === META_COMPONENTS_ENUM.MetaArrayItem + type.value === META_TYPES.array && widgetComponent.value === META_COMPONENTS_ENUM.ArrayItemConfigurator if (property) { widgetComponent.value = property.widget.component diff --git a/packages/plugins/block/src/js/blockSetting.jsx b/packages/plugins/block/src/js/blockSetting.jsx index 256f4015b..e58188525 100644 --- a/packages/plugins/block/src/js/blockSetting.jsx +++ b/packages/plugins/block/src/js/blockSetting.jsx @@ -94,24 +94,24 @@ export const META_TYPES_OPTIONS = Object.entries(META_TYPES).map(([key, value]) // 组件的枚举 export const META_COMPONENTS_ENUM = { - MetaCodeEditor: 'MetaCodeEditor', - MetaArrayItem: 'MetaArrayItem', - MetaInput: 'MetaInput', - MetaSelect: 'MetaSelect', - MetaBindI18n: 'MetaBindI18n', - MetaNumber: 'MetaNumber', - MetaJsSlot: 'MetaJsSlot', + CodeConfigurator: 'CodeConfigurator', + ArrayItemConfigurator: 'ArrayItemConfigurator', + InputConfigurator: 'InputConfigurator', + SelectConfigurator: 'SelectConfigurator', + I18nConfigurator: 'I18nConfigurator', + NumberConfigurator: 'NumberConfigurator', + JsSlotConfigurator: 'JsSlotConfigurator', SwitchConfigurator: 'SwitchConfigurator' } // 每个值类型可选的编辑器类型 export const META_COMPONENT_LIST = { - [META_TYPES.array]: ['MetaCodeEditor', 'MetaArrayItem', 'MetaRelatedColumns', 'MetaRelatedEditor'], - [META_TYPES.string]: ['MetaInput', 'MetaSelect', 'MetaBindI18n'], - [META_TYPES.number]: ['MetaNumber'], - [META_TYPES.object]: ['MetaCodeEditor', 'MetaJsSlot'], + [META_TYPES.array]: ['CodeConfigurator', 'ArrayItemConfigurator', 'RelatedColumnsConfigurator', 'RelatedEditorConfigurator'], + [META_TYPES.string]: ['InputConfigurator', 'SelectConfigurator', 'I18nConfigurator'], + [META_TYPES.number]: ['NumberConfigurator'], + [META_TYPES.object]: ['CodeConfigurator', 'JsSlotConfigurator'], [META_TYPES.boolean]: ['SwitchConfigurator'], - [META_TYPES.function]: ['MetaCodeEditor'] + [META_TYPES.function]: ['CodeConfigurator'] } // 数组类型 item 的配置 @@ -127,7 +127,7 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: { modelValue: '' } @@ -144,7 +144,7 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaSelect', + component: 'SelectConfigurator', props: { options: META_TYPES_OPTIONS, modelValue: '' @@ -154,7 +154,7 @@ export const DEFAULT_ARRAY_CONFIG = [ { property: 'component', type: META_TYPES.string, - defaultValue: 'MetaInput', + defaultValue: 'InputConfigurator', label: { text: { zh_CN: '设计器' @@ -162,10 +162,10 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaSelect', + component: 'SelectConfigurator', props: { options: META_COMPONENT_LIST[META_TYPES.string], - modelValue: 'MetaInput' + modelValue: 'InputConfigurator' } } }, @@ -180,7 +180,7 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaCodeEditor', + component: 'CodeConfigurator', props: { modelValue: '{}', language: 'json' @@ -198,7 +198,7 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaCodeEditor', + component: 'CodeConfigurator', props: { modelValue: '' } @@ -215,7 +215,7 @@ export const DEFAULT_ARRAY_CONFIG = [ }, labelPosition: 'top', widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: { modelValue: '' } @@ -235,12 +235,12 @@ export const META_DEFAULT_VALUE = { // 区块暴露属性和事件各类型对应的默认编辑器 export const META_COMPONENTS = { - [META_TYPES.array]: 'MetaCodeEditor', - [META_TYPES.string]: 'MetaInput', - [META_TYPES.number]: 'MetaNumber', - [META_TYPES.object]: 'MetaCodeEditor', + [META_TYPES.array]: 'CodeConfigurator', + [META_TYPES.string]: 'InputConfigurator', + [META_TYPES.number]: 'NumberConfigurator', + [META_TYPES.object]: 'CodeConfigurator', [META_TYPES.boolean]: 'SwitchConfigurator', - [META_TYPES.function]: 'MetaCodeEditor' + [META_TYPES.function]: 'CodeConfigurator' } // 区块默认的属性schema @@ -322,7 +322,7 @@ export const setEditProperty = (property) => { state.property = property state.arrayConfig = (property?.properties?.[0]?.content || []).map( - ({ property, type, defaultValue, label, widget: { props = {}, component = 'MetaInput' } = {} }) => ({ + ({ property, type, defaultValue, label, widget: { props = {}, component = 'InputConfigurator' } = {} }) => ({ property, type, defaultValue, diff --git a/packages/settings/design/src/assets/materials/ng-bundle.json b/packages/settings/design/src/assets/materials/ng-bundle.json index 11c099e2d..5e891093c 100644 --- a/packages/settings/design/src/assets/materials/ng-bundle.json +++ b/packages/settings/design/src/assets/materials/ng-bundle.json @@ -641,7 +641,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": ["", "danger", "primary"] } @@ -663,7 +663,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": ["large", "middle", "small", "xs"] } diff --git a/packages/settings/design/src/assets/materials/ng-components/table.json b/packages/settings/design/src/assets/materials/ng-components/table.json index 88d84330e..74042cc90 100644 --- a/packages/settings/design/src/assets/materials/ng-components/table.json +++ b/packages/settings/design/src/assets/materials/ng-components/table.json @@ -78,7 +78,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaCodeEditorList", + "component": "CodeListConfigurator", "props": { "language": "json", "buttonText": "编辑列配置", diff --git a/packages/settings/design/src/components/SettingPanel.vue b/packages/settings/design/src/components/SettingPanel.vue index 7a3a1fc0a..c0786b788 100644 --- a/packages/settings/design/src/components/SettingPanel.vue +++ b/packages/settings/design/src/components/SettingPanel.vue @@ -173,7 +173,7 @@ export default { const handleTypeChange = () => { const shouldShowArrayItem = store.currentProperty.type === META_TYPES_ENUM.array && - store.currentProperty.widget.component === META_COMPONENTS.MetaArrayItem + store.currentProperty.widget.component === META_COMPONENTS.ArrayItemConfigurator showArrayItem.value = shouldShowArrayItem @@ -198,7 +198,7 @@ export default { } }, widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: {} } }) diff --git a/packages/settings/design/src/convertToSchema.js b/packages/settings/design/src/convertToSchema.js index 344e8e0e8..edbdda8dd 100644 --- a/packages/settings/design/src/convertToSchema.js +++ b/packages/settings/design/src/convertToSchema.js @@ -41,11 +41,11 @@ const results = { } const widgetMap = { - object: 'MetaCodeEditor', - array: 'MetaCodeEditor', - enum: 'MetaSelect', - string: 'MetaInput', - number: 'MetaNumeric', + object: 'CodeConfigurator', + array: 'CodeConfigurator', + enum: 'SelectConfigurator', + string: 'InputConfigurator', + number: 'NumberConfigurator', boolean: 'SwitchConfigurator' } diff --git a/packages/settings/design/src/schemas/button.json b/packages/settings/design/src/schemas/button.json index 9944a9282..18f09b101 100644 --- a/packages/settings/design/src/schemas/button.json +++ b/packages/settings/design/src/schemas/button.json @@ -36,7 +36,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} }, "description": { @@ -105,7 +105,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/checkboxgroup.json b/packages/settings/design/src/schemas/checkboxgroup.json index 8d098c379..daf1a0da9 100644 --- a/packages/settings/design/src/schemas/checkboxgroup.json +++ b/packages/settings/design/src/schemas/checkboxgroup.json @@ -71,7 +71,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -90,7 +90,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/form.json b/packages/settings/design/src/schemas/form.json index 79bcfcf96..ddf0425c2 100644 --- a/packages/settings/design/src/schemas/form.json +++ b/packages/settings/design/src/schemas/form.json @@ -129,7 +129,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { @@ -171,7 +171,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -191,7 +191,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/grid.json b/packages/settings/design/src/schemas/grid.json index 52ab8512d..a882068cf 100644 --- a/packages/settings/design/src/schemas/grid.json +++ b/packages/settings/design/src/schemas/grid.json @@ -32,7 +32,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCollection", + "component": "CollectionConfigurator", "props": {} }, "description": { @@ -66,7 +66,7 @@ } }, "widget": { - "component": "MetaBindI18n", + "component": "I18nConfigurator", "props": {} } }, @@ -136,7 +136,7 @@ } }, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -152,7 +152,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { @@ -191,7 +191,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -211,7 +211,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -222,7 +222,7 @@ } ], "widget": { - "component": "MetaArrayItem", + "component": "ArrayItemConfigurator", "props": { "type": "object", "textField": "title", @@ -248,7 +248,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -267,7 +267,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -306,7 +306,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -326,7 +326,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -345,7 +345,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -481,7 +481,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -521,7 +521,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/gridcolumn.json b/packages/settings/design/src/schemas/gridcolumn.json index 5d39e202d..c1455089a 100644 --- a/packages/settings/design/src/schemas/gridcolumn.json +++ b/packages/settings/design/src/schemas/gridcolumn.json @@ -91,7 +91,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { @@ -150,7 +150,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -170,7 +170,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -229,7 +229,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/input.json b/packages/settings/design/src/schemas/input.json index a14f9b10f..ed73665cb 100644 --- a/packages/settings/design/src/schemas/input.json +++ b/packages/settings/design/src/schemas/input.json @@ -111,7 +111,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/pager.json b/packages/settings/design/src/schemas/pager.json index aa9bce455..0d9e5c23b 100644 --- a/packages/settings/design/src/schemas/pager.json +++ b/packages/settings/design/src/schemas/pager.json @@ -72,7 +72,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/popeditor.json b/packages/settings/design/src/schemas/popeditor.json index d03063690..3624926c5 100644 --- a/packages/settings/design/src/schemas/popeditor.json +++ b/packages/settings/design/src/schemas/popeditor.json @@ -139,7 +139,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -159,7 +159,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -179,7 +179,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/popover.json b/packages/settings/design/src/schemas/popover.json index 4c6b0d550..5e09149fa 100644 --- a/packages/settings/design/src/schemas/popover.json +++ b/packages/settings/design/src/schemas/popover.json @@ -52,7 +52,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { @@ -123,7 +123,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/select.json b/packages/settings/design/src/schemas/select.json index 57833c3a5..ab6265006 100644 --- a/packages/settings/design/src/schemas/select.json +++ b/packages/settings/design/src/schemas/select.json @@ -111,7 +111,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCollection", + "component": "CollectionConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/tabs.json b/packages/settings/design/src/schemas/tabs.json index 603b2f148..dac09280e 100644 --- a/packages/settings/design/src/schemas/tabs.json +++ b/packages/settings/design/src/schemas/tabs.json @@ -131,7 +131,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/time-line.json b/packages/settings/design/src/schemas/time-line.json index bff999475..553cc5089 100644 --- a/packages/settings/design/src/schemas/time-line.json +++ b/packages/settings/design/src/schemas/time-line.json @@ -80,7 +80,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCollection", + "component": "CollectionConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/schemas/tooltip.json b/packages/settings/design/src/schemas/tooltip.json index 7541b2ee3..55e6fb1fb 100644 --- a/packages/settings/design/src/schemas/tooltip.json +++ b/packages/settings/design/src/schemas/tooltip.json @@ -32,7 +32,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaSelect", + "component": "SelectConfigurator", "props": { "options": [ { diff --git a/packages/settings/design/src/schemas/tree.json b/packages/settings/design/src/schemas/tree.json index c7f5d7859..5eeae316d 100644 --- a/packages/settings/design/src/schemas/tree.json +++ b/packages/settings/design/src/schemas/tree.json @@ -52,7 +52,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -111,7 +111,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -131,7 +131,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { @@ -179,7 +179,7 @@ "disabled": false, "cols": 12, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} }, "description": { diff --git a/packages/settings/design/src/store/index.js b/packages/settings/design/src/store/index.js index e80b0c52f..682d5c99a 100644 --- a/packages/settings/design/src/store/index.js +++ b/packages/settings/design/src/store/index.js @@ -63,7 +63,7 @@ const store = reactive({ childrenSchema: [], currentProperties: {}, currentProperty: { - widget: 'MetaInput', + widget: 'InputConfigurator', device: [] }, currentGroup: null, @@ -77,20 +77,18 @@ const store = reactive({ }) export const META_COMPONENTS = { - MetaCodeEditor: 'MetaCodeEditor', - MetaArrayItem: 'MetaArrayItem', - MetaInput: 'MetaInput', - MetaSelect: 'MetaSelect', - MetaBindI18n: 'MetaBindI18n', + CodeConfigurator: 'CodeConfigurator', + ArrayItemConfigurator: 'ArrayItemConfigurator', + InputConfigurator: 'InputConfigurator', + SelectConfigurator: 'SelectConfigurator', + I18nConfigurator: 'I18nConfigurator', CheckBoxConfigurator: 'CheckBoxConfigurator', - MetaColor: 'MetaColor', + ColorConfigurator: 'ColorConfigurator', DatePickerConfigurator: 'DatePickerConfigurator', - MetaRadio: 'MetaRadio', - MetaRadioGroup: 'MetaRadioGroup', - MetaNumber: 'MetaNumber', - MetaJsSlot: 'MetaJsSlot', + RadioConfigurator: 'RadioConfigurator', + RadioConfiguratorGroup: 'RadioGroupConfigurator', + NumberConfigurator: 'NumberConfigurator', JsSlotConfigurator: 'JsSlotConfigurator', - MetaSwitch: 'MetaSwitch', SwitchConfigurator: 'SwitchConfigurator' } @@ -107,12 +105,12 @@ export const META_TYPES_OPTIONS = Object.entries(META_TYPES_ENUM).map(([key, val // 数据类型对应的默认 meta component export const META_DEFAULT_COMPONENT = { - [META_TYPES_ENUM.array]: META_COMPONENTS.MetaCodeEditor, - [META_TYPES_ENUM.string]: META_COMPONENTS.MetaInput, - [META_TYPES_ENUM.number]: META_COMPONENTS.MetaNumber, - [META_TYPES_ENUM.object]: META_COMPONENTS.MetaCodeEditor, + [META_TYPES_ENUM.array]: META_COMPONENTS.CodeConfigurator, + [META_TYPES_ENUM.string]: META_COMPONENTS.InputConfigurator, + [META_TYPES_ENUM.number]: META_COMPONENTS.NumberConfigurator, + [META_TYPES_ENUM.object]: META_COMPONENTS.CodeConfigurator, [META_TYPES_ENUM.boolean]: META_COMPONENTS.SwitchConfigurator, - [META_TYPES_ENUM.function]: META_COMPONENTS.MetaCodeEditor + [META_TYPES_ENUM.function]: META_COMPONENTS.CodeConfigurator } export const META_DEFAULT_VALUE = { @@ -189,11 +187,11 @@ export const addGroup = (index) => { export const addProperty = (group, prop, index = 0) => { const typeMap = { - string: 'MetaInput', + string: 'InputConfigurator', boolean: 'SwitchConfigurator', - number: 'MetaNumeric', - array: 'MetaInput', - object: 'MetaInput' + number: 'NumberConfigurator', + array: 'InputConfigurator', + object: 'InputConfigurator' } const meta = store?.currentProperties[prop] const newProperty = { diff --git a/packages/settings/props/src/composable/useProperties.js b/packages/settings/props/src/composable/useProperties.js index 49a1f2da9..5d6250bc3 100644 --- a/packages/settings/props/src/composable/useProperties.js +++ b/packages/settings/props/src/composable/useProperties.js @@ -30,7 +30,7 @@ const otherBaseKey = { cols: 12, rules: [], widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: {} } }, @@ -46,7 +46,7 @@ const otherBaseKey = { cols: 12, rules: [], widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: {} } }, @@ -62,7 +62,7 @@ const otherBaseKey = { cols: 12, rules: [], widget: { - component: 'MetaInput', + component: 'InputConfigurator', props: {} } } @@ -92,7 +92,7 @@ const getSlotSwitch = (properties, slots = {}) => { labelPosition: 'none', bindState: false, widget: { - component: 'MetaSlot', + component: 'SlotConfigurator', props: { slots } diff --git a/packages/vue-generator/test/testcases/full/case1_normal/input/blocks.schema.json b/packages/vue-generator/test/testcases/full/case1_normal/input/blocks.schema.json index 461899d4a..6ba91c783 100644 --- a/packages/vue-generator/test/testcases/full/case1_normal/input/blocks.schema.json +++ b/packages/vue-generator/test/testcases/full/case1_normal/input/blocks.schema.json @@ -89,7 +89,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -109,7 +109,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "modelValue": [] } diff --git a/packages/vue-generator/test/testcases/sfc/case01/blocks.schema.json b/packages/vue-generator/test/testcases/sfc/case01/blocks.schema.json index 4d6abe80a..6874581b8 100644 --- a/packages/vue-generator/test/testcases/sfc/case01/blocks.schema.json +++ b/packages/vue-generator/test/testcases/sfc/case01/blocks.schema.json @@ -86,7 +86,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": {} } }, @@ -106,7 +106,7 @@ "readOnly": false, "disabled": false, "widget": { - "component": "MetaCodeEditor", + "component": "CodeConfigurator", "props": { "modelValue": [] }