From c971b2b85d3f1cef6816982d61670b5f346d1347 Mon Sep 17 00:00:00 2001 From: yy-wow Date: Tue, 17 Dec 2024 23:18:13 -0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8A=A8=E6=80=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=BB=84=E4=BB=B6=E5=BA=93=E6=A8=A1=E5=9D=97=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-demo/public/mock/bundle.json | 220 +++++--------------------- packages/canvas/render/src/runner.js | 4 +- 2 files changed, 42 insertions(+), 182 deletions(-) diff --git a/designer-demo/public/mock/bundle.json b/designer-demo/public/mock/bundle.json index a425caa63..1b480104d 100644 --- a/designer-demo/public/mock/bundle.json +++ b/designer-demo/public/mock/bundle.json @@ -295,10 +295,6 @@ "dev_mode": "proCode", "npm": { "package": "element-plus", - "version": "2.4.2", - "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs", - "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css", - "dependencies": null, "exportName": "ElButton" }, "group": "基础组件", @@ -616,10 +612,6 @@ "dev_mode": "proCode", "npm": { "package": "element-plus", - "version": "2.4.2", - "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs", - "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css", - "dependencies": null, "exportName": "ElForm" }, "group": "表单组件", @@ -1071,10 +1063,6 @@ "dev_mode": "proCode", "npm": { "package": "element-plus", - "version": "2.4.2", - "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs", - "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css", - "dependencies": null, "exportName": "ElFormItem" }, "group": "表单组件", @@ -1420,10 +1408,6 @@ "dev_mode": "proCode", "npm": { "package": "element-plus", - "version": "2.4.2", - "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs", - "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css", - "dependencies": null, "exportName": "ElTable" }, "group": "数据展示", @@ -2657,10 +2641,6 @@ "dev_mode": "proCode", "npm": { "package": "element-plus", - "version": "2.4.2", - "script": "https://unpkg.com/element-plus@2.4.2/dist/index.full.mjs", - "css": "https://unpkg.com/element-plus@2.4.2/dist/index.css", - "dependencies": null, "exportName": "ElTableColumn" }, "group": "表单组件", @@ -2723,11 +2703,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "CarouselItem", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "CarouselItem" }, "group": "component", "category": "容器组件", @@ -2856,11 +2832,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Carousel", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Carousel" }, "group": "component", "category": "容器组件", @@ -4530,11 +4502,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "ButtonGroup", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "ButtonGroup" }, "group": "component", "category": "general", @@ -4688,11 +4656,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Row", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Row" }, "group": "component", "priority": 5, @@ -4838,11 +4802,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Form", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Form" }, "group": "component", "priority": 5, @@ -5192,11 +5152,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "FormItem", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "FormItem" }, "group": "component", "priority": 12, @@ -5324,11 +5280,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Col", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Col" }, "group": "component", "priority": 2, @@ -5602,11 +5554,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Button", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Button" }, "group": "component", "priority": 2, @@ -5941,11 +5889,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Input", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Input" }, "group": "component", "priority": 1, @@ -6355,11 +6299,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Radio", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Radio" }, "group": "component", "priority": 3, @@ -6592,11 +6532,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Select", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Select" }, "group": "component", "priority": 8, @@ -6997,11 +6933,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Switch", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Switch" }, "group": "component", "priority": 9, @@ -7196,11 +7128,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Search", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Search" }, "group": "component", "priority": 2, @@ -7471,11 +7399,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Checkbox", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Checkbox" }, "group": "component", "priority": 4, @@ -7730,11 +7654,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "CheckboxButton", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "CheckboxButton" }, "group": "component", "priority": 1, @@ -7918,11 +7838,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "CheckboxGroup", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "CheckboxGroup" }, "group": "component", "priority": 2, @@ -8127,11 +8043,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "DialogBox", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "DialogBox" }, "group": "component", "priority": 4, @@ -8405,11 +8317,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Tabs", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Tabs" }, "group": "component", "priority": 10, @@ -8686,11 +8594,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "TabItem", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "TabItem" }, "group": "component", "priority": 2, @@ -8795,11 +8699,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Breadcrumb", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Breadcrumb" }, "group": "component", "priority": 1, @@ -8934,11 +8834,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "BreadcrumbItem", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "BreadcrumbItem" }, "group": "component", "priority": 1, @@ -9023,11 +8919,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Collapse", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Collapse" }, "group": "component", "priority": 3, @@ -9150,11 +9042,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "CollapseItem", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "CollapseItem" }, "group": "component", "priority": 2, @@ -9261,11 +9149,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Grid", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Grid" }, "group": "component", "priority": 2, @@ -10176,11 +10060,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Pager", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Pager" }, "group": "component", "priority": 1, @@ -10409,11 +10289,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Popeditor", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Popeditor" }, "group": "component", "priority": 6, @@ -10772,11 +10648,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Tree", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Tree" }, "group": "component", "priority": 12, @@ -11107,11 +10979,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "TimeLine", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "TimeLine" }, "group": "component", "priority": 3, @@ -11314,11 +11182,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Tooltip", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Tooltip" }, "group": "component", "priority": 11, @@ -11535,11 +11399,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Popover", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Popover" }, "group": "component", "priority": 7, @@ -12030,11 +11890,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "DatePicker", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "DatePicker" }, "group": "component", "priority": 1, @@ -12445,11 +12301,7 @@ "devMode": "proCode", "npm": { "package": "@opentiny/vue", - "exportName": "Numeric", - "version": "3.14.0", - "destructuring": true, - "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", - "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + "exportName": "Numeric" }, "group": "component", "priority": 1, @@ -14079,6 +13931,14 @@ } ], "packages": [ + { + "name": "TinyVue组件库", + "package": "@opentiny/vue", + "version": "3.14.0", + "destructuring": true, + "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs", + "css": "https://unpkg.com/@opentiny/vue-theme@~3.14/index.css" + }, { "name": "element-plus组件库", "package": "element-plus", diff --git a/packages/canvas/render/src/runner.js b/packages/canvas/render/src/runner.js index 42fd5610a..36c6a4884 100644 --- a/packages/canvas/render/src/runner.js +++ b/packages/canvas/render/src/runner.js @@ -11,7 +11,7 @@ */ import { createApp } from 'vue' -import { addScript, addStyle, setComponents, updateDependencies } from '../../common' +import { addScript, addStyle, getComponents, updateDependencies } from '../../common' import TinyI18nHost, { I18nInjectionKey } from '@opentiny/tiny-engine-common/js/i18n' import Main, { api } from './RenderMain' import lowcode from './lowcode' @@ -85,7 +85,7 @@ export const createRender = (config) => { const { scripts: componentsScriptsDeps = [], styles: componentsStylesDeps = [] } = window.componentsDepsMap || {} Promise.all([ - ...componentsScriptsDeps.map(setComponents), + ...componentsScriptsDeps.map(getComponents), ...scripts.map((src) => addScript(src)).concat([...componentsStylesDeps, ...styles].map((src) => addStyle(src))) ]).finally(() => create(config)) }