fix: 国际化 (#417)

* fix: 国际化 * fix: 内置字段多条件搜索 Co-authored-by: v_yutyi <[email protected]>
TencentBlueKing · May 10, 2022 · 90fdd48 · 90fdd48
1 parent 908c36e
commit 90fdd48
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/src/pages/src/views/organization/details/InputSelect.vue b/src/pages/src/views/organization/details/InputSelect.vue
@@ -35,7 +35,7 @@
         v-for="(option, index) in item.options"
         :key="index"
         :id="option.id"
-        :name="statusMap[option.value]">
+        :name="$i18n.locale === 'en' ? option.id : statusMap[option.id]">
       </bk-option>
     </bk-select>
   </div>

diff --git a/src/pages/src/views/organization/details/UserMaterial.vue b/src/pages/src/views/organization/details/UserMaterial.vue
@@ -247,7 +247,10 @@ export default {
       try {
         for (let i = 0; i < options.length; i++) {
           if (value === options[i].id) {
-            return this.statusMap[options[i].value];
+            if (this.$i18n.locale === 'en') {
+              return value;
+            }
+            return this.statusMap[options[i].id];
           }
         }
       } catch (e) {

diff --git a/src/pages/src/views/organization/index.vue b/src/pages/src/views/organization/index.vue
@@ -489,7 +489,11 @@ export default {
         const multiable = true;
         if (options.length > 0) {
           options.forEach((k) => {
-            children.push({ id: k.id, name: k.value });
+            if (this.$i18n.locale === 'en') {
+              children.push({ id: k.id, name: k.id });
+            } else {
+              children.push({ id: k.id, name: k.value });
+            }
           });
           this.heardList.push({ name, id, multiable, children });
         } else {
@@ -602,7 +606,7 @@ export default {
         this.setTableFields.forEach((item) => {
           if (item.options && item.options.length) {
             item.options.forEach((key) => {
-              this.$set(this.statusMap, key.value, key.value);
+              this.$set(this.statusMap, key.id, key.value);
             });
           }
         });
@@ -755,7 +759,12 @@ export default {
       this.getTableData();
     },
     updateHeardList(value) {
-      this.searchDataList = value;
+      this.searchDataList = [];
+      value.forEach((item) => {
+        if (item.builtin) {
+          this.searchDataList.push(item);
+        }
+      });
     },
     handleClear() {
       if (this.tableSearchedKey !== []) {

diff --git a/src/pages/src/views/organization/table/UserTable.vue b/src/pages/src/views/organization/table/UserTable.vue
@@ -259,7 +259,10 @@ export default {
           }
           for (let i = 0; i < options.length; i++) {
             if (options[i].id === value) {
-              return this.statusMap[options[i].value];
+              if (this.$i18n.locale === 'en') {
+                return value;
+              }
+              return this.statusMap[options[i].id];
             }
           }
         } else {