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/lwc/customOutputGood/customOutputGood.html | 41 ++++++++---------------------------------
1 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/lwc/customOutputGood/customOutputGood.html b/force-app/main/default/lwc/customOutputGood/customOutputGood.html
index 1ca7b1b..d2c8ea1 100644
--- a/force-app/main/default/lwc/customOutputGood/customOutputGood.html
+++ b/force-app/main/default/lwc/customOutputGood/customOutputGood.html
@@ -1,48 +1,23 @@
<template>
<template if:true={showTitle}>
<template if:true={showLink}>
- <p style="height: 10px"></p>
- <a
- style="margin-left: 10px; margin-top: 10px; margin-bottom: 10px"
- onclick={clickLink}
- ><lightning-formatted-text
- value={outputValue}
- ></lightning-formatted-text
- ></a>
- <p style="height: 10px"></p>
+ <p style="height: 10px;"></p>
+ <a style="margin-left: 10px;margin-top: 10px;margin-bottom: 10px;" onclick={clickLink}><lightning-formatted-text value={outputValue}></lightning-formatted-text></a>
+ <p style="height: 10px;"></p>
</template>
<template if:false={showLink}>
- <div
- style="
- margin-left: 10px;
- margin-top: 10px;
- margin-bottom: 10px;
- font-size: 16px;
- color: #696969;
- "
- >
- <lightning-formatted-text
- value={outputValue}
- ></lightning-formatted-text>
+ <div style="margin-left: 10px;margin-top: 10px;margin-bottom: 10px;font-size:14px;color:#696969;">
+ <lightning-formatted-text value={outputValue}></lightning-formatted-text>
</div>
</template>
</template>
<template if:false={showTitle}>
- <div style="text-align: right">
+ <div style="text-align: right;">
<template if:true={showLink}>
- <a
- style="margin-left: 10px; margin-right: 10px"
- onclick={clickLink}
- ><lightning-formatted-number
- value={outputValue}
- ></lightning-formatted-number
- ></a>
+ <a style="margin-left: 10px;margin-right: 10px;" onclick={clickLink}><lightning-formatted-number value={outputValue}></lightning-formatted-number></a>
</template>
<template if:false={showLink}>
- <lightning-formatted-number
- style="margin-left: 10px; margin-right: 10px"
- value={outputValue}
- ></lightning-formatted-number>
+ <lightning-formatted-number style="margin-left: 10px;margin-right: 10px;" value={outputValue}></lightning-formatted-number>
</template>
</div>
</template>
--
Gitblit v1.9.1