n20-common-lib 2.6.13 → 2.6.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.6.13",
+  "version": "2.6.14",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/AdvancedFilter/index.vue

@@ -113,27 +113,12 @@ export default {
   watch: {
     visible: {
       handler(val) {
-        val &&
-          this.getFilterList().then(() => {
-            for (const key in getOptionsMap()) {
-              if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-                const data = getOptionsMap()[key]
-                this.setChoices(key, data)
-              }
-            }
-          })
+        val && this.getFilterList()
       }
     }
   },
   created() {
-    this.getFilterList().then(() => {
-      for (const key in getOptionsMap()) {
-        if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-          const data = getOptionsMap()[key]
-          this.setChoices(key, data)
-        }
-      }
-    })
+    this.getFilterList()
   },
   methods: {
     getOnlyKey(data) {
@@ -217,14 +202,7 @@ export default {
       })
       this.saveFilter(data).then(({ code }) => {
         if (code === 200) {
-          this.getFilterList().then(() => {
-            for (const key in getOptionsMap()) {
-              if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-                const data = getOptionsMap()[key]
-                this.setChoices(key, data)
-              }
-            }
-          })
+          this.getFilterList()
         }
       })
       this.$emit('change', this.model)
@@ -249,14 +227,7 @@ export default {
         // 如果保存成功
         if (code === 200) {
           // 重新获取过滤条件列表
-          this.getFilterList().then(() => {
-            for (const key in getOptionsMap()) {
-              if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
-                const data = getOptionsMap()[key]
-                this.setChoices(key, data)
-              }
-            }
-          })
+          this.getFilterList()
         }
       })
       this.$emit('check')
@@ -320,7 +291,14 @@ export default {
           }
           this.checkList = this.GroupData.map((res) => res.id)
           this.checkC = cloneDeep(this.checkList)
-          return Promise.resolve()
+        })
+        .finally(() => {
+          for (const key in getOptionsMap()) {
+            if (Object.hasOwnProperty.call(getOptionsMap(), key)) {
+              const data = getOptionsMap()[key]
+              this.setChoices(key, data)
+            }
+          }
         })
     }
   }