From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp
index 99361e6..36cc3c8 100644
--- a/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp
+++ b/force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp
@@ -1,27 +1,21 @@
<aura:component
implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,forceCommunity:availableForAllPageTypes,force:lightningQuickActionWithoutHeader,lightning:actionOverride"
- access="global">
- 聽 聽 <aura:html tag="style">
- 聽 聽 聽 聽 .slds-modal__container{
- 聽 聽 聽 聽 max-width: 65rem !important;
- 聽 聽 聽 聽 width:100% !important;
- 聽 聽 聽 聽 }
- 聽 聽 聽 聽 .cuf-content {
- 聽 聽 聽 聽 padding: 0 0rem !important;
- 聽 聽 聽 聽 }
- 聽 聽 聽 聽 .slds-p-around--medium {
- 聽 聽 聽 聽 padding: 0rem !important;
- 聽 聽 聽 聽 }
- 聽 聽 聽 聽 .slds-modal__content{
- 聽 聽 聽 聽 overflow-y:auto !important;
- 聽 聽 聽 聽 height:unset !important;
- 聽 聽 聽 聽 max-height:unset !important;
- 聽 聽 聽 聽 min-height:8rem;
- 聽 聽 聽 聽 }
- 聽 聽 聽 聽 .slds-tile_board{
- 聽 聽 聽 聽 padding:20px 40px;
- 聽 聽 聽 聽 }
- 聽 聽 </aura:html>
+ access="global"
+>
聽 聽
- <c:lexNewAndEditContactPIPL onclose="{!c.closeModal}" onrefresh="{!c.refreshView}" recordId="{!v.recordId}" />
-</aura:component>
\ No newline at end of file
+ <aura:html tag="style">
+ 聽 聽 聽 聽 .slds-modal__container{ 聽 聽 聽 聽 max-width: 65rem !important; 聽 聽
+ 聽 聽 width:100% !important; 聽 聽 聽 聽 } 聽 聽 聽 聽 .cuf-content { 聽 聽 聽 聽
+ padding: 0 0rem !important; 聽 聽 聽 聽 } 聽 聽 聽 聽 .slds-p-around--medium { 聽
+ 聽 聽 聽 padding: 0rem !important; 聽 聽 聽 聽 } 聽 聽 聽 聽 .slds-modal__content{
+ 聽 聽 聽 聽 overflow-y:auto !important; 聽 聽 聽 聽 height:unset !important; 聽 聽
+ 聽 聽 max-height:unset !important; 聽 聽 聽 聽 min-height:8rem; 聽 聽 聽 聽 } 聽 聽
+ 聽 聽 .slds-tile_board{ 聽 聽 聽 聽 padding:20px 40px; 聽 聽 聽 聽 } 聽 聽
+ </aura:html>
+ 聽 聽
+ <c:lexNewAndEditContactPIPL
+ onclose="{!c.closeModal}"
+ onrefresh="{!c.refreshView}"
+ recordId="{!v.recordId}"
+ />
+</aura:component>
--
Gitblit v1.9.1