From e2b713d0f1e74d985b74cd7ab9feeefc0869dd64 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Thu, 24 Aug 2023 18:10:46 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=B3=BB=E7=BB=9F=E8=8C=83=E5=9B=B4=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA&=E7=94=A8=E6=88=B7=E6=89=B9=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/models/setting/user.ts                        | 1 +
 frontend/src/router/routes/modules/apiTest.ts              | 2 +-
 frontend/src/router/routes/modules/bugManagement.ts        | 2 +-
 frontend/src/router/routes/modules/featureTest.ts          | 2 +-
 frontend/src/router/routes/modules/uiTest.ts               | 2 +-
 frontend/src/router/routes/modules/workbench.ts            | 2 +-
 .../src/views/setting/system/log/components/logCards.vue   | 6 +++++-
 frontend/src/views/setting/system/resourcePool/detail.vue  | 6 +++++-
 .../views/setting/system/user/components/batchModal.vue    | 7 ++++---
 9 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/frontend/src/models/setting/user.ts b/frontend/src/models/setting/user.ts
index 2105ff30ea..546603de46 100644
--- a/frontend/src/models/setting/user.ts
+++ b/frontend/src/models/setting/user.ts
@@ -105,4 +105,5 @@ export interface OrgsItem {
   id: string;
   name: string;
   children?: OrgsItem[];
+  leafNode: boolean;
 }
