From 58a494707c0863f35afefc5fdfb1637ee927564d Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 15 Mar 2024 15:23:08 +0800 Subject: [PATCH] update --- app.platform/build.gradle | 6 +- erm.frontend/package.json | 2 +- erm.frontend/src/views/kpi/Indicator.vue | 61 ++++++------ .../src/views/kpi/IndicatorStatus.vue | 17 ---- .../src/views/kpi/SelectIndicatorDialog.vue | 47 ++++++---- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.platform.core.frontend/package.json | 2 +- .../src/platform/components/index.ts | 3 - .../components/layout/WHScreenDiv.vue | 38 -------- .../components/layout/WVExpandDiv.vue | 17 ++-- .../src/platform/index.ts | 1 - .../src/platform/views/Home.vue | 11 +-- .../src/views/FormElements.vue | 4 +- .../template-project/package.json | 4 +- .../template-project/src/components/index.ts | 40 ++++---- .../src/views/FormElements.vue | 94 ++++++++++--------- .../util-components-generator.cjs | 6 +- .../core/controller/EnumWebController.java | 2 +- .../META-INF/platform/plugins/components.json | 1 + .../jdbc/liquibase/updater/updater.html | 6 +- .../src/views/Frontend.vue | 4 +- .../src/views/Theme.vue | 4 +- 22 files changed, 163 insertions(+), 209 deletions(-) delete mode 100644 erm.frontend/src/views/kpi/IndicatorStatus.vue delete mode 100644 io.sc.platform.core.frontend/src/platform/components/layout/WHScreenDiv.vue diff --git a/app.platform/build.gradle b/app.platform/build.gradle index 8cb4d753..a22cb0a3 100644 --- a/app.platform/build.gradle +++ b/app.platform/build.gradle @@ -15,9 +15,9 @@ dependencies { project(":io.sc.platform.developer"), project(":io.sc.platform.security.loginform"), -// project(":io.sc.engine.mv"), -// project(":io.sc.engine.mv.frontend"), -// project(":io.sc.engine.mv.sample"), + project(":io.sc.engine.mv"), + project(":io.sc.engine.mv.frontend"), + project(":io.sc.engine.mv.sample"), project(":erm"), project(":erm.frontend"), diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 9216b2cc..a9510e68 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.138", + "platform-core": "8.1.140", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/erm.frontend/src/views/kpi/Indicator.vue b/erm.frontend/src/views/kpi/Indicator.vue index 85534305..f2cfad54 100644 --- a/erm.frontend/src/views/kpi/Indicator.vue +++ b/erm.frontend/src/views/kpi/Indicator.vue @@ -24,7 +24,7 @@ label: $t('erm.kpi.indicator.grid.entity.source'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_SOURCE), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_SOURCE), queryOperator: 'equals', }, { @@ -40,7 +40,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryRisk'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_RISK), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_RISK), queryOperator: 'equals', }, { @@ -48,7 +48,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryBusiness'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_BUSINESS), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_BUSINESS), queryOperator: 'equals', }, { @@ -56,7 +56,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryCal'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_CAL), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_CAL), queryOperator: 'equals', }, { @@ -64,7 +64,7 @@ label: $t('erm.kpi.indicator.grid.entity.unit'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_UNIT), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_UNIT), queryOperator: 'equals', }, { @@ -72,7 +72,7 @@ label: $t('erm.kpi.indicator.grid.entity.frequency'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_FREQUENCY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_FREQUENCY), queryOperator: 'equals', }, ]" @@ -86,27 +86,32 @@ { width: 100, name: 'code', label: $t('code') }, { width: 300, name: 'name', label: $t('name') }, { width: 70, name: 'enable', label: $t('enable'), align: 'center', format: Formater.enableTag() }, - { width: 70, name: 'unit', label: $t('erm.kpi.indicator.grid.entity.unit'), format: Formater.dictionary(INDICATOR_UNIT) }, - { width: 70, name: 'frequency', label: $t('erm.kpi.indicator.grid.entity.frequency'), format: Formater.dictionary(INDICATOR_FREQUENCY) }, - { width: 80, name: 'category', label: $t('erm.kpi.indicator.grid.entity.category'), format: Formater.dictionary(INDICATOR_CATEGORY) }, - { width: 100, name: 'categoryCal', label: $t('erm.kpi.indicator.grid.entity.categoryCal'), format: Formater.dictionary(INDICATOR_CATEGORY_CAL) }, + { width: 70, name: 'unit', label: $t('erm.kpi.indicator.grid.entity.unit'), format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_UNIT) }, + { width: 70, name: 'frequency', label: $t('erm.kpi.indicator.grid.entity.frequency'), format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_FREQUENCY) }, + { width: 80, name: 'category', label: $t('erm.kpi.indicator.grid.entity.category'), format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY) }, + { + width: 100, + name: 'categoryCal', + label: $t('erm.kpi.indicator.grid.entity.categoryCal'), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_CAL), + }, { width: 100, name: 'categoryRisk', label: $t('erm.kpi.indicator.grid.entity.categoryRisk'), - format: Formater.dictionary(INDICATOR_CATEGORY_RISK), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_RISK), }, { width: 100, name: 'categoryBusiness', label: $t('erm.kpi.indicator.grid.entity.categoryBusiness'), - format: Formater.dictionary(INDICATOR_CATEGORY_BUSINESS), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_BUSINESS), }, { width: 100, name: 'source', label: $t('erm.kpi.indicator.grid.entity.source'), - format: Formater.dictionary(INDICATOR_SOURCE), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_SOURCE), }, { width: 100, @@ -142,47 +147,47 @@ label: $t('erm.kpi.indicator.grid.entity.source'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_SOURCE), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_SOURCE), }, { name: 'category', label: $t('erm.kpi.indicator.grid.entity.category'), type: 'select', required: true, - options: Options.dictionary(INDICATOR_CATEGORY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY), }, { name: 'categoryCal', label: $t('erm.kpi.indicator.grid.entity.categoryCal'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_CAL), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_CAL), }, { name: 'categoryRisk', label: $t('erm.kpi.indicator.grid.entity.categoryRisk'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_RISK), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_RISK), }, { name: 'categoryBusiness', label: $t('erm.kpi.indicator.grid.entity.categoryBusiness'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_BUSINESS), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_BUSINESS), }, { name: 'unit', label: $t('erm.kpi.indicator.grid.entity.unit'), type: 'select', - options: Options.dictionary(INDICATOR_UNIT), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_UNIT), }, { name: 'frequency', label: $t('erm.kpi.indicator.grid.entity.frequency'), type: 'select', - options: Options.dictionary(INDICATOR_FREQUENCY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_FREQUENCY), }, { name: 'formula', label: $t('erm.kpi.indicator.grid.entity.formula'), type: 'code-mirror', colSpan: 3, rows: 3 }, { name: 'sql', label: $t('erm.kpi.indicator.grid.entity.sql'), type: 'code-mirror', colSpan: 3, rows: 3 }, @@ -246,12 +251,14 @@ import IndicatorStatus from './IndicatorStatus'; const gridRef = ref(); -const INDICATOR_CATEGORY = await DictionaryTools.fetch('INDICATOR_CATEGORY'); -const INDICATOR_CATEGORY_RISK = await DictionaryTools.fetch('INDICATOR_CATEGORY_RISK'); -const INDICATOR_CATEGORY_BUSINESS = await DictionaryTools.fetch('INDICATOR_CATEGORY_BUSINESS'); -const INDICATOR_CATEGORY_CAL = await DictionaryTools.fetch('INDICATOR_CATEGORY_CAL'); -const INDICATOR_UNIT = await DictionaryTools.fetch('INDICATOR_UNIT'); -const INDICATOR_FREQUENCY = await DictionaryTools.fetch('INDICATOR_FREQUENCY'); -const INDICATOR_SOURCE = await DictionaryTools.fetch('INDICATOR_SOURCE'); +const DICTIONARY_MAP = await DictionaryTools.fetch([ + 'INDICATOR_CATEGORY', + 'INDICATOR_CATEGORY_RISK', + 'INDICATOR_CATEGORY_BUSINESS', + 'INDICATOR_CATEGORY_CAL', + 'INDICATOR_UNIT', + 'INDICATOR_FREQUENCY', + 'INDICATOR_SOURCE', +]); const CONDITIONS = ['>', '>=', '<', '<=']; diff --git a/erm.frontend/src/views/kpi/IndicatorStatus.vue b/erm.frontend/src/views/kpi/IndicatorStatus.vue deleted file mode 100644 index afda96ef..00000000 --- a/erm.frontend/src/views/kpi/IndicatorStatus.vue +++ /dev/null @@ -1,17 +0,0 @@ - - diff --git a/erm.frontend/src/views/kpi/SelectIndicatorDialog.vue b/erm.frontend/src/views/kpi/SelectIndicatorDialog.vue index 9560626f..c25fcacd 100644 --- a/erm.frontend/src/views/kpi/SelectIndicatorDialog.vue +++ b/erm.frontend/src/views/kpi/SelectIndicatorDialog.vue @@ -47,7 +47,7 @@ label: $t('erm.kpi.indicator.grid.entity.source'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_SOURCE), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_SOURCE), queryOperator: 'equals', }, { @@ -55,7 +55,7 @@ label: $t('erm.kpi.indicator.grid.entity.category'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY), queryOperator: 'equals', }, { @@ -63,7 +63,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryRisk'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_RISK), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_RISK), queryOperator: 'equals', }, { @@ -71,7 +71,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryBusiness'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_BUSINESS), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_BUSINESS), queryOperator: 'equals', }, { @@ -79,7 +79,7 @@ label: $t('erm.kpi.indicator.grid.entity.categoryCal'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_CATEGORY_CAL), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_CAL), queryOperator: 'equals', }, { @@ -87,7 +87,7 @@ label: $t('erm.kpi.indicator.grid.entity.unit'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_UNIT), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_UNIT), queryOperator: 'equals', }, { @@ -95,7 +95,7 @@ label: $t('erm.kpi.indicator.grid.entity.frequency'), type: 'select', clearable: true, - options: Options.dictionary(INDICATOR_FREQUENCY), + options: Options.dictionary(DICTIONARY_MAP.INDICATOR_FREQUENCY), queryOperator: 'equals', }, ]" @@ -105,26 +105,31 @@ { width: 100, name: 'code', label: $t('code') }, { width: 300, name: 'name', label: $t('name') }, { width: 70, name: 'enable', label: $t('enable'), align: 'center', format: Formater.enableTag() }, - { width: 70, name: 'unit', label: $t('erm.kpi.indicator.grid.entity.unit'), format: Formater.dictionary(INDICATOR_UNIT) }, - { width: 70, name: 'frequency', label: $t('erm.kpi.indicator.grid.entity.frequency'), format: Formater.dictionary(INDICATOR_FREQUENCY) }, - { width: 80, name: 'category', label: $t('erm.kpi.indicator.grid.entity.category'), format: Formater.dictionary(INDICATOR_CATEGORY) }, + { width: 70, name: 'unit', label: $t('erm.kpi.indicator.grid.entity.unit'), format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_UNIT) }, + { + width: 70, + name: 'frequency', + label: $t('erm.kpi.indicator.grid.entity.frequency'), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_FREQUENCY), + }, + { width: 80, name: 'category', label: $t('erm.kpi.indicator.grid.entity.category'), format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY) }, { width: 100, name: 'categoryCal', label: $t('erm.kpi.indicator.grid.entity.categoryCal'), - format: Formater.dictionary(INDICATOR_CATEGORY_CAL), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_CAL), }, { width: 100, name: 'categoryRisk', label: $t('erm.kpi.indicator.grid.entity.categoryRisk'), - format: Formater.dictionary(INDICATOR_CATEGORY_RISK), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_RISK), }, { width: 100, name: 'categoryBusiness', label: $t('erm.kpi.indicator.grid.entity.categoryBusiness'), - format: Formater.dictionary(INDICATOR_CATEGORY_BUSINESS), + format: Formater.dictionary(DICTIONARY_MAP.INDICATOR_CATEGORY_BUSINESS), }, { width: 100, @@ -181,11 +186,13 @@ defineExpose({ close, }); -const INDICATOR_CATEGORY = await DictionaryTools.fetch('INDICATOR_CATEGORY'); -const INDICATOR_CATEGORY_RISK = await DictionaryTools.fetch('INDICATOR_CATEGORY_RISK'); -const INDICATOR_CATEGORY_BUSINESS = await DictionaryTools.fetch('INDICATOR_CATEGORY_BUSINESS'); -const INDICATOR_CATEGORY_CAL = await DictionaryTools.fetch('INDICATOR_CATEGORY_CAL'); -const INDICATOR_UNIT = await DictionaryTools.fetch('INDICATOR_UNIT'); -const INDICATOR_FREQUENCY = await DictionaryTools.fetch('INDICATOR_FREQUENCY'); -const INDICATOR_SOURCE = await DictionaryTools.fetch('INDICATOR_SOURCE'); +const DICTIONARY_MAP = await DictionaryTools.fetch([ + 'INDICATOR_CATEGORY', + 'INDICATOR_CATEGORY_RISK', + 'INDICATOR_CATEGORY_BUSINESS', + 'INDICATOR_CATEGORY_CAL', + 'INDICATOR_UNIT', + 'INDICATOR_FREQUENCY', + 'INDICATOR_SOURCE', +]); diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 4296d6ee..0ff033f3 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -80,7 +80,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.137", + "platform-core": "8.1.140", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 8f9de1f4..74c509b3 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.139", + "version": "8.1.141", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/index.ts b/io.sc.platform.core.frontend/src/platform/components/index.ts index 594c401b..cdd19e74 100644 --- a/io.sc.platform.core.frontend/src/platform/components/index.ts +++ b/io.sc.platform.core.frontend/src/platform/components/index.ts @@ -27,7 +27,6 @@ import WGrid from './grid/WGrid.vue'; import WIconEmpty from './icon/WIconEmpty.vue'; -import WHScreenDiv from './layout/WHScreenDiv.vue'; import WVExpandDiv from './layout/WVExpandDiv.vue'; import WInfoPanel from './panel/WInfoPanel.vue'; @@ -71,7 +70,6 @@ export default { app.component('WIconEmpty', WIconEmpty); - app.component('WHScreenDiv', WHScreenDiv); app.component('WVExpandDiv', WVExpandDiv); app.component('WInfoPanel', WInfoPanel); @@ -110,7 +108,6 @@ export { WOptionGroup, WGrid, WIconEmpty, - WHScreenDiv, WVExpandDiv, WInfoPanel, WProgress, diff --git a/io.sc.platform.core.frontend/src/platform/components/layout/WHScreenDiv.vue b/io.sc.platform.core.frontend/src/platform/components/layout/WHScreenDiv.vue deleted file mode 100644 index cfe75500..00000000 --- a/io.sc.platform.core.frontend/src/platform/components/layout/WHScreenDiv.vue +++ /dev/null @@ -1,38 +0,0 @@ - - diff --git a/io.sc.platform.core.frontend/src/platform/components/layout/WVExpandDiv.vue b/io.sc.platform.core.frontend/src/platform/components/layout/WVExpandDiv.vue index 75a71e17..d216a056 100644 --- a/io.sc.platform.core.frontend/src/platform/components/layout/WVExpandDiv.vue +++ b/io.sc.platform.core.frontend/src/platform/components/layout/WVExpandDiv.vue @@ -2,7 +2,6 @@
@@ -10,7 +9,7 @@
diff --git a/io.sc.platform.core.frontend/src/views/FormElements.vue b/io.sc.platform.core.frontend/src/views/FormElements.vue index 39720abd..be27f66d 100644 --- a/io.sc.platform.core.frontend/src/views/FormElements.vue +++ b/io.sc.platform.core.frontend/src/views/FormElements.vue @@ -30,8 +30,8 @@ { name: 'cron', label: 'please input cron expression', type: 'cron', outlined: true, dense: true }, { name: 'position', label: 'please select position', type: 'position', outlined: true, dense: true, readOnly: true }, { name: 'icon', label: 'please select icon', type: 'icon', outlined: true, dense: true }, - { name: 'dataComeFrom', label: '', type: 'select', options: Options.enum(DataComeFromEnums['io.sc.platform.orm.api.enums.DataComeFrom']) }, - { name: 'dataComeFrom', label: '', type: 'select', options: Options.enum(DataComeFromEnums['io.sc.platform.system.enums.UrlOpenType']) }, + { name: 'dataComeFrom', label: '', type: 'select', options: Options.enum(DataComeFromEnums.DataComeFrom) }, + { name: 'dataComeFrom', label: '', type: 'select', options: Options.enum(DataComeFromEnums.UrlOpenType) }, ]" > diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 289039ad..1763b3e3 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.137", + "version": "8.1.141", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.137", + "platform-core": "8.1.141", "quasar": "2.14.5", "tailwindcss": "3.4.0", "vue": "3.4.3", 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 7f05c927..940d5b83 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,28 +2,28 @@ * 此文件为自动生成文件,请勿修改 */ -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'; -import infoPanel from '@/views/likm/InfoPanel.vue'; -import grid from '@/views/likm/Grid.vue'; -import toolbar from '@/views/likm/Toolbar.vue'; -import quasarGrid from '@/views/likm/QuasarGrid.vue'; -import gridLayout from '@/views/likm/GridLayout.vue'; -import likmTreeGrid from '@/views/likm/TreeGrid.vue'; +import component_testcase_formElements from '@/views/FormElements.vue'; +import component_testcase_likmDialog from '@/views/likm/Dialog.vue'; +import component_testcase_likmDrawer from '@/views/likm/Drawer.vue'; +import component_testcase_likmForm from '@/views/likm/Form.vue'; +import component_testcase_infoPanel from '@/views/likm/InfoPanel.vue'; +import component_testcase_grid from '@/views/likm/Grid.vue'; +import component_testcase_toolbar from '@/views/likm/Toolbar.vue'; +import component_testcase_quasarGrid from '@/views/likm/QuasarGrid.vue'; +import component_testcase_gridLayout from '@/views/likm/GridLayout.vue'; +import component_testcase_likmTreeGrid from '@/views/likm/TreeGrid.vue'; const localComponents = { - 'component.testcase.formElements': formElements, - 'component.testcase.likmDialog': likmDialog, - 'component.testcase.likmDrawer': likmDrawer, - 'component.testcase.likmForm': likmForm, - 'component.testcase.infoPanel': infoPanel, - 'component.testcase.grid': grid, - 'component.testcase.toolbar': toolbar, - 'component.testcase.quasarGrid': quasarGrid, - 'component.testcase.gridLayout': gridLayout, - 'component.testcase.likmTreeGrid': likmTreeGrid, + 'component.testcase.formElements': component_testcase_formElements, + 'component.testcase.likmDialog': component_testcase_likmDialog, + 'component.testcase.likmDrawer': component_testcase_likmDrawer, + 'component.testcase.likmForm': component_testcase_likmForm, + 'component.testcase.infoPanel': component_testcase_infoPanel, + 'component.testcase.grid': component_testcase_grid, + 'component.testcase.toolbar': component_testcase_toolbar, + 'component.testcase.quasarGrid': component_testcase_quasarGrid, + 'component.testcase.gridLayout': component_testcase_gridLayout, + 'component.testcase.likmTreeGrid': component_testcase_likmTreeGrid, }; export default localComponents; 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 index ca17b66a..af32143c 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/FormElements.vue @@ -1,59 +1,61 @@ + + diff --git a/io.sc.platform.core.frontend/template-project/util-components-generator.cjs b/io.sc.platform.core.frontend/template-project/util-components-generator.cjs index dcf297d2..884a774d 100644 --- a/io.sc.platform.core.frontend/template-project/util-components-generator.cjs +++ b/io.sc.platform.core.frontend/template-project/util-components-generator.cjs @@ -13,7 +13,7 @@ content +='/**\n'; content +=' * 此文件为自动生成文件,请勿修改\n'; content +=' */\n\n'; for(const route of routesJson){ - const componentName =route.component.substring(route.component.lastIndexOf('.')+1); + const componentName =route.component.replaceAll('.','_'); const componentPath =route.componentPath; content +=`import ${componentName} from '${componentPath}';\n`; } @@ -21,7 +21,7 @@ for(const route of routesJson){ content +='\n'; content +='const localComponents = { \n'; for(const route of routesJson){ - const componentName =route.component.substring(route.component.lastIndexOf('.')+1); + const componentName =route.component.replaceAll('.','_'); content +=`'${route.component}': ${componentName},\n`; } content +='}\n\n'; @@ -29,4 +29,4 @@ content +='export default localComponents;\n'; fs.writeFileSync('./src/components/index.ts', content); -console.info('components generated!'); \ No newline at end of file +console.info('components generated!'); diff --git a/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/EnumWebController.java b/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/EnumWebController.java index aa2add1c..2a86e773 100644 --- a/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/EnumWebController.java +++ b/io.sc.platform.core/src/main/java/io/sc/platform/core/controller/EnumWebController.java @@ -37,7 +37,7 @@ public class EnumWebController { if(clazz.isEnum()){ Method method =clazz.getDeclaredMethod("values"); Enum[] enums =(Enum[])method.invoke(null); - result.put(type,convert(enums)); + result.put(clazz.getSimpleName(),convert(enums)); } } } diff --git a/io.sc.platform.jdbc.liquibase/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.jdbc.liquibase/src/main/resources/META-INF/platform/plugins/components.json index 17ed5f33..e6f1d67b 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/resources/META-INF/platform/plugins/components.json +++ b/io.sc.platform.jdbc.liquibase/src/main/resources/META-INF/platform/plugins/components.json @@ -1,6 +1,7 @@ { "includes":[ "io.sc.platform.jdbc.liquibase.installer.controller", + "io.sc.platform.jdbc.liquibase.controller", "io.sc.platform.jdbc.liquibase.service" ] } \ No newline at end of file diff --git a/io.sc.platform.jdbc.liquibase/src/main/resources/templates/io/sc/platform/jdbc/liquibase/updater/updater.html b/io.sc.platform.jdbc.liquibase/src/main/resources/templates/io/sc/platform/jdbc/liquibase/updater/updater.html index 067aefc5..7625f4e1 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/resources/templates/io/sc/platform/jdbc/liquibase/updater/updater.html +++ b/io.sc.platform.jdbc.liquibase/src/main/resources/templates/io/sc/platform/jdbc/liquibase/updater/updater.html @@ -33,7 +33,7 @@ @@ -73,9 +73,9 @@
将要更新的内容清单:
- + - + diff --git a/io.sc.platform.lcdp.frontend/src/views/Frontend.vue b/io.sc.platform.lcdp.frontend/src/views/Frontend.vue index c43f9980..bbc8ab0e 100644 --- a/io.sc.platform.lcdp.frontend/src/views/Frontend.vue +++ b/io.sc.platform.lcdp.frontend/src/views/Frontend.vue @@ -1,5 +1,5 @@
[[#{liquibase.updater.table.order}]][[#{liquibase.updater.table.order}]] [[#{liquibase.updater.table.location}]][[#{liquibase.updater.table.description}]][[#{liquibase.updater.table.description}]]