n20-common-lib 2.22.22 → 2.22.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.22.22",
+  "version": "2.22.23",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/index.vue

@@ -115,6 +115,10 @@ export default {
     filterId: {
       type: String,
       default: ''
+    },
+    beforeFilterList: {
+      type: Function,
+      default: (data) => data
     }
   },
   data() {
@@ -363,9 +367,9 @@ export default {
     /**
      * 获取筛选条件
      */
-    getFilterList() {
-      axios
-        .post(
+    async getFilterList() {
+      try {
+        const { data } = await axios.post(
           `/bems/prod_1.0/user/pageHabit/list?t=${Date.now()}`,
           {
             userNo: this.userNo,
@@ -373,53 +377,55 @@ export default {
           },
           { loading: false, noMsg: true }
         )
-        .then(({ data }) => {
-          let _data = JSON.parse(data)
-          if (_data && _data.length > 0) {
-            this.GroupData = _data.map((item) => {
-              for (let i = 0; i < this.filterList.length; i++) {
-                const originItem = this.filterList[i]
-                if (originItem[this.onlyKey] === item[this.onlyKey]) {
-                  item.label = originItem.label
-                  if (item.options && originItem.options) {
-                    item.options = originItem.options
-                  }
+
+        const _data = JSON.parse(data)
+
+        await Promise.resolve(this.beforeFilterList(_data))
+
+        if (_data && _data.length > 0) {
+          this.GroupData = _data.map((item) => {
+            for (let i = 0; i < this.filterList.length; i++) {
+              const originItem = this.filterList[i]
+              if (originItem[this.onlyKey] === item[this.onlyKey]) {
+                item.label = originItem.label
+                if (item.options && originItem.options) {
+                  item.options = originItem.options
                 }
               }
-              return item
+            }
+            return item
+          })
+        } else {
+          if (this.removeLoad) {
+            this.GroupData = this.filterList.filter((item) => {
+              if (item.isDefault) {
+                return item
+              }
             })
           } else {
-            if (this.removeLoad) {
-              this.GroupData = this.filterList.filter((item) => {
-                if (item.isDefault) {
-                  return item
-                }
-              })
-            } else {
-              this.GroupData = []
-            }
+            this.GroupData = []
           }
-          this.checkList = this.GroupData.map((res) => res.id)
-          this.cancelCheck = XEUtils.clone(this.checkList, true)
-          // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
-          this.filterList = this.filterList.sort((a, b) => {
-            if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {
-              return -1
-            }
-            if (!this.checkList.includes(a[this.onlyKey]) && this.checkList.includes(b[this.onlyKey])) {
-              return 1
-            }
-            return 0
-          })
-        })
-        .finally(() => {
-          for (const key in getOptionsMap()) {
-            if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-              const data = getOptionsMap()[key]
-              this.setChoices(key, data)
-            }
+        }
+        this.checkList = this.GroupData.map((res) => res.id)
+        this.cancelCheck = XEUtils.clone(this.checkList, true)
+        // 查找排序，在this.filterList中查找this.checkList中的每一项，并将其排在前面
+        this.filterList = this.filterList.sort((a, b) => {
+          if (this.checkList.includes(a[this.onlyKey]) && !this.checkList.includes(b[this.onlyKey])) {
+            return -1
+          }
+          if (!this.checkList.includes(a[this.onlyKey]) && this.checkList.includes(b[this.onlyKey])) {
+            return 1
           }
+          return 0
         })
+      } finally {
+        for (const key in getOptionsMap()) {
+          if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
+            const data = getOptionsMap()[key]
+            this.setChoices(key, data)
+          }
+        }
+      }
     }
   }
 }