Merge branch 'main' of http://gitlab.sc.io:9000/wangshaoping/platform

2. 修复开发者工具的前端 bug

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",

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

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",

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",

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",

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"

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
       },
       { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false },
     ]"
@@ -40,5 +28,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
         align: 'left',
         sortable: false,
       },
@@ -30,5 +24,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
       },
       {
         width: 300,
@@ -40,5 +34,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
       },
       { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false },
     ]"
@@ -26,5 +20,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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"

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
       },
       { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false },
     ]"
@@ -40,5 +28,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        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 + '<br/>';
-          }
-          return result;
-        },
+        format: Formater.join('<br/>'),
+        title: Formater.join('\n'),
       },
       { width: 200, name: 'configurationFileUrl', label: $t('url'), sortable: false },
     ]"
@@ -40,5 +28,5 @@
 </template>
 <script setup lang="ts">
 import 'tailwindcss/utilities.css';
-import { Environment } from 'platform-core';
+import { Environment, Formater } from 'platform-core';
 </script>

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",

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",

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",

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",

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",

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",

io.sc.website/package.json

@@ -28,6 +28,6 @@
   },
   "dependencies": {
     "vue": "3.5.13",
-    "platform-core": "8.2.28"
+    "platform-core": "8.2.29"
   }
 }