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/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html | 136 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 37 deletions(-)
diff --git a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html
index 1f5c839..faa6a37 100644
--- a/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html
+++ b/force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html
@@ -3,58 +3,113 @@
<template>
<template if:true={isDoctor}>
<!-- 灞曠ず -->
- <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01"
- class="slds-modal slds-fade-in-open slds-modal_medium">
+ <section
+ role="dialog"
+ tabindex="-1"
+ aria-modal="true"
+ aria-labelledby="modal-heading-01"
+ class="slds-modal slds-fade-in-open slds-modal_medium"
+ >
<div class="slds-modal__container">
<div class="slds-scrollable">
- <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse">
- <svg class="slds-button__icon slds-button__icon_large" aria-hidden="true">
- <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#close"></use>
+ <button
+ class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
+ >
+ <svg
+ class="slds-button__icon slds-button__icon_large"
+ aria-hidden="true"
+ >
+ <use
+ xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#close"
+ ></use>
</svg>
- <span class="slds-assistive-text">Cancel and close</span>
+ <span class="slds-assistive-text"
+ >Cancel and close</span
+ >
</button>
<div class="slds-modal__header">
- <h1 id="modal-heading-01" class="slds-modal__title slds-hyphenate">鏂板缓瀹㈡埛浜哄憳</h1>
+ <h1
+ id="modal-heading-01"
+ class="slds-modal__title slds-hyphenate"
+ >
+ 鏂板缓瀹㈡埛浜哄憳
+ </h1>
</div>
<div class="slds-modal__content" id="modal-content-id-1">
<lightning-card class="slds-text-align_center">
<template if:true={isShowSpinner}>
- <lightning-spinner size="large" alternative-text="Loading"
- style="height: 100%;"></lightning-spinner>
+ <lightning-spinner
+ size="large"
+ alternative-text="Loading"
+ style="height: 100%"
+ ></lightning-spinner>
</template>
- <lightning-record-edit-form object-api-name={sobjectType} record-type-id={recordTypeId}
- record-id={recordId} onsubmit={handleSubmit} onsuccess={handleSuccess}
- onerror={handleError}>
- <template for:each={layout} for:item="layoutSection">
- <lightning-accordion lwc:if={layoutSection.editHeading} class="greyyyy"
- active-section-name={sectionName} allow-multiple-sections-open
- key={layoutSection.name}>
- <lightning-accordion-section name={layoutSection.label}
- label={layoutSection.label}>
- <lightning-layout multiple-rows="true">
- <template for:each={layoutSection.layoutColumns}
- for:item="layoutColumns">
- <lightning-layout-item class="hehe-layoutItem" size="6"
- key={layoutColumns.index}>
- <template for:each={layoutColumns.layoutItems}
- for:item="layoutField">
- <template if:false={layoutField.isDisable}>
- <template if:false={layoutField.isModify}>
+ <lightning-record-edit-form
+ object-api-name={sobjectType}
+ record-type-id={recordTypeId}
+ record-id={recordId}
+ onsubmit={handleSubmit}
+ onsuccess={handleSuccess}
+ onerror={handleError}
+ >
+ <template
+ for:each={layout}
+ for:item="layoutSection"
+ >
+ <lightning-accordion
+ lwc:if={layoutSection.editHeading}
+ class="greyyyy"
+ active-section-name={sectionName}
+ allow-multiple-sections-open
+ key={layoutSection.name}
+ >
+ <lightning-accordion-section
+ name={layoutSection.label}
+ label={layoutSection.label}
+ >
+ <lightning-layout
+ multiple-rows="true"
+ >
+ <template
+ for:each={layoutSection.layoutColumns}
+ for:item="layoutColumns"
+ >
+ <lightning-layout-item
+ class="hehe-layoutItem"
+ size="6"
+ key={layoutColumns.index}
+ >
+ <template
+ for:each={layoutColumns.layoutItems}
+ for:item="layoutField"
+ >
+ <template
+ if:false={layoutField.isDisable}
+ >
+ <template
+ if:false={layoutField.isModify}
+ >
<lightning-input-field
field-name={layoutField.field}
value={layoutField.value}
required={layoutField.isRequired}
data-field={layoutField.field}
- key={layoutField.field}>
+ key={layoutField.field}
+ >
</lightning-input-field>
</template>
- <template if:true={layoutField.isModify}>
- <lightning-input label={layoutField.fieldLabel}
+ <template
+ if:true={layoutField.isModify}
+ >
+ <lightning-input
+ label={layoutField.fieldLabel}
value={layoutField.value}
required={layoutField.isRequired}
data-field={layoutField.field}
- variant="label-inline" onchange={dataChange}
- key={layoutField.field}>
+ variant="label-inline"
+ onchange={dataChange}
+ key={layoutField.field}
+ >
</lightning-input>
</template>
</template>
@@ -63,7 +118,6 @@
</template>
</lightning-layout>
</lightning-accordion-section>
-
</lightning-accordion>
</template>
</lightning-record-edit-form>
@@ -72,13 +126,21 @@
</div>
<div class="slds-modal__footer">
<div class="slds-text-align_center">
- <lightning-button label="淇濆瓨" type="submit" onsubmit={handleSubmit}
- class="slds-m-right_x-small"></lightning-button>
- <lightning-button label="鍙栨秷" onclick={cancel} class="slds-m-right_x-small"></lightning-button>
+ <lightning-button
+ label="淇濆瓨"
+ type="submit"
+ onsubmit={handleSubmit}
+ class="slds-m-right_x-small"
+ ></lightning-button>
+ <lightning-button
+ label="鍙栨秷"
+ onclick={cancel}
+ class="slds-m-right_x-small"
+ ></lightning-button>
</div>
</div>
</div>
</section>
</template>
<div class="slds-backdrop slds-backdrop_open"></div>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1