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/lexInventory/lexInventory.html | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.html b/force-app/main/default/lwc/lexInventory/lexInventory.html
index c90c293..6f1c4f6 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.html
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.html
@@ -200,7 +200,6 @@
style="word-wrap: break-word; word-break: break-all"
>
</lightning-datatable>
-<<<<<<< HEAD
<c-paginator
onprevious={handlePrevious}
onnext={handleNext}
@@ -208,19 +207,13 @@
onfirst={handleFirst}
onlast={handleLast}
page-size-options={pageSizeOptions}
+ default-page-size={pageSize}
previous-button-disabled={previousButtonDisabled}
next-button-disabled={nextButtonDisabled}
record-start={recordStart}
record-end={recordEnd}
total-records={totalRecords}
></c-paginator>
-=======
- <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
- onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions} default-page-size={pageSize}
- previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
- record-start={recordStart} record-end={recordEnd}
- total-records={totalRecords}></c-paginator>
->>>>>>> LEXCommunityLiJun
</div>
<!-- </template> -->
</div>
--
Gitblit v1.9.1