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 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
index 10aa3b5..83dda01 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
+++ b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
@@ -1,5 +1,17 @@
+<<<<<<< HEAD
<aura:component
controller="DealerPersonnelController"
+=======
+<!--
+ * @Author: Thhto 997058689@qq.com
+ * @Date: 2022-07-08 10:47:25
+ * @LastEditors: Thhto 997058689@qq.com
+ * @LastEditTime: 2023-02-03 15:25:46
+ * @FilePath: \ceshihuanj\force-app\main\default\aura\DealerPersonnelInformationImport\DealerPersonnelInformationImport.cmp
+ * @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"
>
@@ -51,6 +63,7 @@
</div>
</aura:renderIf>
<!-- 鎵归噺娣诲姞鍛ㄦ姤 start-->
+<<<<<<< HEAD
<div
class="slds-modal slds-fade-in-open slds-hide"
aura:id="errorDiv"
@@ -58,6 +71,11 @@
>
<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"
@@ -65,6 +83,7 @@
>
<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
@@ -76,6 +95,15 @@
<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" />
+ <!-- DB202301262139 SFDC缁忛攢鍟嗕汉鍛樺鍏ュ姛鑳芥敼杩� start -->
+ <!-- <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>
@@ -83,8 +111,13 @@
</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"
@@ -109,8 +142,13 @@
</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">
瀹㈡埛浜哄憳鎵归噺瀵煎叆
@@ -131,6 +169,7 @@
</center>
</div>
<aura:set attribute="else">
+<<<<<<< HEAD
<ui:outputRichText
class="uiOutputRichText slds-m--around-large"
value="{!v.TableContent}"
@@ -148,6 +187,12 @@
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
@@ -159,6 +204,7 @@
onclick="{!c.exportErrorInfo}"
/>
</div>
+<<<<<<< HEAD
<div
class="slds-p-around--large slds-align--absolute-center"
>
@@ -170,6 +216,12 @@
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>
--
Gitblit v1.9.1