diff --git a/frontend/src/router/routes/modules/apiTest.ts b/frontend/src/router/routes/modules/apiTest.ts
index e2dc14d46c..3383956122 100644
--- a/frontend/src/router/routes/modules/apiTest.ts
+++ b/frontend/src/router/routes/modules/apiTest.ts
@@ -17,7 +17,7 @@ const ApiTest: AppRouteRecordRaw = {
   children: [
     {
       path: 'index',
-      name: 'ApiTestIndex',
+      name: 'apiTestIndex',
       component: () => import('@/views/api-test/index.vue'),
       meta: {
         roles: ['*'],
diff --git a/frontend/src/router/routes/modules/bugManagement.ts b/frontend/src/router/routes/modules/bugManagement.ts
index 71aedbb43b..f2565b10e8 100644
--- a/frontend/src/router/routes/modules/bugManagement.ts
+++ b/frontend/src/router/routes/modules/bugManagement.ts
@@ -17,7 +17,7 @@ const BugManagement: AppRouteRecordRaw = {
   children: [
     {
       path: 'index',
-      name: 'BugManagementIndex',
+      name: 'bugManagementIndex',
       component: () => import('@/views/bug-management/index.vue'),
       meta: {
         roles: ['*'],
diff --git a/frontend/src/router/routes/modules/featureTest.ts b/frontend/src/router/routes/modules/featureTest.ts
index a9fbc28129..cd1995aa36 100644
--- a/frontend/src/router/routes/modules/featureTest.ts
+++ b/frontend/src/router/routes/modules/featureTest.ts
@@ -17,7 +17,7 @@ const FeatureTest: AppRouteRecordRaw = {
   children: [
     {
       path: 'index',
-      name: 'FeatureTestIndex',
+      name: 'featureTestIndex',
       component: () => import('@/views/feature-test/index.vue'),
       meta: {
         roles: ['*'],
diff --git a/frontend/src/router/routes/modules/uiTest.ts b/frontend/src/router/routes/modules/uiTest.ts
index 663a965223..3e1eab1888 100644
--- a/frontend/src/router/routes/modules/uiTest.ts
+++ b/frontend/src/router/routes/modules/uiTest.ts
@@ -17,7 +17,7 @@ const UiTest: AppRouteRecordRaw = {
   children: [
     {
       path: 'index',
-      name: 'UiTestIndex',
+      name: 'uiTestIndex',
       component: () => import('@/views/ui-test/index.vue'),
       meta: {
         roles: ['*'],
diff --git a/frontend/src/router/routes/modules/workbench.ts b/frontend/src/router/routes/modules/workbench.ts
index 33d7d3f59b..adf014c8ef 100644
--- a/frontend/src/router/routes/modules/workbench.ts
+++ b/frontend/src/router/routes/modules/workbench.ts
@@ -17,7 +17,7 @@ const Workbench: AppRouteRecordRaw = {
   children: [
     {
       path: 'index',
-      name: 'WorkbenchIndex',
+      name: 'workbenchIndex',
       component: () => import('@/views/workbench/index.vue'),
       meta: {
         roles: ['*'],
diff --git a/frontend/src/views/setting/system/log/components/logCards.vue b/frontend/src/views/setting/system/log/components/logCards.vue
index 5ce46e2bc4..ccfdf7e6c8 100644
--- a/frontend/src/views/setting/system/log/components/logCards.vue
+++ b/frontend/src/views/setting/system/log/components/logCards.vue
@@ -76,7 +76,11 @@
     </div>
     <ms-base-table v-bind="propsRes" no-disable sticky-header v-on="propsEvent">
       <template #range="{ record }">
-        {{ `${record.organizationName}${record.projectName ? `/${record.projectName}` : ''}` }}
+        {{
+          record.organizationId === 'SYSTEM'
+            ? t('system.log.system')
+            : `${record.organizationName}${record.projectName ? `/${record.projectName}` : ''}`
+        }}
       </template>
       <template #module="{ record }">
         {{ getModuleLocale(record.module) }}
diff --git a/frontend/src/views/setting/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue
index 443ad4649a..4300a50c06 100644
--- a/frontend/src/views/setting/system/resourcePool/detail.vue
+++ b/frontend/src/views/setting/system/resourcePool/detail.vue
@@ -631,7 +631,11 @@
     let name = '';
     let yamlStr = '';
     const { nameSpaces, deployName } = form.value.testResourceDTO;
-    const apiImage = `registry.cn-qingdao.aliyuncs.com/metersphere/node-controller:${appStore.version}`;
+    // 镜像内的版本号需要去掉尾部的 -xxx
+    const apiImage = `registry.cn-qingdao.aliyuncs.com/metersphere/node-controller:${appStore.version.substring(
+      0,
+      appStore.version.lastIndexOf('-')
+    )}`;
     switch (type) {
       case 'role':
         name = 'Role.yml';
diff --git a/frontend/src/views/setting/system/user/components/batchModal.vue b/frontend/src/views/setting/system/user/components/batchModal.vue
index 5c0e602559..a5bd4453e3 100644
--- a/frontend/src/views/setting/system/user/components/batchModal.vue
+++ b/frontend/src/views/setting/system/user/components/batchModal.vue
@@ -96,7 +96,7 @@
    */
   const getTransferData = (_treeData: OrgsItem[], transferDataSource: TransferDataItem[]) => {
     _treeData.forEach((item) => {
-      if (item.children) getTransferData(item.children, transferDataSource);
+      if (!item.leafNode && item.children) getTransferData(item.children, transferDataSource);
       else transferDataSource.push({ label: item.name, value: item.id, disabled: false });
     });
     return transferDataSource;
@@ -112,8 +112,9 @@
       const treeDataSource: TreeDataItem[] = [];
       _treeData.forEach((item) => {
         // 需要判断当前父节点下的子节点是否全部选中，若选中则不会 push 进穿梭框数组内，否则会出现空的节点无法选中
-        const allSelected = item.children?.every((child) => target.value.includes(child.id));
-        if (!allSelected && (item.children || values.includes(item.id))) {
+        const allSelected =
+          target.value.length > 0 && !item.leafNode && item.children?.every((child) => target.value.includes(child.id));
+        if (!allSelected && !target.value.includes(item.id) && (item.children || values.includes(item.id))) {
           treeDataSource.push({
             title: item.name,
             key: item.id,