From 80a3f59e2d3df07805bc67e329300b8de90a5b3a Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:13:08 +0800
Subject: [PATCH] Merge branch 'LEXCommunityLiJun' into LEXUpgrade2023-Deloitte
---
force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
index 76b9b05..fe5196e 100644
--- a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
+++ b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
@@ -3,11 +3,17 @@
<template>
<c-common-toast></c-common-toast>
<template if:true={isShowSpinner}>
- <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
-聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span>
-聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-a"></div>
-聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-b"></div>
-聽 聽 聽 聽 </div>
+ <div
+ role="status"
+ class="slds-spinner slds-spinner_medium slds-spinner_brand"
+ >
+ 聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span> 聽 聽
+ 聽 聽 聽 聽 聽 聽
+ <div class="slds-spinner__dot-a"></div>
+ 聽 聽 聽 聽 聽 聽 聽 聽
+ <div class="slds-spinner__dot-b"></div>
+ 聽 聽 聽 聽
+ </div>
</template>
<div class="outerBorderCss">
<div style="padding: 5px">
@@ -16,11 +22,22 @@
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false" class="centerCss searchName">
<lightning-layout multiple-rows="true">
- <lightning-layout-item size="4" style="display: flex;align-items: center;">
- <lightning-input class="floatLeft" label="" name="file uploader"
- onchange={handleFilesChange} type="file" accept={acceptedType}
- variant="label-hidden"></lightning-input>
- <div class="slds-text-body_small floatLeft fontWeight">
+ <lightning-layout-item
+ size="4"
+ style="display: flex; align-items: center"
+ >
+ <lightning-input
+ class="floatLeft"
+ label=""
+ name="file uploader"
+ onchange={handleFilesChange}
+ type="file"
+ accept={acceptedType}
+ variant="label-hidden"
+ ></lightning-input>
+ <div
+ class="slds-text-body_small floatLeft fontWeight"
+ >
{fileName}
</div>
</lightning-layout-item>
@@ -29,8 +46,12 @@
label="璇诲彇csv鏂囦欢"
onclick={getCsvFile}
></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={getCsvFile}>璇诲彇csv鏂囦欢</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ onclick={getCsvFile}
+ >
+ 璇诲彇csv鏂囦欢
+ </button>
</lightning-layout-item>
<lightning-layout-item size="4">
<!-- <lightning-button
@@ -38,13 +59,18 @@
onclick={dataImport}
disabled={saveFLGbln}
></lightning-button> -->
- <button class="slds-button slds-button_neutral slds-button_stretch lexBorder"
- onclick={dataImport} disabled={saveFLGbln}>瀵煎叆鏁版嵁</button>
+ <button
+ class="slds-button slds-button_neutral slds-button_stretch lexBorder"
+ onclick={dataImport}
+ disabled={saveFLGbln}
+ >
+ 瀵煎叆鏁版嵁
+ </button>
</lightning-layout-item>
</lightning-layout>
</div>
- <div class="borderCss" style="margin-top: 10px;">
+ <div class="borderCss" style="margin-top: 10px">
<div class="headerDorderCss">
<lightning-layout>
<lightning-layout-item padding="around-small">
@@ -57,9 +83,17 @@
<div style="padding: 7px">
<div lwc:dom="manual" class="resultDiv"></div>
<div draggable="false">
- <lightning-datatable key-field="id" data={data} columns={columns} hide-checkbox-column
- default-sort-direction={defaultSortDirection} sorted-direction={sortDirection}
- sorted-by={sortedBy} onsort={onHandleSort} class="wrapped-header-datatable">
+ <lightning-datatable
+ key-field="id"
+ data={data}
+ columns={columns}
+ hide-checkbox-column
+ default-sort-direction={defaultSortDirection}
+ sorted-direction={sortDirection}
+ sorted-by={sortedBy}
+ onsort={onHandleSort}
+ class="wrapped-header-datatable"
+ >
</lightning-datatable>
</div>
</div>
@@ -68,4 +102,4 @@
</div>
</div>
</div>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1