From 8bab50cc9d7a6e595cae91842db8494cf6f6bdd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com>
Date: Fri, 2 Aug 2024 18:07:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8Dwd-?=
 =?UTF-8?q?button=20=E5=9C=A8hairline=E6=97=B6active=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9C=86=E8=A7=92=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复wd-button 在hairline时active没有圆角问题
---
 src/uni_modules/wot-design-uni/components/wd-button/index.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/uni_modules/wot-design-uni/components/wd-button/index.scss b/src/uni_modules/wot-design-uni/components/wd-button/index.scss
index 02e4d5865..cf53eea0b 100644
--- a/src/uni_modules/wot-design-uni/components/wd-button/index.scss
+++ b/src/uni_modules/wot-design-uni/components/wd-button/index.scss
@@ -80,6 +80,7 @@
   @include m(active) {
     &:active::before {
       opacity: 0.15;
+      border-radius: 6px;
     }
   }
 

From 1e91f8c931e0bc43ae02ad3a59ed13618448a3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com>
Date: Wed, 9 Oct 2024 15:54:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E2=9C=A8=20=E6=96=B0=E5=A2=9ECurta?=
 =?UTF-8?q?in=20=E5=B9=95=E5=B8=98=E5=B1=9E=E6=80=A7=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E4=BD=BF=E7=94=A8=E5=85=B6=E4=BB=96=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增Curtain 幕帘属性，支持使用其他图标
---
 docs/component/curtain.md                     |  3 +++
 src/pages/curtain/Index.vue                   | 20 +++++++++++++++++++
 .../components/wd-curtain/types.ts            | 15 +++++++++++++-
 .../components/wd-curtain/wd-curtain.vue      | 11 ++++++++--
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/docs/component/curtain.md b/docs/component/curtain.md
index c83de3531..224a0bf4d 100644
--- a/docs/component/curtain.md
+++ b/docs/component/curtain.md
@@ -108,6 +108,9 @@ function handleClose() {
 | close-position | 关闭按钮位置 | string | inset / top / bottom / top-left / top-right / bottom-left / bottom-right | inset | - |
 | close-on-click-modal | 点击遮罩是否关闭 | boolean | - | false | - |
 | hide-when-close | 是否当关闭时将弹出层隐藏（display: none) | boolean | - | true | - |
+| close-icon-name | 关闭按钮图标 | string | close-outline / close | close-outline | $LOWEST_VERSION$ |
+| close-icon-size | 图标的字体大小 | string |	- |	inherit | - |
+| close-icon-color | 图标的字体颜色 | string |	- |	inherit | - |
 
 ## Events
 
diff --git a/src/pages/curtain/Index.vue b/src/pages/curtain/Index.vue
index 6228c5443..069f22cd3 100644
--- a/src/pages/curtain/Index.vue
+++ b/src/pages/curtain/Index.vue
@@ -18,6 +18,9 @@
     <demo-block title="点击遮罩关闭">
       <wd-button @click="handleClick8">点击遮罩关闭</wd-button>
     </demo-block>
+    <demo-block title="自定义图标">
+      <wd-button @click="handleClick9">关闭图标自定义</wd-button>
+    </demo-block>
 
     <wd-curtain :value="value1" :src="img" :to="link" @close="handleClose1" :width="280"></wd-curtain>
     <wd-curtain :value="value2" :src="img" :to="link" close-position="top-left" :width="200" @close="handleClose2"></wd-curtain>
@@ -35,6 +38,16 @@
       @close="handleClose8"
       :close-on-click-modal="true"
     ></wd-curtain>
+    <wd-curtain
+      :value="value9"
+      :src="img"
+      :to="link"
+      closeIconName="close"
+      closeIconSize="20"
+      closeIconColor="red"
+      @close="handleClose9"
+      :width="280"
+    ></wd-curtain>
   </page-wraper>
 </template>
 <script lang="ts" setup>
@@ -48,6 +61,7 @@ const value5 = ref<boolean>(false)
 const value6 = ref<boolean>(false)
 const value7 = ref<boolean>(false)
 const value8 = ref<boolean>(false)
+const value9 = ref<boolean>(false)
 const img = ref<string>('https://img20.360buyimg.com/da/jfs/t1/141592/25/8861/261559/5f68d8c1E33ed78ab/698ad655bfcfbaed.png')
 const link = ref<string>('/pages/index/index')
 
