bri-components 1.4.78 → 1.4.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -46,7 +46,7 @@ export default {
|
|
|
46
46
|
...this.selfColumns
|
|
47
47
|
.filter((colItem, colIndex) => colIndex > firstNormalIndex && this.mergeRowColKeys.includes(colItem._key))
|
|
48
48
|
.map(colItem => colItem._key)
|
|
49
|
-
|
|
49
|
+
];
|
|
50
50
|
} else {
|
|
51
51
|
return [];
|
|
52
52
|
}
|
|
@@ -83,10 +83,11 @@ export default {
|
|
|
83
83
|
curPageShowListData () {
|
|
84
84
|
return this.pagePropsObj.page >= 1
|
|
85
85
|
? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
|
|
86
|
-
? this.showListData.slice(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
86
|
+
? this.showListData.slice(-(
|
|
87
|
+
this.showListData.length % this.pagePropsObj.pagesize === 0
|
|
88
|
+
? this.pagePropsObj.pagesize
|
|
89
|
+
: this.showListData.length % this.pagePropsObj.pagesize
|
|
90
|
+
))
|
|
90
91
|
: this.showListData.slice(
|
|
91
92
|
(this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
|
|
92
93
|
this.pagePropsObj.page * this.pagePropsObj.pagesize
|
|
@@ -444,7 +445,7 @@ export default {
|
|
|
444
445
|
.forEach(rowItem => {
|
|
445
446
|
console.log(rowItem[column._key]);
|
|
446
447
|
rowItem[column._key] = this.$deepCopy(row[column._key]);
|
|
447
|
-
|
|
448
|
+
});
|
|
448
449
|
}
|
|
449
450
|
}
|
|
450
451
|
}
|