diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 964ab21f..1bd63b5f 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 09766e9d..928e682a 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 182c89a6..93aab56f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.44 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.137 +platform_core_frontend_version=8.2.138 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index fc0c75e2..dcff2d96 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 9edade1a..b6d3a3b5 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 53f6b6f2..315762e9 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index bba22a80..98f33487 100644 --- a/io.sc.platform.ai.frontend/package.json +++ b/io.sc.platform.ai.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 6f2b3b06..c5a91711 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.2.137", + "version": "8.2.138", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/views/home/ShortcutMenuSettingDialog.vue b/io.sc.platform.core.frontend/src/platform/views/home/ShortcutMenuSettingDialog.vue index 66066659..d107e3cb 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/ShortcutMenuSettingDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/ShortcutMenuSettingDialog.vue @@ -32,6 +32,7 @@ name: 'menuIconColor', label: $t('settings.shortcutMenus.entity.menuIconColor'), sortable: false, + html: true, format: (value, row) => { return '' + value + ''; }, @@ -122,7 +123,7 @@ { name: 'shortcutMenuName', label: $t('settings.shortcutMenus.entity.shortcutMenuName'), type: 'w-text' }, { name: 'menuIconColor', - label: $t('settings.shortcutMenus.entity.shortcutMenuName'), + label: $t('settings.shortcutMenus.entity.menuIconColor'), type: 'w-color-input-palette', defaultValue: 'primary', }, diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 43d429c7..6cf566c0 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.2.137", + "version": "8.2.138", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index da2544eb..439bb990 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 7466d80d..ed2c340e 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue b/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue index e053a5c7..dcce9f4d 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/ApplicationProperties.vue @@ -14,6 +14,7 @@ name: 'properties', label: $t('properties'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Components.vue b/io.sc.platform.developer.frontend/src/views/plugin/Components.vue index 93adc2d7..db5d60f6 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Components.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Components.vue @@ -11,6 +11,7 @@ name: 'includes', label: $t('include'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, @@ -19,6 +20,7 @@ name: 'excludes', label: $t('exclude'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue b/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue index b0986d9d..d4ed81f4 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/FrontendModule.vue @@ -12,6 +12,7 @@ name: 'components', label: $t('component'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, @@ -20,6 +21,7 @@ name: 'resources', label: $t('resource'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue b/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue index ae3c8d34..87484cd8 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue @@ -11,6 +11,7 @@ name: 'includes', label: $t('include'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, @@ -19,6 +20,7 @@ name: 'excludes', label: $t('exclude'), sortable: false, + html: true, format: (excludes) => { excludes = excludes || []; let result = ''; diff --git a/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue b/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue index 44095701..f3a6a72b 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue @@ -11,6 +11,7 @@ name: 'ignoredPatterns', label: $t('ignored'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue b/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue index 50ac85c1..af9687eb 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue @@ -11,6 +11,7 @@ name: 'includes', label: $t('include'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, @@ -19,6 +20,7 @@ name: 'excludes', label: $t('exclude'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue b/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue index 2abd9f92..344ee484 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue @@ -11,6 +11,7 @@ name: 'container', label: $t('webContainer'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, @@ -19,6 +20,7 @@ name: 'jar', label: $t('jar'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Security.vue b/io.sc.platform.developer.frontend/src/views/plugin/Security.vue index a5f597e0..a12dfeef 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Security.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Security.vue @@ -11,6 +11,7 @@ name: 'permitPatterns', label: $t('ignored'), sortable: false, + html: true, format: Formater.join('
'), title: Formater.join('\n'), }, diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 231b9f4a..ea10f912 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 7b693d9c..27aec36f 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 7ca9c7cb..05ce9feb 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index e3049a82..bdac0dab 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 73f8abe0..4b7743c6 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/src/views/menu/ImportMenuPluginDialog.vue b/io.sc.platform.system.frontend/src/views/menu/ImportMenuPluginDialog.vue index 1eae4141..f796dd05 100644 --- a/io.sc.platform.system.frontend/src/views/menu/ImportMenuPluginDialog.vue +++ b/io.sc.platform.system.frontend/src/views/menu/ImportMenuPluginDialog.vue @@ -47,7 +47,8 @@ sortable: false, format: (value, row) => { if (row.type === 'SEPARATOR') { - return `
`; + //return `
`; + return ''; } else { return $t(value); } diff --git a/io.sc.platform.system.frontend/src/views/menu/Menu.vue b/io.sc.platform.system.frontend/src/views/menu/Menu.vue index 2b7aa858..05f942bf 100644 --- a/io.sc.platform.system.frontend/src/views/menu/Menu.vue +++ b/io.sc.platform.system.frontend/src/views/menu/Menu.vue @@ -62,7 +62,8 @@ sortable: false, format: (value, row) => { if (row.type === 'SEPARATOR') { - return `
`; + //return `
`; + return ''; } else if (row.type === 'ROUTE_ACTION') { return $t(row.i18nKey); } else { diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue index 6a8c3f13..02d05291 100644 --- a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue +++ b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue @@ -57,7 +57,8 @@ sortable: false, format: (value, row) => { if (row.type === 'SEPARATOR') { - return `
`; + //return `
`; + return ''; } else if (row.type === 'ROUTE_ACTION') { return $t(row.i18nKey); } else { diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index 0022d713..49cc2eca 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.website/package.json b/io.sc.website/package.json index 252f71fc..2082b165 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.137" + "platform-core": "8.2.138" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index a45c711f..b39043a2 100644 --- a/wra.report.frontend/package.json +++ b/wra.report.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.137", + "platform-core": "8.2.138", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7",