bri-components 1.4.77 → 1.4.79

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.77",
+    "version": "1.4.79",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/list/mixins/DshFlatTableMixin.js

@@ -46,7 +46,7 @@ export default {
                         ...this.selfColumns
                             .filter((colItem, colIndex) => colIndex > firstNormalIndex && this.mergeRowColKeys.includes(colItem._key))
                             .map(colItem => colItem._key)
-                ];
+                    ];
             } else {
                 return [];
             }
@@ -83,10 +83,11 @@ export default {
         curPageShowListData () {
             return this.pagePropsObj.page >= 1
                 ? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
-                    ? this.showListData.slice(
-                        (this.pagePropsObj.page - 2) * this.pagePropsObj.pagesize,
-                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize
-                    )
+                    ? this.showListData.slice(-(
+                        this.showListData.length % this.pagePropsObj.pagesize === 0
+                            ? this.pagePropsObj.pagesize
+                            : this.showListData.length % this.pagePropsObj.pagesize
+                    ))
                     : this.showListData.slice(
                         (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
                         this.pagePropsObj.page * this.pagePropsObj.pagesize
@@ -176,6 +177,7 @@ export default {
         changePageSize (pagesize) {
             this.pagePropsObj.page = 1;
             this.pagePropsObj.pagesize = pagesize;
+            this.loadingFunc();
         },
 
         // 点击 -添加行
@@ -443,7 +445,7 @@ export default {
                     .forEach(rowItem => {
                         console.log(rowItem[column._key]);
                         rowItem[column._key] = this.$deepCopy(row[column._key]);
-                });
+                    });
             }
         }
     }

package/src/components/list/mixins/tableBaseMixin.js

@@ -805,6 +805,12 @@ export default {
             this.loadingFunc();
         },
 
+        // 共外部使用
+        validate () {
+            this.showRuleMessage = true;
+
+            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+        },
         // 重置
         reset () {
             this.initFlag = true;
@@ -824,11 +830,12 @@ export default {
 
             this.selfReset && this.selfReset();
         },
-        // 共外部使用
-        validate () {
-            this.showRuleMessage = true;
-
-            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+        loadingFunc () {
+            this.isLoading = true;
+            setTimeout(() => {
+                this.changeSelect();
+                this.isLoading = false;
+            });
         },
 
         // 筛选回调
@@ -840,14 +847,8 @@ export default {
             }
         },
         // 列表选择项改变
-        changeSelect (...params) {
-            this.$emit("changeSelect", params[0].map(item => item._id), ...params);
-        },
-        loadingFunc () {
-            this.isLoading = true;
-            setTimeout(() => {
-                this.isLoading = false;
-            });
+        changeSelect (selections = [], ...params) {
+            this.$emit("changeSelect", selections.map(item => item._id), selections, ...params);
         },
 
         // 输入框失去焦点