From 896a58a5ebe07a12772d7bce8ab99e6588607cec Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Fri, 25 Aug 2023 15:55:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=B1=A0=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?&=E7=A9=BF=E6=A2=AD=E6=A1=86=E7=BB=84=E4=BB=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4&=E8=AF=B7=E6=B1=82=E6=90=BA=E5=B8=A6=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/http/index.ts                | 10 ++++++++-
 .../src/components/pure/ms-transfer/index.vue | 10 ++++-----
 frontend/src/locale/useLocale.ts              |  1 +
 frontend/src/models/setting/resourcePool.ts   |  2 +-
 .../setting/system/resourcePool/detail.vue    | 22 +++++++++----------
 .../setting/system/resourcePool/index.vue     |  6 ++---
 .../system/resourcePool/locale/en-US.ts       |  2 +-
 .../system/resourcePool/locale/zh-CN.ts       |  2 +-
 8 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/frontend/src/api/http/index.ts b/frontend/src/api/http/index.ts
index 274d7b14a8..904a2c0282 100644
--- a/frontend/src/api/http/index.ts
+++ b/frontend/src/api/http/index.ts
@@ -6,6 +6,7 @@ import { isString } from '@/utils/is';
 import { getToken } from '@/utils/auth';
 import { setObjToUrlParams, deepMerge } from '@/utils';
 import { useI18n } from '@/hooks/useI18n';
+import useLocale from '@/locale/useLocale';
 import { joinTimestamp } from './helper';
 
 import type { AxiosResponse } from 'axios';
