@monoui/vuejs 1.1.49 → 1.1.50
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/dist/main.js +2 -2
- package/package.json +1 -1
- package/src/components/Table/Table.vue +12 -3
package/package.json
CHANGED
|
@@ -482,7 +482,10 @@ export default {
|
|
|
482
482
|
return values;
|
|
483
483
|
},
|
|
484
484
|
itemPerPageText() {
|
|
485
|
-
if (
|
|
485
|
+
if (
|
|
486
|
+
this.settings.itemPerPage >= this.settings.totalItemCount ||
|
|
487
|
+
this.settings.totalItemCount === undefined
|
|
488
|
+
) {
|
|
486
489
|
return "All";
|
|
487
490
|
}
|
|
488
491
|
return `${this.settings.itemPerPage}`;
|
|
@@ -652,8 +655,14 @@ export default {
|
|
|
652
655
|
resultData.pageCount || resultData.PageCount;
|
|
653
656
|
this.settings.itemPerPage =
|
|
654
657
|
resultData.itemPerPage || resultData.ItemPerPage;
|
|
655
|
-
|
|
656
|
-
|
|
658
|
+
|
|
659
|
+
if (resultData.totalItemCount !== undefined) {
|
|
660
|
+
this.settings.totalItemCount = resultData.totalItemCount;
|
|
661
|
+
}
|
|
662
|
+
|
|
663
|
+
if (resultData.TotalItemCount !== undefined) {
|
|
664
|
+
this.settings.totalItemCount = resultData.TotalItemCount;
|
|
665
|
+
}
|
|
657
666
|
|
|
658
667
|
this.tableData = resultData.data || resultData.Data;
|
|
659
668
|
if (this.settings.totalItemCount == 0) {
|