diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 478f0032..031f0f5b 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.220", + "version": "8.1.223", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue index 3cfbbd89..d831ea42 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue @@ -1519,11 +1519,11 @@ const addRowKey = (rows: []) => { rows.forEach((item: any, index) => { item[rowKey_] = Tools.uuid(); if (item[table.tickedField] === true) { - item['tickedCount'] = 1; - } else if (item['tickedCount'] === false) { - item['tickedCount'] = 0; + item['_tickedCount'] = 1; + } else if (item['_tickedCount'] === false) { + item['_tickedCount'] = 0; } else { - item['tickedCount'] = 0; + item['_tickedCount'] = 0; } item[table.tickedField] = item[table.tickedField] || false; item[table.selectedField] = item[table.selectedField] || false; @@ -1532,15 +1532,19 @@ const addRowKey = (rows: []) => { } if (props.tree && item.children && item.children.length > 0) { addRowKey(item.children); + item['_childrenTickedCount'] = 0; item.children.forEach((child) => { - item['tickedCount'] = child['tickedCount'] === null ? item['tickedCount'] : item['tickedCount'] + child['tickedCount']; + item['_childrenTickedCount'] += child['_tickedCount']; }); - if (item['tickedCount'] === 0) { + if (item['_childrenTickedCount'] === 0) { item[table.tickedField] = false; - } else if (item['tickedCount'] === item.children.length) { + item['_tickedCount'] = 0; + } else if (item['_childrenTickedCount'] === item.children.length) { item[table.tickedField] = true; + item['_tickedCount'] = 1; } else { item[table.tickedField] = null; + item['_tickedCount'] = 0; } } }); diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue index 2f3654a1..cafdbeb9 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/form/form.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/form/form.vue @@ -1,10 +1,125 @@ diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationDialog.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationDialog.vue new file mode 100644 index 00000000..9eb2a56a --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationDialog.vue @@ -0,0 +1,102 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationGrid.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationGrid.vue new file mode 100644 index 00000000..b00d914d --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectApplicationGrid.vue @@ -0,0 +1,141 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectMenuTreeGrid.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectMenuTreeGrid.vue new file mode 100644 index 00000000..241a71b3 --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectMenuTreeGrid.vue @@ -0,0 +1,123 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectOrgTreeGrid.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectOrgTreeGrid.vue new file mode 100644 index 00000000..2c19ca1f --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectOrgTreeGrid.vue @@ -0,0 +1,97 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleDialog.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleDialog.vue new file mode 100644 index 00000000..169d6a60 --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleDialog.vue @@ -0,0 +1,102 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleGrid.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleGrid.vue new file mode 100644 index 00000000..8033896c --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectRoleGrid.vue @@ -0,0 +1,141 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserDialog.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserDialog.vue new file mode 100644 index 00000000..5dde6b52 --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserDialog.vue @@ -0,0 +1,106 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserGrid.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserGrid.vue new file mode 100644 index 00000000..46d4812f --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/SelectUserGrid.vue @@ -0,0 +1,161 @@ + + diff --git a/io.sc.platform.core.frontend/src/views/testcase/form/shared/UserStatusTag.vue b/io.sc.platform.core.frontend/src/views/testcase/form/shared/UserStatusTag.vue new file mode 100644 index 00000000..3940b924 --- /dev/null +++ b/io.sc.platform.core.frontend/src/views/testcase/form/shared/UserStatusTag.vue @@ -0,0 +1,17 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 9477f546..15029754 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.220", + "version": "8.1.223", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.220", + "platform-core": "8.1.223", "quasar": "2.15.3", "tailwindcss": "3.4.3", "vue": "3.4.24", 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 70198cea..8dfeb7fd 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 @@ -5,6 +5,7 @@ import component_testcase_openNoMenuRoute from '@/views/testcase/route/OpenNoMenuRoute.vue'; import component_testcase_noMenuRoute from '@/views/testcase/route/NoMenuRoute.vue'; import component_testcase_mathEditor from '@/views/testcase/math/MathEditor.vue'; +import component_testcase_form from '@/views/testcase/form/form.vue'; import component_testcase_excel from '@/views/testcase/excel/Excel.vue'; import component_testcase_word from '@/views/testcase/word/Word.vue'; import component_testcase_likmDialog from '@/views/likm/Dialog.vue'; @@ -21,6 +22,7 @@ const localComponents = { 'component.testcase.openNoMenuRoute': component_testcase_openNoMenuRoute, 'component.testcase.noMenuRoute': component_testcase_noMenuRoute, 'component.testcase.mathEditor': component_testcase_mathEditor, + 'component.testcase.form': component_testcase_form, 'component.testcase.excel': component_testcase_excel, 'component.testcase.word': component_testcase_word, 'component.testcase.likmDialog': component_testcase_likmDialog, 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 1ca43cfc..aa4092d5 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 @@ -2,6 +2,7 @@ "menu.testcase": "Test Case", "menu.testcase.openNoMenuRoute": "Open No Menu Route", "menu.testcase.mathEditor": "Math Formual Editor", + "menu.testcase.form":"Form Element", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", 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 68ec4498..67d73c56 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 @@ -2,6 +2,7 @@ "menu.testcase": "測試用例", "menu.testcase.openNoMenuRoute": "打開無關聯菜單的路由", "menu.testcase.mathEditor": "數學公式編輯器", + "menu.testcase.form":"表單元素", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", 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 44d32110..27fc8c52 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 @@ -2,6 +2,7 @@ "menu.testcase": "测试用例", "menu.testcase.openNoMenuRoute": "打开无关联菜单的路由示例", "menu.testcase.mathEditor": "数学公式编辑器", + "menu.testcase.form":"表单元素", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", 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 2a3878bc..ed7f8b9c 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 @@ -40,6 +40,15 @@ "type": "ROUTE", "order": 300, "parentId": "menu.testcase", + "id": "menu.testcase.form", + "titleI18nKey": "menu.testcase.form", + "icon": "bi-palette", + "routeName": "route.testcase.form" + }, + { + "type": "ROUTE", + "order": 400, + "parentId": "menu.testcase", "id": "menu.testcase.excel", "titleI18nKey": "menu.testcase.excel", "icon": "bi-palette", @@ -47,7 +56,7 @@ }, { "type": "ROUTE", - "order": 400, + "order": 500, "parentId": "menu.testcase", "id": "menu.testcase.word", "titleI18nKey": "menu.testcase.word", 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 e67d9951..9a499a7d 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 @@ -39,6 +39,19 @@ } }, + { + "name": "route.testcase.form", + "path": "testcase/form", + "parent": "/", + "priority": 0, + "component": "component.testcase.form", + "componentPath": "@/views/testcase/form/form.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/form/**/*"] + } + }, + { "name": "route.testcase.excel", "path": "testcase/excel", diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue index 463d2ec6..cafdbeb9 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/form.vue @@ -1,408 +1,125 @@ diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationDialog.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationDialog.vue new file mode 100644 index 00000000..9eb2a56a --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationDialog.vue @@ -0,0 +1,102 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationGrid.vue new file mode 100644 index 00000000..b00d914d --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectApplicationGrid.vue @@ -0,0 +1,141 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectMenuTreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectMenuTreeGrid.vue new file mode 100644 index 00000000..241a71b3 --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectMenuTreeGrid.vue @@ -0,0 +1,123 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectOrgTreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectOrgTreeGrid.vue new file mode 100644 index 00000000..2c19ca1f --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectOrgTreeGrid.vue @@ -0,0 +1,97 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleDialog.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleDialog.vue new file mode 100644 index 00000000..169d6a60 --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleDialog.vue @@ -0,0 +1,102 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleGrid.vue new file mode 100644 index 00000000..8033896c --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectRoleGrid.vue @@ -0,0 +1,141 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserDialog.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserDialog.vue new file mode 100644 index 00000000..5dde6b52 --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserDialog.vue @@ -0,0 +1,106 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserGrid.vue new file mode 100644 index 00000000..46d4812f --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/SelectUserGrid.vue @@ -0,0 +1,161 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/UserStatusTag.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/UserStatusTag.vue new file mode 100644 index 00000000..3940b924 --- /dev/null +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/form/shared/UserStatusTag.vue @@ -0,0 +1,17 @@ + + diff --git a/io.sc.platform.developer.frontend/src/views/backend/sql/Sql.vue b/io.sc.platform.developer.frontend/src/views/backend/sql/Sql.vue index 86efd571..bd4f9325 100644 --- a/io.sc.platform.developer.frontend/src/views/backend/sql/Sql.vue +++ b/io.sc.platform.developer.frontend/src/views/backend/sql/Sql.vue @@ -1,6 +1,6 @@