From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp | 157 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 136 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
index 83c0c1a..83dda01 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+<aura:component
+ controller="DealerPersonnelController"
+=======
<!--
* @Author: Thhto 997058689@qq.com
* @Date: 2022-07-08 10:47:25
@@ -7,15 +11,29 @@
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<aura:component controller="DealerPersonnelController"
+>>>>>>> LEXCommunityLiJun
implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
- access="global">
+ access="global"
+>
<!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
<!-- <aura:handler name="init" value="{!this}" action="{!c.doInit}" /> -->
<aura:attribute name="reports_date" type="List" />
<aura:attribute name="errorMessage" type="String" />
- <aura:attribute name="TableContent" type="String" description=" Show the Result class" />
- <aura:attribute name="TableContent2" type="String" description=" Show the Result class" />
- <aura:attribute name="TargetFileName" type="String" description="Name of the file" />
+ <aura:attribute
+ name="TableContent"
+ type="String"
+ description=" Show the Result class"
+ />
+ <aura:attribute
+ name="TableContent2"
+ type="String"
+ description=" Show the Result class"
+ />
+ <aura:attribute
+ name="TargetFileName"
+ type="String"
+ description="Name of the file"
+ />
<aura:attribute name="tableheaders" type="Object[]" />
<aura:attribute name="fileContentData" type="String" />
<aura:attribute name="filename" type="String" />
@@ -34,7 +52,10 @@
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
<aura:renderIf isTrue="{!v.login}">
<div class="slds-spinner_container height100vh">
- <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
+ <div
+ class="slds-spinner--brand slds-spinner slds-spinner--medium"
+ role="alert"
+ >
<span class="slds-assistive-text">Loading</span>
<div class="slds-spinner__dot-a"></div>
<div class="slds-spinner__dot-b"></div>
@@ -42,13 +63,39 @@
</div>
</aura:renderIf>
<!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+<<<<<<< HEAD
+ <div
+ class="slds-modal slds-fade-in-open slds-hide"
+ aura:id="errorDiv"
+ style="z-index: 10001"
+ >
+ <ui:inputText aura:id="articleURL" />
+ <div class="demo-only" style="height: 8rem">
+=======
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
<!-- <ui:inputText aura:id="articleURL" /> -->
<div class="demo-only" style="height: 8rem;">
+>>>>>>> LEXCommunityLiJun
<div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
- <div class=" slds-m-left_xx-large">
+ <div
+ class="slds-notify slds-notify_toast slds-theme_error"
+ role="status"
+ >
+ <div class="slds-m-left_xx-large">
<div
+<<<<<<< HEAD
+ class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large"
+ >
+ <lightning:icon
+ alternativeText="error"
+ iconName="utility:error"
+ size="small"
+ class="buttonColor slds-m-right_small"
+ />
+ <h2 class="slds-text-heading_small">
+ {!v.errorMessage}
+ </h2>
+=======
class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
<lightning:icon alternativeText="error" iconName="utility:error" size="small"
class="buttonColor slds-m-right_small" />
@@ -56,6 +103,7 @@
<!-- <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2> -->
<pre class="slds-text-heading_small ">{!v.errorMessage}</pre>
<!-- DB202301262139 SFDC缁忛攢鍟嗕汉鍛樺鍏ュ姛鑳芥敼杩� end -->
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</div>
@@ -63,56 +111,123 @@
</div>
</div>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
+<<<<<<< HEAD
+ <ui:inputText aura:id="articleURL" />
+ <div class="demo-only" style="height: 8rem">
+=======
<!-- <ui:inputText aura:id="articleURL" /> -->
<div class="demo-only" style="height: 8rem;">
+>>>>>>> LEXCommunityLiJun
<div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
- <div class=" slds-m-left_xx-large">
+ <div
+ class="slds-notify slds-notify_toast slds-theme_success"
+ role="alert"
+ >
+ <div class="slds-m-left_xx-large">
<div
- class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
- <lightning:icon alternativeText="Success" iconName="utility:success" size="small"
- class="buttonColor slds-m-right_small" />
- <h2 class="slds-text-heading_small ">{!v.successMessage}</h2>
+ class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large"
+ >
+ <lightning:icon
+ alternativeText="Success"
+ iconName="utility:success"
+ size="small"
+ class="buttonColor slds-m-right_small"
+ />
+ <h2 class="slds-text-heading_small">
+ {!v.successMessage}
+ </h2>
</div>
</div>
</div>
</div>
</div>
</div>
+<<<<<<< HEAD
+ <div>
+ <div class="slds-modal__header">
+=======
<div >
<div class="slds-modal__header ">
+>>>>>>> LEXCommunityLiJun
<h4 id="headerTarget" class="slds-float--left"></h4>
- <h2 id="headerTarget" class="slds-text-heading--medium">瀹㈡埛浜哄憳鎵归噺瀵煎叆</h2>
+ <h2 id="headerTarget" class="slds-text-heading--medium">
+ 瀹㈡埛浜哄憳鎵归噺瀵煎叆
+ </h2>
</div>
- <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium ">
+ <div
+ class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
+ >
<aura:if isTrue="{!v.showMain}">
<div>
<center>
- <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
+ <lightning:input
+ type="file"
+ class="file"
+ uara:id="file"
+ onchange="{!c.CreateRecord}"
+ />
</center>
</div>
<aura:set attribute="else">
+<<<<<<< HEAD
+ <ui:outputRichText
+ class="uiOutputRichText slds-m--around-large"
+ value="{!v.TableContent}"
+ />
+ <div
+ class="slds-p-around--large slds-align--absolute-center"
+ >
+ <lightning:button
+ label="淇濆瓨"
+ variant="brand"
+ onclick="{!c.processFileContent}"
+ />
+ <lightning:button
+ label="鍙栨秷"
+ variant="brand"
+ onclick="{!c.cancel}"
+ />
+=======
<ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
<div class="slds-p-around--large slds-align--absolute-center">
<lightning:button aura:id="save_con" label="淇濆瓨" variant="brand" onclick="{!c.processFileContent}" disabled="false" />
<lightning:button label="鍙栨秷" variant="brand" onclick="{!c.cancel}" />
+>>>>>>> LEXCommunityLiJun
</div>
<aura:if isTrue="{!v.showErrorInfo}">
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button label="瀵煎嚭閿欒淇℃伅" variant="brand" onclick="{!c.exportErrorInfo}" />
+ <div
+ class="slds-p-around--large slds-align--absolute-center"
+ >
+ <lightning:button
+ label="瀵煎嚭閿欒淇℃伅"
+ variant="brand"
+ onclick="{!c.exportErrorInfo}"
+ />
</div>
+<<<<<<< HEAD
+ <div
+ class="slds-p-around--large slds-align--absolute-center"
+ >
+ <div style="height: 300px; overflow-x: scroll">
+ <lightning:datatable
+ keyField="id"
+ data="{! v.errorData }"
+ columns="{! v.errorColumns }"
+ hideCheckboxColumn="true"
+ minColumnWidth="120"
+ />
+=======
<div class="slds-p-around--large slds-align--absolute-center">
<div style="height: 300px;overflow-x:scroll">
<lightning:datatable keyField="id" data="{! v.errorData }" columns="{! v.errorColumns }"
hideCheckboxColumn="true"/>
+>>>>>>> LEXCommunityLiJun
</div>
</div>
</aura:if>
</aura:set>
</aura:if>
</div>
-
</div>
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
-
-</aura:component>
\ No newline at end of file
+</aura:component>
--
Gitblit v1.9.1