n20-common-lib 1.3.52 → 1.3.53

package/package.json

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

package/src/components/Filters/index.vue

@@ -1,5 +1,6 @@
 <template>
   <el-popover
+    ref="popover"
     v-model="showPop"
     trigger="manual"
     :width="width"
@@ -39,7 +40,7 @@
             <el-button
               class="p-t-0 m-b-s color-primary"
               type="text"
-              @click="showMore = !showMore"
+              @click="moreFn"
               ><span>更多条件</span
               ><i
                 :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
@@ -197,6 +198,14 @@ export default {
         this.showPop = false
       }
     },
+    moreFn() {
+      if (this.showMore) {
+        this.showMore = false
+      } else {
+        this.showMore = true
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
+      }
+    },
     setOptions(key, opts) {
       let item = this.filterList.find((f) => f.value === key)
       if (item) {
@@ -205,11 +214,20 @@ export default {
     },
     getRemote() {
       this.$refs['setRemote'].getColumns().then((list) => {
-        this.remoteList = list || this.filterList.slice(0, this.defaultShow)
+        if (list) {
+          this.remoteList = list
+        } else {
+          let defaultList = this.filterList.filter((col) => col.isDefault)
+          this.remoteList = defaultList.length
+            ? defaultList
+            : this.filterList.slice(0, this.defaultShow)
+        }
+        setTimeout(() => this.$refs['popover'].updatePopper(), 360)
       })
     },
     setRemoteChange(list) {
       this.remoteList = list
+      setTimeout(() => this.$refs['popover'].updatePopper(), 360)
     }
   }
 }

package/src/components/ShowColumn/index.vue

@@ -174,7 +174,11 @@ export default {
       }
     },
     reset() {
-      ////
+      if (this.isFilter) {
+        let dragList = this.columns.filter((col) => col.isDefault)
+        this.dragList = dragList.length ? dragList : this.checkColumns
+        return
+      }
       this.dragList = this.checkColumns.filter((col) => !col.static)
     },
     setChange() {