web-component-gallery 2.0.33 → 2.0.35

package/lib/form-comp/ASelectCustom.vue

@@ -18,6 +18,7 @@
       :getPopupContainer="tirggerNode => tirggerNode.parentNode"
       @select="handleSelect"
       @search="handleSearch"
+      @change="handleChange"
       @popupScroll="handleScroll"
       v-bind="attrs"
       v-on="$listeners"
@@ -179,7 +180,7 @@ export default {
 
   mounted() {
     this.pagination.size = this.pSize
-    this.initLoad && this.fetchData()
+    this.initLoad && this.fetchData(false)
     document.addEventListener('click', this.handleDocumentClick)
   },
 
@@ -197,7 +198,7 @@ export default {
       this.pagination.current = 1
       this.fetchData()
     },
-    async fetchData() {
+    async fetchData(isReset = true) {
       if (!this.listPageHandler) return
       
       try {
@@ -207,11 +208,10 @@ export default {
           ...this.listPageParams,
           [this.searchKey]: this.searchValue
         })
-
-        this.pagination.current === 1 ?
-        this.innerOptions = [...records] :
-        this.innerOptions = [...this.innerOptions, ...records]
-
+        
+        this.innerOptions = this.pagination.current === 1 && isReset
+         ? [...records]
+         : [...this.innerOptions, ...this.handleFilter(records)]
         this.pagination.total = total
       } catch (error) {
         this.pagination.current--
@@ -221,6 +221,14 @@ export default {
       }
     },
 
+    // 筛选掉相同数据
+    handleFilter(data) {
+      const optionsCache = new Map(
+        this.innerOptions.map(item => [item[this.valueKey], item])
+      )
+      return data.filter(item => !optionsCache.has(item[this.valueKey]))
+    },
+
     // 下拉滚动加载更多
     handleScroll(e) {
       const { scrollTop, scrollHeight, clientHeight } = e.target
@@ -228,6 +236,11 @@ export default {
       if (reachBottom && !this.isLoadingMore && this.hasMore) this.debouncedLoadMore()
     },
 
+    // 数据清空处理
+    handleChange(value) {
+      if (!value) return this.resetRequest()
+    },
+
     // 搜索事件处理
     handleSearch(value) {
       this.isInput && (this.innerValue = value)

package/lib/modal/style/index.less

@@ -4,37 +4,42 @@
 .AntModal {
     &__small {
         .ant-modal {
-           .layout( 712px, 640px );
+            .layout(712px, 640px);
         }
     }
+
     &__middle {
         .ant-modal {
-           .layout( 1104px, 848px );
+            .layout(1104px, 848px);
         }
     }
+
     &__large {
         .ant-modal {
-           .layout( 1600px, 848px );
+            .layout(1600px, 848px);
         }
     }
+
     &__max {
         .ant-modal {
-           top: 0;
-           padding-bottom: 0;
-           .layout();
+            top: 0;
+            padding-bottom: 0;
+            .layout();
         }
     }
+
     &__screen {
         .ant-modal {
-           top: 0;
-           padding: 0;
-           .layout();
-    
-           &-body {
-               padding: 0;
-           }
+            top: 0;
+            padding: 0;
+            .layout();
+
+            &-body {
+                padding: 0;
+            }
         }
     }
+
     &__Title {
         .flex-layout();
 
@@ -45,8 +50,14 @@
 
             .anticon {
                 cursor: pointer;
-                &:hover { color: @primary-color; }
-                &:first-child { margin-right: @padding-sm; }
+
+                &:hover {
+                    color: @primary-color;
+                }
+
+                &:first-child {
+                    margin-right: @padding-sm;
+                }
             }
         }
     }
@@ -57,8 +68,13 @@
         height: 100%;
         .flex-layout(column);
     }
+
     &-body {
         flex: 1;
         min-height: 0;
-    } 
+
+        &>div {
+            .layout()
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-component-gallery",
-  "version": "2.0.33",
+  "version": "2.0.35",
   "description": "基础vue、antdvue、less实现的私有组件库",
   "main": "dist/index.umd.js",
   "files": [