From b3b86cbdca58adf1793fcd56d2f2595366166f0f Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 28 Feb 2024 16:15:36 +0800 Subject: [PATCH] update --- io.sc.platform.core.frontend/package.json | 2 +- .../template-project/package.json | 6 +- .../template-project/src/components/index.ts | 10 +- .../template-project/src/i18n/messages.json | 6 +- .../src/i18n/messages_tw_CN.json | 6 +- .../src/i18n/messages_zh_CN.json | 6 +- .../template-project/src/menus/menus.json | 44 +--- .../template-project/src/routes/routes.json | 46 +--- .../template-project/src/views/Codemirror.vue | 50 ---- .../template-project/src/views/Dialog.vue | 37 --- .../template-project/src/views/Form1.vue | 30 --- .../src/views/FormElements.vue | 44 ++++ .../template-project/src/views/Grid1.vue | 4 - .../template-project/src/views/Select.vue | 22 -- .../template-project/src/views/Table.vue | 64 ----- .../template-project/src/views/TableTitle.vue | 118 --------- .../template-project/src/views/TreeGrid.vue | 236 ------------------ .../util.template-generator.cjs | 4 - 18 files changed, 62 insertions(+), 673 deletions(-) delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Codemirror.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Dialog.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Form1.vue create mode 100644 io.sc.platform.core.frontend/template-project/src/views/FormElements.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Grid1.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Select.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/Table.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/TableTitle.vue delete mode 100644 io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index f8a23963..19a7becc 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.125", + "version": "8.1.126", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index f843ec42..d4e9f486 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.122", + "version": "8.1.126", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -92,8 +92,8 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.122", - "quasar": "2.14.2", + "platform-core": "8.1.126", + "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", "vue-codemirror6": "1.2.0", diff --git a/io.sc.platform.core.frontend/template-project/src/components/index.ts b/io.sc.platform.core.frontend/template-project/src/components/index.ts index e9e64953..7f05c927 100644 --- a/io.sc.platform.core.frontend/template-project/src/components/index.ts +++ b/io.sc.platform.core.frontend/template-project/src/components/index.ts @@ -2,10 +2,7 @@ * 此文件为自动生成文件,请勿修改 */ -import dialog from '@/views/Dialog.vue'; -import codemirror from '@/views/Codemirror.vue'; -import select from '@/views/Select.vue'; -import treeGrid from '@/views/TreeGrid.vue'; +import formElements from '@/views/FormElements.vue'; import likmDialog from '@/views/likm/Dialog.vue'; import likmDrawer from '@/views/likm/Drawer.vue'; import likmForm from '@/views/likm/Form.vue'; @@ -17,10 +14,7 @@ import gridLayout from '@/views/likm/GridLayout.vue'; import likmTreeGrid from '@/views/likm/TreeGrid.vue'; const localComponents = { - 'component.testcase.dialog': dialog, - 'component.testcase.codemirror': codemirror, - 'component.testcase.select': select, - 'component.testcase.treeGrid': treeGrid, + 'component.testcase.formElements': formElements, 'component.testcase.likmDialog': likmDialog, 'component.testcase.likmDrawer': likmDrawer, 'component.testcase.likmForm': likmForm, diff --git a/io.sc.platform.core.frontend/template-project/src/i18n/messages.json b/io.sc.platform.core.frontend/template-project/src/i18n/messages.json index e57d162e..5dd6a83a 100644 --- a/io.sc.platform.core.frontend/template-project/src/i18n/messages.json +++ b/io.sc.platform.core.frontend/template-project/src/i18n/messages.json @@ -1,8 +1,4 @@ { "menu.testcase": "Test Case", - "menu.testcase.codemirror": "CodeMirror", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "Form Elements" } diff --git a/io.sc.platform.core.frontend/template-project/src/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/template-project/src/i18n/messages_tw_CN.json index c443b2be..8ef29361 100644 --- a/io.sc.platform.core.frontend/template-project/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/template-project/src/i18n/messages_tw_CN.json @@ -1,8 +1,4 @@ { "menu.testcase": "測試用例", - "menu.testcase.codemirror": "CodeMirror", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "表單控件" } diff --git a/io.sc.platform.core.frontend/template-project/src/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/template-project/src/i18n/messages_zh_CN.json index c33c404a..d90ce270 100644 --- a/io.sc.platform.core.frontend/template-project/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/template-project/src/i18n/messages_zh_CN.json @@ -1,8 +1,4 @@ { "menu.testcase": "测试用例", - "menu.testcase.codemirror": "CodeMirror", - "menu.testcase.dialog": "Dialog", - "menu.testcase.select": "Select", - "menu.testcase.treeGrid": "Tree Grid", - "menu.testcase.table": "Table" + "menu.testcase.formElements": "表单控件" } diff --git a/io.sc.platform.core.frontend/template-project/src/menus/menus.json b/io.sc.platform.core.frontend/template-project/src/menus/menus.json index 6ff1dd88..6f0b4f75 100644 --- a/io.sc.platform.core.frontend/template-project/src/menus/menus.json +++ b/io.sc.platform.core.frontend/template-project/src/menus/menus.json @@ -20,48 +20,12 @@ { "type": "GROUP", "order": 20000, "id": "menu.testcase", "titleI18nKey": "menu.testcase", "icon": "bi-gear" }, { "type": "ROUTE", - "order": 200, - "parentId": "menu.testcase", - "id": "menu.testcase.dialog", - "titleI18nKey": "menu.testcase.dialog", - "icon": "bi-palette", - "routeName": "route.testcase.dialog" - }, - { - "type": "ROUTE", - "order": 300, - "parentId": "menu.testcase", - "id": "menu.testcase.codemirror", - "titleI18nKey": "menu.testcase.codemirror", - "icon": "bi-palette", - "routeName": "route.testcase.codemirror" - }, - { - "type": "ROUTE", - "order": 400, - "parentId": "menu.testcase", - "id": "menu.testcase.select", - "titleI18nKey": "menu.testcase.select", - "icon": "bi-palette", - "routeName": "route.testcase.select" - }, - { - "type": "ROUTE", - "order": 400, - "parentId": "menu.testcase", - "id": "menu.testcase.treeGrid", - "titleI18nKey": "menu.testcase.treeGrid", - "icon": "bi-palette", - "routeName": "route.testcase.treeGrid" - }, - { - "type": "ROUTE", - "order": 400, + "order": 100, "parentId": "menu.testcase", - "id": "menu.testcase.table", - "titleI18nKey": "menu.testcase.table", + "id": "menu.testcase.formElements", + "titleI18nKey": "menu.testcase.formElements", "icon": "bi-palette", - "routeName": "route.testcase.table" + "routeName": "route.testcase.formElements" }, { "type": "GROUP", "order": 30000, "id": "menu.testcase.likm", "titleI18nKey": "测试用例-likm", "icon": "home" }, { diff --git a/io.sc.platform.core.frontend/template-project/src/routes/routes.json b/io.sc.platform.core.frontend/template-project/src/routes/routes.json index fd16fe64..e15d3bc2 100644 --- a/io.sc.platform.core.frontend/template-project/src/routes/routes.json +++ b/io.sc.platform.core.frontend/template-project/src/routes/routes.json @@ -1,50 +1,14 @@ [ { - "name": "route.testcase.dialog", - "path": "testcase/dialog", + "name": "route.testcase.formElements", + "path": "testcase/formElements", "parent": "/", "priority": 0, - "component": "component.testcase.dialog", - "componentPath": "@/views/Dialog.vue", + "component": "component.testcase.formElements", + "componentPath": "@/views/FormElements.vue", "redirect": null, "meta": { - "permissions": ["/testcase/dialog/**/*"] - } - }, - { - "name": "route.testcase.codemirror", - "path": "testcase/codemirror", - "parent": "/", - "priority": 0, - "component": "component.testcase.codemirror", - "componentPath": "@/views/Codemirror.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/codemirror/**/*"] - } - }, - { - "name": "route.testcase.select", - "path": "testcase/select", - "parent": "/", - "priority": 0, - "component": "component.testcase.select", - "componentPath": "@/views/Select.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/select/**/*"] - } - }, - { - "name": "route.testcase.treeGrid", - "path": "testcase/treeGrid", - "parent": "/", - "priority": 0, - "component": "component.testcase.treeGrid", - "componentPath": "@/views/TreeGrid.vue", - "redirect": null, - "meta": { - "permissions": ["/testcase/treeGrid/**/*"] + "permissions": ["/testcase/formElements/**/*"] } }, { diff --git a/io.sc.platform.core.frontend/template-project/src/views/Codemirror.vue b/io.sc.platform.core.frontend/template-project/src/views/Codemirror.vue deleted file mode 100644 index 20d19d75..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Codemirror.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/Dialog.vue b/io.sc.platform.core.frontend/template-project/src/views/Dialog.vue deleted file mode 100644 index 4487cf9e..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Dialog.vue +++ /dev/null @@ -1,37 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/Form1.vue b/io.sc.platform.core.frontend/template-project/src/views/Form1.vue deleted file mode 100644 index 444f06df..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Form1.vue +++ /dev/null @@ -1,30 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue b/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue new file mode 100644 index 00000000..0379af5a --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue @@ -0,0 +1,44 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/Grid1.vue b/io.sc.platform.core.frontend/template-project/src/views/Grid1.vue deleted file mode 100644 index d7e5272c..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Grid1.vue +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/Select.vue b/io.sc.platform.core.frontend/template-project/src/views/Select.vue deleted file mode 100644 index 6c791fa5..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Select.vue +++ /dev/null @@ -1,22 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/Table.vue b/io.sc.platform.core.frontend/template-project/src/views/Table.vue deleted file mode 100644 index 72a4bc62..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/Table.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/TableTitle.vue b/io.sc.platform.core.frontend/template-project/src/views/TableTitle.vue deleted file mode 100644 index 17ee9b13..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/TableTitle.vue +++ /dev/null @@ -1,118 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue deleted file mode 100644 index 55ef6444..00000000 --- a/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue +++ /dev/null @@ -1,236 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/util.template-generator.cjs b/io.sc.platform.core.frontend/util.template-generator.cjs index abd3fdab..9da53911 100644 --- a/io.sc.platform.core.frontend/util.template-generator.cjs +++ b/io.sc.platform.core.frontend/util.template-generator.cjs @@ -79,10 +79,6 @@ cp('./public', targetDir + 'public'); replaceAll(targetDir + 'src/boostrap.ts', {'@/platform':'platform-core','// ':'','//':''}); replaceAll(targetDir + 'src/shims-vue.d.ts', {'@/platform':'platform-core'}); replaceAll(targetDir + 'src/App.vue', {'@/platform':'platform-core'}); -replaceAll(targetDir + 'src/views/Codemirror.vue', {'@/platform':'platform-core'}); -replaceAll(targetDir + 'src/views/Dialog.vue', {'@/platform':'platform-core'}); -replaceAll(targetDir + 'src/views/Select.vue', {'@/platform':'platform-core'}); - cp(sourceDir + '.browserslistrc', targetDir + '.browserslistrc'); cp(sourceDir + '.editorconfig', targetDir + '.editorconfig');