@@ -99,6 +113,12 @@ function handleClick8() {
 function handleClose8() {
   value8.value = false
 }
+function handleClick9() {
+  value9.value = true
+}
+function handleClose9() {
+  value9.value = false
+}
 function clickImg() {
   uni.navigateTo({
     url: '/pages/index/index'
diff --git a/src/uni_modules/wot-design-uni/components/wd-curtain/types.ts b/src/uni_modules/wot-design-uni/components/wd-curtain/types.ts
index 2f7931fc2..0f7264a17 100644
--- a/src/uni_modules/wot-design-uni/components/wd-curtain/types.ts
+++ b/src/uni_modules/wot-design-uni/components/wd-curtain/types.ts
@@ -2,6 +2,7 @@ import type { ExtractPropTypes } from 'vue'
 import { baseProps, makeBooleanProp, makeStringProp } from '../common/props'
 
 export type ClosePosition = 'inset' | 'top' | 'bottom' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right'
+export type CloseIconName = 'close-outline' | 'close'
 
 export const curtainProps = {
   ...baseProps,
@@ -32,7 +33,19 @@ export const curtainProps = {
   /**
    * 是否当关闭时将弹出层隐藏（display: none)
    */
-  hideWhenClose: makeBooleanProp(true)
+  hideWhenClose: makeBooleanProp(true),
+  /**
+   * 关闭按钮图标，可选值：close-outline / close
+   */
+  closeIconName: makeStringProp<CloseIconName>('close-outline'),
+  /**
+   * 图标的字体大小
+   */
+  closeIconSize: String,
+  /**
+   * 图标的字体颜色
+   */
+  closeIconColor: String
 }
 
 export type CurtainProps = ExtractPropTypes<typeof curtainProps>
diff --git a/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue b/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
index c23098212..ce67dc94c 100644
--- a/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
@@ -19,7 +19,13 @@
     >
       <view class="wd-curtain__content">
         <image :src="src" class="wd-curtain__content-img" :style="imgStyle" @click="clickImage" @error="imgErr" @load="imgLoad"></image>
-        <wd-icon name="close-outline" :custom-class="`wd-curtain__content-close ${closePosition}`" @click="close" />
+        <wd-icon
+          :name="closeIconName"
+          :size="closeIconSize"
+          :color="closeIconColor"
+          :custom-class="`wd-curtain__content-close ${closePosition}`"
+          @click="close"
+        />
       </view>
     </wd-popup>
   </view>
@@ -39,7 +45,8 @@ export default {
 <script lang="ts" setup>
 import wdIcon from '../wd-icon/wd-icon.vue'
 import wdPopup from '../wd-popup/wd-popup.vue'
-import { ref, watch } from 'vue'
+import { addUnit, objToStyle } from '../common/util'
+import { computed, ref, watch, type CSSProperties } from 'vue'
 import { curtainProps } from './types'
 
 const props = defineProps(curtainProps)

From e5c9920a5b151b72b4538a6474825f58570086cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com>
Date: Wed, 9 Oct 2024 16:25:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wot-design-uni/components/wd-curtain/wd-curtain.vue        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue b/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
index ce67dc94c..6edf508a4 100644
--- a/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-curtain/wd-curtain.vue
@@ -45,8 +45,7 @@ export default {
 <script lang="ts" setup>
 import wdIcon from '../wd-icon/wd-icon.vue'
 import wdPopup from '../wd-popup/wd-popup.vue'
-import { addUnit, objToStyle } from '../common/util'
-import { computed, ref, watch, type CSSProperties } from 'vue'
+import { ref, watch } from 'vue'
 import { curtainProps } from './types'
 
 const props = defineProps(curtainProps)

From c87b6f8c89db7a312896dd326a388a28e12d40d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E6=9C=AF?= <864822121@qq.com>
Date: Wed, 9 Oct 2024 16:35:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?docs:=20=E2=9C=8F=EF=B8=8F=20=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E6=A1=A3=E5=A4=9A=E4=BD=99=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/component/curtain.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/component/curtain.md b/docs/component/curtain.md
index 224a0bf4d..a7f46110b 100644
--- a/docs/component/curtain.md
+++ b/docs/component/curtain.md
@@ -108,7 +108,7 @@ function handleClose() {
 | close-position | 关闭按钮位置 | string | inset / top / bottom / top-left / top-right / bottom-left / bottom-right | inset | - |
 | close-on-click-modal | 点击遮罩是否关闭 | boolean | - | false | - |
 | hide-when-close | 是否当关闭时将弹出层隐藏（display: none) | boolean | - | true | - |
-| close-icon-name | 关闭按钮图标 | string | close-outline / close | close-outline | $LOWEST_VERSION$ |
+| close-icon-name | 关闭按钮图标 | string | close-outline / close | close-outline | - |
 | close-icon-size | 图标的字体大小 | string |	- |	inherit | - |
 | close-icon-color | 图标的字体颜色 | string |	- |	inherit | - |