From ec22a30675a380b1b822dac2cc2876ff01eee677 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Mon, 13 Jan 2025 11:20:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=89=8D=E7=AB=AF=E5=8F=91=E5=B8=83=208.2?= =?UTF-8?q?.29=202.=20=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8F=91=E8=80=85?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E5=89=8D=E7=AB=AF=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erm.frontend/package.json | 2 +- gradle.properties | 2 +- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.engine.rule.frontend/package.json | 2 +- io.sc.engine.st.frontend/package.json | 2 +- io.sc.platform.developer.doc/package.json | 2 +- .../package.json | 2 +- .../src/views/plugin/Components.vue | 22 +++++-------------- .../src/views/plugin/Liquibase.vue | 12 +++------- .../src/views/plugin/Messages.vue | 12 +++------- .../src/views/plugin/P6spy.vue | 12 +++------- .../src/views/plugin/Parameters.vue | 5 +++++ .../src/views/plugin/Repositories.vue | 22 +++++-------------- .../src/views/plugin/RestartProperties.vue | 22 +++++-------------- io.sc.platform.lcdp.frontend/package.json | 2 +- .../package.json | 2 +- io.sc.platform.mvc.frontend/package.json | 2 +- .../package.json | 2 +- io.sc.platform.system.frontend/package.json | 2 +- io.sc.standard.frontend/package.json | 2 +- io.sc.website/package.json | 2 +- 21 files changed, 43 insertions(+), 92 deletions(-) diff --git a/erm.frontend/package.json b/erm.frontend/package.json index f43f34e1..2ea6f828 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/gradle.properties b/gradle.properties index 1b9a1fcb..dbff788e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.6 platform_plugin_version=8.2.6 -platform_core_frontend_version=8.2.28 +platform_core_frontend_version=8.2.29 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 7af87cf9..17e6bce9 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 99dcb480..db0286b9 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 27e26b16..f52fe1b9 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 2577f899..dfc07567 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.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "vue": "3.5.13", "vue-i18n": "10.0.4" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index ab72bbea..e83131ef 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -122,4 +122,4 @@ "vue-router": "4.5.0", "xml-formatter": "3.6.3" } -} +} \ No newline at end of file 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 c9777b74..16ec8935 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Components.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Components.vue @@ -11,28 +11,16 @@ name: 'includes', label: $t('include'), sortable: false, - format: (includes) => { - includes = includes || []; - let result = ''; - for (const include of includes) { - result += include + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 300, name: 'excludes', label: $t('exclude'), sortable: false, - format: (excludes) => { - excludes = excludes || []; - let result = ''; - for (const exclude of excludes) { - result += exclude + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false }, ]" @@ -40,5 +28,5 @@ diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue b/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue index 447eb294..88a96973 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Liquibase.vue @@ -13,14 +13,8 @@ width: 600, name: 'locations', label: $t('location'), - format: (locations) => { - locations = locations || []; - let result = ''; - for (const location of locations) { - result += location + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), align: 'left', sortable: false, }, @@ -30,5 +24,5 @@ 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 11096f6b..c205706e 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Messages.vue @@ -11,14 +11,8 @@ name: 'includes', label: $t('include'), sortable: false, - format: (includes) => { - includes = includes || []; - let result = ''; - for (const include of includes) { - result += include + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 300, @@ -40,5 +34,5 @@ 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 f8e61735..ed1c5b9a 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/P6spy.vue @@ -11,14 +11,8 @@ name: 'ignoredPatterns', label: $t('ignored'), sortable: false, - format: (ignoredPatterns) => { - ignoredPatterns = ignoredPatterns || []; - let result = ''; - for (const ignoredPattern of ignoredPatterns) { - result += ignoredPattern + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false }, ]" @@ -26,5 +20,5 @@ diff --git a/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue b/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue index e05a7092..40f6f25d 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Parameters.vue @@ -3,6 +3,11 @@ :title="$t('menu.developer.plugin.parameters')" :tree="true" tree-relationship-field="parentId" + :tree-icon=" + (row) => { + return { name: 'folder', color: 'amber' }; + } + " :toolbar-actions="['refresh', 'separator', 'view', 'export']" :fetch-data-url="Environment.apiContextPath('/api/developer/plugins/parameters')" :checkbox-selection="false" 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 68b3e03c..894d5caf 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/Repositories.vue @@ -11,28 +11,16 @@ name: 'includes', label: $t('include'), sortable: false, - format: (includes) => { - includes = includes || []; - let result = ''; - for (const include of includes) { - result += include + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 300, name: 'excludes', label: $t('exclude'), sortable: false, - format: (excludes) => { - excludes = excludes || []; - let result = ''; - for (const exclude of excludes) { - result += exclude + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false }, ]" @@ -40,5 +28,5 @@ 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 f4704f1f..e0221fbd 100644 --- a/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue +++ b/io.sc.platform.developer.frontend/src/views/plugin/RestartProperties.vue @@ -11,28 +11,16 @@ name: 'container', label: $t('webContainer'), sortable: false, - format: (containers) => { - containers = containers || []; - let result = ''; - for (const container of containers) { - result += container + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 300, name: 'jar', label: $t('jar'), sortable: false, - format: (jars) => { - jars = jars || []; - let result = ''; - for (const jar of jars) { - result += jar + '
'; - } - return result; - }, + format: Formater.join('
'), + title: Formater.join('\n'), }, { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false }, ]" @@ -40,5 +28,5 @@ diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 3525d5d4..3c82672a 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 4ac42d9f..72ea9441 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index df1bd8b7..d3c9b9b8 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 6ff05df3..d3d1bf74 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 3893a5c8..4fe3755a 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -110,7 +110,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.4", "pinia": "2.2.6", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index 2cf35068..733f6eba 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.4", "pinia": "2.2.6", "pinia-undo": "0.2.4", - "platform-core": "8.2.28", + "platform-core": "8.2.29", "quasar": "2.17.4", "sort-array": "5.0.0", "svg-path-commander": "2.1.5", diff --git a/io.sc.website/package.json b/io.sc.website/package.json index a415f48d..1c891b5d 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.28" + "platform-core": "8.2.29" } } \ No newline at end of file