@@ -110,10 +111,17 @@ const transform: AxiosTransform = {
    */
   requestInterceptors: (config) => {
     // 请求之前处理config
+    const { currentLocale } = useLocale();
     const token = getToken();
     if (token && (config as Recordable)?.requestOptions?.withToken !== false) {
       const { sessionId, csrfToken } = token;
-      (config as Recordable).headers = { 'X-AUTH-TOKEN': sessionId, 'CSRF-TOKEN': csrfToken };
+
+      (config as Recordable).headers = {
+        ...config.headers,
+        'X-AUTH-TOKEN': sessionId,
+        'CSRF-TOKEN': csrfToken,
+        'Accept-Language': currentLocale.value,
+      };
     }
     return config;
   },
diff --git a/frontend/src/components/pure/ms-transfer/index.vue b/frontend/src/components/pure/ms-transfer/index.vue
index 27f4659267..f6df64adff 100644
--- a/frontend/src/components/pure/ms-transfer/index.vue
+++ b/frontend/src/components/pure/ms-transfer/index.vue
@@ -5,12 +5,12 @@
     :data="transferData"
     show-search
   >
-    <template #source="{ data: tData, selectedKeys, onSelect }">
+    <template #source="{ selectedKeys, onSelect }">
       <a-tree
         :checkable="true"
         checked-strategy="child"
         :checked-keys="selectedKeys"
-        :data="getTreeData(tData)"
+        :data="getTreeData()"
         block-node
         @check="onSelect"
       />
@@ -96,9 +96,7 @@
   /**
    * 获取树结构数据，根据穿梭框过滤的数据获取
    */
-  const getTreeData = (data: TransferDataItem[]) => {
-    const values = data.map((item) => item[props.treeFiled.key]);
-
+  const getTreeData = () => {
     const travel = (_treeData: TreeDataItem[]) => {
       const treeDataSource: TreeDataItem[] = [];
       _treeData.forEach((item) => {
@@ -111,7 +109,7 @@
           Array.isArray(itemChildren) &&
           itemChildren.length > 0 &&
           itemChildren?.every((child: TreeDataItem) => innerTarget.value.includes(child[props.treeFiled.key]));
-        if (!allSelected && !innerTarget.value.includes(itemKey) && (itemChildren || values.includes(itemKey))) {
+        if (!allSelected && !innerTarget.value.includes(itemKey)) {
           // 非选中父节点时，需要判断每个子节点是否已经在右侧的选中的数组内，不在才渲染到左侧
           treeDataSource.push({
             title: itemTitle,
diff --git a/frontend/src/locale/useLocale.ts b/frontend/src/locale/useLocale.ts
index 3f6b28b098..5ef437f50c 100644
--- a/frontend/src/locale/useLocale.ts
+++ b/frontend/src/locale/useLocale.ts
@@ -53,6 +53,7 @@ async function changeLocale(locale: LocaleType) {
   loadLocalePool.push(locale);
 
   setI18nLanguage(locale);
+  window.location.reload();
   return locale;
 }
 
diff --git a/frontend/src/models/setting/resourcePool.ts b/frontend/src/models/setting/resourcePool.ts
index 8be3610422..ab1d4f1da3 100644
--- a/frontend/src/models/setting/resourcePool.ts
+++ b/frontend/src/models/setting/resourcePool.ts
@@ -19,7 +19,7 @@ export interface TestResourceDTO {
   nodesList: NodesListItem[]; // node资源
   ip: string; // k8s ip
   token: string; // k8s token
-  nameSpaces: string; // k8s 命名空间
+  namespace: string; // k8s 命名空间
   concurrentNumber: number; // k8s 最大并发数
   podThreads: number; // k8s 单pod最大线程数
   jobDefinition: string; // k8s job自定义模板
diff --git a/frontend/src/views/setting/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue
index b4cfccc4f1..cd37f3b62e 100644
--- a/frontend/src/views/setting/system/resourcePool/detail.vue
+++ b/frontend/src/views/setting/system/resourcePool/detail.vue
@@ -235,14 +235,14 @@
           />
         </a-form-item>
         <a-form-item
-          :label="t('system.resourcePool.testResourceDTO.nameSpaces')"
-          field="testResourceDTO.nameSpaces"
+          :label="t('system.resourcePool.testResourceDTO.namespace')"
+          field="testResourceDTO.namespace"
           class="form-item"
           :rules="[{ required: true, message: t('system.resourcePool.testResourceDTO.nameSpacesRequired') }]"
           asterisk-position="end"
         >
           <a-input
-            v-model:model-value="form.testResourceDTO.nameSpaces"
+            v-model:model-value="form.testResourceDTO.namespace"
             :placeholder="t('system.resourcePool.testResourceDTO.nameSpacesPlaceholder')"
             :max-length="250"
             class="mr-[8px] flex-1"
@@ -379,7 +379,7 @@
       nodesList: [] as NodesListItem[],
       ip: '',
       token: '',
-      nameSpaces: '',
+      namespace: '',
       jobDefinition: job,
       deployName: '',
       orgIds: [] as string[],
@@ -483,7 +483,7 @@
   // 是否显示K8S资源配置信息
   const isShowK8SResources = computed(() => form.value.type === 'Kubernetes' && isShowTypeItem.value);
   // 是否填写了命名空间
-  const isFillNameSpaces = computed(() => form.value.testResourceDTO.nameSpaces?.trim() !== '');
+  const isFillNameSpaces = computed(() => form.value.testResourceDTO.namespace?.trim() !== '');
   // 是否填写了命名空间及Deploy Name
   const isFillNameSpacesAndDeployName = computed(
     () => isFillNameSpaces.value && form.value.testResourceDTO.deployName?.trim() !== ''
@@ -630,7 +630,7 @@
   function downloadYaml(type: YamlType) {
     let name = '';
     let yamlStr = '';
-    const { nameSpaces, deployName } = form.value.testResourceDTO;
+    const { namespace, deployName } = form.value.testResourceDTO;
     // 镜像内的版本号需要去掉尾部的 -xxx
     const apiImage = `registry.cn-qingdao.aliyuncs.com/metersphere/task-runner:${appStore.version.substring(
       0,
@@ -639,15 +639,15 @@
     switch (type) {
       case 'role':
         name = 'Role.yml';
-        yamlStr = getYaml('role', '', nameSpaces, '');
+        yamlStr = getYaml('role', '', namespace, '');
         break;
       case 'Deployment':
         name = 'Deployment.yml';
-        yamlStr = getYaml('Deployment', deployName, nameSpaces, apiImage);
+        yamlStr = getYaml('Deployment', deployName, namespace, apiImage);
         break;
       case 'DaemonSet':
         name = 'Daemonset.yml';
-        yamlStr = getYaml('DaemonSet', deployName, nameSpaces, apiImage);
+        yamlStr = getYaml('DaemonSet', deployName, namespace, apiImage);
         break;
       default:
         throw new Error('文件类型不在可选范围');
@@ -673,7 +673,7 @@
     const {
       ip,
       token, // k8s token
-      nameSpaces, // k8s 命名空间
+      namespace, // k8s 命名空间
       concurrentNumber, // k8s 最大并发数
       podThreads, // k8s 单pod最大线程数
       jobDefinition, // k8s job自定义模板
@@ -694,7 +694,7 @@
         ? {
             ip,
             token,
-            nameSpaces,
+            namespace,
             concurrentNumber,
             podThreads,
             deployName: isCheckedAPI.value ? deployName : null, // 勾选了接口测试才需要传
diff --git a/frontend/src/views/setting/system/resourcePool/index.vue b/frontend/src/views/setting/system/resourcePool/index.vue
index 9dd0e9f672..fc30ffb0a8 100644
--- a/frontend/src/views/setting/system/resourcePool/index.vue
+++ b/frontend/src/views/setting/system/resourcePool/index.vue
@@ -264,7 +264,7 @@
         const {
           ip,
           token, // k8s token
-          nameSpaces, // k8s 命名空间
+          namespace, // k8s 命名空间
           concurrentNumber, // k8s 最大并发数
           podThreads, // k8s 单pod最大线程数
           deployName, // k8s api测试部署名称
@@ -298,8 +298,8 @@
                   value: token,
                 },
                 {
-                  label: t('system.resourcePool.testResourceDTO.nameSpaces'),
-                  value: nameSpaces,
+                  label: t('system.resourcePool.testResourceDTO.namespace'),
+                  value: namespace,
                 },
                 {
                   label: t('system.resourcePool.testResourceDTO.deployName'),
diff --git a/frontend/src/views/setting/system/resourcePool/locale/en-US.ts b/frontend/src/views/setting/system/resourcePool/locale/en-US.ts
index 0b35936c52..6c32e3bc82 100644
--- a/frontend/src/views/setting/system/resourcePool/locale/en-US.ts
+++ b/frontend/src/views/setting/system/resourcePool/locale/en-US.ts
@@ -94,7 +94,7 @@ export default {
   'system.resourcePool.testResourceDTO.token': 'Token',
   'system.resourcePool.testResourceDTO.tokenRequired': 'Please fill in the Token',
   'system.resourcePool.testResourceDTO.tokenPlaceholder': 'Please fill in the Token',
-  'system.resourcePool.testResourceDTO.nameSpaces': 'NameSpaces',
+  'system.resourcePool.testResourceDTO.namespace': 'NameSpaces',
   'system.resourcePool.testResourceDTO.nameSpacesRequired': 'Please fill in the namespace',
   'system.resourcePool.testResourceDTO.nameSpacesPlaceholder':
     'To use the K8S resource pool, you need to deploy the Role.yaml file',
diff --git a/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts b/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts
index c33efea62a..b3b440b7f2 100644
--- a/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/resourcePool/locale/zh-CN.ts
@@ -91,7 +91,7 @@ export default {
   'system.resourcePool.testResourceDTO.token': 'Token',
   'system.resourcePool.testResourceDTO.tokenRequired': 'Token 不能为空',
   'system.resourcePool.testResourceDTO.tokenPlaceholder': '请输入 Token',
-  'system.resourcePool.testResourceDTO.nameSpaces': '命名空间',
+  'system.resourcePool.testResourceDTO.namespace': '命名空间',
   'system.resourcePool.testResourceDTO.nameSpacesRequired': '命名空间不能为空',
   'system.resourcePool.testResourceDTO.nameSpacesPlaceholder': '使用K8S资源池需要部署Role.yaml文件',
   'system.resourcePool.testResourceDTO.deployName': 'Deploy Name',