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/lexinventoryViewLWC/lexinventoryViewLWC.js |   72 ------------------------------------
 1 files changed, 0 insertions(+), 72 deletions(-)

diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
index c532a8a..7fb5f5c 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
@@ -15,11 +15,7 @@
     //鍒嗛〉start
     @track sortBy = '';
     //@track sortDirection = "asc";
-<<<<<<< HEAD
-    @track pageSize = 10;
-=======
     @track pageSize = 200;
->>>>>>> LEXCommunityLiJun
     error;
     records;
     currentPageToken = 0;
@@ -29,11 +25,7 @@
     @track pageNumber = 1;
     @track paginationVisibility = false;
     @track totalPages = 1;
-<<<<<<< HEAD
-    pageSizeOptions = [10, 25, 50, 100];
-=======
     pageSizeOptions = [100, 200, 300];
->>>>>>> LEXCommunityLiJun
     @track recordStart = 0;
     @track recordEnd = 0;
     //end
@@ -671,7 +663,6 @@
         } else {
             this.rowNumberOffset = 0;
         }
-<<<<<<< HEAD
     }
 
     handlePrevious() {
@@ -733,66 +724,3 @@
             .showToast(variant, content, iconName, 10000);
     }
 }
-=======
-    }
-
-    handlePrevious() {
-        this.currentPageToken =
-            Number(this.currentPageToken) - Number(this.pageSize);
-        this.searchOrderDetail();
-    }
-
-    handleNext() {
-        this.currentPageToken =
-            Number(this.currentPageToken) + Number(this.pageSize);
-        this.searchOrderDetail();
-    }
-    handleFirst() {
-        this.currentPageToken = 0;
-        this.searchOrderDetail();
-    }
-
-    handleLast() {
-        this.currentPageToken =
-            this.totalPages > 1 ? (this.totalPages - 1) * this.pageSize : 0;
-        this.searchOrderDetail();
-    }
-
-    handlePageschange(event) {
-        console.log(event.detail);
-        this.pageSize = event.detail;
-        this.currentPageToken = 0;
-        this.searchOrderDetail();
-    }
-    get previousButtonDisabled() {
-        return this.currentPageToken === 0;
-    }
-
-    get nextButtonDisabled() {
-        return this.nextPageToken === undefined;
-    }
-    showMyToast(title, message, variant) {
-        console.log('show custom message');
-        var iconName = '';
-        var content = '';
-        if (variant == 'success') {
-            iconName = 'utility:check';
-        } else {
-            iconName = 'utility:error';
-        }
-        if (message != '') {
-            content =
-                '<h2><strong>' +
-                title +
-                '<strong/></h2><h5>' +
-                message +
-                '</h5>';
-        } else {
-            content = '<h2><strong>' + title + '<strong/></h2>';
-        }
-        this.template
-            .querySelector('c-common-toast')
-            .showToast(variant, content, iconName, 10000);
-    }
-}
->>>>>>> LEXCommunityLiJun

--
Gitblit v1.9.1