From 500a91914c95e845f9720a5f803f386289fe727f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 16 Mar 2022 12:02:22 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataSearch/index.vue |  5 +-
 src/components/AutoDataTable/index.vue  |  4 +-
 src/components/TagSearch/index.vue      | 65 +++++++++++++------------
 src/i18n/langs/cn.json                  |  2 +-
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/components/AutoDataSearch/index.vue b/src/components/AutoDataSearch/index.vue
index 746c4f3da..7c329b8a3 100644
--- a/src/components/AutoDataSearch/index.vue
+++ b/src/components/AutoDataSearch/index.vue
@@ -4,6 +4,7 @@
 
 <script>
 import TagSearch from '@/components/TagSearch'
+import i18n from '@/i18n/i18n'
 export default {
   name: 'AutoDataSearch',
   components: { TagSearch },
@@ -78,8 +79,8 @@ export default {
         }
         if (field.type === 'boolean') {
           option.children = [
-            { label: this.$t('common.Yes'), value: true },
-            { label: this.$t('common.No'), value: false }
+            { label: i18n.t('common.Yes'), value: true },
+            { label: i18n.t('common.No'), value: false }
           ]
         }
         vm.internalOptions.push(option)
diff --git a/src/components/AutoDataTable/index.vue b/src/components/AutoDataTable/index.vue
index 85c6a05f4..365529639 100644
--- a/src/components/AutoDataTable/index.vue
+++ b/src/components/AutoDataTable/index.vue
@@ -173,8 +173,8 @@ export default {
         }
         if (column.type === 'boolean') {
           col.filters = [
-            { text: this.$t('common.Yes'), value: true },
-            { text: this.$t('common.No'), value: false }
+            { text: i18n.t('common.Yes'), value: true },
+            { text: i18n.t('common.No'), value: false }
           ]
           col.sortable = false
           col['column-key'] = col.prop
diff --git a/src/components/TagSearch/index.vue b/src/components/TagSearch/index.vue
index be90adc30..66b954985 100644
--- a/src/components/TagSearch/index.vue
+++ b/src/components/TagSearch/index.vue
@@ -114,11 +114,16 @@ export default {
         if (val && val.length > 0) {
           const routeFilter = this.checkInTableColumns()
           const routerSearch = routeFilter.search || {}
-          const routerSearchArrs = routerSearch?.value?.split(',') || []
-          const routerSearchArrsLength = routerSearchArrs.length || 0
-          if (routerSearch && routerSearchArrsLength > 0) {
-            for (let i = 0; i < routerSearchArrsLength; i++) {
-              const cur = routerSearchArrs[i]
+          let routerSearchAttrs = []
+          if (typeof routerSearch?.value !== 'string') {
+            routerSearchAttrs = [routerSearch.value]
+          } else {
+            routerSearchAttrs = routerSearch?.value?.split(',') || []
+          }
+          const routerSearchAttrsLength = routerSearchAttrs.length || 0
+          if (routerSearch && routerSearchAttrsLength > 0) {
+            for (let i = 0; i < routerSearchAttrsLength; i++) {
+              const cur = routerSearchAttrs[i]
               routeFilter[`search_${cur}`] = {
                 ...routerSearch,
                 value: cur
@@ -157,32 +162,32 @@ export default {
       const routeQueryKeys = Object.keys(routeQuery)
       const routeQueryKeysLength = routeQueryKeys.length
       const keys = {}
-      if (routeQueryKeysLength < 1) return keys
-      if (routeQueryKeysLength > 0) {
-        for (let i = 0; i < routeQueryKeysLength; i++) {
-          const key = routeQueryKeys[i]
-          let valueDecode = decodeURI(routeQuery[key])
-          const isSearch = key !== 'search'
-          const curOptions = this.options || []
-          for (let k = 0, len = curOptions.length; k < len; k++) {
-            const cur = curOptions[k]
-            if (cur?.type === 'boolean') {
-              valueDecode = !!valueDecode
+      if (routeQueryKeysLength < 1) {
+        return keys
+      }
+      for (const [key, value] of Object.entries(routeQuery)) {
+        let valueDecode = decodeURI(value)
+        const isSearch = key !== 'search'
+        const curOptions = this.options || []
+
+        for (let k = 0, len = curOptions.length; k < len; k++) {
+          const cur = curOptions[k]
+          if (cur?.type === 'boolean') {
+            valueDecode = !!valueDecode
+          }
+          if (key === cur.value || !isSearch) {
+            const curChildren = cur.children || []
+            keys[key] = {
+              ...cur,
+              key,
+              label: isSearch ? cur.label : '',
+              value: valueDecode
             }
-            if (key === cur.value || !isSearch) {
-              const curChildren = cur.children || []
-              keys[key] = {
-                ...cur,
-                key,
-                label: isSearch ? cur.label : '',
-                value: valueDecode
-              }
-              if (isSearch && curChildren.length > 0) {
-                for (const item of curChildren) {
-                  if (valueDecode === item.value) {
-                    keys[key].valueLabel = item.label
-                    break
-                  }
+            if (isSearch && curChildren.length > 0) {
+              for (const item of curChildren) {
+                if (valueDecode === item.value) {
+                  keys[key].valueLabel = item.label
+                  break
                 }
               }
             }
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 232259091..8290017c9 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -351,7 +351,7 @@
     "NoData": "暂无数据",
     "Open": "打开",
     "Other": "其它",
-    "Others": "其他",
+    "Others": "其它",
     "Push": "推送",
     "QuickUpdate": "快速更新",
     "RemoveSuccessMsg": "移除成功",