From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexConsumable/lexConsumable.js | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 714e78a..f944034 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -85,15 +85,9 @@
@track sortedBy;
//鍒嗛〉
@track currentPage = 1;
-<<<<<<< HEAD
- @track pageSize = 10;
- // @track totalPage = 0;
- @track pageSizeOptions = [10, 25, 50, 100];
-=======
@track pageSize = 200;
// @track totalPage = 0;
- @track pageSizeOptions = [100, 200,300];
->>>>>>> LEXCommunityLiJun
+ @track pageSizeOptions = [100, 200, 300];
@track recordStart = 0;
@track recordEnd = 0;
//鎶ラ敊鎻愰啋
@@ -1781,8 +1775,4 @@
get nextButtonDisabled() {
return this.currentPage == this.totalPage;
}
-<<<<<<< HEAD
}
-=======
-}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1