From fb4a31a3ad27292ebf3b2ba5fec6ad1219c5e888 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 11:10:54 +0800
Subject: [PATCH 01/62] fix(SwipeCell): fix docs (#1634)

---
 src/swipe-cell/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/swipe-cell/README.md b/src/swipe-cell/README.md
index 8b41f8abe..b0c80d59b 100644
--- a/src/swipe-cell/README.md
+++ b/src/swipe-cell/README.md
@@ -40,9 +40,9 @@ isComponent: true
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
 disabled | Boolean | - | 是否禁用滑动 | N
-opened   | Boolean / Array | false  | 操作项是否呈现为打开态，值为数组时表示分别控制左右滑动的展开和收起状态。TS 类型：`boolean| Array<boolean>` | N   |
+opened   | Boolean / Array | false  | 操作项是否呈现为打开态，值为数组时表示分别控制左右滑动的展开和收起状态。TS 类型：`boolean \| Array<boolean>` | N   |
 left | Array / Slot | - | 左侧滑动操作项。所有行为同 `right`。TS 类型：`Array<SwipeActionItem>` | N
-right | Array / Slot | - | 右侧滑动操作项。有两种定义方式，一种是使用数组，二种是使用插槽。`right.text` 表示操作文本，`right.className` 表示操作项类名，`right.style` 表示操作项样式，`right.onClick` 表示点击操作项后执行的回调函数。示例：`[{ text: '删除', icon: 'delete', style: 'background-color: red', onClick: () => {} }]`。TS 类型：`Array<SwipeActionItem>` `interface SwipeActionItem {text?: string; icon?: string | object, className?: string; style?: string; onClick?: () => void; [key: string]: any }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/swipe-cell/type.ts) | N
+right | Array / Slot | - | 右侧滑动操作项。有两种定义方式，一种是使用数组，二种是使用插槽。`right.text` 表示操作文本，`right.className` 表示操作项类名，`right.style` 表示操作项样式，`right.onClick` 表示点击操作项后执行的回调函数。示例：`[{ text: '删除', icon: 'delete', style: 'background-color: red', onClick: () => {} }]`。TS 类型：`Array<SwipeActionItem>` `interface SwipeActionItem {text?: string; icon?: string \| object, className?: string; style?: string; onClick?: () => void; [key: string]: any }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/swipe-cell/type.ts) | N
 
 ### SwipeCell Events
 

From 5da469e727a0a8966e6ca5dc40820cb879d2c959 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 11:11:28 +0800
Subject: [PATCH 02/62] fix(Dialog): fix button style (#1633)

---
 src/dialog/dialog.less | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/dialog/dialog.less b/src/dialog/dialog.less
index 3bd39217e..1cf4b4574 100644
--- a/src/dialog/dialog.less
+++ b/src/dialog/dialog.less
@@ -91,14 +91,6 @@
     }
   }
 
-  &-button {
-    border-radius: 0 !important;
-
-    &:after {
-      border-radius: 0;
-    }
-  }
-
   &__button {
     position: relative;
     flex: 1;
@@ -116,6 +108,7 @@
 
     &--text {
       flex: 1;
+      --td-button-border-radius: 0;
       --td-button-medium-height: 112rpx;
       border-radius: 0;
 

From 0813b233e16b0d0f895373f148a28788a1ac776f Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Wed, 22 Feb 2023 11:18:54 +0800
Subject: [PATCH 03/62] fix(loading): update loading color (#1627)

---
 src/switch/switch.less | 8 ++++++++
 src/switch/switch.wxml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/switch/switch.less b/src/switch/switch.less
index 25a1788eb..e1c9383cf 100644
--- a/src/switch/switch.less
+++ b/src/switch/switch.less
@@ -69,6 +69,14 @@
       color: @switch-label-checked-color;
     }
 
+    &--disabled {
+      color: @switch-unchecked-disabled-color;
+    }
+
+    &--checked&--disabled {
+      color: @switch-checked-disabled-color;
+    }
+
     &--large {
       font-size: @swtich-label-large-font-size;
     }
diff --git a/src/switch/switch.wxml b/src/switch/switch.wxml
index d4e90d245..2cfc9eced 100644
--- a/src/switch/switch.wxml
+++ b/src/switch/switch.wxml
@@ -17,9 +17,9 @@
     >
       <view
         wx:if="{{label}}"
-        class="{{_.cls(classPrefix + '__label', [['checked', checked], size])}} {{prefix}}-class-label"
+        class="{{_.cls(classPrefix + '__label', [['checked', checked], ['disabled', disabled], size])}} {{prefix}}-class-label"
       >
-        <t-loading wx:if="{{loading}}" inherit-color size="32rpx" t-class="{{classPrefix}}__loading" />
+        <t-loading wx:if="{{loading}}" inherit-color size="32rpx" />
         <text wx:elif="{{label.length == 2}}">{{checked ? label[1] : label[0]}}</text>
         <t-icon
           wx:elif="{{icon.length == 2}}"

From 2c96f51c9a28901725d85710070666cce911f4f5 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Wed, 22 Feb 2023 14:41:20 +0800
Subject: [PATCH 04/62] Refactor/loading remove (#1626)

* fix(loading): remove bar and error theme

* test(loading): update

* test(image-viewer): update snapshot
---
 .../__test__/__snapshots__/index.test.js.snap | 135 ++++++++----------
 .../__test__/__snapshots__/demo.test.js.snap  |  19 ---
 src/loading/__test__/demo.test.js             |   2 +-
 .../__test__/{indx.test.js => index.test.js}  |  38 -----
 src/loading/_example/base/index.wxss          |   3 +-
 src/loading/_example/error/index.js           |   9 --
 src/loading/_example/error/index.json         |   6 -
 src/loading/_example/error/index.wxml         |   1 -
 src/loading/_example/error/index.wxss         |   0
 src/loading/_example/loading.json             |   2 -
 src/loading/_example/loading.wxml             |   7 -
 .../_example/loadingProgress/index.json       |   4 -
 .../_example/loadingProgress/index.less       |   0
 src/loading/_example/loadingProgress/index.ts |  22 ---
 .../_example/loadingProgress/index.wxml       |   1 -
 src/loading/loading.less                      |  28 ----
 src/loading/loading.wxml                      |  78 +++++-----
 17 files changed, 95 insertions(+), 260 deletions(-)
 rename src/loading/__test__/{indx.test.js => index.test.js} (79%)
 delete mode 100644 src/loading/_example/error/index.js
 delete mode 100644 src/loading/_example/error/index.json
 delete mode 100644 src/loading/_example/error/index.wxml
 delete mode 100644 src/loading/_example/error/index.wxss
 delete mode 100644 src/loading/_example/loadingProgress/index.json
 delete mode 100644 src/loading/_example/loadingProgress/index.less
 delete mode 100644 src/loading/_example/loadingProgress/index.ts
 delete mode 100644 src/loading/_example/loadingProgress/index.wxml

diff --git a/src/image-viewer/__test__/__snapshots__/index.test.js.snap b/src/image-viewer/__test__/__snapshots__/index.test.js.snap
index 9f07aa14a..66610fc4f 100644
--- a/src/image-viewer/__test__/__snapshots__/index.test.js.snap
+++ b/src/image-viewer/__test__/__snapshots__/index.test.js.snap
@@ -17,38 +17,33 @@ exports[`image-viewer :base 1`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
@@ -87,38 +82,33 @@ exports[`image-viewer :base 2`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
@@ -157,38 +147,33 @@ exports[`image-viewer :base 3`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
diff --git a/src/loading/__test__/__snapshots__/demo.test.js.snap b/src/loading/__test__/__snapshots__/demo.test.js.snap
index f2d47f834..2f176b80b 100644
--- a/src/loading/__test__/__snapshots__/demo.test.js.snap
+++ b/src/loading/__test__/__snapshots__/demo.test.js.snap
@@ -48,15 +48,6 @@ exports[`Loading Loading duration demo works fine 1`] = `
 </duration>
 `;
 
-exports[`Loading Loading error demo works fine 1`] = `
-<error>
-  <t-loading
-    theme="error"
-    bind:reload="reloadPage"
-  />
-</error>
-`;
-
 exports[`Loading Loading horizontal demo works fine 1`] = `
 <horizontal>
   <wx-view
@@ -79,16 +70,6 @@ exports[`Loading Loading horizontal demo works fine 1`] = `
 </horizontal>
 `;
 
-exports[`Loading Loading loadingProgress demo works fine 1`] = `
-<loadingProgress>
-  <t-loading
-    loading="{{false}}"
-    progress="{{100}}"
-    theme="bar"
-  />
-</loadingProgress>
-`;
-
 exports[`Loading Loading size demo works fine 1`] = `
 <size>
   <wx-view
diff --git a/src/loading/__test__/demo.test.js b/src/loading/__test__/demo.test.js
index 8cdc90fa3..60a8118fc 100644
--- a/src/loading/__test__/demo.test.js
+++ b/src/loading/__test__/demo.test.js
@@ -5,7 +5,7 @@
 import simulate from 'miniprogram-simulate';
 import path from 'path';
 
-const mapper = ['base', 'duration', 'error', 'horizontal', 'loadingProgress', 'size', 'status', 'text', 'vertical'];
+const mapper = ['base', 'duration', 'horizontal', 'size', 'status', 'text', 'vertical'];
 
 describe('Loading', () => {
   mapper.forEach((demoName) => {
diff --git a/src/loading/__test__/indx.test.js b/src/loading/__test__/index.test.js
similarity index 79%
rename from src/loading/__test__/indx.test.js
rename to src/loading/__test__/index.test.js
index 229deaa30..dd4bb8a1b 100644
--- a/src/loading/__test__/indx.test.js
+++ b/src/loading/__test__/index.test.js
@@ -114,42 +114,4 @@ describe('loading', () => {
       expect(window.getComputedStyle(indicator.dom).width).toBe('20px');
     });
   });
-
-  describe('event', () => {
-    it(`loading :`, async () => {
-      const handleReload = jest.fn();
-      const id = simulate.load({
-        template: `
-        <t-loading
-          class="base"
-          theme="{{theme}}"
-          loading="{{loading}}"
-          bind:reload="handleReload"
-        ></t-loading>
-        `,
-        data: {
-          theme: 'circular',
-          loading: false,
-        },
-        methods: {
-          handleReload,
-        },
-        usingComponents: {
-          't-loading': loading,
-        },
-      });
-
-      const comp = simulate.render(id);
-      comp.attach(document.createElement('parent-wrapper'));
-
-      // theme = 'error', 存在 reload 事件
-      comp.setData({ theme: 'error' });
-      const $refresh = comp.querySelector('.base >>> .t-loading__refresh-btn');
-      $refresh.dispatchEvent('tap');
-      await simulate.sleep(10);
-      expect(handleReload).toHaveBeenCalledTimes(1);
-
-      comp.detach();
-    });
-  });
 });
diff --git a/src/loading/_example/base/index.wxss b/src/loading/_example/base/index.wxss
index d0cf77d72..e22e585ee 100644
--- a/src/loading/_example/base/index.wxss
+++ b/src/loading/_example/base/index.wxss
@@ -4,6 +4,5 @@
 }
 
 .wrapper {
-  min-width: 20%;
-  margin-right: 40rpx;
+  margin-right: 40px;
 }
diff --git a/src/loading/_example/error/index.js b/src/loading/_example/error/index.js
deleted file mode 100644
index ae3034c18..000000000
--- a/src/loading/_example/error/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-Component({
-  methods: {
-    reloadPage() {
-      wx.redirectTo({
-        url: '/pages/loading/loading',
-      });
-    },
-  },
-});
diff --git a/src/loading/_example/error/index.json b/src/loading/_example/error/index.json
deleted file mode 100644
index dc12aafa5..000000000
--- a/src/loading/_example/error/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "components": true,
-  "usingComponents": {
-    "t-loading": "tdesign-miniprogram/loading/loading"
-  }
-}
diff --git a/src/loading/_example/error/index.wxml b/src/loading/_example/error/index.wxml
deleted file mode 100644
index efdf8a12a..000000000
--- a/src/loading/_example/error/index.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<t-loading theme="error" bind:reload="reloadPage"></t-loading>
diff --git a/src/loading/_example/error/index.wxss b/src/loading/_example/error/index.wxss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/loading/_example/loading.json b/src/loading/_example/loading.json
index 27fedd62c..61274486a 100644
--- a/src/loading/_example/loading.json
+++ b/src/loading/_example/loading.json
@@ -2,12 +2,10 @@
   "navigationBarTitleText": "Loading",
   "navigationBarBackgroundColor": "#fff",
   "usingComponents": {
-    "t-button": "tdesign-miniprogram/button/button",
     "base": "./base",
     "horizontal": "./horizontal",
     "vertical": "./vertical",
     "text": "./text",
-    "error": "./error",
     "status": "./status",
     "duration": "./duration",
     "size": "./size"
diff --git a/src/loading/_example/loading.wxml b/src/loading/_example/loading.wxml
index 5d86d4dc7..093fa9750 100644
--- a/src/loading/_example/loading.wxml
+++ b/src/loading/_example/loading.wxml
@@ -15,13 +15,6 @@
   <t-demo desc="纯文字" padding>
     <text />
   </t-demo>
-  <t-demo desc="加载失败" padding>
-    <error />
-  </t-demo>
-
-  <!-- <t-demo desc="进度条加载" padding>
-    <t-button size="large" plain block bind:tap="goToProgress">页面进度条加载</t-button>
-  </t-demo> -->
 
   <t-demo title="02 组件尺寸" desc="大尺寸" padding>
     <size />
diff --git a/src/loading/_example/loadingProgress/index.json b/src/loading/_example/loadingProgress/index.json
deleted file mode 100644
index 16738c730..000000000
--- a/src/loading/_example/loadingProgress/index.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "页面加载样式",
-  "usingComponents": {}
-}
diff --git a/src/loading/_example/loadingProgress/index.less b/src/loading/_example/loadingProgress/index.less
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/loading/_example/loadingProgress/index.ts b/src/loading/_example/loadingProgress/index.ts
deleted file mode 100644
index cc993fa9e..000000000
--- a/src/loading/_example/loadingProgress/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-Page({
-  data: {
-    progress: 100,
-    isLoading: false,
-    barLoadingTimeOut: null,
-  },
-
-  onLoad() {
-    const timeout = setTimeout(() => {
-      this.setData({ isLoading: false });
-    }, 10000);
-    this.setData({
-      progress: -1,
-      isLoading: true,
-      barLoadingTimeOut: timeout,
-    });
-  },
-
-  onUnload() {
-    clearTimeout(this.data.barLoadingTimeOut);
-  },
-});
diff --git a/src/loading/_example/loadingProgress/index.wxml b/src/loading/_example/loadingProgress/index.wxml
deleted file mode 100644
index 2f3d6c89c..000000000
--- a/src/loading/_example/loadingProgress/index.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<t-loading theme="bar" progress="{{progress}}" loading="{{isLoading}}"></t-loading>
diff --git a/src/loading/loading.less b/src/loading/loading.less
index a7e896eb8..eeb5429c7 100644
--- a/src/loading/loading.less
+++ b/src/loading/loading.less
@@ -109,34 +109,6 @@
     flex-direction: row;
     vertical-align: top;
   }
-
-  &__refresh-btn {
-    margin-left: 16rpx;
-    color: @loading-color;
-  }
-
-  &__bar {
-    height: 6rpx;
-    width: 80%;
-    transition: 0.5s;
-    background-color: @loading-color;
-    display: none;
-
-    &--static {
-      display: block;
-    }
-
-    &--loaded {
-      opacity: 0;
-      height: 0;
-      animation: t-bar-loaded 1s ease-out;
-    }
-
-    &--animation {
-      animation: t-bar 8s linear;
-      display: block;
-    }
-  }
 }
 
 @keyframes t-bar {
diff --git a/src/loading/loading.wxml b/src/loading/loading.wxml
index ed50d16ed..925b4f3a9 100644
--- a/src/loading/loading.wxml
+++ b/src/loading/loading.wxml
@@ -1,51 +1,39 @@
 <wxs src="../common/utils.wxs" module="_" />
 <view
-  style="{{_._style([style, customStyle, (!text && theme != 'error' && 'width: ' + _.addUnit(size) + '; height: ' + _.addUnit(size))])}}"
-  class="class {{prefix}}-class"
+  style="{{_._style([style, customStyle, (!text && 'width: ' + _.addUnit(size) + '; height: ' + _.addUnit(size))])}} {{show ? '' : 'display:none'}} {{inheritColor ? 'color: inherit' : ''}}"
+  class="class {{prefix}}-class {{classPrefix}} {{classPrefix + '--' + layout}}"
 >
   <view
-    wx:if="{{theme === 'bar' && theme !== 'error'}}"
-    style="{{progress >= 0 ? 'width:' + progress + '%' : ''}}"
-    class="{{prefix}}-class-indicator {{classPrefix}}__bar {{classPrefix}}__bar--{{progress < 0 ? 'animation' : progress < 100 ? 'static': ''}} {{progress >= 100 || !loading ? classPrefix + '__bar--loaded' : ''}}"
-  ></view>
-  <view class="{{classPrefix}} {{classPrefix + '--' + layout}}" style="{{show ? '' : 'display:none'}}" wx:else>
-    <view
-      wx:if="{{indicator && theme != 'error'}}"
-      class="{{prefix}}-class-indicator {{classPrefix}}__spinner {{classPrefix}}__spinner--{{ theme }} {{reverse ? 'reverse' : ''}}"
-      style="width: {{ _.addUnit(size) }}; height: {{ _.addUnit(size) }}; {{inheritColor ? 'color: inherit' : ''}} {{indicator ? '' : 'display:none'}}; {{duration ? 'animation-duration: ' + duration / 1000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
-      aria-role="{{ theme !== 'error' ? ariaRole  || 'img' :  ''}}"
-      aria-label="{{ ariaLabel || text || '加载中'  }}"
-
-      >
-      <view wx:if="{{ theme === 'spinner' }}" wx:for="{{12}}" wx:key="index" class="{{classPrefix}}__dot" />
-      <view wx:if="{{ theme === 'circular' }}" class="{{classPrefix}}__circular" />
-      <block wx:if="{{ theme === 'dots' }}">
-        <view
-          class="{{classPrefix}}__dot"
-          style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + 0 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
-        ></view>
-        <view
-          class="{{classPrefix}}__dot"
-          style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + duration * 1 / 3000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
-        ></view>
-        <view
-          class="{{classPrefix}}__dot"
-          style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + duration * 2 / 3000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
-        ></view>
-      </block>
-    </view>
-    <view
-      class="{{_.cls(classPrefix + '__text', [layout])}} {{prefix}}-class-text"
-      aria-hidden="{{indicator && theme != 'error'}}"
-      aria-label="{{ ariaLabel || text }}"
-    >
-      <view wx:if="{{theme === 'error'}}">
-        加载失败
-        <text class="{{classPrefix}}__refresh-btn" bind:tap="refreshPage" aria-role="button">刷新</text>
-      </view>
-      <block wx:if="{{text}}">{{text}}</block>
-      <slot name="text" />
-      <slot />
-    </view>
+    wx:if="{{indicator}}"
+    class="{{prefix}}-class-indicator {{classPrefix}}__spinner {{classPrefix}}__spinner--{{ theme }} {{reverse ? 'reverse' : ''}}"
+    style="width: {{ _.addUnit(size) }}; height: {{ _.addUnit(size) }}; {{inheritColor ? 'color: inherit' : ''}} {{indicator ? '' : 'display:none'}}; {{duration ? 'animation-duration: ' + duration / 1000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
+    aria-role="{{ariaRole  || 'img'}}"
+    aria-label="{{ ariaLabel || text || '加载中'  }}"
+  >
+    <view wx:if="{{ theme === 'spinner' }}" wx:for="{{12}}" wx:key="index" class="{{classPrefix}}__dot" />
+    <view wx:if="{{ theme === 'circular' }}" class="{{classPrefix}}__circular" />
+    <block wx:if="{{ theme === 'dots' }}">
+      <view
+        class="{{classPrefix}}__dot"
+        style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + 0 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
+      ></view>
+      <view
+        class="{{classPrefix}}__dot"
+        style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + duration * 1 / 3000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
+      ></view>
+      <view
+        class="{{classPrefix}}__dot"
+        style="{{duration ? 'animation-duration: ' + duration/1000 + 's; animation-delay:' + duration * 2 / 3000 + 's;' : ''}} animation-play-state: {{pause ? 'paused' : 'running'}};"
+      ></view>
+    </block>
+  </view>
+  <view
+    class="{{_.cls(classPrefix + '__text', [layout])}} {{prefix}}-class-text"
+    aria-hidden="{{indicator}}"
+    aria-label="{{ ariaLabel || text }}"
+  >
+    <block wx:if="{{text}}">{{text}}</block>
+    <slot name="text" />
+    <slot />
   </view>
 </view>

From 61d9a43ecb9164458ea05aa16f58161b859cfc02 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 15:00:09 +0800
Subject: [PATCH 05/62] chore(Cell): adjust className for hover-class (#1635)

* chore(Cell): adjust className for hover-class

* test: update snapshots
---
 src/cell/__test__/__snapshots__/index.test.js.snap        | 4 ++--
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 4 ++--
 src/cell/cell.less                                        | 2 +-
 src/cell/cell.wxml                                        | 4 ++--
 src/collapse/__test__/__snapshots__/index.test.js.snap    | 8 ++++----
 .../__test__/__virtualHostSnapshot__/index.test.js.snap   | 8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/cell/__test__/__snapshots__/index.test.js.snap b/src/cell/__test__/__snapshots__/index.test.js.snap
index 6f25cddf5..a9521a796 100644
--- a/src/cell/__test__/__snapshots__/index.test.js.snap
+++ b/src/cell/__test__/__snapshots__/index.test.js.snap
@@ -8,8 +8,8 @@ exports[`cell :base 1`] = `
     <wx-view
       ariaLabel=""
       ariaRole=""
-      class="class t-class t-cell   t-cell--middle"
-      hoverClass="t-cell--hover-class"
+      class="class t-class t-cell  t-cell--middle"
+      hoverClass=""
       hoverStayTime="70"
       style=""
       bind:tap="onClick"
diff --git a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
index 6f25cddf5..a9521a796 100644
--- a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -8,8 +8,8 @@ exports[`cell :base 1`] = `
     <wx-view
       ariaLabel=""
       ariaRole=""
-      class="class t-class t-cell   t-cell--middle"
-      hoverClass="t-cell--hover-class"
+      class="class t-class t-cell  t-cell--middle"
+      hoverClass=""
       hoverStayTime="70"
       style=""
       bind:tap="onClick"
diff --git a/src/cell/cell.less b/src/cell/cell.less
index 2e79f2baa..409c24d83 100644
--- a/src/cell/cell.less
+++ b/src/cell/cell.less
@@ -112,7 +112,7 @@
     }
   }
 
-  &--hover&--hover-class {
+  &--hover {
     background-color: @cell-hover-color;
   }
 
diff --git a/src/cell/cell.wxml b/src/cell/cell.wxml
index 869aae985..461b9c300 100644
--- a/src/cell/cell.wxml
+++ b/src/cell/cell.wxml
@@ -2,8 +2,8 @@
 
 <view
   style="{{_._style([style, customStyle])}}"
-  class="class {{prefix}}-class {{classPrefix}} {{ hover ? classPrefix + '--hover' : ''}} {{ !bordered || isLastChild ? classPrefix + '--borderless' : ''}} {{classPrefix}}--{{align}}"
-  hover-class="{{classPrefix}}--hover-class"
+  class="class {{prefix}}-class {{classPrefix}} {{ !bordered || isLastChild ? classPrefix + '--borderless' : ''}} {{classPrefix}}--{{align}}"
+  hover-class="{{ hover ? classPrefix + '--hover' : ''}}"
   hover-stay-time="70"
   bind:tap="onClick"
   aria-role="{{ariaRole || (arrow ? 'button' : '')}}"
diff --git a/src/collapse/__test__/__snapshots__/index.test.js.snap b/src/collapse/__test__/__snapshots__/index.test.js.snap
index 9b677c15f..c4dd3cdc0 100644
--- a/src/collapse/__test__/__snapshots__/index.test.js.snap
+++ b/src/collapse/__test__/__snapshots__/index.test.js.snap
@@ -30,8 +30,8 @@ exports[`collapse :defaultExpandAll 1`] = `
             <wx-view
               ariaLabel=""
               ariaRole=""
-              class="class t-class t-cell   t-cell--middle"
-              hoverClass="t-cell--hover-class"
+              class="class t-class t-cell  t-cell--middle"
+              hoverClass=""
               hoverStayTime="70"
               style=""
               bind:tap="onClick"
@@ -115,8 +115,8 @@ exports[`collapse :defaultExpandAll 1`] = `
             <wx-view
               ariaLabel=""
               ariaRole=""
-              class="class t-class t-cell   t-cell--middle"
-              hoverClass="t-cell--hover-class"
+              class="class t-class t-cell  t-cell--middle"
+              hoverClass=""
               hoverStayTime="70"
               style=""
               bind:tap="onClick"
diff --git a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
index 9b677c15f..c4dd3cdc0 100644
--- a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -30,8 +30,8 @@ exports[`collapse :defaultExpandAll 1`] = `
             <wx-view
               ariaLabel=""
               ariaRole=""
-              class="class t-class t-cell   t-cell--middle"
-              hoverClass="t-cell--hover-class"
+              class="class t-class t-cell  t-cell--middle"
+              hoverClass=""
               hoverStayTime="70"
               style=""
               bind:tap="onClick"
@@ -115,8 +115,8 @@ exports[`collapse :defaultExpandAll 1`] = `
             <wx-view
               ariaLabel=""
               ariaRole=""
-              class="class t-class t-cell   t-cell--middle"
-              hoverClass="t-cell--hover-class"
+              class="class t-class t-cell  t-cell--middle"
+              hoverClass=""
               hoverStayTime="70"
               style=""
               bind:tap="onClick"

From 488c6ffa7027602ad01fdf2920162cdf67f03ffb Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 15:09:58 +0800
Subject: [PATCH 06/62] chore(Picker&&DateTimePicker): remove footer slot
 (#1631)

---
 src/date-time-picker/README.md             | 2 +-
 src/date-time-picker/date-time-picker.wxml | 1 -
 src/date-time-picker/props.ts              | 5 -----
 src/date-time-picker/type.ts               | 8 --------
 src/picker/README.md                       | 2 +-
 src/picker/picker.wxml                     | 1 -
 6 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/date-time-picker/README.md b/src/date-time-picker/README.md
index 95681f6f2..480a77e74 100644
--- a/src/date-time-picker/README.md
+++ b/src/date-time-picker/README.md
@@ -47,7 +47,7 @@ cancel-btn | String | 取消 | 取消按钮文字 | N
 confirm-btn | String | - | 确定按钮文字 | N
 end | String / Number | - | 选择器的最大可选时间，默认为当前时间+10年 | N
 external-classes | Array | - | 组件类名，分别用于设置组件外层元素、确认按钮、取消按钮、标题等元素类名。`['t-class', 't-class-confirm', 't-class-cancel', 't-class-title']` | N
-footer | Slot | true | 底部内容 | N
+footer | Slot | true | 已废弃。底部内容 | N
 format | String | 'YYYY-MM-DD HH:mm:ss' | 用于pick、change、confirm事件参数格式化[详细文档](https://day.js.org/docs/en/display/format) | N
 header | Boolean / Slot | true | 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容 | N
 mode | String / Array | 'date' | year = 年；month = 年月；date = 年月日；hour = 年月日时； minute = 年月日时分；当类型为数组时，第一个值控制年月日，第二个值控制时分秒。TS 类型：`DateTimePickerMode` `type DateTimePickerMode = TimeModeValues \| Array<TimeModeValues> ` `type TimeModeValues = 'year' \| 'month' \| 'date' \| 'hour' \| 'minute' \| 'second'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts) | N
diff --git a/src/date-time-picker/date-time-picker.wxml b/src/date-time-picker/date-time-picker.wxml
index 1dd9cbc09..e0897ec33 100644
--- a/src/date-time-picker/date-time-picker.wxml
+++ b/src/date-time-picker/date-time-picker.wxml
@@ -23,5 +23,4 @@
     options="{{item}}"
     index="index"
   />
-  <slot slot="footer" name="footer" />
 </t-picker>
diff --git a/src/date-time-picker/props.ts b/src/date-time-picker/props.ts
index 944e23eab..f3a206560 100644
--- a/src/date-time-picker/props.ts
+++ b/src/date-time-picker/props.ts
@@ -24,11 +24,6 @@ const props: TdDateTimePickerProps = {
   externalClasses: {
     type: Array,
   },
-  /** 底部内容 */
-  footer: {
-    type: Boolean,
-    value: true,
-  },
   /** 用于格式化日期，[详细文档](https://day.js.org/docs/en/display/format) */
   format: {
     type: String,
diff --git a/src/date-time-picker/type.ts b/src/date-time-picker/type.ts
index c5923610c..60f196c35 100644
--- a/src/date-time-picker/type.ts
+++ b/src/date-time-picker/type.ts
@@ -42,14 +42,6 @@ export interface TdDateTimePickerProps {
     type: ArrayConstructor;
     value?: ['t-class', 't-class-confirm', 't-class-cancel', 't-class-title'];
   };
-  /**
-   * 底部内容
-   * @default true
-   */
-  footer?: {
-    type: BooleanConstructor;
-    value?: boolean;
-  };
   /**
    * 用于格式化日期，[详细文档](https://day.js.org/docs/en/display/format)
    * @default ''
diff --git a/src/picker/README.md b/src/picker/README.md
index 1ec55d695..5a753debd 100644
--- a/src/picker/README.md
+++ b/src/picker/README.md
@@ -47,7 +47,7 @@ auto-close | Boolean | true | 自动关闭；在确认、取消、点击遮罩
 cancel-btn | String / Boolean / Object | true | 取消按钮文字。TS 类型：`boolean \| string \| ButtonProps` | N
 columns | Array / Function | [] | 必需。配置每一列的选项。TS 类型：`Array<PickerColumn> \| ((item: Array<PickerValue>)  => Array<PickerColumn>)` `type PickerColumn = PickerColumnItem[]` `interface PickerColumnItem { label: string,value: string}`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/picker/type.ts) | Y
 confirm-btn | String / Boolean / Object | true | 确定按钮文字。TS 类型：`boolean \| string \| ButtonProps`，[Button API Documents](./button?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/picker/type.ts) | N
-footer | Slot | - | 底部内容 | N
+footer | Slot | - | 已废弃。底部内容 | N
 header | Boolean / Slot | true | 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容 | N
 render-label | String / Function | - | 自定义label。TS 类型：`(item: PickerColumnItem) => string` | N
 title | String | '' | 标题 | N
diff --git a/src/picker/picker.wxml b/src/picker/picker.wxml
index 282ee82aa..86e71d8c3 100644
--- a/src/picker/picker.wxml
+++ b/src/picker/picker.wxml
@@ -18,6 +18,5 @@
       <view class="{{classPrefix}}__mask {{classPrefix}}__mask--bottom" />
       <view class="{{classPrefix}}__indicator"></view>
     </view>
-    <slot name="footer" />
   </view>
 </t-popup>

From bfcf649543d772bce702de0844bb899a3b631526 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 15:13:09 +0800
Subject: [PATCH 07/62] chore(Radio): align attribute is renamed to placement
 (#1630)

---
 src/radio-group/props.ts                           | 2 +-
 src/radio-group/radio-group.wxml                   | 2 +-
 src/radio-group/type.ts                            | 2 +-
 src/radio/README.en-US.md                          | 4 ++--
 src/radio/README.md                                | 4 ++--
 src/radio/__test__/__snapshots__/demo.test.js.snap | 2 +-
 src/radio/_example/align/index.wxml                | 2 +-
 src/radio/props.ts                                 | 2 +-
 src/radio/radio.ts                                 | 4 ++--
 src/radio/radio.wxml                               | 6 +++---
 src/radio/type.ts                                  | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/radio-group/props.ts b/src/radio-group/props.ts
index e12f6431c..58bb4ef22 100644
--- a/src/radio-group/props.ts
+++ b/src/radio-group/props.ts
@@ -7,7 +7,7 @@
 import { TdRadioGroupProps } from './type';
 const props: TdRadioGroupProps = {
   /** 复选框和内容相对位置；仅在使用 options 时生效 */
-  align: {
+  placement: {
     type: String,
     value: null,
   },
diff --git a/src/radio-group/radio-group.wxml b/src/radio-group/radio-group.wxml
index dc622f83c..beff6f6dc 100644
--- a/src/radio-group/radio-group.wxml
+++ b/src/radio-group/radio-group.wxml
@@ -11,7 +11,7 @@
       data-index="{{index}}"
       data-value="{{item.value}}"
       disabled="{{item.disabled}}"
-      align="{{align}}"
+      placement="{{placement}}"
       icon="{{icon}}"
       borderless="{{borderless}}"
       bind:change="handleRadioChange"
diff --git a/src/radio-group/type.ts b/src/radio-group/type.ts
index 6455b47d8..3f1bc7ccd 100644
--- a/src/radio-group/type.ts
+++ b/src/radio-group/type.ts
@@ -11,7 +11,7 @@ export interface TdRadioGroupProps<T = RadioValue> {
    * 复选框和内容相对位置；仅在使用 options 时生效
    * @default left
    */
-  align?: {
+  placement?: {
     type: StringConstructor;
     value?: 'left' | 'right';
   };
diff --git a/src/radio/README.en-US.md b/src/radio/README.en-US.md
index 84b8c3ee8..c3cb732bc 100644
--- a/src/radio/README.en-US.md
+++ b/src/radio/README.en-US.md
@@ -5,7 +5,7 @@
 
 name | type | default | description | required
 -- | -- | -- | -- | --
-align | String | left | options：left/right | N
+placement | String | left | options：left/right | N
 allow-uncheck | Boolean | false | \- | N
 block | Boolean | true | \- | N
 checked | Boolean | false | \- | N
@@ -31,7 +31,7 @@ change | `(checked: boolean)` | \-
 
 name | type | default | description | required
 -- | -- | -- | -- | --
-align | String | left | options：left/right | N
+placement | String | left | options：left/right | N
 borderless | Boolean | false | \- | N
 disabled | Boolean | undefined | \- | N
 icon | String / Array | 'circle' | Typescript：`'circle' | 'line' | Array<string>` | N
diff --git a/src/radio/README.md b/src/radio/README.md
index 17c828281..d267dfbf7 100644
--- a/src/radio/README.md
+++ b/src/radio/README.md
@@ -52,7 +52,7 @@ isComponent: true
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-align | String | left | 复选框和内容相对位置。可选项：left/right | N
+placement | String | left | 复选框和内容相对位置。可选项：left/right | N
 allow-uncheck | Boolean | false | 【开发中】是否允许取消选中 | N
 block | Boolean | true | 是否为块级元素 | N
 checked | Boolean | false | 是否选中 | N
@@ -78,7 +78,7 @@ change | `(checked: boolean)` | 值变化时触发
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-align | String | null | 复选框和内容相对位置；仅在使用 options 时生效。可选项：left/right | N
+placement | String | null | 复选框和内容相对位置；仅在使用 options 时生效。可选项：left/right | N
 borderless | Boolean | false | 是否开启无边框模式 | N
 disabled | Boolean | undefined | 是否禁用全部子单选框 | N
 icon | String / Array | 'fill-circle' | 自定义选中图标和非选中图标。示例：[选中态图标，非选中态图标]。值为 fill-circle 表示图标为填充型图标，值为 stroke-line 表示图标为描边型图标；仅在使用 options 时生效。TS 类型：`'fill-circle' | 'stroke-line' | Array<string>` | N
diff --git a/src/radio/__test__/__snapshots__/demo.test.js.snap b/src/radio/__test__/__snapshots__/demo.test.js.snap
index 524dd53d7..77c90df23 100644
--- a/src/radio/__test__/__snapshots__/demo.test.js.snap
+++ b/src/radio/__test__/__snapshots__/demo.test.js.snap
@@ -11,9 +11,9 @@ exports[`Radio Radio align demo works fine 1`] = `
     class="block"
   />
   <t-radio
-    align="right"
     defaultChecked="{{true}}"
     label="单选"
+    placement="right"
     value="radio2"
   />
 </align>
diff --git a/src/radio/_example/align/index.wxml b/src/radio/_example/align/index.wxml
index a62c28a46..eb51f7dd1 100644
--- a/src/radio/_example/align/index.wxml
+++ b/src/radio/_example/align/index.wxml
@@ -2,4 +2,4 @@
 
 <view class="block"></view>
 
-<t-radio value="radio2" label="单选" align="right" default-checked />
+<t-radio value="radio2" label="单选" placement="right" default-checked />
diff --git a/src/radio/props.ts b/src/radio/props.ts
index ab2ec8e61..486c2d12d 100644
--- a/src/radio/props.ts
+++ b/src/radio/props.ts
@@ -7,7 +7,7 @@
 import { TdRadioProps } from './type';
 const props: TdRadioProps = {
   /** 复选框和内容相对位置 */
-  align: {
+  placement: {
     type: String,
     value: 'left',
   },
diff --git a/src/radio/radio.ts b/src/radio/radio.ts
index d7546670e..4051314df 100644
--- a/src/radio/radio.ts
+++ b/src/radio/radio.ts
@@ -24,8 +24,8 @@ export default class Radio extends SuperComponent {
       type: 'ancestor',
       linked(parent) {
         this.parent = parent;
-        if (parent.data.align) {
-          this.setData({ align: parent.data.align });
+        if (parent.data.placement) {
+          this.setData({ placement: parent.data.placement });
         }
         if (parent.data.borderless) {
           this.setData({ borderless: true });
diff --git a/src/radio/radio.wxml b/src/radio/radio.wxml
index c9e6fd356..d1d1f9c1b 100644
--- a/src/radio/radio.wxml
+++ b/src/radio/radio.wxml
@@ -2,7 +2,7 @@
 
 <view
   style="{{_._style([style, customStyle])}}"
-  class="{{_.cls(classPrefix, [align, ['block', block]])}} class {{prefix}}-class"
+  class="{{_.cls(classPrefix, [placement, ['block', block]])}} class {{prefix}}-class"
   disabled="{{disabled}}"
   aria-role="radio"
   aria-checked="{{checked}}"
@@ -12,7 +12,7 @@
   bind:tap="handleTap"
 >
   <view
-    class="{{_.cls(classPrefix + '__icon', [align, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
+    class="{{_.cls(classPrefix + '__icon', [placement, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
   >
     <slot name="icon" wx:if="{{slotIcon}}" />
     <view wx:elif="{{customIcon}}" class="{{classPrefix}}__image">
@@ -56,5 +56,5 @@
     </view>
   </view>
 
-  <view wx:if="{{!borderless}}" class="{{_.cls(classPrefix + '__border', [align])}} {{prefix}}-class-border" />
+  <view wx:if="{{!borderless}}" class="{{_.cls(classPrefix + '__border', [placement])}} {{prefix}}-class-border" />
 </view>
diff --git a/src/radio/type.ts b/src/radio/type.ts
index c98c0c573..d4af04476 100644
--- a/src/radio/type.ts
+++ b/src/radio/type.ts
@@ -9,7 +9,7 @@ export interface TdRadioProps<T = RadioValue> {
    * 复选框和内容相对位置
    * @default left
    */
-  align?: {
+  placement?: {
     type: StringConstructor;
     value?: 'left' | 'right';
   };

From 8f1c4b04e97fff1a550dbd2186cf80f235d6249e Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 15:13:49 +0800
Subject: [PATCH 08/62] chore(Checkbox): align attribute is renamed to
 placement (#1629)

---
 src/checkbox/README.en-US.md | 2 +-
 src/checkbox/README.md       | 2 +-
 src/checkbox/checkbox.wxml   | 6 +++---
 src/checkbox/props.ts        | 2 +-
 src/checkbox/type.ts         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/checkbox/README.en-US.md b/src/checkbox/README.en-US.md
index 6e77d6459..9f7940375 100644
--- a/src/checkbox/README.en-US.md
+++ b/src/checkbox/README.en-US.md
@@ -5,7 +5,7 @@
 
 name | type | default | description | required
 -- | -- | -- | -- | --
-align | String | left | options：left/right | N
+placement | String | left | options：left/right | N
 block | Boolean | true | \- | N
 check-all | Boolean | false | \- | N
 checked | Boolean | false | \- | N
diff --git a/src/checkbox/README.md b/src/checkbox/README.md
index f1ff9c659..b56f536d5 100644
--- a/src/checkbox/README.md
+++ b/src/checkbox/README.md
@@ -64,7 +64,7 @@ isComponent: true
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-align | String | left | 多选框和内容相对位置。可选项：left/right | N
+placement | String | left | 多选框和内容相对位置。可选项：left/right | N
 block | Boolean | true | 是否为块级元素 | N
 check-all | Boolean | false | 用于标识是否为「全选选项」。单独使用无效，需在 CheckboxGroup 中使用 | N
 checked | Boolean | false | 是否选中 | N
diff --git a/src/checkbox/checkbox.wxml b/src/checkbox/checkbox.wxml
index d1bdb7e7a..9feb113dd 100644
--- a/src/checkbox/checkbox.wxml
+++ b/src/checkbox/checkbox.wxml
@@ -2,7 +2,7 @@
 
 <view
   style="{{_._style([style, customStyle])}}"
-  class="{{_.cls(classPrefix, [align, theme, ['checked', checked], ['block', block]])}} class {{prefix}}-class"
+  class="{{_.cls(classPrefix, [placement, theme, ['checked', checked], ['block', block]])}} class {{prefix}}-class"
   aria-role="checkbox"
   aria-checked="{{checked ? (indeterminate ? 'mixed' : true) : false}}"
   aria-disabled="{{disabled ? true : false}}"
@@ -11,7 +11,7 @@
 >
   <view
     wx:if="{{theme == 'default'}}"
-    class="{{_.cls(classPrefix + '__icon', [align, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
+    class="{{_.cls(classPrefix + '__icon', [placement, ['checked', checked], ['disabled', disabled]])}} {{prefix}}-class-icon"
   >
     <view wx:if="{{_.isArray(icon)}}" class="{{classPrefix}}__icon">
       <image src="{{checked ? icon[0] : icon[1]}}" class="{{classPrefix}}__icon-image" webp />
@@ -51,6 +51,6 @@
   </view>
   <view
     wx:if="{{theme == 'default' && !borderless}}"
-    class="{{_.cls(classPrefix + '__border', [align])}} {{prefix}}-class-border"
+    class="{{_.cls(classPrefix + '__border', [placement])}} {{prefix}}-class-border"
   />
 </view>
diff --git a/src/checkbox/props.ts b/src/checkbox/props.ts
index e99108aa5..24fa54249 100644
--- a/src/checkbox/props.ts
+++ b/src/checkbox/props.ts
@@ -7,7 +7,7 @@
 import { TdCheckboxProps } from './type';
 const props: TdCheckboxProps = {
   /** 多选框和内容相对位置 */
-  align: {
+  placement: {
     type: String,
     value: 'left',
   },
diff --git a/src/checkbox/type.ts b/src/checkbox/type.ts
index e646810ec..247c4f622 100644
--- a/src/checkbox/type.ts
+++ b/src/checkbox/type.ts
@@ -9,7 +9,7 @@ export interface TdCheckboxProps {
    * 多选框和内容相对位置
    * @default left
    */
-  align?: {
+  placement?: {
     type: StringConstructor;
     value?: 'left' | 'right';
   };

From cfddfb3fc136fe7bad2a39f7cfccd6ff55b75566 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 22 Feb 2023 15:19:12 +0800
Subject: [PATCH 09/62] chore(Search): remove the right-icon and add the
 clearable attribute (#1628)

---
 src/search/README.md                                |  5 +++--
 src/search/__test__/__snapshots__/demo.test.js.snap |  1 -
 .../__virtualHostSnapshot__/demo.test.js.snap       |  1 -
 src/search/__test__/index.test.js                   | 10 +++-------
 src/search/_example/action/index.wxml               |  1 -
 src/search/props.ts                                 |  5 +++++
 src/search/search.less                              |  6 +++---
 src/search/search.ts                                |  2 +-
 src/search/search.wxml                              | 13 +++----------
 src/search/type.ts                                  |  8 ++++++++
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/search/README.md b/src/search/README.md
index a58cef2bd..8517271cf 100644
--- a/src/search/README.md
+++ b/src/search/README.md
@@ -48,12 +48,13 @@ isComponent: true
 action | String / Slot | '' | 自定义右侧操作按钮文字 | N
 center | Boolean | false | 是否居中 | N
 disabled | Boolean | false | 是否禁用 | N
-external-classes | Array | - | 组件外部样式类名，分别用于设置组件外层类名、输入框类名、输入框容器类名、右侧 cancel 文本类名、左侧图标类名、右侧图标类型。`['t-class', 't-class-input', 't-class-input-container', 't-class-action','t-class-left','t-class-right']` | N
+external-classes | Array | - | 组件外部样式类名，分别用于设置组件外层类名、输入框类名、输入框容器类名、右侧 cancel 文本类名、左侧图标类名、右侧图标类型。`['t-class', 't-class-input', 't-class-input-container', 't-class-action','t-class-left','t-class-clear']` | N
 focus | Boolean | false | 是否聚焦 | N
 label | String | '' | 已废弃。左侧文本 | N
 left-icon | String / Slot | 'search' | 左侧图标 | N
 placeholder | String | '' | 占位符 | N
-right-icon | String / Slot | 'close-circle-filled' | 右侧图标 | N
+right-icon | String / Slot | 'close-circle-filled' | 已废弃。右侧图标 | N
+clearable | Boolean | true | 是否启用清除控件 | N
 shape | String | 'square' | 搜索框形状。可选项：square/round | N
 value | String | '' | 值 | N
 
diff --git a/src/search/__test__/__snapshots__/demo.test.js.snap b/src/search/__test__/__snapshots__/demo.test.js.snap
index 1e88a562f..01b84450c 100644
--- a/src/search/__test__/__snapshots__/demo.test.js.snap
+++ b/src/search/__test__/__snapshots__/demo.test.js.snap
@@ -13,7 +13,6 @@ exports[`Search Search action demo works fine 1`] = `
       bind:action-click="actionHandle"
       bind:blur="blurHandle"
       bind:change="changeHandle"
-      bind:clear="clearHandle"
       bind:focus="focusHandle"
     />
   </wx-view>
diff --git a/src/search/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/search/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 1e88a562f..01b84450c 100644
--- a/src/search/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/search/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -13,7 +13,6 @@ exports[`Search Search action demo works fine 1`] = `
       bind:action-click="actionHandle"
       bind:blur="blurHandle"
       bind:change="changeHandle"
-      bind:clear="clearHandle"
       bind:focus="focusHandle"
     />
   </wx-view>
diff --git a/src/search/__test__/index.test.js b/src/search/__test__/index.test.js
index 62ca5ec6b..76f109c48 100644
--- a/src/search/__test__/index.test.js
+++ b/src/search/__test__/index.test.js
@@ -120,15 +120,14 @@ describe('search', () => {
       ).toBeTruthy();
     });
 
-    it(':left-icon & right-icon', () => {
+    it(':left-icon', () => {
       const id = simulate.load({
-        template: `<t-search class="search" left-icon="{{leftIcon}}" right-icon="{{rightIcon}}" value="{{value}}"></t-search>`,
+        template: `<t-search class="search" left-icon="{{leftIcon}}" value="{{value}}"></t-search>`,
         usingComponents: {
           't-search': search,
         },
         data: {
           leftIcon: 'add-circle',
-          rightIcon: 'caret-right',
           value: 'test',
         },
       });
@@ -137,9 +136,6 @@ describe('search', () => {
 
       const $leftIcon = comp.querySelector('.search >>> .t-icon-add-circle');
       expect($leftIcon).toBeDefined();
-
-      const $rightIcon = comp.querySelector('.search >>> .t-icon-caret-right');
-      expect($rightIcon).toBeDefined();
     });
 
     it(':shape', () => {
@@ -210,7 +206,7 @@ describe('search', () => {
       const comp = simulate.render(id);
       comp.attach(document.createElement('parent-wrapper'));
 
-      const $clear = comp.querySelector('.search >>> .t-search__right');
+      const $clear = comp.querySelector('.search >>> .t-search__clear');
       $clear.dispatchEvent('tap');
       await simulate.sleep(20);
       expect(onClear).toHaveBeenCalledTimes(1);
diff --git a/src/search/_example/action/index.wxml b/src/search/_example/action/index.wxml
index 443ed59e9..12cb35e82 100644
--- a/src/search/_example/action/index.wxml
+++ b/src/search/_example/action/index.wxml
@@ -6,7 +6,6 @@
     action="{{actionText}}"
     bind:blur="blurHandle"
     bind:focus="focusHandle"
-    bind:clear="clearHandle"
     bind:action-click="actionHandle"
     bind:change="changeHandle"
   />
diff --git a/src/search/props.ts b/src/search/props.ts
index 5c679d440..62c72c8c4 100644
--- a/src/search/props.ts
+++ b/src/search/props.ts
@@ -60,6 +60,11 @@ const props: TdSearchProps = {
     type: String,
     value: '',
   },
+  /** 是否启用清除控件 */
+  clearable: {
+    type: Boolean,
+    value: true,
+  },
 };
 
 export default props;
diff --git a/src/search/search.less b/src/search/search.less
index b355c6b06..a06f9be03 100644
--- a/src/search/search.less
+++ b/src/search/search.less
@@ -11,7 +11,7 @@
 @search-square-radius: var(--td-search-square-radius, @radius-default);
 @search-round-radius: calc(@search-height / 2);
 @search-action-color: var(--td-search-action-color, @brand-color);
-@search-right-icon-color: var(--td-search-right-icon-color, @font-gray-3);
+@search-clear-icon-color: var(--td-search-clear-icon-color, @font-gray-3);
 
 .@{prefix}-search {
   display: flex;
@@ -62,10 +62,10 @@
     }
   }
 
-  &__right {
+  &__clear {
     position: relative;
     margin-left: 10px;
-    color: @search-right-icon-color;
+    color: @search-clear-icon-color;
     .hotspot-expanded();
   }
 
diff --git a/src/search/search.ts b/src/search/search.ts
index 9b55bcc24..9e6a820d2 100644
--- a/src/search/search.ts
+++ b/src/search/search.ts
@@ -13,7 +13,7 @@ export default class Search extends SuperComponent {
     `${prefix}-class-input`,
     `${prefix}-class-action`,
     `${prefix}-class-left`,
-    `${prefix}-class-right`,
+    `${prefix}-class-clear`,
   ];
 
   options = {
diff --git a/src/search/search.wxml b/src/search/search.wxml
index 9eda6baf9..92156d5f4 100644
--- a/src/search/search.wxml
+++ b/src/search/search.wxml
@@ -30,20 +30,13 @@
       bind:confirm="onConfirm"
     />
     <view
-      wx:if="{{value !==''}}"
-      class="{{classPrefix}}__right {{prefix}}-class-right"
+      wx:if="{{value !=='' && clearable}}"
+      class="{{classPrefix}}__clear {{prefix}}-class-clear"
       bind:tap="handleClear"
       aria-role="button"
       aria-label="清除"
     >
-      <t-icon
-        wx:if="{{rightIcon}}"
-        name="{{rightIcon}}"
-        class="{{prefix}}-icon"
-        size="18px"
-        color="rgba(187,187,187,1)"
-      />
-      <slot name="right-icon" />
+      <t-icon name="close-circle-filled" size="24" />
     </view>
   </view>
   <view
diff --git a/src/search/type.ts b/src/search/type.ts
index 522cd903b..542ffcea4 100644
--- a/src/search/type.ts
+++ b/src/search/type.ts
@@ -100,4 +100,12 @@ export interface TdSearchProps {
     type: StringConstructor;
     value?: string;
   };
+  /**
+   * 是否启用清除控件
+   * @default true
+   */
+  clearable: {
+    type: BooleanConstructor;
+    value?: boolean;
+  };
 }

From 86f4742bd7ed1a1927dbfba46b4927b566523568 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Wed, 22 Feb 2023 15:20:18 +0800
Subject: [PATCH 10/62] feat(button): support suffix slot (#1624)

* feat(button): support suffix slot

* test(button): update snapshot
---
 src/button/README.en-US.md                          |  6 +++---
 src/button/README.md                                |  3 ++-
 src/button/__test__/__snapshots__/demo.test.js.snap | 12 ++++++------
 src/button/_example/icon-btn/index.wxml             |  2 +-
 src/button/_example/shape/index.wxml                |  4 ++--
 src/button/button.wxml                              |  3 ++-
 src/button/props.ts                                 |  2 +-
 src/button/type.ts                                  | 10 +---------
 8 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/button/README.en-US.md b/src/button/README.en-US.md
index e05af2262..ee2b1d7e5 100644
--- a/src/button/README.en-US.md
+++ b/src/button/README.en-US.md
@@ -11,12 +11,12 @@ custom-dataset | Object | - | Typescript：`any` | N
 disabled | Boolean | false | disable the button, make it can not be clicked | N
 external-classes | Array | - | `['t-class', 't-class-icon', 't-class-loading']` | N
 ghost | Boolean | false | make background-color to be transparent | N
-icon | String | - | icon name | N
-icon-props | Object | {} | icon properties | N
+icon | String / Object | - | icon name | N
 loading | Boolean | false | set button to be loading state | N
 loading-props | Object | - | Typescript：`LoadingProps`，[Loading API Documents](./loading?tab=api)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/button/type.ts) | N
 shape | String | rectangle | button shape。options：rectangle/square/round/circle | N
 size | String | medium | a button has three size。options：small/medium/large。Typescript：`SizeEnum` | N
+suffix | Slot | - | \- | N
 theme | String | default | button theme。options：default/primary/danger | N
 type | String | - | type of button element, same as formType of Miniprogram。options：submit/reset | N
 variant | String | base | button variant。options：base/outline/text | N
@@ -43,4 +43,4 @@ bindchooseavatar | Eventhandle | - | \- | N
 
 name | params | description
 -- | -- | --
-tap | `event` | \-
+tap | `(e: MouseEvent)` | trigger on click
diff --git a/src/button/README.md b/src/button/README.md
index f99fbb4e3..f318844e7 100644
--- a/src/button/README.md
+++ b/src/button/README.md
@@ -73,9 +73,10 @@ external-classes | Array | - | 组件类名。`['t-class', 't-class-icon', 't-cl
 ghost | Boolean | false | 是否为幽灵按钮（镂空按钮） | N
 icon | String / Object | - | 图标名称。值为字符串表示图标名称，值为 `Object` 类型，表示透传至 `icon`。 | N
 loading | Boolean | false | 是否显示为加载状态 | N
-loading-props | Object | - | 加载loading样式。TS 类型：`LoadingProps`，[Loading API Documents](./loading?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/button/type.ts) | N
+loading-props | Object | - | 透传至 Loading 组件。TS 类型：`LoadingProps`，[Loading API Documents](./loading?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/button/type.ts) | N
 shape | String | rectangle | 按钮形状，有 4 种：长方形、正方形、圆角长方形、圆形。可选项：rectangle/square/round/circle | N
 size | String | medium | 组件尺寸。可选项：extra-small/small/medium/large。TS 类型：`SizeEnum` | N
+suffix | Slot | - | 右侧内容，可用于定义右侧图标 | N
 theme | String | default | 组件风格，依次为品牌色、危险色。可选项：default/primary/danger/light | N
 type | String | - | 同小程序的 formType。可选项：submit/reset | N
 variant | String | base | 按钮形式，基础、线框、文字。可选项：base/outline/dashed/text | N
diff --git a/src/button/__test__/__snapshots__/demo.test.js.snap b/src/button/__test__/__snapshots__/demo.test.js.snap
index caeac6dbb..09d357f55 100644
--- a/src/button/__test__/__snapshots__/demo.test.js.snap
+++ b/src/button/__test__/__snapshots__/demo.test.js.snap
@@ -182,9 +182,9 @@ exports[`Button Button icon-btn demo works fine 1`] = `
       加载中
     </t-button>
     <t-button
-      ariaLabel="返回"
+      ariaLabel="搜索"
       class="margin"
-      icon="chevron-left"
+      icon="search"
       shape="square"
       size="large"
       theme="primary"
@@ -205,8 +205,8 @@ exports[`Button Button shape demo works fine 1`] = `
       填充按钮
     </t-button>
     <t-button
-      ariaLabel="返回"
-      icon="chevron-left"
+      ariaLabel="搜索"
+      icon="search"
       shape="square"
       size="large"
       theme="primary"
@@ -219,8 +219,8 @@ exports[`Button Button shape demo works fine 1`] = `
       填充按钮
     </t-button>
     <t-button
-      ariaLabel="返回"
-      icon="chevron-left"
+      ariaLabel="搜索"
+      icon="search"
       shape="circle"
       size="large"
       theme="primary"
diff --git a/src/button/_example/icon-btn/index.wxml b/src/button/_example/icon-btn/index.wxml
index c67a28a56..cf1312fbc 100644
--- a/src/button/_example/icon-btn/index.wxml
+++ b/src/button/_example/icon-btn/index.wxml
@@ -1,5 +1,5 @@
 <view class="button-example">
   <t-button theme="primary" icon="app" content="填充按钮" size="large" class="margin"></t-button>
   <t-button theme="primary" size="large" loading class="margin">加载中</t-button>
-  <t-button theme="primary" icon="chevron-left" shape="square" size="large" class="margin" aria-label="返回"></t-button>
+  <t-button theme="primary" icon="search" shape="square" size="large" class="margin" aria-label="搜索"></t-button>
 </view>
diff --git a/src/button/_example/shape/index.wxml b/src/button/_example/shape/index.wxml
index 3d2f76866..c799ec0bd 100644
--- a/src/button/_example/shape/index.wxml
+++ b/src/button/_example/shape/index.wxml
@@ -1,8 +1,8 @@
 <view class="button-example">
   <t-button theme="primary" size="large">填充按钮</t-button>
-  <t-button theme="primary" size="large" icon="chevron-left" shape="square" aria-label="返回"></t-button>
+  <t-button theme="primary" size="large" icon="search" shape="square" aria-label="搜索"></t-button>
   <t-button theme="primary" size="large" shape="round">填充按钮</t-button>
-  <t-button theme="primary" size="large" icon="chevron-left" shape="circle" aria-label="返回"></t-button>
+  <t-button theme="primary" size="large" icon="search" shape="circle" aria-label="搜索"></t-button>
 </view>
 
 <t-button theme="primary" size="large" block t-class="external-class">填充按钮</t-button>
diff --git a/src/button/button.wxml b/src/button/button.wxml
index 1e57bb661..b2389852a 100644
--- a/src/button/button.wxml
+++ b/src/button/button.wxml
@@ -49,10 +49,11 @@
     loading
     t-class="{{classPrefix}}__loading {{classPrefix}}__loading--wrapper"
     t-class-indicator="{{classPrefix}}__loading--indicator {{prefix}}-class-loading"
-  ></t-loading>
+  />
   <view class="{{classPrefix}}__content">
     <slot name="content" />
     <block>{{content}}</block>
     <slot />
   </view>
+  <slot name="suffix" />
 </button>
diff --git a/src/button/props.ts b/src/button/props.ts
index 0115fc96c..a08db5891 100644
--- a/src/button/props.ts
+++ b/src/button/props.ts
@@ -42,7 +42,7 @@ const props: TdButtonProps = {
     type: Boolean,
     value: false,
   },
-  /** 加载loading样式 */
+  /** 透传至 Loading 组件 */
   loadingProps: {
     type: Object,
   },
diff --git a/src/button/type.ts b/src/button/type.ts
index 8c5e87603..4069e1656 100644
--- a/src/button/type.ts
+++ b/src/button/type.ts
@@ -30,14 +30,6 @@ export interface TdButtonProps {
     type: ObjectConstructor;
     value?: any;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 禁用状态
    * @default false
@@ -77,7 +69,7 @@ export interface TdButtonProps {
     value?: boolean;
   };
   /**
-   * 加载loading样式
+   * 透传至 Loading 组件
    */
   loadingProps?: {
     type: ObjectConstructor;

From 062ef4316556e99daad479048a1f90f9be4dd6b0 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Thu, 23 Feb 2023 12:44:57 +0800
Subject: [PATCH 11/62] chore(Avatar): remove bordered attribute (#1632)

* chore(Avatar): remove bordered attribute

* fix: fix cr
---
 src/avatar-group/props.ts                     |  2 +-
 src/avatar/README.md                          |  4 ++--
 .../__test__/__snapshots__/demo.test.js.snap  | 14 +------------
 .../__test__/__snapshots__/index.test.js.snap |  2 +-
 .../__virtualHostSnapshot__/demo.test.js.snap | 14 +------------
 .../index.test.js.snap                        |  2 +-
 src/avatar/_example/action/index.wxml         |  4 ++--
 src/avatar/_example/exhibition/index.wxml     |  4 ++--
 src/avatar/avatar.less                        | 21 -------------------
 src/avatar/avatar.wxml                        |  2 +-
 src/avatar/avatar.wxs                         |  4 +---
 11 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/src/avatar-group/props.ts b/src/avatar-group/props.ts
index 319e30e35..598ebd22f 100644
--- a/src/avatar-group/props.ts
+++ b/src/avatar-group/props.ts
@@ -9,7 +9,7 @@ const props: TdAvatarGroupProps = {
   /** 图片之间的层叠关系，可选值：左侧图片在上和右侧图片在上 */
   cascading: {
     type: String,
-    value: 'right-up',
+    value: 'left-up',
   },
   /** 头像数量超出时，会出现一个头像折叠元素。该元素内容可自定义。默认为 `+N`。示例：`+5`，`...`, `更多` */
   collapseAvatar: {
diff --git a/src/avatar/README.md b/src/avatar/README.md
index 4092efffc..d083ac64e 100644
--- a/src/avatar/README.md
+++ b/src/avatar/README.md
@@ -61,7 +61,7 @@ isComponent: true
 -- | -- | -- | -- | --
 alt | String | - | 头像替换文本，仅当图片加载失败时有效 | N
 badge-props | Object | - | 头像右上角提示信息，继承 Badge 组件的全部特性。如：小红点，或者数字。TS 类型：`BadgeProps`，[Badge API Documents](./badge?tab=api)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/avatar/type.ts) | N
-bordered | Boolean | false | 是否显示外边框 | N
+bordered | Boolean | false | 已废弃。是否显示外边框 | N
 external-classes | Array | - | 组件类名，用于设置组件外层元素类名。`['t-class', 't-class-image', 't-class-icon', 't-class-alt', 't-class-content']` | N
 hide-on-load-failed | Boolean | false | 加载失败时隐藏图片 | N
 icon | String / Object | - | 图标。值为字符串表示图标名称，值为 `Object` 类型，表示透传至 `icon`。 | N
@@ -80,7 +80,7 @@ error | \- | 图片加载失败时触发
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-cascading | String | 'right-up' | 图片之间的层叠关系，可选值：左侧图片在上和右侧图片在上。可选项：left-up/right-up。TS 类型：`CascadingValue` `type CascadingValue = 'left-up' \| 'right-up'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/avatar-group/type.ts) | N
+cascading | String | 'left-up' | 图片之间的层叠关系，可选值：左侧图片在上和右侧图片在上。可选项：left-up/right-up。TS 类型：`CascadingValue` `type CascadingValue = 'left-up' \| 'right-up'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/avatar-group/type.ts) | N
 collapse-avatar | String / Slot | - | 头像数量超出时，会出现一个头像折叠元素。该元素内容可自定义。默认为 `+N`。示例：`+5`，`...`, `更多` | N
 external-classes | Array | - | 组件类名，用于设置组件外层元素类名。`['t-class', 't-class-image', 't-class-content']` | N
 max | Number | - | 能够同时显示的最多头像数量 | N
diff --git a/src/avatar/__test__/__snapshots__/demo.test.js.snap b/src/avatar/__test__/__snapshots__/demo.test.js.snap
index 789d390bf..fa3684f29 100644
--- a/src/avatar/__test__/__snapshots__/demo.test.js.snap
+++ b/src/avatar/__test__/__snapshots__/demo.test.js.snap
@@ -3,30 +3,25 @@
 exports[`Avatar Avatar action demo works fine 1`] = `
 <action>
   <t-avatar-group
+    cascading="right-up"
     max="5"
   >
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar2.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar3.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar4.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar5.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
   </t-avatar-group>
@@ -101,32 +96,25 @@ exports[`Avatar Avatar character-avatar demo works fine 1`] = `
 exports[`Avatar Avatar exhibition demo works fine 1`] = `
 <exhibition>
   <t-avatar-group
-    cascading="left-up"
     collapseAvatar="+5"
     max="5"
   >
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar2.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar3.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar4.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar5.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
   </t-avatar-group>
diff --git a/src/avatar/__test__/__snapshots__/index.test.js.snap b/src/avatar/__test__/__snapshots__/index.test.js.snap
index c581813b4..1807438ac 100644
--- a/src/avatar/__test__/__snapshots__/index.test.js.snap
+++ b/src/avatar/__test__/__snapshots__/index.test.js.snap
@@ -30,7 +30,7 @@ exports[`Avatar & Avatar Groups Avatar Props : style && customStyle 1`] = `
               ariaHidden="{{false}}"
               ariaLabel="头像"
               ariaRole="img"
-              class="t-avatar t-avatar--circle  t-avatar--medium t-class-image"
+              class="t-avatar t-avatar--circle t-avatar--medium t-class-image"
               style=""
             >
               <wx-view
diff --git a/src/avatar/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/avatar/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 789d390bf..fa3684f29 100644
--- a/src/avatar/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/avatar/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -3,30 +3,25 @@
 exports[`Avatar Avatar action demo works fine 1`] = `
 <action>
   <t-avatar-group
+    cascading="right-up"
     max="5"
   >
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar2.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar3.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar4.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar5.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
   </t-avatar-group>
@@ -101,32 +96,25 @@ exports[`Avatar Avatar character-avatar demo works fine 1`] = `
 exports[`Avatar Avatar exhibition demo works fine 1`] = `
 <exhibition>
   <t-avatar-group
-    cascading="left-up"
     collapseAvatar="+5"
     max="5"
   >
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar2.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar3.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar4.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar5.png"
     />
     <t-avatar
-      bordered="{{true}}"
       image="https://tdesign.gtimg.com/miniprogram/images/avatar1.png"
     />
   </t-avatar-group>
diff --git a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
index c292c83f6..4d57821ab 100644
--- a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -30,7 +30,7 @@ exports[`Avatar & Avatar Groups Avatar Props : style && customStyle 1`] = `
               ariaHidden="{{false}}"
               ariaLabel="头像"
               ariaRole="img"
-              class="t-avatar t-avatar--circle  t-avatar--medium t-class-image"
+              class="t-avatar t-avatar--circle t-avatar--medium t-class-image"
               style=""
             >
               <wx-view
diff --git a/src/avatar/_example/action/index.wxml b/src/avatar/_example/action/index.wxml
index 88e40e27b..bd0b5fa11 100644
--- a/src/avatar/_example/action/index.wxml
+++ b/src/avatar/_example/action/index.wxml
@@ -1,3 +1,3 @@
-<t-avatar-group max="5">
-  <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
+<t-avatar-group cascading="right-up" max="5">
+  <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" />
 </t-avatar-group>
diff --git a/src/avatar/_example/exhibition/index.wxml b/src/avatar/_example/exhibition/index.wxml
index 9724d19c9..aae96784f 100644
--- a/src/avatar/_example/exhibition/index.wxml
+++ b/src/avatar/_example/exhibition/index.wxml
@@ -1,3 +1,3 @@
-<t-avatar-group max="5" cascading="left-up" collapseAvatar="+5">
-  <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" bordered />
+<t-avatar-group max="5" collapseAvatar="+5">
+  <t-avatar wx:for="{{pics}}" wx:for-item="pic" wx:key="index" image="{{pic}}" />
 </t-avatar-group>
diff --git a/src/avatar/avatar.less b/src/avatar/avatar.less
index 379f7e1b0..091f218aa 100644
--- a/src/avatar/avatar.less
+++ b/src/avatar/avatar.less
@@ -14,10 +14,6 @@
 @avatar-icon-medium-font-size: var(--td-avatar-icon-medium-font-size, 48rpx);
 @avatar-icon-large-font-size: var(--td-avatar-icon-large-font-size, 64rpx);
 
-@avatar-border-width-small: var(--td-avatar-border-width-small, 4rpx);
-@avatar-border-width-medium: var(--td-avatar-border-width-medium, 6rpx);
-@avatar-border-width-large: var(--td-avatar-border-width-large, 8rpx);
-@avatar-border-color: var(--td-avatar-border-color, #fff);
 @avatar-circle-border-radius: var(--td-avatar-circle-border-radius, @radius-circle);
 @avatar-round-border-radius: var(--td-avatar-round-border-radius, @radius-default);
 
@@ -96,21 +92,4 @@
       height: 0;
     }
   }
-
-  //头像边框
-  &--border {
-    border-color: @avatar-border-color;
-    border-style: solid;
-    &-small {
-      border-width: @avatar-border-width-small;
-    }
-
-    &-medium {
-      border-width: @avatar-border-width-medium;
-    }
-
-    &-large {
-      border-width: @avatar-border-width-large;
-    }
-  }
 }
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index e908f5ad3..7a6e333da 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -21,7 +21,7 @@
     t-class-count="{{badgeProps.tClassCount}}"
   >
     <view
-      class="{{this.getClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image"
+      class="{{this.getClass(classPrefix, size, shape)}} {{prefix}}-class-image"
       style="{{this.getSize(size)}}"
       aria-label="{{ ariaLabel || alt ||'头像'}}"
       aria-role="{{ ariaRole || 'img'}}"
diff --git a/src/avatar/avatar.wxs b/src/avatar/avatar.wxs
index d67e5d88c..3880514d1 100644
--- a/src/avatar/avatar.wxs
+++ b/src/avatar/avatar.wxs
@@ -1,11 +1,9 @@
 module.exports = {
-  getClass: function (classPrefix, size, shape, bordered) {
+  getClass: function (classPrefix, size, shape) {
     var hasPx = (size || '').indexOf('px') > -1;
-    var borderSize = hasPx ? 'medium' : size;
     var classNames = [
       classPrefix,
       classPrefix + (shape === 'round' ? '--round' : '--circle'),
-      bordered ? classPrefix + '--border' + ' ' + classPrefix + '--border-' + borderSize : '',
       hasPx ? '' : classPrefix + '--' + size,
     ];
     return classNames.join(' ');

From 221aba860a8a471a3ccc051e2ff9b9160c78c068 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Thu, 23 Feb 2023 12:47:05 +0800
Subject: [PATCH 12/62] chore(Message): remove action and add the link
 attribute (#1637)

* chore(Message): remove action and add the link attribute

* fix: fix cr
---
 src/link/link.wxml                            |  1 +
 src/message/README.en-US.md                   |  3 ++-
 src/message/README.md                         | 12 ++++-----
 .../__test__/__snapshots__/index.test.js.snap |  2 +-
 .../index.test.js.snap                        |  2 +-
 src/message/_example/base/index.js            |  7 ++++-
 src/message/message.json                      |  2 +-
 src/message/message.less                      | 15 +++--------
 src/message/message.ts                        | 24 +++++++++++++----
 src/message/message.wxml                      | 27 +++++++++++--------
 src/message/props.ts                          |  4 +++
 src/message/type.ts                           |  7 +++++
 12 files changed, 68 insertions(+), 38 deletions(-)

diff --git a/src/link/link.wxml b/src/link/link.wxml
index d84061346..fb8015232 100644
--- a/src/link/link.wxml
+++ b/src/link/link.wxml
@@ -33,6 +33,7 @@
   <view class="{{classPrefix}}__content {{prefix}}-class-content">
     <block wx:if="{{content}}">{{content}}</block>
     <slot name="content" />
+    <slot />
   </view>
   <view class="{{classPrefix}}__suffix-icon">
     <slot name="suffix-icon" />
diff --git a/src/message/README.en-US.md b/src/message/README.en-US.md
index 2b9197a3a..dd3225a21 100644
--- a/src/message/README.en-US.md
+++ b/src/message/README.en-US.md
@@ -10,7 +10,7 @@ align | String | left | options：left/center。Typescript：`MessageAlignType`
 close-btn | String / Boolean / Object / Slot | false | \- | N
 content | String / Slot | - | \- | N
 duration | Number | 3000 | \- | N
-external-classes | Array | - | `['t-class', 't-class-content', 't-class-icon', 't-class-action', 't-class-close-btn']` | N
+external-classes | Array | - | `['t-class', 't-class-content', 't-class-icon', 't-class-link', 't-class-close-btn']` | N
 icon | String / Boolean / Object/ Slot | true | Typescript：`boolean \| 'info' \| 'bell'` | N
 marquee | Boolean / Object | false | Typescript：`boolean \| DrawMarquee` `interface DrawMarquee { speed?: number; loop?: number; delay?: number }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/message/type.ts) | N
 offset | Array | - | Typescript：`Array<string \| number>` | N
@@ -26,3 +26,4 @@ name | params | description
 action-btn-click | - | \-
 close-btn-click | - | \-
 duration-end | \- | \-
+link-click | \- | \-
diff --git a/src/message/README.md b/src/message/README.md
index bcaf18211..4660f7a56 100644
--- a/src/message/README.md
+++ b/src/message/README.md
@@ -45,25 +45,25 @@ import Message from 'tdesign-miniprogram/message/index';
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-action | String / Slot | - | 操作 | N
+action | String / Slot | - | 已废弃。操作 | N
 align | String | left | 文本对齐方式。可选项：left/center。TS 类型：`MessageAlignType` `type MessageAlignType = 'left' \| 'center'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/message/type.ts) | N
 close-btn | String / Boolean / Object / Slot | false | 关闭按钮，可以自定义。值为 true 显示默认关闭按钮，值为 false 不显示关闭按钮。值类型为 string ，如：'user'，则显示组件内置图标。值类型为 object ，则会透传至 icon 组件。| N
 content | String / Slot | - | 用于自定义消息弹出内容 | N
 duration | Number | 3000 | 消息内置计时器，计时到达时会触发 duration-end 事件。单位：毫秒。值为 0 则表示没有计时器。 | N
-external-classes | Array | - | 样式类名，分别用于设置 组件外层、消息内容、左侧图标、操作按钮、关闭按钮等元素类名。`['t-class', 't-class-content', 't-class-icon', 't-class-action', 't-class-close-btn']` | N
+external-classes | Array | - | 样式类名，分别用于设置 组件外层、消息内容、左侧图标、操作按钮、关闭按钮等元素类名。`['t-class', 't-class-content', 't-class-icon', 't-class-link', 't-class-close-btn']` | N
 icon | String / Boolean / Object / Slot | true | 消息提醒前面的图标，可以自定义。值为 true 则根据 theme 显示对应的图标，值为 false 则不显示图标。值为 true 显示默认关闭按钮，值为 false 不显示关闭按钮。值类型为 string ，如：'info'，则显示组件内置图标。值类型为 object ，则会透传至 icon 组件。| N
-marquee | Boolean / Object | false | 跑马灯效果。speed 指速度控制；loop 指循环播放次数，值为 -1 表示循环播放，值为 0 表示不循环播放；delay 表示延迟多久开始播放。TS 类型：`boolean \| DrawMarquee` `interface DrawMarquee { speed?: number; loop?: number
-; delay?: number }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/message/type.ts) | N
+marquee | Boolean / Object | false | 跑马灯效果。speed 指速度控制；loop 指循环播放次数，值为 -1 表示循环播放，值为 0 表示不循环播放；delay 表示延迟多久开始播放。TS 类型：`boolean \| DrawMarquee` `interface DrawMarquee { speed?: number; loop?: number; delay?: number }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/message/type.ts) | N
 offset | Array | - | 相对于 placement 的偏移量，默认单位 rpx。示例：[-10, 20] 或 ['10rpx', '8rpx']。TS 类型：`Array<string \| number>` | N
 theme | String | info | 消息组件风格。可选项：info/success/warning/error。TS 类型：`MessageThemeList` `type MessageThemeList = 'info' \| 'success' \| 'warning' \| 'error'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/message/type.ts) | N
 visible | Boolean | false | 是否显示，隐藏时默认销毁组件 | N
 default-visible | Boolean | false | 是否显示，隐藏时默认销毁组件。非受控属性 | N
 z-index | Number | 15000 | 元素层级，样式默认为 15000 | N
-
+link | String / Object / Slot | - | 链接名称。值为字符串表示链接名称，值为 `Object` 类型，表示透传至 `Link`。 | N
 ### Message Events
 
 名称 | 参数 | 描述
 -- | -- | --
-action-btn-click | - | 当操作按钮存在时，用户点击操作按钮时触发
+action-btn-click | - | 已废弃。当操作按钮存在时，用户点击操作按钮时触发
 close-btn-click | - | 当关闭按钮存在时，用户点击关闭按钮触发
 duration-end | \- | 计时结束后触发
+link-click | - | 当`link`链接存在时，点击链接文本时触发
diff --git a/src/message/__test__/__snapshots__/index.test.js.snap b/src/message/__test__/__snapshots__/index.test.js.snap
index 42453af0f..67aa8f6c8 100644
--- a/src/message/__test__/__snapshots__/index.test.js.snap
+++ b/src/message/__test__/__snapshots__/index.test.js.snap
@@ -52,7 +52,7 @@ exports[`message props : style && customStyle 1`] = `
             bind:tap="onTap"
           >
             <wx-label
-              class="t-icon-error-circle-filled t-icon-base"
+              class="t-icon-info-circle-filled t-icon-base"
             />
           </wx-view>
         </t-icon>
diff --git a/src/message/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/message/__test__/__virtualHostSnapshot__/index.test.js.snap
index 42453af0f..67aa8f6c8 100644
--- a/src/message/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/message/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -52,7 +52,7 @@ exports[`message props : style && customStyle 1`] = `
             bind:tap="onTap"
           >
             <wx-label
-              class="t-icon-error-circle-filled t-icon-base"
+              class="t-icon-info-circle-filled t-icon-base"
             />
           </wx-view>
         </t-icon>
diff --git a/src/message/_example/base/index.js b/src/message/_example/base/index.js
index 9157dbd9a..28168f484 100644
--- a/src/message/_example/base/index.js
+++ b/src/message/_example/base/index.js
@@ -50,7 +50,12 @@ Component({
         icon: 'notification-filled',
         content: '这是一条带操作的消息通知',
         duration: -1,
-        action: '按钮',
+        link: {
+          content: '链接',
+          navigatorProps: {
+            url: '/page/xxx/xxx',
+          },
+        },
       });
     },
   },
diff --git a/src/message/message.json b/src/message/message.json
index ef9e100f2..75c11ffa3 100644
--- a/src/message/message.json
+++ b/src/message/message.json
@@ -2,6 +2,6 @@
   "component": true,
   "usingComponents": {
     "t-icon": "../icon/icon",
-    "t-button": "../button/button"
+    "t-link": "../link/link"
   }
 }
diff --git a/src/message/message.less b/src/message/message.less
index 9cb4186f1..319431223 100644
--- a/src/message/message.less
+++ b/src/message/message.less
@@ -1,7 +1,7 @@
 @import '../common/style/index.less';
 
+@message-height: 96rpx;
 @message-horizontal-padding: 32rpx;
-@message-vertical-padding: 24rpx;
 @message-z-index: 15000;
 
 @message-align: flex-start;
@@ -28,9 +28,10 @@
   right: 0;
   display: flex;
   justify-content: @message-align;
+  height: @message-height;
   align-items: center;
   z-index: @message-z-index;
-  padding: @message-vertical-padding @message-horizontal-padding;
+  padding: 0 @message-horizontal-padding;
   box-sizing: border-box;
   border-radius: @message-border-radius;
   line-height: 1;
@@ -85,16 +86,8 @@
   }
 
   &__icon--right:not(:empty),
-  .@{message}__btn--right {
+  &__link {
     flex: 0 0 auto;
     margin-left: @spacer;
   }
-
-  .@{message}__btn--right {
-    font-size: @message-content-font-size;
-    line-height: @message-content-height;
-    height: @message-content-height;
-    border-radius: @message-border-radius;
-    padding: 0;
-  }
 }
diff --git a/src/message/message.ts b/src/message/message.ts
index a1dc2edec..5d2236f08 100644
--- a/src/message/message.ts
+++ b/src/message/message.ts
@@ -2,13 +2,22 @@ import { SuperComponent, wxComponent, ComponentsOptionsType } from '../common/sr
 import config from '../common/config';
 import { MessageProps } from './message.interface';
 import props from './props';
-import { getRect, unitConvert, calcIcon } from '../common/utils';
+import { getRect, unitConvert, calcIcon, isObject } from '../common/utils';
 
 const { prefix } = config;
 const name = `${prefix}-message`;
 
 // 展示动画持续时间
 const SHOW_DURATION = 500;
+
+// 主题图标
+const THEME_ICON = {
+  info: 'info-circle-filled',
+  success: 'check-circle-filled',
+  warning: 'info-circle-filled',
+  error: 'error-circle-filled',
+};
+
 @wxComponent()
 export default class Message extends SuperComponent {
   externalClasses = [
@@ -50,12 +59,17 @@ export default class Message extends SuperComponent {
       }
     },
 
-    icon(v) {
+    'icon, theme'(icon, theme) {
       this.setData({
-        _icon: calcIcon(v, 'error-circle-filled'),
+        _icon: calcIcon(icon, THEME_ICON[theme]),
       });
     },
 
+    link(v) {
+      const _link = isObject(v) ? { ...v } : { content: v };
+      this.setData({ _link });
+    },
+
     closeBtn(v) {
       this.setData({
         _closeBtn: calcIcon(v, 'close'),
@@ -206,7 +220,7 @@ export default class Message extends SuperComponent {
     this.triggerEvent('close-btn-click');
   }
 
-  handleBtnClick() {
-    this.triggerEvent('action-btn-click', { self: this });
+  handleLinkClick() {
+    this.triggerEvent('link-click');
   }
 }
diff --git a/src/message/message.wxml b/src/message/message.wxml
index d9bb27c84..1e508c99d 100644
--- a/src/message/message.wxml
+++ b/src/message/message.wxml
@@ -24,19 +24,24 @@
       <view class="{{classPrefix}}__text {{prefix}}-class-content" id="{{classPrefix}}__text" animation="{{animation}}">
         <block wx:if="{{content}}">{{content}}</block>
         <slot name="content" />
+        <slot />
       </view>
     </view>
-
-    <t-button
-      wx:if="{{action}}"
-      t-class="{{classPrefix}}__btn--right {{prefix}}-class-action"
-      theme="primary"
-      variant="text"
-      size="small"
-      bind:tap="handleBtnClick"
-      >{{action}}</t-button
-    >
-    <slot name="action" />
+    <t-link
+      wx:if="{{_link.content}}"
+      class="{{classPrefix}}__link {{prefix}}-class-link"
+      style="{{_._style([_link.style, _link.customStyle])}}"
+      theme="{{_link.theme || 'primary'}}"
+      size="{{_link.size || 'medium'}}"
+      prefixIcon="{{_link.prefixIcon || false}}"
+      suffixIcon="{{_link.suffixIcon || false}}"
+      status="{{_link.status || 'normal'}}"
+      underline="{{_link.underline || false}}"
+      content="{{_link.content || ''}}"
+      navigatorProps="{{_link.navigatorProps || null}}"
+      bind:complete="handleLinkClick"
+    />
+    <slot name="link" />
 
     <view class="{{classPrefix}}__icon--right" bind:tap="handleClose">
       <slot name="close-btn" />
diff --git a/src/message/props.ts b/src/message/props.ts
index 445d7b85a..98bd1411c 100644
--- a/src/message/props.ts
+++ b/src/message/props.ts
@@ -67,6 +67,10 @@ const props: TdMessageProps = {
     type: Number,
     value: 15000,
   },
+  /** 链接名称。值为字符串表示链接名称，值为 `Object` 类型，表示透传至 `Link`。 */
+  link: {
+    type: null,
+  },
 };
 
 export default props;
diff --git a/src/message/type.ts b/src/message/type.ts
index cfd5053ba..b5437d6b5 100644
--- a/src/message/type.ts
+++ b/src/message/type.ts
@@ -113,6 +113,13 @@ export interface TdMessageProps {
     type: NumberConstructor;
     value?: number;
   };
+  /**
+   * 链接名称。值为字符串表示链接名称，值为 `Object` 类型，表示透传至 `Link`。
+   */
+  link?: {
+    type: null;
+    value?: string | object;
+  };
 }
 
 export type MessageAlignType = 'left' | 'center';

From ff779311369da4facebe1bf7c7271715f01f11a4 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Thu, 23 Feb 2023 12:51:19 +0800
Subject: [PATCH 13/62] fix(navbar): resolve capsule event currectly (#1641)

---
 .../__test__/__snapshots__/demo.test.js.snap   |  2 ++
 src/navbar/_example/back-home/index.js         |  5 ++++-
 src/navbar/_example/back-home/index.wxml       | 18 ++++++++++++++++--
 src/navbar/navbar.less                         |  2 +-
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/navbar/__test__/__snapshots__/demo.test.js.snap b/src/navbar/__test__/__snapshots__/demo.test.js.snap
index f2e32dc4b..44e88ff13 100644
--- a/src/navbar/__test__/__snapshots__/demo.test.js.snap
+++ b/src/navbar/__test__/__snapshots__/demo.test.js.snap
@@ -15,6 +15,7 @@ exports[`Navbar Navbar back-home demo works fine 1`] = `
         class="custom-capsule__icon"
         name="chevron-left"
         size="20"
+        bind:tap="onBack"
       />
       <t-icon
         ariaLabel="首页"
@@ -22,6 +23,7 @@ exports[`Navbar Navbar back-home demo works fine 1`] = `
         class="custom-capsule__icon"
         name="home"
         size="20"
+        bind:tap="onGoHome"
       />
     </wx-view>
   </t-navbar>
diff --git a/src/navbar/_example/back-home/index.js b/src/navbar/_example/back-home/index.js
index 95889b68a..c5bac4f95 100644
--- a/src/navbar/_example/back-home/index.js
+++ b/src/navbar/_example/back-home/index.js
@@ -1,7 +1,10 @@
 Component({
   methods: {
+    onBack() {
+      wx.navigateBack();
+    },
     onGoHome() {
-      wx.navigateTo({
+      wx.reLaunch({
         url: '/pages/home/home',
       });
     },
diff --git a/src/navbar/_example/back-home/index.wxml b/src/navbar/_example/back-home/index.wxml
index 639f89dd9..4d52c70b6 100644
--- a/src/navbar/_example/back-home/index.wxml
+++ b/src/navbar/_example/back-home/index.wxml
@@ -1,6 +1,20 @@
 <t-navbar title="标题文字">
   <view slot="capsule" class="custom-capsule">
-    <t-icon size="20" aria-role="button" aria-label="返回" name="chevron-left" class="custom-capsule__icon" />
-    <t-icon size="20" aria-role="button" aria-label="首页" name="home" class="custom-capsule__icon" />
+    <t-icon
+      size="20"
+      bind:tap="onBack"
+      aria-role="button"
+      aria-label="返回"
+      name="chevron-left"
+      class="custom-capsule__icon"
+    />
+    <t-icon
+      size="20"
+      bind:tap="onGoHome"
+      aria-role="button"
+      aria-label="首页"
+      name="home"
+      class="custom-capsule__icon"
+    />
   </view>
 </t-navbar>
diff --git a/src/navbar/navbar.less b/src/navbar/navbar.less
index 41836d75e..30176d247 100644
--- a/src/navbar/navbar.less
+++ b/src/navbar/navbar.less
@@ -93,7 +93,7 @@
     display: flex;
     align-items: center;
 
-    &::after {
+    &::before {
       content: '';
       position: absolute;
       top: 0;

From c787a51d8757992a2b6845357a771cd053d35fd9 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Thu, 23 Feb 2023 12:52:37 +0800
Subject: [PATCH 14/62] chore(Footer): copyright attribute is renamed to text
 (#1642)

* chore(Footer): copyright attribute is renamed to text

* chore(CountDown): remove theme attribute
---
 src/footer/README.en-US.md                    |  5 ++---
 src/footer/README.md                          |  9 ++++----
 .../__test__/__snapshots__/demo.test.js.snap  | 15 +++++--------
 .../__test__/__snapshots__/index.test.js.snap |  2 +-
 .../__virtualHostSnapshot__/demo.test.js.snap | 15 +++++--------
 .../index.test.js.snap                        |  2 +-
 src/footer/_example/base/index.js             |  2 +-
 src/footer/_example/base/index.wxml           |  2 +-
 src/footer/_example/link/index.js             |  4 ++--
 src/footer/_example/link/index.wxml           |  4 ++--
 src/footer/_example/logo/index.wxml           |  4 ++--
 src/footer/footer.less                        | 22 +++++++++++--------
 src/footer/footer.wxml                        | 14 ++++++------
 src/footer/props.ts                           |  9 ++------
 src/footer/type.ts                            | 20 ++---------------
 15 files changed, 50 insertions(+), 79 deletions(-)

diff --git a/src/footer/README.en-US.md b/src/footer/README.en-US.md
index 5b1d31751..dc05b80d4 100644
--- a/src/footer/README.en-US.md
+++ b/src/footer/README.en-US.md
@@ -5,7 +5,6 @@
 
 name | type | default | description | required
 -- | -- | -- | -- | --
-copyright | String | '' | \- | N
+text | String | '' | \- | N
 logo | Object | - | Typescript：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
-text-link-list | Array | [] | Typescript：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
-theme | String | 'text' | options：text/logo | N
+links | Array | [] | Typescript：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
diff --git a/src/footer/README.md b/src/footer/README.md
index 42da331f8..f2a8e53de 100644
--- a/src/footer/README.md
+++ b/src/footer/README.md
@@ -39,8 +39,7 @@ isComponent: true
 ### Footer Props
 
 名称 | 类型 | 默认值 | 说明 | 必传
--- | -- | -- | -- | --
-copyright | String | '' | 版权信息，type 为`text`生效 | N
-logo | Object | - | 图标配置，type 为`logo`生效。`logo.icon` 表示图标链接地址，`logo.title` 表示标题文本，`logo.url` 表示链接跳转地址。TS 类型：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
-text-link-list | Array | [] | 链接列表，type 为`text`生效。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
-theme | String | 'text' | 页脚展示类型。可选项：text/logo | N
+-- | -- | -- | -- | 
+text | String | '' | 版权信息。 | N
+logo | Object | - | 图标配置。`logo.icon` 表示图标链接地址，`logo.title` 表示标题文本，`logo.url` 表示链接跳转地址。TS 类型：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+links| Array | [] | 链接列表。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
diff --git a/src/footer/__test__/__snapshots__/demo.test.js.snap b/src/footer/__test__/__snapshots__/demo.test.js.snap
index c43514740..0acded27c 100644
--- a/src/footer/__test__/__snapshots__/demo.test.js.snap
+++ b/src/footer/__test__/__snapshots__/demo.test.js.snap
@@ -3,8 +3,7 @@
 exports[`Footer Footer base demo works fine 1`] = `
 <base>
   <t-footer
-    copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-    theme="text"
+    text="Copyright © 2021-2031 TD.All Rights Reserved."
   />
 </base>
 `;
@@ -15,8 +14,7 @@ exports[`Footer Footer link demo works fine 1`] = `
     class="footer-example"
   >
     <t-footer
-      copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-      textLinkList="{{
+      links="{{
         Array [
           Object {
             "name": "底部链接",
@@ -25,15 +23,14 @@ exports[`Footer Footer link demo works fine 1`] = `
           },
         ]
       }}"
-      theme="text"
+      text="Copyright © 2021-2031 TD.All Rights Reserved."
     />
   </wx-view>
   <wx-view
     class="footer-example"
   >
     <t-footer
-      copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-      textLinkList="{{
+      links="{{
         Array [
           Object {
             "name": "底部链接",
@@ -47,7 +44,7 @@ exports[`Footer Footer link demo works fine 1`] = `
           },
         ]
       }}"
-      theme="text"
+      text="Copyright © 2021-2031 TD.All Rights Reserved."
     />
   </wx-view>
 </link>
@@ -65,7 +62,6 @@ exports[`Footer Footer logo demo works fine 1`] = `
           "title": "品牌名称",
         }
       }}"
-      theme="logo"
     />
   </wx-view>
   <wx-view
@@ -77,7 +73,6 @@ exports[`Footer Footer logo demo works fine 1`] = `
           "url": "https://tdesign.gtimg.com/miniprogram/images/logo1.png",
         }
       }}"
-      theme="logo"
     />
   </wx-view>
 </logo>
diff --git a/src/footer/__test__/__snapshots__/index.test.js.snap b/src/footer/__test__/__snapshots__/index.test.js.snap
index 24c3c66df..a75d29e0d 100644
--- a/src/footer/__test__/__snapshots__/index.test.js.snap
+++ b/src/footer/__test__/__snapshots__/index.test.js.snap
@@ -8,7 +8,7 @@ exports[`Footer :base 1`] = `
       style=""
     >
       <wx-view
-        class="t-footer__copyright-info"
+        class="t-footer__text"
       >
         
       </wx-view>
diff --git a/src/footer/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/footer/__test__/__virtualHostSnapshot__/demo.test.js.snap
index c43514740..0acded27c 100644
--- a/src/footer/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/footer/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -3,8 +3,7 @@
 exports[`Footer Footer base demo works fine 1`] = `
 <base>
   <t-footer
-    copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-    theme="text"
+    text="Copyright © 2021-2031 TD.All Rights Reserved."
   />
 </base>
 `;
@@ -15,8 +14,7 @@ exports[`Footer Footer link demo works fine 1`] = `
     class="footer-example"
   >
     <t-footer
-      copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-      textLinkList="{{
+      links="{{
         Array [
           Object {
             "name": "底部链接",
@@ -25,15 +23,14 @@ exports[`Footer Footer link demo works fine 1`] = `
           },
         ]
       }}"
-      theme="text"
+      text="Copyright © 2021-2031 TD.All Rights Reserved."
     />
   </wx-view>
   <wx-view
     class="footer-example"
   >
     <t-footer
-      copyright="Copyright © 2021-2031 TD.All Rights Reserved."
-      textLinkList="{{
+      links="{{
         Array [
           Object {
             "name": "底部链接",
@@ -47,7 +44,7 @@ exports[`Footer Footer link demo works fine 1`] = `
           },
         ]
       }}"
-      theme="text"
+      text="Copyright © 2021-2031 TD.All Rights Reserved."
     />
   </wx-view>
 </link>
@@ -65,7 +62,6 @@ exports[`Footer Footer logo demo works fine 1`] = `
           "title": "品牌名称",
         }
       }}"
-      theme="logo"
     />
   </wx-view>
   <wx-view
@@ -77,7 +73,6 @@ exports[`Footer Footer logo demo works fine 1`] = `
           "url": "https://tdesign.gtimg.com/miniprogram/images/logo1.png",
         }
       }}"
-      theme="logo"
     />
   </wx-view>
 </logo>
diff --git a/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap
index 24c3c66df..a75d29e0d 100644
--- a/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/footer/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -8,7 +8,7 @@ exports[`Footer :base 1`] = `
       style=""
     >
       <wx-view
-        class="t-footer__copyright-info"
+        class="t-footer__text"
       >
         
       </wx-view>
diff --git a/src/footer/_example/base/index.js b/src/footer/_example/base/index.js
index a8c110c86..ff52d3cf6 100644
--- a/src/footer/_example/base/index.js
+++ b/src/footer/_example/base/index.js
@@ -1,5 +1,5 @@
 Component({
   data: {
-    copyright: 'Copyright © 2021-2031 TD.All Rights Reserved.',
+    text: 'Copyright © 2021-2031 TD.All Rights Reserved.',
   },
 });
diff --git a/src/footer/_example/base/index.wxml b/src/footer/_example/base/index.wxml
index 7034a4d00..12f05dd20 100644
--- a/src/footer/_example/base/index.wxml
+++ b/src/footer/_example/base/index.wxml
@@ -1,2 +1,2 @@
 <!-- 基础页脚 只有版权信息 -->
-<t-footer theme="text" copyright="{{copyright}}"></t-footer>
+<t-footer text="{{text}}"></t-footer>
diff --git a/src/footer/_example/link/index.js b/src/footer/_example/link/index.js
index 6245dfa0c..97a768c01 100644
--- a/src/footer/_example/link/index.js
+++ b/src/footer/_example/link/index.js
@@ -1,7 +1,7 @@
 Component({
   data: {
-    copyright: 'Copyright © 2021-2031 TD.All Rights Reserved.',
-    textLinkList: [
+    text: 'Copyright © 2021-2031 TD.All Rights Reserved.',
+    links: [
       [
         {
           name: '底部链接',
diff --git a/src/footer/_example/link/index.wxml b/src/footer/_example/link/index.wxml
index aae441b5a..123475550 100644
--- a/src/footer/_example/link/index.wxml
+++ b/src/footer/_example/link/index.wxml
@@ -1,8 +1,8 @@
 <!-- theme 为 text，含有底部链接 -->
 <view class="footer-example">
-  <t-footer theme="text" copyright="{{copyright}}" textLinkList="{{textLinkList[0]}}" />
+  <t-footer text="{{text}}" links="{{links[0]}}" />
 </view>
 
 <view class="footer-example">
-  <t-footer theme="text" copyright="{{copyright}}" textLinkList="{{textLinkList[1]}}" />
+  <t-footer text="{{text}}" links="{{links[1]}}" />
 </view>
diff --git a/src/footer/_example/logo/index.wxml b/src/footer/_example/logo/index.wxml
index fc7e4962d..421ab0cea 100644
--- a/src/footer/_example/logo/index.wxml
+++ b/src/footer/_example/logo/index.wxml
@@ -1,8 +1,8 @@
 <!-- theme 为 logo -->
 <view class="footer-example">
-  <t-footer theme="logo" logo="{{logoList[0]}}" />
+  <t-footer logo="{{logoList[0]}}" />
 </view>
 
 <view class="footer-example">
-  <t-footer theme="logo" logo="{{logoList[1]}}" />
+  <t-footer logo="{{logoList[1]}}" />
 </view>
diff --git a/src/footer/footer.less b/src/footer/footer.less
index a5edbdd75..8c5d89940 100644
--- a/src/footer/footer.less
+++ b/src/footer/footer.less
@@ -1,12 +1,13 @@
 @import '../common/style/index.less';
 
-@footer-copyright-color: var(--td-footer-copyright-color, @font-gray-3);
-@footer-copyright-font-size: var(--td-footer-copyright-font-size, @font-size-s);
-@footer-copyright-line-height: var(--td-footer-copyright-line-height, 40rpx);
+@footer-text-color: var(--td-footer-text-color, @font-gray-3);
+@footer-text-font-size: var(--td-footer-text-font-size, @font-size-s);
+@footer-text-line-height: var(--td-footer-text-line-height, 40rpx);
+@footer-text-margin-top: var(--td-footer-text-margin-top, 8rpx);
 @footer-link-color: var(--td-footer-link-color, @brand-color);
 @footer-link-font-size: var(--td-footer-link-font-size, @font-size-s);
 @footer-link-line-height: var(--td-footer-link-line-height, 40rpx);
-@footer-link-margin-bottom: var(--td-footer-link-margin-bottom, 8rpx);
+
 @footer-link-dividing-line-padding: var(--td-footer-link-dividing-line-padding, @spacer-1);
 @footer-link-dividing-line-color: var(--td-footer-link-dividing-line-color, @font-gray-3);
 @footer-logo-icon-width: var(--td-footer-logo-icon-width, 48rpx);
@@ -22,17 +23,20 @@
   align-items: center;
   justify-content: flex-start;
 
-  &__copyright-info {
-    font-size: @footer-copyright-font-size; // 版权信息文本大小
-    line-height: @footer-copyright-line-height; // 版权信息文本行高
-    color: @footer-copyright-color; // 版权信息文本颜色
+  &__text {
+    font-size: @footer-text-font-size; // 版权信息文本大小
+    line-height: @footer-text-line-height; // 版权信息文本行高
+    color: @footer-text-color; // 版权信息文本颜色
+  }
+
+  &__link-list + &__text:not(:empty) {
+    margin-top: @footer-text-margin-top; // 版权信息顶部间距
   }
 
   &__link-list {
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-bottom: @footer-link-margin-bottom; // 链接底部间距
   }
 
   &__link-item {
diff --git a/src/footer/footer.wxml b/src/footer/footer.wxml
index 56e00b31f..56e8d9934 100644
--- a/src/footer/footer.wxml
+++ b/src/footer/footer.wxml
@@ -1,18 +1,18 @@
 <wxs src="../common/utils.wxs" module="_" />
 
 <view style="{{_._style([style, customStyle])}}" class="{{classPrefix}} class {{prefix}}-class">
-  <!-- theme 为 logo -->
-  <block wx:if="{{theme === 'logo'}}">
+  <!-- logo -->
+  <block wx:if="{{logo}}">
     <view class="{{classPrefix}}__logo">
       <t-image t-class="{{classPrefix}}__icon" src="{{logo.icon}}" wx:if="{{logo.icon}}" />
       <view class="{{classPrefix}}__title" wx:if="{{logo.title}}">{{logo.title}}</view>
       <t-image t-class="{{classPrefix}}__title-url" src="{{logo.url}}" mode="widthFix" wx:elif="{{logo.url}}" />
     </view>
   </block>
-  <!-- theme 为 text -->
+  <!-- text -->
   <block wx:else>
-    <view wx:if="{{textLinkList.length > 0}}" class="{{classPrefix}}__link-list">
-      <block wx:for="{{textLinkList}}" wx:key="name" wx:for-item="item">
+    <view wx:if="{{links.length > 0}}" class="{{classPrefix}}__link-list">
+      <block wx:for="{{links}}" wx:key="name" wx:for-item="item">
         <navigator
           url="{{item.url}}"
           open-type="{{item.openType}}"
@@ -21,11 +21,11 @@
         >
           {{item.name}}
         </navigator>
-        <view aria-hidden="{{true}}" wx:if="{{index !== (textLinkList.length - 1)}}" class="{{classPrefix}}__link-line"
+        <view aria-hidden="{{true}}" wx:if="{{index !== (links.length - 1)}}" class="{{classPrefix}}__link-line"
           >|</view
         >
       </block>
     </view>
-    <view class="{{classPrefix}}__copyright-info">{{copyright}}</view>
+    <view class="{{classPrefix}}__text">{{text}}</view>
   </block>
 </view>
diff --git a/src/footer/props.ts b/src/footer/props.ts
index 6e97f5a04..25e096f3c 100644
--- a/src/footer/props.ts
+++ b/src/footer/props.ts
@@ -7,7 +7,7 @@
 import { TdFooterProps } from './type';
 const props: TdFooterProps = {
   /** 版权信息，type 为`text`生效 */
-  copyright: {
+  text: {
     type: String,
     value: '',
   },
@@ -16,15 +16,10 @@ const props: TdFooterProps = {
     type: Object,
   },
   /** 链接列表，type 为`text`生效。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式 */
-  textLinkList: {
+  links: {
     type: Array,
     value: [],
   },
-  /** 页脚展示类型 */
-  theme: {
-    type: String,
-    value: 'text',
-  },
 };
 
 export default props;
diff --git a/src/footer/type.ts b/src/footer/type.ts
index 6cdd34149..2e9c1aecd 100644
--- a/src/footer/type.ts
+++ b/src/footer/type.ts
@@ -9,15 +9,7 @@ export interface TdFooterProps {
    * 版权信息，type 为`text`生效
    * @default ''
    */
-  copyright?: {
-    type: StringConstructor;
-    value?: string;
-  };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
+  text?: {
     type: StringConstructor;
     value?: string;
   };
@@ -32,18 +24,10 @@ export interface TdFooterProps {
    * 链接列表，type 为`text`生效。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式
    * @default []
    */
-  textLinkList?: {
+  links?: {
     type: ArrayConstructor;
     value?: Array<LinkObj>;
   };
-  /**
-   * 页脚展示类型
-   * @default 'text'
-   */
-  theme?: {
-    type: StringConstructor;
-    value?: 'text' | 'logo';
-  };
 }
 
 export interface FooterLogo {

From e810c0d57cf37593409584adf0ec3fe795944a77 Mon Sep 17 00:00:00 2001
From: Wang <awangjianjun9@gmail.com>
Date: Thu, 23 Feb 2023 12:52:48 +0800
Subject: [PATCH 15/62] fix(dialog): resolve word misspelling (#1644)

---
 src/dialog/dialog.ts |  4 ++--
 src/dialog/index.ts  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/dialog/dialog.ts b/src/dialog/dialog.ts
index 60d1e208a..d33912b48 100644
--- a/src/dialog/dialog.ts
+++ b/src/dialog/dialog.ts
@@ -104,8 +104,8 @@ export default class Dialog extends SuperComponent {
 
     onConfirm() {
       this.triggerEvent('confirm');
-      if (this._onComfirm) {
-        this._onComfirm();
+      if (this._onConfirm) {
+        this._onConfirm();
         this.close();
       }
     },
diff --git a/src/dialog/index.ts b/src/dialog/index.ts
index d0a29480a..a940c0910 100644
--- a/src/dialog/index.ts
+++ b/src/dialog/index.ts
@@ -16,7 +16,7 @@ interface DialogAlertOptionsType {
   confirmBtn?: string | object;
 }
 
-interface DialogComfirmOptionsType extends DialogAlertOptionsType {
+interface DialogConfirmOptionsType extends DialogAlertOptionsType {
   cancelButtonText?: string;
 }
 
@@ -62,10 +62,10 @@ export default {
         ...otherOptions,
         visible: true,
       });
-      instance._onComfirm = resolve;
+      instance._onConfirm = resolve;
     });
   },
-  confirm(options: DialogComfirmOptionsType) {
+  confirm(options: DialogConfirmOptionsType) {
     const { context, selector = '#t-dialog', ...otherOptions } = { ...defaultOptions, ...options };
     const instance = getInstance(context, selector);
     if (!instance) return Promise.reject();
@@ -75,11 +75,11 @@ export default {
         ...otherOptions,
         visible: true,
       });
-      instance._onComfirm = resolve;
+      instance._onConfirm = resolve;
       instance._onCancel = reject;
     });
   },
-  close(options: DialogComfirmOptionsType) {
+  close(options: DialogConfirmOptionsType) {
     const { context, selector = '#t-dialog' } = { ...options };
     const instance = getInstance(context, selector);
     if (instance) {

From ee6b48b75ab07020608e0f0ba897f649bb0e6a35 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Thu, 23 Feb 2023 13:03:10 +0800
Subject: [PATCH 16/62] chore(CountDown): remove hightlight theme (#1645)

---
 src/count-down/README.md                      |  2 +-
 .../__test__/__snapshots__/demo.test.js.snap  | 44 +------------------
 .../__virtualHostSnapshot__/demo.test.js.snap | 44 +------------------
 src/count-down/_example/base/index.wxml       |  8 +++-
 src/count-down/_example/base/index.wxss       | 12 +++++
 src/count-down/_example/size/index.wxml       | 13 ------
 src/count-down/count-down.less                | 35 ++++-----------
 src/count-down/count-down.wxml                |  2 +-
 src/count-down/type.ts                        |  2 +-
 9 files changed, 34 insertions(+), 128 deletions(-)

diff --git a/src/count-down/README.md b/src/count-down/README.md
index 64945f457..12cd2247a 100644
--- a/src/count-down/README.md
+++ b/src/count-down/README.md
@@ -37,7 +37,7 @@ format | String | HH:mm:ss | 时间格式，DD-日，HH-时，mm-分，ss-秒，
 millisecond | Boolean | false | 是否开启毫秒级渲染 | N
 size | String `v0.5.1` | 'medium' | 倒计时尺寸。可选项：small/medium/large | N
 split-with-unit `v0.5.1` | Boolean | false | 使用时间单位分割 | N
-theme | String `v0.5.1` | 'default' | 倒计时风格。可选项：default/round/square/hightlight | N
+theme | String `v0.5.1` | 'default' | 倒计时风格。可选项：default/round/square | N
 time | Number | - | 必需。倒计时时长，单位毫秒 | Y
 external-classes | Array | - | 组件类名，分别用于设置 组件外层类名、计时器类型、分隔线类名 等。`['t-class', 't-class-count', 't-class-split']` | N
 
diff --git a/src/count-down/__test__/__snapshots__/demo.test.js.snap b/src/count-down/__test__/__snapshots__/demo.test.js.snap
index 512d78dd8..c9ffeb78e 100644
--- a/src/count-down/__test__/__snapshots__/demo.test.js.snap
+++ b/src/count-down/__test__/__snapshots__/demo.test.js.snap
@@ -105,7 +105,8 @@ exports[`CountDown CountDown base demo works fine 1`] = `
       <t-count-down
         content="default"
         splitWithUnit="{{true}}"
-        theme="hightlight"
+        tClassCount="external-count"
+        tClassSplit="external-split"
         time="{{5760000}}"
       />
     </wx-view>
@@ -302,46 +303,5 @@ exports[`CountDown CountDown size demo works fine 1`] = `
       />
     </wx-view>
   </wx-view>
-  <wx-view
-    class="demo-count-down"
-  >
-    <wx-text
-      class="demo-count-down-desc"
-    >
-       无底色带单位 
-    </wx-text>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        size="small"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        size="large"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-  </wx-view>
 </size>
 `;
diff --git a/src/count-down/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/count-down/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 512d78dd8..c9ffeb78e 100644
--- a/src/count-down/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/count-down/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -105,7 +105,8 @@ exports[`CountDown CountDown base demo works fine 1`] = `
       <t-count-down
         content="default"
         splitWithUnit="{{true}}"
-        theme="hightlight"
+        tClassCount="external-count"
+        tClassSplit="external-split"
         time="{{5760000}}"
       />
     </wx-view>
@@ -302,46 +303,5 @@ exports[`CountDown CountDown size demo works fine 1`] = `
       />
     </wx-view>
   </wx-view>
-  <wx-view
-    class="demo-count-down"
-  >
-    <wx-text
-      class="demo-count-down-desc"
-    >
-       无底色带单位 
-    </wx-text>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        size="small"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-    <wx-view
-      class="demo-count-down-content"
-    >
-      <t-count-down
-        format="HH:mm:ss"
-        size="large"
-        splitWithUnit="{{true}}"
-        theme="hightlight"
-        time="{{5760000}}"
-      />
-    </wx-view>
-  </wx-view>
 </size>
 `;
diff --git a/src/count-down/_example/base/index.wxml b/src/count-down/_example/base/index.wxml
index 3e3c384c2..dbfa40914 100644
--- a/src/count-down/_example/base/index.wxml
+++ b/src/count-down/_example/base/index.wxml
@@ -36,6 +36,12 @@
 <view class="demo-count-down">
   <text class="demo-count-down-desc"> 无底色带单位 </text>
   <view class="demo-count-down-content">
-    <t-count-down content="default" time="{{ time }}" splitWithUnit theme="hightlight" />
+    <t-count-down
+      t-class-count="external-count"
+      t-class-split="external-split"
+      content="default"
+      time="{{ time }}"
+      splitWithUnit
+    />
   </view>
 </view>
diff --git a/src/count-down/_example/base/index.wxss b/src/count-down/_example/base/index.wxss
index 611490f9f..61d646179 100644
--- a/src/count-down/_example/base/index.wxss
+++ b/src/count-down/_example/base/index.wxss
@@ -6,3 +6,15 @@
 .demo-count-down-content {
   margin: 32rpx 0 48rpx;
 }
+
+.external-count {
+  color: #e34d59;
+  font-size: 36rpx;
+  line-height: 48rpx;
+  vertical-align: middle;
+}
+
+.external-split {
+  font-size: 20rpx;
+  margin: 0 10rpx;
+}
diff --git a/src/count-down/_example/size/index.wxml b/src/count-down/_example/size/index.wxml
index 07b7e1ccb..6fb7ee817 100644
--- a/src/count-down/_example/size/index.wxml
+++ b/src/count-down/_example/size/index.wxml
@@ -62,16 +62,3 @@
     <t-count-down size="large" format="HH:mm:ss" time="{{ time }}" splitWithUnit theme="round" />
   </view>
 </view>
-
-<view class="demo-count-down">
-  <text class="demo-count-down-desc"> 无底色带单位 </text>
-  <view class="demo-count-down-content">
-    <t-count-down size="small" format="HH:mm:ss" time="{{ time }}" splitWithUnit theme="hightlight" />
-  </view>
-  <view class="demo-count-down-content">
-    <t-count-down format="HH:mm:ss" time="{{ time }}" splitWithUnit theme="hightlight" />
-  </view>
-  <view class="demo-count-down-content">
-    <t-count-down size="large" format="HH:mm:ss" time="{{ time }}" splitWithUnit theme="hightlight" />
-  </view>
-</view>
diff --git a/src/count-down/count-down.less b/src/count-down/count-down.less
index f4b91d973..478b45b8f 100644
--- a/src/count-down/count-down.less
+++ b/src/count-down/count-down.less
@@ -1,44 +1,38 @@
 @import '../common/style/index.less';
 
-@countdown-small-unit-margin: calc(@spacer * 0.5); // 'small'尺寸单位分割文本左右间距
-@countdown-medium-unit-margin: calc(@spacer * 0.625); // 'medium'尺寸单位分割文本左右间距
-@countdown-large-unit-margin: calc(@spacer * 0.75); // 'large'尺寸单位分割文本左右间距
+@countdown-small-unit-margin: 8rpx; // 'small'尺寸单位分割文本左右间距
+@countdown-medium-unit-margin: 10rpx; // 'medium'尺寸单位分割文本左右间距
+@countdown-large-unit-margin: 12rpx; // 'large'尺寸单位分割文本左右间距
 @countdown-unit-color: @font-gray-1; // 带单位分割线文本颜色
 @countdown-no-unit-color: @error-color-6; // 无单位分割线文本颜色
-@countdown-large-no-unit-margin: calc(@spacer * 0.75); // 'large'尺寸无单位分割文本左右间距
-@countdown-medium-no-unit-margin: calc(@spacer * 0.375); // 'medium'尺寸无单位分割文本左右间距
-@countdown-small-no-unit-margin: calc(@spacer * 0.25); // 'small'尺寸无单位分割文本左右间距
+@countdown-large-no-unit-margin: 12rpx; // 'large'尺寸无单位分割文本左右间距
+@countdown-medium-no-unit-margin: 6rpx; // 'medium'尺寸无单位分割文本左右间距
+@countdown-small-no-unit-margin: 4rpx; // 'small'尺寸无单位分割文本左右间距
 @countdown-small-bg-width: 40rpx; // 'small'尺寸方/圆底背景宽高
 @countdown-medium-bg-width: 48rpx; // 'medium'尺寸方/圆底背景宽高
 @countdown-large-bg-width: 56rpx; // 'large'尺寸方/圆底背景宽高
 @countdown-small-default-font-size: @font-size-base; // 'small'尺寸纯数字倒计时文本大小
 @countdown-small-square-font-size: @font-size-s; // 'small'尺寸带方形底倒计时文本大小
 @countdown-small-round-font-size: @font-size-s; // 'small'尺寸带圆形底倒计时文本大小
-@countdown-small-hightlight-font-size: @font-size-m; // 'small'尺寸高亮倒计时文本大小
 @countdown-small-unit-font-size: @font-size; // 'small'尺寸单位分割文本大小
 @countdown-small-no-unit-font-size: @font-size-base; // 'small'尺寸无单位分割文本大小
 @countdown-medium-default-font-size: @font-size-m; // 'medium'尺寸纯数字倒计时文本大小
 @countdown-medium-square-font-size: @font-size-base; // 'medium'尺寸带方形底倒计时文本大小
 @countdown-medium-round-font-size: @font-size-base; // 'medium'尺寸带圆形底倒计时文本大小
-@countdown-medium-hightlight-font-size: 36rpx; // 'medium'尺寸高亮倒计时文本大小
 @countdown-medium-unit-font-size: @font-size-s; // 'medium'尺寸单位分割文本大小
 @countdown-medium-no-unit-font-size: @font-size-m; // 'medium'尺寸无单位分割文本大小
 @countdown-large-default-font-size: 36rpx; // 'large'尺寸纯数字倒计时文本大小
 @countdown-large-square-font-size: @font-size-m; // 'large'尺寸带方形底倒计时文本大小
 @countdown-large-round-font-size: @font-size-m; // 'large'尺寸带圆形底倒计时文本大小
-@countdown-large-hightlight-font-size: 36rpx; // 'large'尺寸高亮倒计时文本大小
 @countdown-large-unit-font-size: @font-size-base; // 'large'尺寸单位分割文本大小
 @countdown-large-no-unit-font-size: 36rpx; // 'large'尺寸无单位分割文本大小
 
 // 纯数字倒计时文本颜色
 @countdown-default-text-color: var(--td-countdown-default-color, @font-gray-1);
-// 高亮倒计时文本颜色
-@countdown-hightlight-color: var(--td-countdown-hightlight-color, @error-color-6);
 // 方形/圆形底倒计时文本颜色
 @countdown-text-color: var(--td-countdown-round-color, @font-white-1);
 // 方形/圆形底背景颜色
 @countdown-bg-color: var(--td-countdown-bg-color, @error-color-6);
-
 // 带方形底倒计时圆角大小
 @countdown-square-border-radius: var(--td-countdown-square-border-radius, @radius-small);
 // 带圆形底倒计时圆角大小
@@ -53,7 +47,6 @@
     @defaultFontSize: 'countdown-@{size}-default-font-size';
     @roundFontSize: 'countdown-@{size}-round-font-size';
     @squareFontSize: 'countdown-@{size}-square-font-size';
-    @hightlightFontSize: 'countdown-@{size}-hightlight-font-size';
     @width: 'countdown-@{size}-bg-width';
     @height: 'countdown-@{size}-bg-width';
     @dotMargin: 'countdown-@{size}-no-unit-margin';
@@ -78,12 +71,6 @@
         }
       }
 
-      &.@{countdown}--hightlight {
-        > .@{item} {
-          font-size: @@hightlightFontSize;
-        }
-      }
-
       &.@{countdown}--round,
       &.@{countdown}--square {
         > .@{item} {
@@ -93,8 +80,7 @@
       }
 
       &.@{countdown}--round,
-      &.@{countdown}--square,
-      &.@{countdown}--hightlight {
+      &.@{countdown}--square {
         > .@{split}--dot {
           margin: 0 @@dotMargin;
           font-size: @@dotFontSize;
@@ -125,8 +111,7 @@
   }
 
   &--square,
-  &--round,
-  &--hightlight {
+  &--round {
     > .@{split}--dot {
       color: @countdown-no-unit-color;
     }
@@ -157,8 +142,4 @@
       background: @countdown-bg-color;
     }
   }
-
-  &--hightlight {
-    color: @countdown-hightlight-color;
-  }
 }
diff --git a/src/count-down/count-down.wxml b/src/count-down/count-down.wxml
index d9ad87d17..7add47e99 100644
--- a/src/count-down/count-down.wxml
+++ b/src/count-down/count-down.wxml
@@ -8,7 +8,7 @@
 >
   <slot wx:if="{{content !== 'default'}}" name="content" />
   <slot wx:if="{{content !== 'default'}}" />
-  <block wx:elif="{{theme == 'default'}}">{{formattedTime}}</block>
+  <block wx:elif="{{theme == 'default' && !splitWithUnit}}">{{formattedTime}}</block>
   <block wx:else>
     <block wx:for="{{timeRange}}" wx:key="index">
       <text class="{{classPrefix}}__item {{prefix}}-class-count">{{this.format(timeData[timeRange[index]])}}</text>
diff --git a/src/count-down/type.ts b/src/count-down/type.ts
index d1e3260fb..31b0fdf11 100644
--- a/src/count-down/type.ts
+++ b/src/count-down/type.ts
@@ -67,7 +67,7 @@ export interface TdCountDownProps {
    */
   theme?: {
     type: StringConstructor;
-    value?: 'default' | 'round' | 'square' | 'hightlight';
+    value?: 'default' | 'round' | 'square';
   };
   /**
    * 倒计时时长，单位毫秒

From dfbf99e8ecb197e8639889b3bd81d9bc5a5ad673 Mon Sep 17 00:00:00 2001
From: byqbai <byq1213@qq.com>
Date: Thu, 23 Feb 2023 15:30:20 +0800
Subject: [PATCH 17/62] =?UTF-8?q?fix(slider):=20=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=97=A0=E9=9A=9C=E7=A2=8D=E8=AF=AD=E4=B9=89.=20(#1388)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(slider): 规范无障碍语义

* fix(slider): 无障碍滑块valuetext规范.(#1402)

* fix(slider): 无用动态百分比播报问题.(#1402)

* fix(slider): 隐藏数值读取.(#1402)

* fix(slider): 隐藏数值读取.(#1402)

* fix(slider): 变量规范.(#1402)
---
 src/slider/slider.less |  2 +-
 src/slider/slider.ts   | 11 +++++++++++
 src/slider/slider.wxml | 25 ++++++++++++++++++-------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/slider/slider.less b/src/slider/slider.less
index 4223db93d..c78c5fc7d 100644
--- a/src/slider/slider.less
+++ b/src/slider/slider.less
@@ -80,7 +80,7 @@
       transform: translateX(-50%);
       top: -52rpx;
       text-align: center;
-      width: 48rpx;
+      width: 96rpx;
       height: 44rpx;
       line-height: 44rpx;
     }
diff --git a/src/slider/slider.ts b/src/slider/slider.ts
index 0754fc177..e025e4ea4 100644
--- a/src/slider/slider.ts
+++ b/src/slider/slider.ts
@@ -26,6 +26,7 @@ type dataType = {
   scaleTextArray: any[];
   _value: SliderValue;
   prefix: string;
+  isVisibleToScreenReader: boolean;
 };
 
 interface boundingClientRect {
@@ -70,6 +71,7 @@ export default class Slider extends SuperComponent {
     scaleArray: [],
     scaleTextArray: [],
     prefix,
+    isVisibleToScreenReader: false,
   };
 
   observers = {
@@ -88,6 +90,15 @@ export default class Slider extends SuperComponent {
       } else {
         this.setSingleBarWidth(newValue as number);
       }
+
+      this.setData({
+        isVisibleToScreenReader: true,
+      });
+      setTimeout(() => {
+        this.setData({
+          isVisibleToScreenReader: false,
+        });
+      }, 2e3);
     },
     marks(val) {
       if (this.data.initialLeft != null) {
diff --git a/src/slider/slider.wxml b/src/slider/slider.wxml
index eafe8a6d1..4a07f59ea 100644
--- a/src/slider/slider.wxml
+++ b/src/slider/slider.wxml
@@ -21,6 +21,7 @@
           wx:for="{{scaleArray}}"
           wx:key="index"
           style="left:{{item.left}}px; transform: translateX(-50%); {{t.getColor(disabled, _value >= item.val, disabledColor, colors)}}"
+          aria-hidden="{{true}}"
         >
           <view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}}}">
             {{scaleTextArray[index]}}
@@ -39,9 +40,11 @@
           bind:touchcancel="onTouchEnd"
         >
           <view
+            wx:if="{{label || isVisibleToScreenReader}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
-            aria-role="region"
+            aria-role="alert"
             aria-live="assertive"
+            aria-hidden="{{!isVisibleToScreenReader}}"
           >
             {{t.getValue(label, _value) || _value}}
           </view>
@@ -52,6 +55,7 @@
             aria-valuemax="{{max}}"
             aria-valuemin="{{min}}"
             aria-valuenow="{{_value}}"
+            aria-valuetext="{{t.getValue(label, _value) || _value}}"
           ></view>
         </view>
       </view>
@@ -81,6 +85,7 @@
           wx:for-index="index"
           wx:key="index"
           style="left: {{item.left}}px; transform: translateX(-50%); {{t.getColor(disabled, (dotTopValue[1] >= item.val && item.val >= dotTopValue[0]), disabledColor, colors)}}"
+          aria-hidden="{{true}}"
         >
           <view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}"
             >{{scaleTextArray[index]}}</view
@@ -99,9 +104,11 @@
           class="{{classPrefix}}__dot {{classPrefix}}__dot--left {{prefix}}-class-cursor"
         >
           <view
+            wx:if="{{label || isVisibleToScreenReader}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
-            aria-role="region"
+            aria-role="alert"
             aria-live="assertive"
+            aria-hidden="{{!isVisibleToScreenReader}}"
           >
             {{t.getValue(label, dotTopValue[0]) || dotTopValue[0]}}
           </view>
@@ -109,9 +116,10 @@
             class="{{classPrefix}}__dot-slider"
             aria-role="slider"
             aria-disabled="{{disabled}}"
-            aria-valuemax="{{t.getValue(label, dotTopValue[1]) || dotTopValue[1]}}"
+            aria-valuemax="{{max}}"
             aria-valuemin="{{min}}"
-            aria-valuenow="{{t.getValue(label, dotTopValue[0]) || dotTopValue[0]}}"
+            aria-valuenow="{{dotTopValue[0]}}"
+            aria-valuetext="{{t.getValue(label, dotTopValue[0]) || dotTopValue[0]}}"
           ></view>
         </view>
         <view
@@ -122,9 +130,11 @@
           class="{{classPrefix}}__dot {{classPrefix}}__dot--right {{prefix}}-class-cursor"
         >
           <view
+            wx:if="{{label || isVisibleToScreenReader}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
-            aria-role="region"
+            aria-role="alert"
             aria-live="assertive"
+            aria-hidden="{{!isVisibleToScreenReader}}"
           >
             {{t.getValue(label, dotTopValue[1]) || dotTopValue[1]}}
           </view>
@@ -133,8 +143,9 @@
             aria-role="slider"
             aria-disabled="{{disabled}}"
             aria-valuemax="{{max}}"
-            aria-valuemin="{{t.getValue(label, dotTopValue[0]) || dotTopValue[0]}}"
-            aria-valuenow="{{t.getValue(label, dotTopValue[1]) || dotTopValue[1]}}"
+            aria-valuemin="{{min}}"
+            aria-valuenow="{{dotTopValue[1]}}"
+            aria-valuetext="{{t.getValue(label, dotTopValue[1]) || dotTopValue[1]}}"
           >
           </view>
         </view>

From 7fc03121951f2e59f416a11784882c6fcf1c0c9b Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Thu, 23 Feb 2023 17:08:50 +0800
Subject: [PATCH 18/62] docs(steps): update api

---
 src/steps/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/steps/README.md b/src/steps/README.md
index aa79d16ea..9f852b84e 100644
--- a/src/steps/README.md
+++ b/src/steps/README.md
@@ -84,5 +84,5 @@ external-classes | Array | - | 组件类名，用于设置组件外层元素元
 icon | String / Slot | - | 图标。传入 slot 代表使用插槽，其他字符串代表使用内置图标 | N
 status | String | default | 当前步骤的状态：默认状态（未开始）、进行中状态、完成状态、错误状态。可选项：default/process/finish/error。TS 类型：`StepStatus` `type StepStatus = 'default' \| 'process' \| 'finish' \| 'error'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/step-item/type.ts) | N
 style | String | - | 自定义组件样式 | N
-sub-step-items | Array | [] | 子步骤条，仅支持 layout  = 'vertical' 时。TS 类型：`SubStepItem[]` `interface SubStepItem { status: StepStatus, title: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/step-item/type.ts) | N
+sub-step-items | Array | [] | 废弃。子步骤条，仅支持 layout  = 'vertical' 时 | N
 title | String / Slot | '' | 标题 | N

From 82e96e736ce59d7b913f510642955686cc5be58a Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Thu, 23 Feb 2023 17:10:40 +0800
Subject: [PATCH 19/62] fix(toast): replace fail theme with error (#1647)

---
 src/toast/README.en-US.md                          | 2 +-
 src/toast/README.md                                | 2 +-
 src/toast/__test__/__snapshots__/demo.test.js.snap | 2 +-
 src/toast/_example/theme/index.js                  | 4 ++--
 src/toast/_example/theme/index.wxml                | 2 +-
 src/toast/index.ts                                 | 2 +-
 src/toast/toast.ts                                 | 2 +-
 src/toast/type.ts                                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/toast/README.en-US.md b/src/toast/README.en-US.md
index 63e42105c..a3f584859 100644
--- a/src/toast/README.en-US.md
+++ b/src/toast/README.en-US.md
@@ -14,7 +14,7 @@ overlay-props | Object | {} | \- | N
 placement | String | middle | options： top/middle/bottom | N
 prevent-scroll-through | Boolean | false | \- | N
 show-overlay | Boolean | false | \- | N
-theme | String | - | options：loading/success/fail | N
+theme | String | - | options：loading/success/error | N
 
 ### Toast Events
 
diff --git a/src/toast/README.md b/src/toast/README.md
index a1341c13f..4fc7cd78b 100644
--- a/src/toast/README.md
+++ b/src/toast/README.md
@@ -45,7 +45,7 @@ overlay-props | Object | {} | 遮罩层属性，透传至 Overlay | N
 placement | String | middle | 弹窗展示位置。可选项： top/middle/bottom | N
 prevent-scroll-through | Boolean | false | 防止滚动穿透，即不允许点击和滚动 | N
 show-overlay | Boolean | false | 是否显示遮罩层 | N
-theme | String | - | 提示类型。可选项：loading/success/fail | N
+theme | String | - | 提示类型。可选项：loading/success/error | N
 
 ### Toast Events
 
diff --git a/src/toast/__test__/__snapshots__/demo.test.js.snap b/src/toast/__test__/__snapshots__/demo.test.js.snap
index 5d591973e..fd6a188bd 100644
--- a/src/toast/__test__/__snapshots__/demo.test.js.snap
+++ b/src/toast/__test__/__snapshots__/demo.test.js.snap
@@ -167,7 +167,7 @@ exports[`Toast Toast theme demo works fine 1`] = `
     variant="outline"
     bind:tap="showErrorToast"
   >
-    失败提示
+    错误提示
   </t-button>
 </theme>
 `;
diff --git a/src/toast/_example/theme/index.js b/src/toast/_example/theme/index.js
index bb68ca2cf..91444cf4a 100644
--- a/src/toast/_example/theme/index.js
+++ b/src/toast/_example/theme/index.js
@@ -25,8 +25,8 @@ Page({
     Toast({
       context: this,
       selector: '#t-toast',
-      message: '失败文案',
-      theme: 'fail',
+      message: '错误文案',
+      theme: 'error',
       direction: 'column',
     });
   },
diff --git a/src/toast/_example/theme/index.wxml b/src/toast/_example/theme/index.wxml
index 69875b0e6..cee53bcf4 100644
--- a/src/toast/_example/theme/index.wxml
+++ b/src/toast/_example/theme/index.wxml
@@ -2,4 +2,4 @@
 
 <t-button theme="primary" size="large" variant="outline" bind:tap="showSuccessToast" block>成功提示</t-button>
 <t-button theme="primary" size="large" variant="outline" bind:tap="showWarningToast" block>警告提示</t-button>
-<t-button theme="primary" size="large" variant="outline" bind:tap="showErrorToast" block>失败提示</t-button>
+<t-button theme="primary" size="large" variant="outline" bind:tap="showErrorToast" block>错误提示</t-button>
diff --git a/src/toast/index.ts b/src/toast/index.ts
index b433482d9..a2f870718 100644
--- a/src/toast/index.ts
+++ b/src/toast/index.ts
@@ -2,7 +2,7 @@ import { getInstance } from '../common/utils';
 
 type Context = WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
 
-type ToastType = 'loading' | 'success' | 'fail';
+type ToastType = 'loading' | 'success' | 'error';
 type ToastPositionType = 'top' | 'middle' | 'bottom';
 type ToastDirectionType = 'row' | 'column';
 
diff --git a/src/toast/toast.ts b/src/toast/toast.ts
index 74e711dd5..89791acee 100644
--- a/src/toast/toast.ts
+++ b/src/toast/toast.ts
@@ -41,7 +41,7 @@ export default class Toast extends SuperComponent {
         loading: 'loading',
         success: 'check-circle',
         warning: 'error-circle',
-        fail: 'close-circle',
+        error: 'close-circle',
       };
       const typeMapIcon = iconMap[options?.theme];
       const defaultOptions = {
diff --git a/src/toast/type.ts b/src/toast/type.ts
index 0208fd71d..283407ed0 100644
--- a/src/toast/type.ts
+++ b/src/toast/type.ts
@@ -88,6 +88,6 @@ export interface TdToastProps {
    */
   theme?: {
     type: StringConstructor;
-    value?: 'loading' | 'success' | 'fail';
+    value?: 'loading' | 'success' | 'error';
   };
 }

From 41f0689003e6d02a3e5411d35412353e3ab49c22 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Fri, 24 Feb 2023 11:35:10 +0800
Subject: [PATCH 20/62] docs: update api & changelog

---
 CHANGELOG.md                   | 30 ++++++------------------------
 src/cell-group/README.en-US.md | 11 -----------
 src/cell-group/README.md       | 11 -----------
 src/cell/README.md             |  9 +++++++++
 4 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 src/cell-group/README.en-US.md
 delete mode 100644 src/cell-group/README.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 515a3f22f..4242a6f8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ docClass: timeline
 - `Input`: 支持 `tips` 文本方向与 `align` 属性值一致 @anlyyao ([#1585](https://github.com/Tencent/tdesign-miniprogram/pull/1585))
 - `CellGroup`: 默认最后一项 `cell` 无底部边框线 @anlyyao ([#1607](https://github.com/Tencent/tdesign-miniprogram/pull/1607))
 - `Image`: 补充外部样式类名 `class` @anlyyao ([#1611](https://github.com/Tencent/tdesign-miniprogram/pull/1611))
-- `DropdownMenu`: 新增 reset 事件 @LeeJim ([#1617](https://github.com/Tencent/tdesign-miniprogram/pull/1617))
+- `DropdownMenu`: 新增 `reset` 事件 @LeeJim ([#1617](https://github.com/Tencent/tdesign-miniprogram/pull/1617))
 - `Drawer`: 支持无障碍访问 @zhangpaopao0609 ([#1552](https://github.com/Tencent/tdesign-miniprogram/pull/1552))
 
 ### 🐞 Bug Fixes
@@ -29,9 +29,9 @@ docClass: timeline
 - `Tabs`: 修复属性不支持响应式变化的问题 @LeeJim ([#1616](https://github.com/Tencent/tdesign-miniprogram/pull/1616))
 - `DropdownMenu`: 修复下拉菜单遮罩层无法点击 @RoseyW ([#1615](https://github.com/Tencent/tdesign-miniprogram/pull/1615))
 - `Message`: 修复事件名称，以符合文档 @LeeJim ([#1618](https://github.com/Tencent/tdesign-miniprogram/pull/1618))
-- `Dialog`: 修复事件名，从 overlayClick 改成 overlay-click @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
-- `SwiperNav`: 修复事件名，从 navBtnChange 改成 nav-btn-change @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
-- `TextArea`: 修复事件名，从 lineChange改成 line-change @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
+- `Dialog`: 修复事件名，从 `overlayClick` 改成 `overlay-click` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
+- `SwiperNav`: 修复事件名，从 `navBtnChange` 改成 `nav-btn-change` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
+- `TextArea`: 修复事件名，从 `lineChange` 改成 `line-change` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
 - `DropdownMenu`: 修复下拉菜单遮罩层无法点击 @RoseyW ([#1615](https://github.com/Tencent/tdesign-miniprogram/pull/1615))
 
 ## 🌈 1.0.0-rc.2 `2023-02-13` 
@@ -39,7 +39,7 @@ docClass: timeline
 - `Icon`: `size` 和 `color` 属性默认值变更为 `''` @anlyyao ([#1553](https://github.com/Tencent/tdesign-miniprogram/pull/1553))
 ### 🚀 Features
 - 所有组件同时支持 `style` 和 `customStyle` 属性 @LeeJim ([#1532](https://github.com/Tencent/tdesign-miniprogram/pull/1532))
-- `Button`: 支持点击态边框颜色 css variable @anlyyao ([#1530](https://github.com/Tencent/tdesign-miniprogram/pull/1530))
+- `Button`: 支持点击态边框颜色 CSS Variable @anlyyao ([#1530](https://github.com/Tencent/tdesign-miniprogram/pull/1530))
 - `Result`: 属性 icon 支持对象类型，透传至图标组件 @LeeJim ([#1539](https://github.com/Tencent/tdesign-miniprogram/pull/1539))
 - `TabBar`: 属性 icon 支持对象类型，透传至图标组件 @LeeJim ([#1539](https://github.com/Tencent/tdesign-miniprogram/pull/1539))
 - `Toast`: 属性 icon 支持对象类型，透传至图标组件 @LeeJim ([#1539](https://github.com/Tencent/tdesign-miniprogram/pull/1539))
@@ -91,23 +91,6 @@ docClass: timeline
 - `Picker`: 修复样式、优化布局以及交互体验 @LeeJim ([#1513](https://github.com/Tencent/tdesign-miniprogram/pull/1513))
 - `Swiper`: 修复 `autoplay` 状态下，`swiper` 偶现左右抖动问题 @anlyyao ([#1494](https://github.com/Tencent/tdesign-miniprogram/pull/1494))
 
-## 🌈 1.0.0-rc.1 `2023-01-18` 
-### ❗ BREAKING CHANGES
-- `Dialog`: 移除内置的 input 样式 @LeeJim ([#1516](https://github.com/Tencent/tdesign-miniprogram/pull/1516))
-- `Input`: 优化 DOM，移除外置的 wapper 元素 @LeeJim ([#1516](https://github.com/Tencent/tdesign-miniprogram/pull/1516))
-
-### 🚀 Features
-- `Cell`: 新增底边框左右边距 CSS Variables @anlyyao ([#1515](https://github.com/Tencent/tdesign-miniprogram/pull/1515))
-- `Cell`: 补充 CSS Variables @anlyyao ([#1517](https://github.com/Tencent/tdesign-miniprogram/pull/1517))
-- `SideBar`: 支持传入 Icon @LeeJim ([#1520](https://github.com/Tencent/tdesign-miniprogram/pull/1520))
-- `Tabs`: 支持传入 icon @LeeJim ([#1519](https://github.com/Tencent/tdesign-miniprogram/pull/1519))
-### 🐞 Bug Fixes
-- `Upload`: 修复 add-content 不生效的问题 @LeeJim ([#1507](https://github.com/Tencent/tdesign-miniprogram/pull/1507))
-- `Upload`: 优化插槽渲染，不再需要传入 add-content = 'slot' @LeeJim ([#1507](https://github.com/Tencent/tdesign-miniprogram/pull/1507))
-- `Cascader`: 修复 slot 无法使用的问题 @LeeJim ([#1508](https://github.com/Tencent/tdesign-miniprogram/pull/1508))
-- `Picker`: 修复样式、优化布局以及交互体验 @LeeJim ([#1513](https://github.com/Tencent/tdesign-miniprogram/pull/1513))
-- `Swiper`: 修复 `autoplay` 状态下，`swiper` 偶现左右抖动问题 @anlyyao ([#1494](https://github.com/Tencent/tdesign-miniprogram/pull/1494))
-
 ## 🌈 1.0.0-rc `2023-01-12` 
 ### ❗ Breaking Changes
 - 全部组件开启 vritualHost，当基础库版本低于 2.19.2 自动关闭 @LeeJim ([#1495](https://github.com/Tencent/tdesign-miniprogram/pull/1495))
@@ -158,7 +141,7 @@ docClass: timeline
 - `PullDownRefresh`: 新增 scroll 事件 @LeeJim ([#1424](https://github.com/Tencent/tdesign-miniprogram/pull/1424))
 - `BackTop`: 放置 pull-down-refresh 内部时，将会滚动该容器到顶部 @LeeJim ([#1424](https://github.com/Tencent/tdesign-miniprogram/pull/1424))
 - `Swiper`: 增加 click 事件 @LeeJim ([#1435](https://github.com/Tencent/tdesign-miniprogram/pull/1435))
-- `Collapse`: 新增 placmen 属性，支持内容面板在上方 @LeeJim ([#1446](https://github.com/Tencent/tdesign-miniprogram/pull/1446))
+- `Collapse`: 新增 placment 属性，支持内容面板在上方 @LeeJim ([#1446](https://github.com/Tencent/tdesign-miniprogram/pull/1446))
 - `Calendar`: 新增 auto-close 属性，以及 close 事件 @LeeJim ([#1448](https://github.com/Tencent/tdesign-miniprogram/pull/1448))
 - `Textarea`: 补充 cursor、disableDefaultPadding、showConfirmBar、 selection-Start、 selectionEnd、holdKeyboard 等属性 @anlyyao ([#1463](https://github.com/Tencent/tdesign-miniprogram/pull/1463))
 - `Textarea`: 补充 keyboardheightchange 事件 @anlyyao ([#1463](https://github.com/Tencent/tdesign-miniprogram/pull/1463))
@@ -304,7 +287,6 @@ docClass: timeline
 - `Fab`: 支持无障碍访问 @zhangpaopao0609 ([#1231](https://github.com/Tencent/tdesign-miniprogram/pull/1231))
 - `Tabs`: 支持无障碍访问 @zhangpaopao0609 ([#1227](https://github.com/Tencent/tdesign-miniprogram/pull/1227))
 - `Overlay`: 支持无障碍访问 @szu-bee ([#1205](https://github.com/Tencent/tdesign-miniprogram/pull/1205))
-- `Collapse`: 支持无障碍访问 @gzzhanghao ([#1224](https://github.com/Tencent/tdesign-miniprogram/pull/1224))
 - `Toast`: 支持无障碍访问 @huaiyinfeilong ([#1210](https://github.com/Tencent/tdesign-miniprogram/pull/1210))
 
 ### 🐞 Bug Fixes
diff --git a/src/cell-group/README.en-US.md b/src/cell-group/README.en-US.md
deleted file mode 100644
index fa6150c3f..000000000
--- a/src/cell-group/README.en-US.md
+++ /dev/null
@@ -1,11 +0,0 @@
-:: BASE_DOC ::
-
-## API
-### CellGroup Props
-
-name | type | default | description | required
--- | -- | -- | -- | --
-bordered | Boolean | - | \- | N
-external-classes | Array | - | `['t-class']` | N
-theme | String | default | options：default/card | N
-title | String | - | \- | N
diff --git a/src/cell-group/README.md b/src/cell-group/README.md
deleted file mode 100644
index c53ba8c0b..000000000
--- a/src/cell-group/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-:: BASE_DOC ::
-
-## API
-### CellGroup Props
-
-名称 | 类型 | 默认值 | 说明 | 必传
--- | -- | -- | -- | --
-bordered | Boolean | - | 是否显示组边框 | N
-external-classes | Array | - | 组件类名。`['t-class']` | N
-theme | String | default | 单元格风格。可选项：default/card | N
-title | String | - | 单元格组标题 | N
diff --git a/src/cell/README.md b/src/cell/README.md
index 4609478e5..fda3de052 100644
--- a/src/cell/README.md
+++ b/src/cell/README.md
@@ -63,3 +63,12 @@ url | String | - | 点击后跳转链接地址。如果值为空，则表示不
 名称 | 参数 | 描述
 -- | -- | --
 click | - | 右侧内容
+
+### CellGroup Props
+
+名称 | 类型 | 默认值 | 说明 | 必传
+-- | -- | -- | -- | --
+bordered | Boolean | - | 是否显示组边框 | N
+external-classes | Array | - | 组件类名。`['t-class']` | N
+theme | String | default | 单元格风格。可选项：default/card | N
+title | String | - | 单元格组标题 | N

From a0afdedaa4c976adb2cb9c05c8dbf4deb37fe09a Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Fri, 24 Feb 2023 16:32:58 +0800
Subject: [PATCH 21/62] fix: fix overview.md errors (#1651)

---
 site/docs/overview.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/site/docs/overview.md b/site/docs/overview.md
index bc9215128..b9b4ba1ce 100644
--- a/site/docs/overview.md
+++ b/site/docs/overview.md
@@ -78,7 +78,7 @@ spline: explain
     </a>
   </div>
   <div class="image-wrapper">
-    <a class="item" href="/miniprogram/components/sidebar">
+    <a class="item" href="/miniprogram/components/side-bar">
       <img class="__light__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-sidebar.png" />
       <img class="__dark__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-sidebar-dark.png" />
       <p class="name">SideBar 侧边导航栏</p>
@@ -203,7 +203,7 @@ spline: explain
   </div>
 
   <div class="image-wrapper">
-    <a class="item" href="/miniprogram/components/textarea">
+    <a class="item" href="/miniprogram/components/tree-select">
       <img class="__light__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-treeselect.png" />
       <img class="__dark__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-treeselect-dark.png" />
       <p class="name">TreeSelect 树形选择</p>
@@ -401,7 +401,7 @@ spline: explain
   </div>
 
   <div class="image-wrapper">
-    <a class="item" href="/miniprogram/components/popup">
+    <a class="item" href="/miniprogram/components/overlay">
       <img class="__light__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-overlay.png" />
       <img class="__dark__" src="https://tdesign.gtimg.com/site/miniprogram-doc/doc-overlay-dark.png" />
       <p class="name">Overlay 遮罩层</p>

From e2c7b6a060ec61fb490fdd1f750fd95a1f57e991 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Fri, 24 Feb 2023 16:49:39 +0800
Subject: [PATCH 22/62] fix: update pages

---
 example/app.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/app.json b/example/app.json
index 8832837c7..05c393c78 100644
--- a/example/app.json
+++ b/example/app.json
@@ -5,7 +5,6 @@
     "pages/tabs/tabs",
     "pages/icon/icon",
     "pages/loading/loading",
-    "pages/loading/loadingProgress/index",
     "pages/progress/progress",
     "pages/cascader/cascader",
     "pages/cell/cell",

From 7d3ccdb1889ac24a8c46b7d8084dd73bd09ea7e2 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Fri, 24 Feb 2023 17:03:12 +0800
Subject: [PATCH 23/62] fix(collapse): resolve disabled color (#1648)

* fix(collapse): resolve disabled color

* test: update snapshot
---
 src/cell/__test__/__snapshots__/index.test.js.snap     | 4 ++--
 src/cell/cell.wxml                                     | 4 ++--
 src/collapse-panel/collapse-panel.less                 | 4 ++--
 src/collapse/__test__/__snapshots__/index.test.js.snap | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cell/__test__/__snapshots__/index.test.js.snap b/src/cell/__test__/__snapshots__/index.test.js.snap
index a9521a796..049933a34 100644
--- a/src/cell/__test__/__snapshots__/index.test.js.snap
+++ b/src/cell/__test__/__snapshots__/index.test.js.snap
@@ -18,10 +18,10 @@ exports[`cell :base 1`] = `
         class="t-cell__left t-class-left"
       />
       <wx-view
-        class="t-cell__title t-class-title"
+        class="t-cell__title"
       >
         <wx-view
-          class="t-cell__title-text"
+          class="t-cell__title-text  t-class-title"
         />
         <wx-view
           class="t-cell__description t-class-description"
diff --git a/src/cell/cell.wxml b/src/cell/cell.wxml
index 461b9c300..e15486982 100644
--- a/src/cell/cell.wxml
+++ b/src/cell/cell.wxml
@@ -24,8 +24,8 @@
     />
     <slot name="image" />
   </view>
-  <view class="{{classPrefix}}__title {{prefix}}-class-title">
-    <view class="{{classPrefix}}__title-text">
+  <view class="{{classPrefix}}__title">
+    <view class="{{classPrefix}}__title-text  {{prefix}}-class-title">
       <block wx:if="{{ title }}"> {{ title}} </block>
       <slot name="title" />
       <block wx:if="{{required}}">
diff --git a/src/collapse-panel/collapse-panel.less b/src/collapse-panel/collapse-panel.less
index a58170dc6..ac27ec16a 100644
--- a/src/collapse-panel/collapse-panel.less
+++ b/src/collapse-panel/collapse-panel.less
@@ -115,13 +115,13 @@
 
   &-note {
     &--disabled {
-      color: @font-gray-4 !important;
+      color: @font-gray-4;
     }
   }
 
   &-right-icon {
     &--disabled {
-      color: @font-gray-4 !important;
+      color: @font-gray-4;
     }
   }
 }
diff --git a/src/collapse/__test__/__snapshots__/index.test.js.snap b/src/collapse/__test__/__snapshots__/index.test.js.snap
index c4dd3cdc0..3c2af13a0 100644
--- a/src/collapse/__test__/__snapshots__/index.test.js.snap
+++ b/src/collapse/__test__/__snapshots__/index.test.js.snap
@@ -40,10 +40,10 @@ exports[`collapse :defaultExpandAll 1`] = `
                 class="t-cell__left t-class-left"
               />
               <wx-view
-                class="t-cell__title t-class-title"
+                class="t-cell__title"
               >
                 <wx-view
-                  class="t-cell__title-text"
+                  class="t-cell__title-text  t-class-title"
                 >
                    first 
                 </wx-view>
@@ -125,10 +125,10 @@ exports[`collapse :defaultExpandAll 1`] = `
                 class="t-cell__left t-class-left"
               />
               <wx-view
-                class="t-cell__title t-class-title"
+                class="t-cell__title"
               >
                 <wx-view
-                  class="t-cell__title-text"
+                  class="t-cell__title-text  t-class-title"
                 >
                    second 
                 </wx-view>

From 7b911dfdc6c102a47baad38e69cc9b15462b3353 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Fri, 24 Feb 2023 17:10:37 +0800
Subject: [PATCH 24/62] chore(Link): remove status and add disabled and hover
 (#1652)

* chore(Link): remove status and add disabled and hover

* feat(Link): support external-classes
---
 src/link/README.en-US.md                      |  2 +
 src/link/README.md                            |  8 +-
 .../__test__/__snapshots__/demo.test.js.snap  | 98 +++++++++++--------
 .../__virtualHostSnapshot__/demo.test.js.snap | 98 +++++++++++--------
 src/link/__test__/demo.test.js                |  2 +-
 src/link/_example/content/index.wxml          |  4 +-
 .../_example/{status => disabled}/index.js    |  0
 .../_example/{status => disabled}/index.json  |  0
 .../_example/{status => disabled}/index.wxml  | 10 +-
 .../_example/{status => disabled}/index.wxss  |  0
 src/link/_example/link.json                   |  2 +-
 src/link/_example/link.wxml                   |  2 +-
 src/link/_example/prefix/index.wxml           |  4 +-
 src/link/_example/size/index.wxml             |  6 +-
 src/link/_example/suffix/index.wxml           |  4 +-
 src/link/_example/theme/index.wxml            | 10 +-
 src/link/_example/underline/index.wxml        |  4 +-
 src/link/link.less                            | 68 +++++++------
 src/link/link.ts                              | 14 ++-
 src/link/link.wxml                            |  6 +-
 src/link/props.ts                             | 12 ++-
 src/link/type.ts                              | 17 +++-
 22 files changed, 222 insertions(+), 149 deletions(-)
 rename src/link/_example/{status => disabled}/index.js (100%)
 rename src/link/_example/{status => disabled}/index.json (100%)
 rename src/link/_example/{status => disabled}/index.wxml (70%)
 rename src/link/_example/{status => disabled}/index.wxss (100%)

diff --git a/src/link/README.en-US.md b/src/link/README.en-US.md
index c89261acc..3b01055b4 100644
--- a/src/link/README.en-US.md
+++ b/src/link/README.en-US.md
@@ -10,6 +10,8 @@ navigator-props | Object | - | \- | N
 prefix-icon | String / Object / Slot | - | \- | N
 size | String | medium | options：small/medium/large。Typescript：`SizeEnum` | N
 status | String | normal | options：normal/active/disabled | N
+disabled | Boolean | false | \- | N
+hover | Boolean | - | \- | N
 suffix-icon | String / Object / Slot | - | \- | N
 theme | String | default | options：default/primary/danger/warning/success | N
 underline | Boolean | - | \- | N
diff --git a/src/link/README.md b/src/link/README.md
index d579faa56..0a279a704 100644
--- a/src/link/README.md
+++ b/src/link/README.md
@@ -50,7 +50,7 @@ isComponent: true
 
 禁用状态
 
-{{ status }}
+{{ disabled }}
 
 ### 组件样式
 
@@ -67,11 +67,13 @@ content | String / Slot | - | 链接内容 | N
 navigator-props | Object | - | 与 navigator 原生组件属性保持一致，具体使用参考：https://developers.weixin.qq.com/miniprogram/dev/component/navigator.html。 | N
 prefix-icon | String / Object / Slot | - | 前置图标 | N
 size | String | medium | 尺寸。可选项：small/medium/large。TS 类型：`SizeEnum` | N
-status | String | normal | 组件状态。可选项：normal/active/disabled | N
+status | String | normal | 已废弃。组件状态。可选项：normal/active/disabled | N
+disabled | Boolean | false | 是否为禁用态 | N
+hover | Boolean | - | 是否开启点击反馈 | N
 suffix-icon | String / Object / Slot | - | 前置图标 | N
 theme | String | default | 组件风格，依次为默认色、品牌色、危险色、警告色、成功色。可选项：default/primary/danger/warning/success | N
 underline | Boolean | - | 是否显示链接下划线 | N
-
+external-classes | Array | - | 样式类名。`['t-class', 't-class-hover', 't-class-prefix-icon', 't-class-content', 't-class-suffix-icon']` | N
 ### Link Events
 
 名称 | 参数 | 描述
diff --git a/src/link/__test__/__snapshots__/demo.test.js.snap b/src/link/__test__/__snapshots__/demo.test.js.snap
index 6d0a9ef88..c039856b5 100644
--- a/src/link/__test__/__snapshots__/demo.test.js.snap
+++ b/src/link/__test__/__snapshots__/demo.test.js.snap
@@ -7,111 +7,116 @@ exports[`Link Link content demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
     />
   </wx-view>
 </content>
 `;
 
-exports[`Link Link prefix demo works fine 1`] = `
-<prefix>
+exports[`Link Link disabled demo works fine 1`] = `
+<disabled>
   <wx-view
     class="link-example"
   >
     <t-link
       content="跳转链接"
-      prefixIcon="link"
+      disabled="{{true}}"
+      hover="{{true}}"
       size="small"
+      suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
-      prefixIcon="link"
+      disabled="{{true}}"
       size="small"
+      suffixIcon="jump"
     />
-  </wx-view>
-</prefix>
-`;
-
-exports[`Link Link size demo works fine 1`] = `
-<size>
-  <wx-view
-    class="link-example"
-  >
     <t-link
-      content="S号链接"
+      content="跳转链接"
       disabled="{{true}}"
       size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="danger"
     />
+  </wx-view>
+  <wx-view
+    class="link-example"
+  >
     <t-link
-      content="M号链接"
+      content="跳转链接"
       disabled="{{true}}"
+      size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="warning"
     />
     <t-link
-      content="L号链接"
+      content="跳转链接"
       disabled="{{true}}"
-      size="large"
+      size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="success"
     />
   </wx-view>
-</size>
+</disabled>
 `;
 
-exports[`Link Link status demo works fine 1`] = `
-<status>
+exports[`Link Link prefix demo works fine 1`] = `
+<prefix>
   <wx-view
     class="link-example"
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
+      prefixIcon="link"
       size="small"
-      status="disabled"
-      suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
+      prefixIcon="link"
       size="small"
-      status="disabled"
-      suffixIcon="jump"
-    />
-    <t-link
-      content="跳转链接"
-      size="small"
-      status="disabled"
-      suffixIcon="jump"
-      theme="danger"
     />
   </wx-view>
+</prefix>
+`;
+
+exports[`Link Link size demo works fine 1`] = `
+<size>
   <wx-view
     class="link-example"
   >
     <t-link
-      content="跳转链接"
+      content="S号链接"
+      hover="{{true}}"
       size="small"
-      status="disabled"
       suffixIcon="jump"
-      theme="warning"
+      theme="primary"
     />
     <t-link
-      content="跳转链接"
-      size="small"
-      status="disabled"
+      content="M号链接"
+      hover="{{true}}"
       suffixIcon="jump"
-      theme="success"
+      theme="primary"
+    />
+    <t-link
+      content="L号链接"
+      hover="{{true}}"
+      size="large"
+      suffixIcon="jump"
+      theme="primary"
     />
   </wx-view>
-</status>
+</size>
 `;
 
 exports[`Link Link suffix demo works fine 1`] = `
@@ -121,12 +126,14 @@ exports[`Link Link suffix demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
     />
@@ -141,17 +148,20 @@ exports[`Link Link theme demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="danger"
@@ -162,12 +172,14 @@ exports[`Link Link theme demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="warning"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="success"
@@ -183,12 +195,14 @@ exports[`Link Link underline demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       theme="primary"
       underline="{{true}}"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       underline="{{true}}"
     />
diff --git a/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 6d0a9ef88..c039856b5 100644
--- a/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/link/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -7,111 +7,116 @@ exports[`Link Link content demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
     />
   </wx-view>
 </content>
 `;
 
-exports[`Link Link prefix demo works fine 1`] = `
-<prefix>
+exports[`Link Link disabled demo works fine 1`] = `
+<disabled>
   <wx-view
     class="link-example"
   >
     <t-link
       content="跳转链接"
-      prefixIcon="link"
+      disabled="{{true}}"
+      hover="{{true}}"
       size="small"
+      suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
-      prefixIcon="link"
+      disabled="{{true}}"
       size="small"
+      suffixIcon="jump"
     />
-  </wx-view>
-</prefix>
-`;
-
-exports[`Link Link size demo works fine 1`] = `
-<size>
-  <wx-view
-    class="link-example"
-  >
     <t-link
-      content="S号链接"
+      content="跳转链接"
       disabled="{{true}}"
       size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="danger"
     />
+  </wx-view>
+  <wx-view
+    class="link-example"
+  >
     <t-link
-      content="M号链接"
+      content="跳转链接"
       disabled="{{true}}"
+      size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="warning"
     />
     <t-link
-      content="L号链接"
+      content="跳转链接"
       disabled="{{true}}"
-      size="large"
+      size="small"
       suffixIcon="jump"
-      theme="primary"
+      theme="success"
     />
   </wx-view>
-</size>
+</disabled>
 `;
 
-exports[`Link Link status demo works fine 1`] = `
-<status>
+exports[`Link Link prefix demo works fine 1`] = `
+<prefix>
   <wx-view
     class="link-example"
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
+      prefixIcon="link"
       size="small"
-      status="disabled"
-      suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
+      prefixIcon="link"
       size="small"
-      status="disabled"
-      suffixIcon="jump"
-    />
-    <t-link
-      content="跳转链接"
-      size="small"
-      status="disabled"
-      suffixIcon="jump"
-      theme="danger"
     />
   </wx-view>
+</prefix>
+`;
+
+exports[`Link Link size demo works fine 1`] = `
+<size>
   <wx-view
     class="link-example"
   >
     <t-link
-      content="跳转链接"
+      content="S号链接"
+      hover="{{true}}"
       size="small"
-      status="disabled"
       suffixIcon="jump"
-      theme="warning"
+      theme="primary"
     />
     <t-link
-      content="跳转链接"
-      size="small"
-      status="disabled"
+      content="M号链接"
+      hover="{{true}}"
       suffixIcon="jump"
-      theme="success"
+      theme="primary"
+    />
+    <t-link
+      content="L号链接"
+      hover="{{true}}"
+      size="large"
+      suffixIcon="jump"
+      theme="primary"
     />
   </wx-view>
-</status>
+</size>
 `;
 
 exports[`Link Link suffix demo works fine 1`] = `
@@ -121,12 +126,14 @@ exports[`Link Link suffix demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
     />
@@ -141,17 +148,20 @@ exports[`Link Link theme demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="primary"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="danger"
@@ -162,12 +172,14 @@ exports[`Link Link theme demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="warning"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       suffixIcon="jump"
       theme="success"
@@ -183,12 +195,14 @@ exports[`Link Link underline demo works fine 1`] = `
   >
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       theme="primary"
       underline="{{true}}"
     />
     <t-link
       content="跳转链接"
+      hover="{{true}}"
       size="small"
       underline="{{true}}"
     />
diff --git a/src/link/__test__/demo.test.js b/src/link/__test__/demo.test.js
index 0b02ba828..a4d25a655 100644
--- a/src/link/__test__/demo.test.js
+++ b/src/link/__test__/demo.test.js
@@ -5,7 +5,7 @@
 import simulate from 'miniprogram-simulate';
 import path from 'path';
 
-const mapper = ['content', 'prefix', 'size', 'status', 'suffix', 'theme', 'underline'];
+const mapper = ['content', 'disabled', 'prefix', 'size', 'suffix', 'theme', 'underline'];
 
 describe('Link', () => {
   mapper.forEach((demoName) => {
diff --git a/src/link/_example/content/index.wxml b/src/link/_example/content/index.wxml
index e2890950f..1bf3ca333 100644
--- a/src/link/_example/content/index.wxml
+++ b/src/link/_example/content/index.wxml
@@ -1,4 +1,4 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" />
-  <t-link size="small" content="跳转链接" />
+  <t-link size="small" theme="primary" content="跳转链接" hover />
+  <t-link size="small" content="跳转链接" hover />
 </view>
diff --git a/src/link/_example/status/index.js b/src/link/_example/disabled/index.js
similarity index 100%
rename from src/link/_example/status/index.js
rename to src/link/_example/disabled/index.js
diff --git a/src/link/_example/status/index.json b/src/link/_example/disabled/index.json
similarity index 100%
rename from src/link/_example/status/index.json
rename to src/link/_example/disabled/index.json
diff --git a/src/link/_example/status/index.wxml b/src/link/_example/disabled/index.wxml
similarity index 70%
rename from src/link/_example/status/index.wxml
rename to src/link/_example/disabled/index.wxml
index 728b31051..eb49e1a7b 100644
--- a/src/link/_example/status/index.wxml
+++ b/src/link/_example/disabled/index.wxml
@@ -1,9 +1,9 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" status="disabled" />
-  <t-link size="small" content="跳转链接" suffixIcon="jump" status="disabled" />
-  <t-link size="small" theme="danger" content="跳转链接" suffixIcon="jump" status="disabled" />
+  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" disabled hover />
+  <t-link size="small" content="跳转链接" suffixIcon="jump" disabled />
+  <t-link size="small" theme="danger" content="跳转链接" suffixIcon="jump" disabled />
 </view>
 <view class="link-example">
-  <t-link size="small" theme="warning" content="跳转链接" suffixIcon="jump" status="disabled" />
-  <t-link size="small" theme="success" content="跳转链接" suffixIcon="jump" status="disabled" />
+  <t-link size="small" theme="warning" content="跳转链接" suffixIcon="jump" disabled />
+  <t-link size="small" theme="success" content="跳转链接" suffixIcon="jump" disabled />
 </view>
diff --git a/src/link/_example/status/index.wxss b/src/link/_example/disabled/index.wxss
similarity index 100%
rename from src/link/_example/status/index.wxss
rename to src/link/_example/disabled/index.wxss
diff --git a/src/link/_example/link.json b/src/link/_example/link.json
index e8cbfd9fa..662a25a30 100644
--- a/src/link/_example/link.json
+++ b/src/link/_example/link.json
@@ -6,7 +6,7 @@
     "prefix": "./prefix",
     "suffix": "./suffix",
     "theme": "./theme",
-    "status": "./status",
+    "disabled": "./disabled",
     "size": "./size"
   }
 }
diff --git a/src/link/_example/link.wxml b/src/link/_example/link.wxml
index 6ff3b746f..0123a7915 100644
--- a/src/link/_example/link.wxml
+++ b/src/link/_example/link.wxml
@@ -17,7 +17,7 @@
     <theme />
   </t-demo>
   <t-demo desc="禁用状态">
-    <status />
+    <disabled />
   </t-demo>
   <t-demo title="03 组件样式" desc="链接尺寸">
     <size />
diff --git a/src/link/_example/prefix/index.wxml b/src/link/_example/prefix/index.wxml
index 90c4005e2..fe479dffa 100644
--- a/src/link/_example/prefix/index.wxml
+++ b/src/link/_example/prefix/index.wxml
@@ -1,4 +1,4 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" prefixIcon="link" />
-  <t-link size="small" content="跳转链接" prefixIcon="link" />
+  <t-link size="small" theme="primary" content="跳转链接" prefixIcon="link" hover />
+  <t-link size="small" content="跳转链接" prefixIcon="link" hover />
 </view>
diff --git a/src/link/_example/size/index.wxml b/src/link/_example/size/index.wxml
index 8baaff3d5..e7a3f2ed1 100644
--- a/src/link/_example/size/index.wxml
+++ b/src/link/_example/size/index.wxml
@@ -1,5 +1,5 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="S号链接" suffixIcon="jump" disabled />
-  <t-link theme="primary" content="M号链接" suffixIcon="jump" disabled />
-  <t-link size="large" theme="primary" content="L号链接" suffixIcon="jump" disabled />
+  <t-link size="small" theme="primary" content="S号链接" suffixIcon="jump" hover />
+  <t-link theme="primary" content="M号链接" suffixIcon="jump" hover />
+  <t-link size="large" theme="primary" content="L号链接" suffixIcon="jump" hover />
 </view>
diff --git a/src/link/_example/suffix/index.wxml b/src/link/_example/suffix/index.wxml
index 2d44f14db..d6153d32d 100644
--- a/src/link/_example/suffix/index.wxml
+++ b/src/link/_example/suffix/index.wxml
@@ -1,4 +1,4 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" />
-  <t-link size="small" content="跳转链接" suffixIcon="jump" />
+  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" hover />
+  <t-link size="small" content="跳转链接" suffixIcon="jump" hover />
 </view>
diff --git a/src/link/_example/theme/index.wxml b/src/link/_example/theme/index.wxml
index 755c0c4d6..ff97f4a3c 100644
--- a/src/link/_example/theme/index.wxml
+++ b/src/link/_example/theme/index.wxml
@@ -1,9 +1,9 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" />
-  <t-link size="small" content="跳转链接" suffixIcon="jump" />
-  <t-link size="small" theme="danger" content="跳转链接" suffixIcon="jump" />
+  <t-link size="small" theme="primary" content="跳转链接" suffixIcon="jump" hover />
+  <t-link size="small" content="跳转链接" suffixIcon="jump" hover />
+  <t-link size="small" theme="danger" content="跳转链接" suffixIcon="jump" hover />
 </view>
 <view class="link-example">
-  <t-link size="small" theme="warning" content="跳转链接" suffixIcon="jump" />
-  <t-link size="small" theme="success" content="跳转链接" suffixIcon="jump" />
+  <t-link size="small" theme="warning" content="跳转链接" suffixIcon="jump" hover />
+  <t-link size="small" theme="success" content="跳转链接" suffixIcon="jump" hover />
 </view>
diff --git a/src/link/_example/underline/index.wxml b/src/link/_example/underline/index.wxml
index 11f0312ea..d289c1aa0 100644
--- a/src/link/_example/underline/index.wxml
+++ b/src/link/_example/underline/index.wxml
@@ -1,4 +1,4 @@
 <view class="link-example">
-  <t-link size="small" theme="primary" content="跳转链接" underline />
-  <t-link size="small" content="跳转链接" underline />
+  <t-link size="small" theme="primary" content="跳转链接" underline hover />
+  <t-link size="small" content="跳转链接" underline hover />
 </view>
diff --git a/src/link/link.less b/src/link/link.less
index ae98d368f..a368d7845 100644
--- a/src/link/link.less
+++ b/src/link/link.less
@@ -2,29 +2,29 @@
 
 // 状态色 - 默认色
 
-@link-normal-default-color: var(--td-link-normal-default-color, @font-gray-1); // default 主题默认态颜色
-@link-active-default-color: var(--td-link-active-default-color, @brand-color-active); // default 主题激活态颜色
-@link-disabled-default-color: var(--td-link-disabled-default-color, @text-color-disabled); // default 主题禁用态颜色
+@link-default-color: var(--td-link-default-color, @font-gray-1); // default 主题默认态颜色
+@link-default-active-color: var(--td-link-default-active-color, @brand-color-active); // default 主题激活态颜色
+@link-default-disabled-color: var(--td-link-default-disabled-color, @text-color-disabled); // default 主题禁用态颜色
 
 // 状态色 - 主色
-@link-normal-primary-color: var(--td-link-normal-primary-color, @brand-color); // primary 主题默认态颜色
-@link-active-primary-color: var(--td-link-active-primary-color, @brand-color-active); // primary 主题激活态颜色
-@link-disabled-primary-color: var(--td-link-disabled-primary-color, @brand-color-disabled); // primary 主题禁用态颜色
+@link-primary-color: var(--td-link-primary-color, @brand-color); // primary 主题默认态颜色
+@link-primary-active-color: var(--td-link-primary-active-color, @brand-color-active); // primary 主题激活态颜色
+@link-primary-disabled-color: var(--td-link-primary-disabled-color, @brand-color-disabled); // primary 主题禁用态颜色
 
 // 状态色 - 成功
-@link-normal-success-color: var(--td-link-normal-success-color, @success-color); // success 主题默认态颜色
-@link-active-success-color: var(--td-link-active-success-color, @success-color-active); // success 主题激活态颜色
-@link-disabled-success-color: var(--td-link-disabled-success-color, @success-color-disabled); // success 主题禁用态颜色
+@link-success-color: var(--td-link-success-color, @success-color); // success 主题默认态颜色
+@link-success-active-color: var(--td-link-success-active-color, @success-color-active); // success 主题激活态颜色
+@link-success-disabled-color: var(--td-link-success-disabled-color, @success-color-disabled); // success 主题禁用态颜色
 
 // 状态色 - 警告
-@link-normal-warning-color: var(--td-link-normal-warning-color, @warning-color); // warning 主题默认态颜色
-@link-active-warning-color: var(--td-link-active-warning-color, @warning-color-active); // warning 主题激活态颜色
-@link-disabled-warning-color: var(--td-link-disabled-warning-color, @warning-color-disabled); // warning 主题禁用态颜色
+@link-warning-color: var(--td-link-warning-color, @warning-color); // warning 主题默认态颜色
+@link-warning-active-color: var(--td-link-warning-active-color, @warning-color-active); // warning 主题激活态颜色
+@link-warning-disabled-color: var(--td-link-warning-disabled-color, @warning-color-disabled); // warning 主题禁用态颜色
 
 // 状态色 - 危险
-@link-normal-danger-color: var(--td-link-normal-danger-color, @error-color); // danger 主题默认态颜色
-@link-active-danger-color: var(--td-link-active-danger-color, @error-color-active); // danger 主题激活态颜色
-@link-disabled-danger-color: var(--td-link-disabled-danger-color, @error-color-disabled); // danger 主题禁用态颜色
+@link-danger-color: var(--td-link-danger-color, @error-color); // danger 主题默认态颜色
+@link-danger-active-color: var(--td-link-danger-active-color, @error-color-active); // danger 主题激活态颜色
+@link-danger-disabled-color: var(--td-link-danger-disabled-color, @error-color-disabled); // danger 主题禁用态颜色
 
 // 字号
 @link-content-small-font-size: 24rpx;
@@ -60,31 +60,41 @@
   }
 }
 
-.link-status(@status) {
-  .for(@themes, @i: 1) when(@i =< length(@themes)) {
-    @theme: extract(@themes, @i);
-    @color: 'link-@{status}-@{theme}-color';
+.link-theme(@theme) {
+  @color: 'link-@{theme}-color';
+  @activeColor: 'link-@{theme}-active-color';
+  @disabledColor: 'link-@{theme}-disabled-color';
 
-    .@{link}--@{status}-@{theme} {
-      color: @@color;
+  .@{link}--@{theme} {
+    color: @@color;
+
+    &.@{link}--underline::after {
+      border-color: @@color;
+    }
+
+    &.@{link}--disabled {
+      color: @@disabledColor;
+    }
+
+    &.@{link}--hover {
+      color: @@activeColor;
 
       &.@{link}--underline::after {
-        border-color: @@color;
+        border-color: @@activeColor;
       }
     }
-
-    .for(@themes, (@i + 1));
   }
-  .for(@themes);
 }
 
 .link-size(small);
 .link-size(medium);
 .link-size(large);
 
-.link-status(normal);
-.link-status(active);
-.link-status(disabled);
+.link-theme(primary);
+.link-theme(success);
+.link-theme(warning);
+.link-theme(default);
+.link-theme(danger);
 
 .@{link} {
   position: relative;
@@ -100,7 +110,7 @@
     height: 0;
     bottom: 0;
     opacity: 1;
-    border-bottom: 1px solid rgb(205, 11, 231);
+    border-bottom: 2rpx solid rgb(205, 11, 231);
   }
 
   &__prefix-icon:not(:empty) + &__content:not(:empty) {
diff --git a/src/link/link.ts b/src/link/link.ts
index 9e066ae27..b6fa9cf25 100644
--- a/src/link/link.ts
+++ b/src/link/link.ts
@@ -8,7 +8,13 @@ const name = `${prefix}-link`;
 
 @wxComponent()
 export default class Link extends SuperComponent {
-  externalClasses = [];
+  externalClasses = [
+    `${prefix}-class`,
+    `${prefix}-class-hover`,
+    `${prefix}-class-prefix-icon`,
+    `${prefix}-class-content`,
+    `${prefix}-class-suffix-icon`,
+  ];
 
   properties = props;
 
@@ -43,12 +49,12 @@ export default class Link extends SuperComponent {
 
   methods = {
     setClass() {
-      const { theme, status, size, underline, navigatorProps } = this.properties;
-      const classList = [name, `${name}--${status}-${theme}`, `${name}--${size}`];
+      const { theme, size, underline, navigatorProps, disabled } = this.properties;
+      const classList = [name, `${name}--${theme}`, `${name}--${size}`];
       if (underline) {
         classList.push(`${name}--underline`);
       }
-      if ((navigatorProps && !navigatorProps.url) || status === 'disabled') {
+      if ((navigatorProps && !navigatorProps.url) || disabled) {
         classList.push(`${name}--disabled`);
       }
 
diff --git a/src/link/link.wxml b/src/link/link.wxml
index fb8015232..94acf7780 100644
--- a/src/link/link.wxml
+++ b/src/link/link.wxml
@@ -13,7 +13,7 @@
   extra-data="{{navigatorProps.extraData}}"
   version="{{navigatorProps.version}}"
   short-link="{{navigatorProps.shortLink}}"
-  hover-class="none {{navigatorProps.hoverClass}}"
+  hover-class="{{ hover && !disabled && classPrefix + '--hover' }} {{prefix}}-class-hover {{navigatorProps.hoverClass}}"
   hover-stop-propagation="navigatorProps.hoverStopPropagation"
   hover-start-time="{{navigatorProps.hoverStartTime}}"
   hover-stay-time="{{navigatorProps.hoverStayTime}}"
@@ -22,7 +22,7 @@
   bindcomplete="onComplete"
   aria-disabled="{{status === 'disabled'}}"
 >
-  <view class="{{classPrefix}}__prefix-icon">
+  <view class="{{classPrefix}}__prefix-icon {{prefix}}-class-prefix-icon">
     <slot name="prefix-icon" />
     <template
       wx:if="{{_prefixIcon}}"
@@ -35,7 +35,7 @@
     <slot name="content" />
     <slot />
   </view>
-  <view class="{{classPrefix}}__suffix-icon">
+  <view class="{{classPrefix}}__suffix-icon {{prefix}}-class-suffix-icon">
     <slot name="suffix-icon" />
     <template
       wx:if="{{_suffixIcon}}"
diff --git a/src/link/props.ts b/src/link/props.ts
index 1f0043586..b1021d552 100644
--- a/src/link/props.ts
+++ b/src/link/props.ts
@@ -23,11 +23,21 @@ const props: TdLinkProps = {
     type: String,
     value: 'medium',
   },
-  /** 组件状态 */
+  /** 已废弃。组件状态 */
   status: {
     type: String,
     value: 'normal',
   },
+  /** 禁用态 */
+  disabled: {
+    type: Boolean,
+    value: false,
+  },
+  /** 是否开启点击反馈 */
+  hover: {
+    type: Boolean,
+    value: false,
+  },
   /** 前置图标 */
   suffixIcon: {
     type: null,
diff --git a/src/link/type.ts b/src/link/type.ts
index c2addcf2e..c218fca23 100644
--- a/src/link/type.ts
+++ b/src/link/type.ts
@@ -37,13 +37,28 @@ export interface TdLinkProps {
     value?: SizeEnum;
   };
   /**
-   * 组件状态
+   * 已废弃。组件状态
    * @default normal
    */
   status?: {
     type: StringConstructor;
     value?: 'normal' | 'active' | 'disabled';
   };
+  /**
+   * 禁用态
+   * @default false
+   */
+  disabled?: {
+    type: BooleanConstructor;
+    value?: boolean;
+  };
+  /**
+   * 是否开启点击反馈
+   */
+  hover?: {
+    type: BooleanConstructor;
+    value?: boolean;
+  };
   /**
    * 前置图标
    */

From 62e12ad2372f359df28f465dc948c7ef89c1f7e9 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 16:09:50 +0800
Subject: [PATCH 25/62] feat(Drawer): add hover style (#1673)

---
 src/drawer/drawer.less | 12 ++++++++++--
 src/drawer/drawer.wxml |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/drawer/drawer.less b/src/drawer/drawer.less
index af7329471..50007866c 100644
--- a/src/drawer/drawer.less
+++ b/src/drawer/drawer.less
@@ -12,6 +12,7 @@
 @drawer-item-icon-size: var(--td-drawer-item-icon-size, 48rpx);
 @drawer-sidebar-height: var(--td-drawer-sidebar-height, 70vh);
 @drawer-footer-padding-bottom: var(--td-drawer-footer-padding-bottom, 40rpx);
+@drawer-hover-color: var(--td-drawer-hover-color, @bg-color-secondarycontainer);
 
 .@{prefix}-drawer {
   background: @drawer-bg-color;
@@ -22,6 +23,10 @@
   padding-bottom: env(safe-area-inset-bottom, 28px);
   padding-bottom: constant(safe-area-inset-bottom, 28px);
 
+  &--hover {
+    background-color: @drawer-hover-color;
+  }
+
   &__title {
     font-weight: 600;
     font-size: @drawer-title-font-size;
@@ -35,10 +40,13 @@
       display: flex;
       align-items: center;
       .border(bottom, @drawer-border-color);
-      padding: @drawer-item-padding 0;
-      margin-left: @drawer-item-padding;
+      padding: @drawer-item-padding 0 @drawer-item-padding @drawer-item-padding;
       line-height: @drawer-item-height;
 
+      &::after {
+        left: @drawer-item-padding;
+      }
+
       &-title {
         flex: 1;
         color: var(--td-drawer-title-color);
diff --git a/src/drawer/drawer.wxml b/src/drawer/drawer.wxml
index 83922ebfe..026f80035 100644
--- a/src/drawer/drawer.wxml
+++ b/src/drawer/drawer.wxml
@@ -17,6 +17,10 @@
     <scroll-view class="{{classPrefix}}__sidebar" scroll-y>
       <view
         class="{{classPrefix}}__sidebar-item"
+        hover-class="{{classPrefix}}--hover"
+        hover-stop-propagation="{{false}}"
+        hover-start-time="{{0}}"
+        hover-stay-time="{{100}}"
         wx:for="{{items}}"
         wx:item="item"
         wx:key="index"

From c649a1da5176985194ed13885e377ee3413c5eba Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 16:12:50 +0800
Subject: [PATCH 26/62] fix(Tag): use catch to bind events (#1669)

---
 src/tag/tag.wxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tag/tag.wxml b/src/tag/tag.wxml
index fe36ff68d..f107a8c4d 100644
--- a/src/tag/tag.wxml
+++ b/src/tag/tag.wxml
@@ -17,7 +17,7 @@
     wx:if="{{ closable }}"
     class="{{classPrefix}}__icon-close"
     t-class="{{prefix}}-icon"
-    bind:tap="handleClose"
+    catch:tap="handleClose"
     name="close"
     aria-role="button"
     aria-label="关闭"

From 2fb8ceaef7044fd89c49f155e60eefa99e3980b3 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Mon, 27 Feb 2023 17:31:00 +0800
Subject: [PATCH 27/62] fix(rate): remove variant property and update tips
 disapper logic (#1674)

* fix(rate): remove variant property and update tips disapper logic

* test(rate): update snapshot
---
 src/rate/README.md                               | 12 +++---------
 .../__test__/__snapshots__/demo.test.js.snap     | 16 ++++++----------
 src/rate/_example/action/index.wxml              |  4 ++--
 src/rate/_example/base/index.wxml                |  4 ++--
 src/rate/_example/color/index.wxml               |  4 ++--
 src/rate/_example/count/index.wxml               |  2 +-
 src/rate/_example/show-text/index.wxml           | 13 +++----------
 src/rate/_example/size/index.wxml                |  4 ++--
 src/rate/_example/un-filled/index.wxml           |  2 +-
 src/rate/props.ts                                |  7 +------
 src/rate/rate.ts                                 | 15 ++++++++++++---
 src/rate/rate.wxml                               |  9 +++++----
 src/rate/rate.wxs                                |  4 +---
 src/rate/type.ts                                 | 10 +---------
 14 files changed, 42 insertions(+), 64 deletions(-)

diff --git a/src/rate/README.md b/src/rate/README.md
index 44d165bce..de4e72dd7 100644
--- a/src/rate/README.md
+++ b/src/rate/README.md
@@ -40,8 +40,6 @@ isComponent: true
 
 ### 组件状态
 
-交互方式：点击
-
 {{ action }}
 
 ### 组件样式
@@ -50,10 +48,6 @@ isComponent: true
 
 {{ size }}
 
-禁用评分
-
-{{ disabled }}
-
 设置评分颜色
 
 {{ color }}
@@ -74,15 +68,15 @@ allow-half | Boolean | false | 是否允许半选 | N
 color | String / Array | '#ED7B2F' | `0.30.0`。评分图标的颜色，样式中默认为 #ED7B2F。一个值表示设置选中高亮的五角星颜色，示例：[选中颜色]。数组则表示分别设置 选中高亮的五角星颜色 和 未选中暗灰的五角星颜色，[选中颜色，未选中颜色]。示例：['#ED7B2F', '#E3E6EB']。TS 类型：`string \| Array<string>` | N
 count | Number | 5 | 评分的数量 | N
 disabled | Boolean | - | 是否禁用评分 | N
-external-classes | Array | - | 组件类名，分别用于设置 组件外层类名、评分图标类名、辅助文字类名。。`['t-class', 't-class-icon', 't-class-text']` | N
+external-classes | Array | - | 组件类名，分别用于设置 组件外层类名、评分图标类名、辅助文字类名。`['t-class', 't-class-icon', 't-class-text']` | N
 gap | Number | 8 | 评分图标的间距 | N
-icon | String / Array | - | `0.30.0`。自定义评分图标，[选中图标，未选中图标]；此时不受 variant 影响。TS 类型：`string \| string[]` | N
+icon | String / Array | - | `0.30.0`。自定义评分图标，[选中图标，未选中图标]。TS 类型：`string \| string[]` | N
 show-text | Boolean | false | 是否显示对应的辅助文字 | N
 size | String | 24px | 评分图标的大小 | N
 texts | Array | [] | 评分等级对应的辅助文字。组件内置默认值为：['极差', '失望', '一般', '满意', '惊喜']。自定义值示例：['1分', '2分', '3分', '4分', '5分']。TS 类型：`Array<string>` | N
 value | Number | 0 | 选择评分的值 | N
 default-value | Number | undefined | 选择评分的值。非受控属性 | N
-variant | String | outline | 形状类型，有描边类型和填充类型两种。可选项：outline/filled | N
+variant | String | outline | 废弃。形状类型，有描边类型和填充类型两种。可选项：outline/filled | N
 
 ### Rate Events
 
diff --git a/src/rate/__test__/__snapshots__/demo.test.js.snap b/src/rate/__test__/__snapshots__/demo.test.js.snap
index 972ac2855..7a5d71d60 100644
--- a/src/rate/__test__/__snapshots__/demo.test.js.snap
+++ b/src/rate/__test__/__snapshots__/demo.test.js.snap
@@ -17,7 +17,6 @@ exports[`Rate Rate action demo works fine 1`] = `
     </wx-view>
     <t-rate
       value="{{3.5}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -37,7 +36,6 @@ exports[`Rate Rate action demo works fine 1`] = `
     <t-rate
       allowHalf="{{true}}"
       defaultValue="{{3}}"
-      variant="filled"
     />
   </wx-view>
 </action>
@@ -55,7 +53,6 @@ exports[`Rate Rate base demo works fine 1`] = `
     </wx-view>
     <t-rate
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -75,7 +72,6 @@ exports[`Rate Rate color demo works fine 1`] = `
     <t-rate
       allowHalf="{{true}}"
       defaultValue="{{3}}"
-      variant="filled"
     />
   </wx-view>
   <wx-view
@@ -89,6 +85,12 @@ exports[`Rate Rate color demo works fine 1`] = `
     <t-rate
       color="#00a870"
       defaultValue="{{3}}"
+      icon="{{
+        Array [
+          "star-filled",
+          "star",
+        ]
+      }}"
     />
   </wx-view>
 </color>
@@ -107,7 +109,6 @@ exports[`Rate Rate count demo works fine 1`] = `
     <t-rate
       count="{{3}}"
       value="{{2}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -156,7 +157,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
         ]
       }}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -172,7 +172,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
       data-index="{{1}}"
       showText="{{true}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -188,7 +187,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
       data-index="{{2}}"
       showText="{{true}}"
       value="{{0}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -208,7 +206,6 @@ exports[`Rate Rate size demo works fine 1`] = `
     <t-rate
       data-index="{{0}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -224,7 +221,6 @@ exports[`Rate Rate size demo works fine 1`] = `
       data-index="{{1}}"
       size="{{20}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
diff --git a/src/rate/_example/action/index.wxml b/src/rate/_example/action/index.wxml
index ada8fd963..5d11fd474 100644
--- a/src/rate/_example/action/index.wxml
+++ b/src/rate/_example/action/index.wxml
@@ -2,12 +2,12 @@
 
 <view class="demo-rate">
   <view class="demo-rate__title">点击或滑动</view>
-  <t-rate value="{{value}}" variant="filled" bind:change="onChange" />
+  <t-rate value="{{value}}" bind:change="onChange" />
 </view>
 
 <view class="demo-desc">只可选半星时</view>
 
 <view class="demo-rate">
   <view class="demo-rate__title">点击或滑动</view>
-  <t-rate default-value="{{3}}" variant="filled" allowHalf />
+  <t-rate default-value="{{3}}" allowHalf />
 </view>
diff --git a/src/rate/_example/base/index.wxml b/src/rate/_example/base/index.wxml
index 90a2aa5fc..96e157261 100644
--- a/src/rate/_example/base/index.wxml
+++ b/src/rate/_example/base/index.wxml
@@ -1,5 +1,5 @@
 <view class="demo-rate">
   <view class="demo-rate__title">实心评分</view>
-  <!-- 实心评分，设置属性：variant-->
-  <t-rate value="{{value}}" variant="filled" bind:change="onChange" />
+
+  <t-rate value="{{value}}" bind:change="onChange" />
 </view>
diff --git a/src/rate/_example/color/index.wxml b/src/rate/_example/color/index.wxml
index cc637c49d..df6548ed3 100644
--- a/src/rate/_example/color/index.wxml
+++ b/src/rate/_example/color/index.wxml
@@ -1,8 +1,8 @@
 <view class="demo-rate custom-color">
   <view class="demo-rate__title">填充评分</view>
-  <t-rate default-value="{{3}}" allowHalf variant="filled" />
+  <t-rate default-value="{{3}}" allowHalf />
 </view>
 <view class="demo-rate">
   <view class="demo-rate__title">线描评分</view>
-  <t-rate default-value="{{3}}" color="#00a870" />
+  <t-rate default-value="{{3}}" icon="{{ ['star-filled', 'star'] }}" color="#00a870" />
 </view>
diff --git a/src/rate/_example/count/index.wxml b/src/rate/_example/count/index.wxml
index 16e18b154..d3ed8a380 100644
--- a/src/rate/_example/count/index.wxml
+++ b/src/rate/_example/count/index.wxml
@@ -1,5 +1,5 @@
 <view class="demo-rate">
   <view class="demo-rate__title">自定义评分数量</view>
   <!-- 自定义评分数量，设置属性：count-->
-  <t-rate value="{{value}}" variant="filled" count="{{3}}" bind:change="onChange" />
+  <t-rate value="{{value}}" count="{{3}}" bind:change="onChange" />
 </view>
diff --git a/src/rate/_example/show-text/index.wxml b/src/rate/_example/show-text/index.wxml
index 3be3c67a7..9cf322316 100644
--- a/src/rate/_example/show-text/index.wxml
+++ b/src/rate/_example/show-text/index.wxml
@@ -1,22 +1,15 @@
 <view class="demo-rate">
   <view class="demo-rate__title">带描述评分</view>
   <!-- 自定义带描述评分，设置属性：texts -->
-  <t-rate
-    value="{{value[0]}}"
-    data-index="{{0}}"
-    bind:change="onChange"
-    showText="{{true}}"
-    texts="{{texts}}"
-    variant="filled"
-  />
+  <t-rate value="{{value[0]}}" data-index="{{0}}" bind:change="onChange" showText="{{true}}" texts="{{texts}}" />
 </view>
 <view class="demo-rate">
   <view class="demo-rate__title">带描述评分</view>
   <!-- 带描述评分，设置属性：showText-->
-  <t-rate value="{{value[1]}}" variant="filled" data-index="{{1}}" bind:change="onChange" showText="{{true}}" />
+  <t-rate value="{{value[1]}}" data-index="{{1}}" bind:change="onChange" showText="{{true}}" />
 </view>
 
 <view class="demo-rate">
   <view class="demo-rate__title">带描述评分</view>
-  <t-rate value="{{value[2]}}" variant="filled" data-index="{{2}}" bind:change="onChange" showText="{{true}}" />
+  <t-rate value="{{value[2]}}" data-index="{{2}}" bind:change="onChange" showText="{{true}}" />
 </view>
diff --git a/src/rate/_example/size/index.wxml b/src/rate/_example/size/index.wxml
index c7e41f886..610b7acaa 100644
--- a/src/rate/_example/size/index.wxml
+++ b/src/rate/_example/size/index.wxml
@@ -1,8 +1,8 @@
 <view class="demo-rate">
   <view class="demo-rate__title">大尺寸 24</view>
-  <t-rate value="{{value[0]}}" data-index="{{0}}" variant="filled" bind:change="onChange" />
+  <t-rate value="{{value[0]}}" data-index="{{0}}" bind:change="onChange" />
 </view>
 <view class="demo-rate">
   <view class="demo-rate__title">小尺寸 20</view>
-  <t-rate value="{{value[1]}}" data-index="{{1}}" variant="filled" bind:change="onChange" size="{{20}}" />
+  <t-rate value="{{value[1]}}" data-index="{{1}}" bind:change="onChange" size="{{20}}" />
 </view>
diff --git a/src/rate/_example/un-filled/index.wxml b/src/rate/_example/un-filled/index.wxml
index 2c1daf06e..63c426f05 100644
--- a/src/rate/_example/un-filled/index.wxml
+++ b/src/rate/_example/un-filled/index.wxml
@@ -1,5 +1,5 @@
 <view class="demo-rate">
   <view class="demo-rate__title">请点击评分</view>
-  <!-- 空心评分，设置属性：variant-->
+
   <t-rate value="{{value}}" bind:change="onChange" />
 </view>
diff --git a/src/rate/props.ts b/src/rate/props.ts
index 1a415217c..5d0c4f0e3 100644
--- a/src/rate/props.ts
+++ b/src/rate/props.ts
@@ -34,7 +34,7 @@ const props: TdRateProps = {
     type: null,
     value: 8,
   },
-  /** 自定义评分图标，[选中图标，未选中图标]；此时不受 variant 影响 */
+  /** 自定义评分图标，[选中图标，未选中图标] */
   icon: {
     type: null,
   },
@@ -63,11 +63,6 @@ const props: TdRateProps = {
     type: Number,
     value: 0,
   },
-  /** 形状类型，有描边类型和填充类型两种 */
-  variant: {
-    type: String,
-    value: 'outline',
-  },
 };
 
 export default props;
diff --git a/src/rate/rate.ts b/src/rate/rate.ts
index 1dde9c637..91a7559f3 100644
--- a/src/rate/rate.ts
+++ b/src/rate/rate.ts
@@ -62,19 +62,28 @@ export default class Rate extends SuperComponent {
         if (value !== currentValue) {
           this._trigger('change', { value });
         }
+
+        if (this.touchEnd) {
+          this.hideTips();
+        }
       });
     },
     onTap(e: WechatMiniprogram.TouchEvent) {
       this.onTouch(e, 'tap');
     },
+    onTouchStart() {
+      this.touchEnd = false;
+    },
     onTouchMove(e: WechatMiniprogram.TouchEvent) {
       this.onTouch(e, 'move');
     },
     onTouchEnd() {
+      this.touchEnd = true;
+      this.hideTips();
+    },
+    hideTips() {
       if (this.data.actionType === 'move') {
-        this.setData({}, () => {
-          this.setData({ tipsVisible: false, scaleIndex: -1 });
-        });
+        this.setData({ tipsVisible: false, scaleIndex: -1 });
       }
     },
     onSelect(e: WechatMiniprogram.TouchEvent) {
diff --git a/src/rate/rate.wxml b/src/rate/rate.wxml
index 8b07be02e..4d8cefa3d 100644
--- a/src/rate/rate.wxml
+++ b/src/rate/rate.wxml
@@ -5,6 +5,7 @@
   <view
     class="{{classPrefix}}__wrapper {{prefix}}-class"
     style="font-size:{{ utils.regSize(size) }}"
+    catch:touchstart="onTouchStart"
     catch:touchmove="{{ !disabled ? 'onTouchMove' : '' }}"
     catch:tap="{{ !disabled ? 'onTap' : '' }}"
     catch:touchend="{{ !disabled ? 'onTouchEnd' : ''}}"
@@ -15,7 +16,7 @@
       wx:key="*this"
       class="{{classPrefix }}__icon {{utils.getIconClass(classPrefix + '__icon', defaultValue, value, index, allowHalf, disabled, scaleIndex)}}"
       t-class="{{prefix}}-class-icon"
-      name="{{utils.getIconName(defaultValue, value, index, variant, icon)}}"
+      name="{{utils.getIconName(defaultValue, value, index, icon)}}"
       size="{{ size }}"
       style="margin-right:{{ count - index > 1 ? gap : 0 }}px; {{utils.getColor(color)}}"
     />
@@ -33,7 +34,7 @@
       >
         <t-icon
           class="{{classPrefix }}__icon {{classPrefix }}__icon--selected-half"
-          name="{{utils.getIconName(defaultValue, value, index, variant, icon)}}"
+          name="{{utils.getIconName(defaultValue, value, index, icon)}}"
           size="{{ size }}"
           style="{{utils.getColor(color)}}"
         />
@@ -46,7 +47,7 @@
       >
         <t-icon
           class="{{_.cls(classPrefix + '__icon', ['selected'])}}"
-          name="{{utils.getIconName(defaultValue, value, index, 'filled', icon)}}"
+          name="{{utils.getIconName(defaultValue, 0, 0, icon)}}"
           size="{{ size }}"
           style="{{utils.getColor(color)}}"
         />
@@ -61,7 +62,7 @@
     >
       <t-icon
         class="{{_.cls(classPrefix + '__icon', [['selected', utils.ceil(value) == value], ['selected-half', utils.ceil(value) != value]]) }}"
-        name="{{utils.getIconName(defaultValue, value, index, 'filled', icon)}}"
+        name="{{utils.getIconName(defaultValue, 0, 0, icon)}}"
         size="{{ size }}"
         style="{{utils.getColor(color)}}; font-size: {{size}};"
       />
diff --git a/src/rate/rate.wxs b/src/rate/rate.wxs
index 61a91680b..d799da422 100644
--- a/src/rate/rate.wxs
+++ b/src/rate/rate.wxs
@@ -7,14 +7,12 @@ module.exports = {
     return texts[curVal] || '未评分';
   },
 
-  getIconName: function (defaultValue, value, index, variant, icon) {
+  getIconName: function (defaultValue, value, index, icon) {
     var curVal = value ? value : defaultValue;
     var name = ['star-filled', 'star-filled'];
 
     if (icon) {
       name = icon.constructor == 'Array' ? icon : [icon, icon];
-    } else if (variant === 'outline') {
-      name[1] = 'star';
     }
 
     return name[curVal >= index + 1 ? 0 : 1];
diff --git a/src/rate/type.ts b/src/rate/type.ts
index 3b21328e7..d139f18da 100644
--- a/src/rate/type.ts
+++ b/src/rate/type.ts
@@ -60,7 +60,7 @@ export interface TdRateProps {
     value?: string | number;
   };
   /**
-   * 自定义评分图标，[选中图标，未选中图标]；此时不受 variant 影响
+   * 自定义评分图标，[选中图标，未选中图标]
    */
   icon?: {
     type: null;
@@ -106,12 +106,4 @@ export interface TdRateProps {
     type: NumberConstructor;
     value?: number;
   };
-  /**
-   * 形状类型，有描边类型和填充类型两种
-   * @default outline
-   */
-  variant?: {
-    type: StringConstructor;
-    value?: 'outline' | 'filled';
-  };
 }

From e191668bb6d6643dcaa9d4d9bbcd3d89f5522930 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 17:33:58 +0800
Subject: [PATCH 28/62] fix(BackTop): fix icon (#1660)

---
 src/back-top/_example/back-top.ts | 2 +-
 src/back-top/back-top.ts          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/back-top/_example/back-top.ts b/src/back-top/_example/back-top.ts
index 6d214f862..0e6fa5690 100644
--- a/src/back-top/_example/back-top.ts
+++ b/src/back-top/_example/back-top.ts
@@ -2,7 +2,7 @@ Page({
   data: {
     type: 'round',
     showBackTop: false,
-    rowCol: [{ size: '163.5px', borderRadius: '12px' }, 1, { width: '61%' }],
+    rowCol: [{ size: '327rpx', borderRadius: '24rpx' }, 1, { width: '61%' }],
   },
 
   onPageScroll(e) {
diff --git a/src/back-top/back-top.ts b/src/back-top/back-top.ts
index e04ecd4be..03b3f329a 100644
--- a/src/back-top/back-top.ts
+++ b/src/back-top/back-top.ts
@@ -36,7 +36,8 @@ export default class BackTop extends SuperComponent {
 
   lifetimes = {
     ready() {
-      this.setIcon();
+      const { icon } = this.properties;
+      this.setIcon(icon);
     },
   };
 

From 03055b0dd57e807d0773ae0eecee6791d0bfb70c Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 17:34:26 +0800
Subject: [PATCH 29/62] fix(Picker): update demo (#1661)

---
 .../__test__/__snapshots__/demo.test.js.snap  | 38 +++++++++++++++++++
 .../__virtualHostSnapshot__/demo.test.js.snap | 38 +++++++++++++++++++
 src/picker/_example/with-title/index.js       |  9 +++--
 src/picker/_example/with-title/index.wxml     | 18 ++++++++-
 4 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/src/picker/__test__/__snapshots__/demo.test.js.snap b/src/picker/__test__/__snapshots__/demo.test.js.snap
index 99e8266c1..302bda052 100644
--- a/src/picker/__test__/__snapshots__/demo.test.js.snap
+++ b/src/picker/__test__/__snapshots__/demo.test.js.snap
@@ -283,5 +283,43 @@ exports[`Picker Picker with-title demo works fine 1`] = `
       }}"
     />
   </t-picker>
+  <t-picker
+    cancelBtn="取消"
+    confirmBtn="确认"
+    data-key="city2"
+    title=""
+    value="{{Array []}}"
+    visible=""
+    bind:cancel="onPickerCancel"
+    bind:change="onPickerChange"
+    bind:pick="onColumnChange"
+  >
+    <t-picker-item
+      options="{{
+        Array [
+          Object {
+            "label": "北京市",
+            "value": "北京市",
+          },
+          Object {
+            "label": "上海市",
+            "value": "上海市",
+          },
+          Object {
+            "label": "广州市",
+            "value": "广州市",
+          },
+          Object {
+            "label": "深圳市",
+            "value": "深圳市",
+          },
+          Object {
+            "label": "成都市",
+            "value": "成都市",
+          },
+        ]
+      }}"
+    />
+  </t-picker>
 </with-title>
 `;
diff --git a/src/picker/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/picker/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 99e8266c1..302bda052 100644
--- a/src/picker/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/picker/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -283,5 +283,43 @@ exports[`Picker Picker with-title demo works fine 1`] = `
       }}"
     />
   </t-picker>
+  <t-picker
+    cancelBtn="取消"
+    confirmBtn="确认"
+    data-key="city2"
+    title=""
+    value="{{Array []}}"
+    visible=""
+    bind:cancel="onPickerCancel"
+    bind:change="onPickerChange"
+    bind:pick="onColumnChange"
+  >
+    <t-picker-item
+      options="{{
+        Array [
+          Object {
+            "label": "北京市",
+            "value": "北京市",
+          },
+          Object {
+            "label": "上海市",
+            "value": "上海市",
+          },
+          Object {
+            "label": "广州市",
+            "value": "广州市",
+          },
+          Object {
+            "label": "深圳市",
+            "value": "深圳市",
+          },
+          Object {
+            "label": "成都市",
+            "value": "成都市",
+          },
+        ]
+      }}"
+    />
+  </t-picker>
 </with-title>
 `;
diff --git a/src/picker/_example/with-title/index.js b/src/picker/_example/with-title/index.js
index c0b525d5e..7945f1510 100644
--- a/src/picker/_example/with-title/index.js
+++ b/src/picker/_example/with-title/index.js
@@ -1,8 +1,11 @@
 Component({
   data: {
     cityText: '',
+    city2Text: '',
     cityValue: [],
-    pickerTitle: '',
+    city2Value: [],
+    cityTitle: '',
+    city2Title: '',
     citys: [
       { label: '北京市', value: '北京市' },
       { label: '上海市', value: '上海市' },
@@ -39,11 +42,11 @@ Component({
     },
 
     onTitlePicker() {
-      this.setData({ cityVisible: true, pickerTitle: '选择城市' });
+      this.setData({ cityVisible: true, cityTitle: '选择城市' });
     },
 
     onWithoutTitlePicker() {
-      this.setData({ cityVisible: true, pickerTitle: '' });
+      this.setData({ city2Visible: true, city2Title: '' });
     },
   },
 });
diff --git a/src/picker/_example/with-title/index.wxml b/src/picker/_example/with-title/index.wxml
index 750b6ed3a..e08d8785c 100644
--- a/src/picker/_example/with-title/index.wxml
+++ b/src/picker/_example/with-title/index.wxml
@@ -1,12 +1,26 @@
 <t-cell class="mb-16" title="带标题选择器" arrow hover note="{{cityText}}" bind:click="onTitlePicker" />
 
-<t-cell title="无标题选择器" arrow hover note="{{cityText}}" bind:click="onWithoutTitlePicker" />
+<t-cell title="无标题选择器" arrow hover note="{{city2Text}}" bind:click="onWithoutTitlePicker" />
 
 <t-picker
   visible="{{cityVisible}}"
   value="{{cityValue}}"
   data-key="city"
-  title="{{pickerTitle}}"
+  title="{{cityTitle}}"
+  cancelBtn="取消"
+  confirmBtn="确认"
+  bindchange="onPickerChange"
+  bindpick="onColumnChange"
+  bindcancel="onPickerCancel"
+>
+  <t-picker-item options="{{citys}}"></t-picker-item>
+</t-picker>
+
+<t-picker
+  visible="{{city2Visible}}"
+  value="{{city2Value}}"
+  data-key="city2"
+  title="{{city2Title}}"
   cancelBtn="取消"
   confirmBtn="确认"
   bindchange="onPickerChange"

From f754cbbcd95c7ada10cd1dc0fa1bcd3b1ef17ce6 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 17:34:53 +0800
Subject: [PATCH 30/62] fix: update sidebar of the site (#1659)

---
 site/site.config.mjs              | 8 ++++----
 src/checkbox/README.md            | 2 +-
 src/divider/README.md             | 2 +-
 src/divider/_example/divider.wxml | 2 +-
 src/side-bar/README.md            | 2 +-
 src/sticky/README.md              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/site/site.config.mjs b/site/site.config.mjs
index e3546ce52..665340efe 100644
--- a/site/site.config.mjs
+++ b/site/site.config.mjs
@@ -129,7 +129,7 @@ export default {
           component: () => import('@/navbar/README.md'),
         },
         {
-          title: 'SideBar 侧边导航',
+          title: 'SideBar 侧边栏',
           name: 'sidebar',
           meta: { docType: 'navigation' },
           path: '/miniprogram/components/side-bar',
@@ -177,7 +177,7 @@ export default {
           component: () => import('@/cascader/README.md'),
         },
         {
-          title: 'CheckBox 复选框',
+          title: 'CheckBox 多选框',
           name: 'checkbox',
           meta: { docType: 'form' },
           path: '/miniprogram/components/checkbox',
@@ -365,7 +365,7 @@ export default {
           component: () => import('@/skeleton/README.md'),
         },
         {
-          title: 'Sticky 吸顶容器',
+          title: 'Sticky 吸顶',
           name: 'sticky',
           meta: { docType: 'navigation' },
           path: '/miniprogram/components/sticky',
@@ -399,7 +399,7 @@ export default {
           component: () => import('@/action-sheet/README.md'),
         },
         {
-          title: 'Dialog 弹出框',
+          title: 'Dialog 对话框',
           name: 'dialog',
           meta: { docType: 'message' },
           path: '/miniprogram/components/dialog',
diff --git a/src/checkbox/README.md b/src/checkbox/README.md
index b56f536d5..b046eec70 100644
--- a/src/checkbox/README.md
+++ b/src/checkbox/README.md
@@ -1,5 +1,5 @@
 ---
-title: Checkbox 复选框
+title: Checkbox 多选框
 description: 用于预设的一组选项中执行多项选择，并呈现选择结果。
 spline: form
 isComponent: true
diff --git a/src/divider/README.md b/src/divider/README.md
index dc83a7a29..a67dece1b 100644
--- a/src/divider/README.md
+++ b/src/divider/README.md
@@ -1,5 +1,5 @@
 ---
-title: Divider 分割符
+title: Divider 分割线
 description: 用于分割、组织、细化有一定逻辑的组织元素内容和页面结构。
 spline: message
 isComponent: true
diff --git a/src/divider/_example/divider.wxml b/src/divider/_example/divider.wxml
index 52b968b31..948b9cb66 100644
--- a/src/divider/_example/divider.wxml
+++ b/src/divider/_example/divider.wxml
@@ -1,5 +1,5 @@
 <view class="demo">
-  <view class="demo-title">Divider 分割符</view>
+  <view class="demo-title">Divider 分割线</view>
   <view class="demo-desc">用于分割、组织、细化有一定逻辑的组织元素内容和页面结构。</view>
   <t-demo title="01 组件类型" desc="水平分割线">
     <base />
diff --git a/src/side-bar/README.md b/src/side-bar/README.md
index 45ceba3a9..ef1068121 100644
--- a/src/side-bar/README.md
+++ b/src/side-bar/README.md
@@ -1,5 +1,5 @@
 ---
-title: SideBar 侧边导航
+title: SideBar 侧边栏
 description: 用于内容分类后的展示切换。
 spline: navigation
 isComponent: true
diff --git a/src/sticky/README.md b/src/sticky/README.md
index e6f700991..aff669555 100644
--- a/src/sticky/README.md
+++ b/src/sticky/README.md
@@ -1,5 +1,5 @@
 ---
-title: Sticky 吸顶容器
+title: Sticky 吸顶
 description: 用于常驻页面顶部的信息、操作展示。
 spline: data
 isComponent: true

From 8992f67728515e3610a05b4fbde0b6613461638b Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 17:35:48 +0800
Subject: [PATCH 31/62] docs(common): update design docs (#1658)

---
 site/plugin-tdoc/md-to-vue.ts  | 12 +++++++++---
 site/plugin-tdoc/transforms.ts | 21 +++++++++++----------
 src/_common                    |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/site/plugin-tdoc/md-to-vue.ts b/site/plugin-tdoc/md-to-vue.ts
index ffe6163a5..21f1a2673 100644
--- a/site/plugin-tdoc/md-to-vue.ts
+++ b/site/plugin-tdoc/md-to-vue.ts
@@ -62,7 +62,7 @@ function customRender({ source, file, md }: any) {
   };
 
   // md filename
-  const reg = file.match(/src\/(\w+-?\w+)\/(\w+-?\w+)\.md/);
+  const reg = file.match(/src\/(\S*)(?=\/\S*.md)/);
   const componentName = reg && reg[1];
 
   // split md
@@ -79,9 +79,15 @@ function customRender({ source, file, md }: any) {
 
   if (pageData.isComponent) {
     mdSegment.demoMd = md.render.call(md, `${demoMd.replace(/<!--[\s\S]+?-->/g, '')}`).html;
-    mdSegment.apiMd = md.render.call(md, `${pageData.toc ? '[toc]\n' : ''}${apiMd.replace(/<!--[\s\S]+?-->/g, '')}`).html;
+    mdSegment.apiMd = md.render.call(
+      md,
+      `${pageData.toc ? '[toc]\n' : ''}${apiMd.replace(/<!--[\s\S]+?-->/g, '')}`,
+    ).html;
   } else {
-    mdSegment.docMd = md.render.call(md, `${pageData.toc ? '[toc]\n' : ''}${content.replace(/<!--[\s\S]+?-->/g, '')}`).html;
+    mdSegment.docMd = md.render.call(
+      md,
+      `${pageData.toc ? '[toc]\n' : ''}${content.replace(/<!--[\s\S]+?-->/g, '')}`,
+    ).html;
   }
 
   // 设计指南内容 不展示 design Tab 则不解析
diff --git a/site/plugin-tdoc/transforms.ts b/site/plugin-tdoc/transforms.ts
index 556c0ee6e..965a7f604 100644
--- a/site/plugin-tdoc/transforms.ts
+++ b/site/plugin-tdoc/transforms.ts
@@ -4,11 +4,10 @@ import mdToVue from './md-to-vue';
 
 let demoCodesImports: Record<string, string> = {};
 
-
 export default {
   before({ source, file, md }: any) {
     const resouceDir = path.dirname(file);
-    const reg = file.match(/src\/(\w+-?\w+)\/\w+-?\w+\.md/);
+    const reg = file.match(/src\/(\S*)(?=\/\S*.md)/);
     const name = reg && reg[1];
     demoCodesImports = {};
 
@@ -16,7 +15,7 @@ export default {
     md.renderer.rules.html_block = function (tokens: string, idx: number) {
       const { content } = tokens[idx];
       if (content.startsWith('<img') && content.indexOf('qrcode') === -1) {
-        return  '';
+        return '';
       }
 
       return content;
@@ -29,10 +28,10 @@ export default {
         console.log('\x1B[36m%s\x1B[0m', `${name} 组件需要实现 _example/${demoDirName} 示例!`);
         return '\n<h3>DEMO (🚧建设中）...</h3>';
       }
-      const wxml = fs.readFileSync(path.resolve(demoPath, 'index.wxml'), { encoding: 'utf-8'});
-      const js = fs.readFileSync(path.resolve(demoPath, 'index.js'), { encoding: 'utf-8'});
-      const css = fs.readFileSync(path.resolve(demoPath, 'index.wxss'), { encoding: 'utf-8'});
-      const json = fs.readFileSync(path.resolve(demoPath, 'index.json'), { encoding: 'utf-8'});
+      const wxml = fs.readFileSync(path.resolve(demoPath, 'index.wxml'), { encoding: 'utf-8' });
+      const js = fs.readFileSync(path.resolve(demoPath, 'index.js'), { encoding: 'utf-8' });
+      const css = fs.readFileSync(path.resolve(demoPath, 'index.wxss'), { encoding: 'utf-8' });
+      const json = fs.readFileSync(path.resolve(demoPath, 'index.json'), { encoding: 'utf-8' });
 
       return `
 <td-code-block panel="WXML">
@@ -43,13 +42,15 @@ export default {
   <pre slot="CSS" lang="css">${encodeURIComponent(css)}</pre>
 
   <pre slot="JSON" lang="javascript">${encodeURIComponent(json)}</pre>
-</td-code-block>`
+</td-code-block>`;
     });
 
     return source;
   },
-  render({ source, file, md }: { source: string, file: string, md: any }) {
-    const demoCodesDefsStr = Object.keys(demoCodesImports).map((key) => demoCodesImports[key]).join(';\n');
+  render({ source, file, md }: { source: string; file: string; md: any }) {
+    const demoCodesDefsStr = Object.keys(demoCodesImports)
+      .map((key) => demoCodesImports[key])
+      .join(';\n');
     const demoCodesInstallStr = Object.keys(demoCodesImports).join(',');
 
     const sfc = mdToVue({
diff --git a/src/_common b/src/_common
index ebfb57388..311a7e88e 160000
--- a/src/_common
+++ b/src/_common
@@ -1 +1 @@
-Subproject commit ebfb57388f9b346a7244cbeb24a4302af7184772
+Subproject commit 311a7e88e2977d129a6ab9ec03684dea917840f9

From 79d9ea5594048bef6e0af0aaa69be8c466352d0b Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 17:41:25 +0800
Subject: [PATCH 32/62] fix(SideBar): fix inaccurate positioning when the page
 was init (#1675)

---
 src/side-bar/_example/base/index.js      | 2 ++
 src/side-bar/_example/custom/index.js    | 2 ++
 src/side-bar/_example/with-icon/index.js | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/side-bar/_example/base/index.js b/src/side-bar/_example/base/index.js
index 58cba10fb..50b43a7f3 100644
--- a/src/side-bar/_example/base/index.js
+++ b/src/side-bar/_example/base/index.js
@@ -45,11 +45,13 @@ Page({
   },
   onLoad() {
     const query = wx.createSelectorQuery().in(this);
+    const { sideBarIndex } = this.data;
 
     query
       .selectAll('.title')
       .boundingClientRect((rects) => {
         this.offsetTopList = rects.map((item) => item.top);
+        this.setData({ scrollTop: rects[sideBarIndex].top });
       })
       .exec();
   },
diff --git a/src/side-bar/_example/custom/index.js b/src/side-bar/_example/custom/index.js
index 8fe6f71be..0c8a08711 100644
--- a/src/side-bar/_example/custom/index.js
+++ b/src/side-bar/_example/custom/index.js
@@ -45,11 +45,13 @@ Page({
   },
   onLoad() {
     const query = wx.createSelectorQuery().in(this);
+    const { sideBarIndex } = this.data;
 
     query
       .selectAll('.title')
       .boundingClientRect((rects) => {
         this.offsetTopList = rects.map((item) => item.top);
+        this.setData({ scrollTop: rects[sideBarIndex].top });
       })
       .exec();
   },
diff --git a/src/side-bar/_example/with-icon/index.js b/src/side-bar/_example/with-icon/index.js
index 0c834fba6..27679c677 100644
--- a/src/side-bar/_example/with-icon/index.js
+++ b/src/side-bar/_example/with-icon/index.js
@@ -50,11 +50,13 @@ Page({
   },
   onLoad() {
     const query = wx.createSelectorQuery().in(this);
+    const { sideBarIndex } = this.data;
 
     query
       .selectAll('.title')
       .boundingClientRect((rects) => {
         this.offsetTopList = rects.map((item) => item.top);
+        this.setData({ scrollTop: rects[sideBarIndex].top });
       })
       .exec();
   },

From 1009e42ef2c45cba9b261d7605d9aaebe73be395 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Mon, 27 Feb 2023 17:42:19 +0800
Subject: [PATCH 33/62] fix(slider): remove colors and disabledColor property
 (#1676)

---
 src/slider/README.md   |  4 ++--
 src/slider/props.ts    | 10 ----------
 src/slider/slider.wxml | 10 ++++------
 src/slider/slider.wxs  | 15 ---------------
 src/slider/type.ts     | 16 ----------------
 5 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/src/slider/README.md b/src/slider/README.md
index 1ef893811..88aa79c8f 100644
--- a/src/slider/README.md
+++ b/src/slider/README.md
@@ -55,9 +55,9 @@ isComponent: true
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-colors | Array | [] | 颜色，[已选择, 未选择]。TS 类型：`Array<string>` | N
+colors | Array | [] | 废弃。颜色，[已选择, 未选择]。TS 类型：`Array<string>` | N
 disabled | Boolean | false | 是否禁用组件 | N
-disabled-color | Array | [] | 禁用状态滑动条的颜色，[已选, 未选]。TS 类型：`Array<string>` | N
+disabled-color | Array | [] | 废弃。禁用状态滑动条的颜色，[已选, 未选]。TS 类型：`Array<string>` | N
 external-classes | Array | - | 组件类名，分别用于设置 组件外层元素、滑道底部、滑道激活态、滑道禁用态、游标 等元素类名。`['t-class', 't-class-bar', 't-class-bar-active', 't-class-bar-disabled', 't-class-cursor']` | N
 label | String / Boolean | false | 滑块当前值文本。<br />值为 true 显示默认文案；值为 false 不显示滑块当前值文本；<br />值为 `${value}%` 则表示组件会根据占位符渲染文案；<br />值类型为函数时，参数 `value` 标识滑块值，参数 `position=start` 表示范围滑块的起始值，参数 `position=end` 表示范围滑块的终点值。TS 类型：`string \| boolean` | N
 marks | Object / Array | {} | 刻度标记，示例：`[0, 10, 40, 200]` 或者 `{ 5:  '5¥', 10: '10%' }`。TS 类型：`Record<number, string> \| Array<number>` | N
diff --git a/src/slider/props.ts b/src/slider/props.ts
index 44e2374d6..77d9bfb07 100644
--- a/src/slider/props.ts
+++ b/src/slider/props.ts
@@ -6,21 +6,11 @@
 
 import { TdSliderProps } from './type';
 const props: TdSliderProps = {
-  /** 颜色，[已选择, 未选择] */
-  colors: {
-    type: Array,
-    value: [],
-  },
   /** 是否禁用组件 */
   disabled: {
     type: Boolean,
     value: false,
   },
-  /** 禁用状态滑动条的颜色，[已选, 未选] */
-  disabledColor: {
-    type: Array,
-    value: [],
-  },
   /** 组件类名，分别用于设置 组件外层元素、滑道底部、滑道激活态、滑道禁用态、游标 等元素类名 */
   externalClasses: {
     type: Array,
diff --git a/src/slider/slider.wxml b/src/slider/slider.wxml
index 4a07f59ea..cd7312704 100644
--- a/src/slider/slider.wxml
+++ b/src/slider/slider.wxml
@@ -12,7 +12,6 @@
     <view
       id="sliderLine"
       class="{{_.cls(classPrefix + '__bar', [['disabled', disabled], theme, ['marks', isScale && theme == 'capsule']])}} {{prefix}}-class-bar"
-      style="{{t.getColor(disabled, false, disabledColor, colors)}}"
       bind:tap="onSingleLineTap"
     >
       <block wx:if="{{isScale}}">
@@ -20,7 +19,7 @@
           class="{{_.cls(classPrefix + '__scale-item', [['active', _value >= item.val], ['disabled', disabled], theme, ['hidden', (index == 0 || index == scaleArray.length - 1) && theme == 'capsule' || value == item.val]])}}"
           wx:for="{{scaleArray}}"
           wx:key="index"
-          style="left:{{item.left}}px; transform: translateX(-50%); {{t.getColor(disabled, _value >= item.val, disabledColor, colors)}}"
+          style="left:{{item.left}}px; transform: translateX(-50%);"
           aria-hidden="{{true}}"
         >
           <view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}}}">
@@ -30,7 +29,7 @@
       </block>
       <view
         class="{{_.cls(classPrefix + '__line', [['disabled', disabled], theme, 'single'])}} {{prefix}}-class-bar-active"
-        style="width: {{lineBarWidth}}; {{t.getColor(disabled, true, disabledColor, colors)}}"
+        style="width: {{lineBarWidth}}"
       >
         <view
           id="singleDot"
@@ -76,7 +75,6 @@
       id="sliderLine"
       bind:tap="onLineTap"
       class="{{_.cls(classPrefix + '__bar', [['disabled', disabled], theme, ['marks', isScale && theme == 'capsule']])}} {{prefix}}-class-bar"
-      style="{{t.getColor(disabled, false, disabledColor, colors)}}"
     >
       <block wx:if="{{isScale}}">
         <view
@@ -84,7 +82,7 @@
           wx:for="{{scaleArray}}"
           wx:for-index="index"
           wx:key="index"
-          style="left: {{item.left}}px; transform: translateX(-50%); {{t.getColor(disabled, (dotTopValue[1] >= item.val && item.val >= dotTopValue[0]), disabledColor, colors)}}"
+          style="left: {{item.left}}px; transform: translateX(-50%)"
           aria-hidden="{{true}}"
         >
           <view wx:if="{{scaleTextArray.length}}" class="{{_.cls(classPrefix + '__scale-desc', [theme])}}"
@@ -94,7 +92,7 @@
       </block>
       <view
         class="{{_.cls(classPrefix + '__line', [['disabled', disabled], theme])}} {{prefix}}-class-bar-active"
-        style="left: {{lineLeft}}px; right: {{lineRight}}px; {{t.getColor(disabled, true, disabledColor, colors)}}"
+        style="left: {{lineLeft}}px; right: {{lineRight}}px"
       >
         <view
           id="leftDot"
diff --git a/src/slider/slider.wxs b/src/slider/slider.wxs
index 216757d83..b4be3ff9e 100644
--- a/src/slider/slider.wxs
+++ b/src/slider/slider.wxs
@@ -5,21 +5,6 @@ function getValue(label, value) {
   if (REGEXP.test(label)) return label.replace(REGEXP, value);
 }
 
-function getColor(disable, active, disabledColor, colors) {
-  var index = active ? 0 : 1;
-
-  if (disable && disabledColor.constructor === 'Array' && disabledColor.length == 2) {
-    return 'background-color: ' + disabledColor[index];
-  }
-
-  if (!disable && colors.constructor === 'Array' && colors.length == 2) {
-    return 'background-color: ' + colors[index];
-  }
-
-  return '';
-}
-
 module.exports = {
   getValue: getValue,
-  getColor: getColor,
 };
diff --git a/src/slider/type.ts b/src/slider/type.ts
index 8ea527af8..1cf197e45 100644
--- a/src/slider/type.ts
+++ b/src/slider/type.ts
@@ -5,14 +5,6 @@
  * */
 
 export interface TdSliderProps {
-  /**
-   * 颜色，[已选择, 未选择]
-   * @default []
-   */
-  colors?: {
-    type: ArrayConstructor;
-    value?: Array<string>;
-  };
   /**
    * 自定义组件样式
    * @default ''
@@ -29,14 +21,6 @@ export interface TdSliderProps {
     type: BooleanConstructor;
     value?: boolean;
   };
-  /**
-   * 禁用状态滑动条的颜色，[已选, 未选]
-   * @default []
-   */
-  disabledColor?: {
-    type: ArrayConstructor;
-    value?: Array<string>;
-  };
   /**
    * 组件类名，分别用于设置 组件外层元素、滑道底部、滑道激活态、滑道禁用态、游标 等元素类名
    */

From 23cd33a1044529903ed21edc77a97dff0f66d595 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 22:56:10 +0800
Subject: [PATCH 34/62] feat(AvatarGroup): add border style (#1678)

---
 src/avatar-group/avatar-group.less            |  1 +
 src/avatar-group/avatar-group.wxml            |  3 +--
 .../__test__/__snapshots__/index.test.js.snap |  2 +-
 .../index.test.js.snap                        |  2 +-
 src/avatar/avatar.less                        | 21 +++++++++++++++++++
 src/avatar/avatar.ts                          |  2 ++
 src/avatar/avatar.wxml                        |  2 +-
 src/avatar/avatar.wxs                         |  4 +++-
 8 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/avatar-group/avatar-group.less b/src/avatar-group/avatar-group.less
index 9654c805b..43744cdd8 100644
--- a/src/avatar-group/avatar-group.less
+++ b/src/avatar-group/avatar-group.less
@@ -1,4 +1,5 @@
 @import '../common/style/index.less';
+@import '../avatar/avatar.less';
 
 //组合头像偏移量
 @avatar-group-offset-small: var(--td-avatar-group-margin-left-small, -4px);
diff --git a/src/avatar-group/avatar-group.wxml b/src/avatar-group/avatar-group.wxml
index d2ff43d31..26929f202 100644
--- a/src/avatar-group/avatar-group.wxml
+++ b/src/avatar-group/avatar-group.wxml
@@ -9,9 +9,8 @@
   <!-- 默认折叠元素 -->
   <view class="{{classPrefix}}__collapse--default" wx:if="{{max && (max < length)}}">
     <t-avatar
-      t-class-image="{{prefix}}-class-image"
+      t-class-image="{{prefix}}-avatar--border {{prefix}}-avatar--border-{{size}} {{prefix}}-class-image"
       t-class-content="{{prefix}}-class-content"
-      bordered
       size="{{size}}"
       icon="{{ collapseAvatar ? '' : 'user-add'}}"
       aria-role="none"
diff --git a/src/avatar/__test__/__snapshots__/index.test.js.snap b/src/avatar/__test__/__snapshots__/index.test.js.snap
index 1807438ac..c581813b4 100644
--- a/src/avatar/__test__/__snapshots__/index.test.js.snap
+++ b/src/avatar/__test__/__snapshots__/index.test.js.snap
@@ -30,7 +30,7 @@ exports[`Avatar & Avatar Groups Avatar Props : style && customStyle 1`] = `
               ariaHidden="{{false}}"
               ariaLabel="头像"
               ariaRole="img"
-              class="t-avatar t-avatar--circle t-avatar--medium t-class-image"
+              class="t-avatar t-avatar--circle  t-avatar--medium t-class-image"
               style=""
             >
               <wx-view
diff --git a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
index 4d57821ab..c292c83f6 100644
--- a/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/avatar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -30,7 +30,7 @@ exports[`Avatar & Avatar Groups Avatar Props : style && customStyle 1`] = `
               ariaHidden="{{false}}"
               ariaLabel="头像"
               ariaRole="img"
-              class="t-avatar t-avatar--circle t-avatar--medium t-class-image"
+              class="t-avatar t-avatar--circle  t-avatar--medium t-class-image"
               style=""
             >
               <wx-view
diff --git a/src/avatar/avatar.less b/src/avatar/avatar.less
index 091f218aa..152cd38bb 100644
--- a/src/avatar/avatar.less
+++ b/src/avatar/avatar.less
@@ -14,6 +14,10 @@
 @avatar-icon-medium-font-size: var(--td-avatar-icon-medium-font-size, 48rpx);
 @avatar-icon-large-font-size: var(--td-avatar-icon-large-font-size, 64rpx);
 
+@avatar-border-width-small: var(--td-avatar-border-width-small, 4rpx);
+@avatar-border-width-medium: var(--td-avatar-border-width-medium, 6rpx);
+@avatar-border-width-large: var(--td-avatar-border-width-large, 8rpx);
+@avatar-border-color: var(--td-avatar-border-color, #fff);
 @avatar-circle-border-radius: var(--td-avatar-circle-border-radius, @radius-circle);
 @avatar-round-border-radius: var(--td-avatar-round-border-radius, @radius-default);
 
@@ -92,4 +96,21 @@
       height: 0;
     }
   }
+
+  // 头像边框
+  &--border {
+    border-color: @avatar-border-color;
+    border-style: solid;
+    &-small {
+      border-width: @avatar-border-width-small;
+    }
+
+    &-medium {
+      border-width: @avatar-border-width-medium;
+    }
+
+    &-large {
+      border-width: @avatar-border-width-large;
+    }
+  }
 }
diff --git a/src/avatar/avatar.ts b/src/avatar/avatar.ts
index 888516793..1c4406738 100644
--- a/src/avatar/avatar.ts
+++ b/src/avatar/avatar.ts
@@ -28,6 +28,7 @@ export default class Avatar extends SuperComponent {
     classPrefix: name,
     isShow: true,
     zIndex: 0,
+    bordered: false,
   };
 
   relations: RelationsOptions = {
@@ -38,6 +39,7 @@ export default class Avatar extends SuperComponent {
 
         this.setData({
           size: this.data.size ?? parent.data.size,
+          bordered: true,
         });
       },
     },
diff --git a/src/avatar/avatar.wxml b/src/avatar/avatar.wxml
index 7a6e333da..e908f5ad3 100644
--- a/src/avatar/avatar.wxml
+++ b/src/avatar/avatar.wxml
@@ -21,7 +21,7 @@
     t-class-count="{{badgeProps.tClassCount}}"
   >
     <view
-      class="{{this.getClass(classPrefix, size, shape)}} {{prefix}}-class-image"
+      class="{{this.getClass(classPrefix, size, shape, bordered)}} {{prefix}}-class-image"
       style="{{this.getSize(size)}}"
       aria-label="{{ ariaLabel || alt ||'头像'}}"
       aria-role="{{ ariaRole || 'img'}}"
diff --git a/src/avatar/avatar.wxs b/src/avatar/avatar.wxs
index 3880514d1..d67e5d88c 100644
--- a/src/avatar/avatar.wxs
+++ b/src/avatar/avatar.wxs
@@ -1,9 +1,11 @@
 module.exports = {
-  getClass: function (classPrefix, size, shape) {
+  getClass: function (classPrefix, size, shape, bordered) {
     var hasPx = (size || '').indexOf('px') > -1;
+    var borderSize = hasPx ? 'medium' : size;
     var classNames = [
       classPrefix,
       classPrefix + (shape === 'round' ? '--round' : '--circle'),
+      bordered ? classPrefix + '--border' + ' ' + classPrefix + '--border-' + borderSize : '',
       hasPx ? '' : classPrefix + '--' + size,
     ];
     return classNames.join(' ');

From 4a3270c34d6e049d8dc92488f95fb543e9416af7 Mon Sep 17 00:00:00 2001
From: Wang <awangjianjun9@gmail.com>
Date: Mon, 27 Feb 2023 22:59:30 +0800
Subject: [PATCH 35/62] fix(dialog): resolve action tsd error and support
 buttonLayout (#1654) (#1655)

---
 src/dialog/index.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/dialog/index.ts b/src/dialog/index.ts
index a940c0910..5cfac79a5 100644
--- a/src/dialog/index.ts
+++ b/src/dialog/index.ts
@@ -21,9 +21,8 @@ interface DialogConfirmOptionsType extends DialogAlertOptionsType {
 }
 
 interface Action {
-  name: string;
-  primary?: boolean;
-  style?: string;
+  content: string;
+  theme?: 'default' | 'primary' | 'danger' | 'light';
 }
 
 interface DialogActionOptionsType {
@@ -92,15 +91,17 @@ export default {
     const { context, selector = '#t-dialog', actions, ...otherOptions } = { ...defaultOptions, ...options };
     const instance = getInstance(context, selector);
     if (!instance) return Promise.reject();
-    if (!actions || (typeof actions === 'object' && (actions.length === 0 || actions.length > 7))) {
-      console.warn('action 数量建议控制在1至7个');
+    const { buttonLayout = 'vertical' } = options;
+    const maxLengthSuggestion = buttonLayout === 'vertical' ? 7 : 3;
+    if (!actions || (typeof actions === 'object' && (actions.length === 0 || actions.length > maxLengthSuggestion))) {
+      console.warn(`action 数量建议控制在1至${maxLengthSuggestion}个`);
     }
 
     return new Promise((resolve) => {
       instance.setData({
         actions,
-        buttonLayout: 'vertical',
         ...otherOptions,
+        buttonLayout,
         visible: true,
       });
       instance._onAction = resolve;

From 01861861baedcb34a419436d68704050be4d762a Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 23:01:10 +0800
Subject: [PATCH 36/62] chore(NoticeBar): extra attribute is renamed to
 operation (#1638)

---
 src/notice-bar/README.en-US.md                |  6 +--
 src/notice-bar/README.md                      | 18 ++++---
 .../__test__/__snapshots__/demo.test.js.snap  | 47 ++++++++-----------
 .../__test__/__snapshots__/index.test.js.snap | 12 ++---
 .../__virtualHostSnapshot__/demo.test.js.snap | 47 ++++++++-----------
 .../index.test.js.snap                        | 12 ++---
 src/notice-bar/__test__/index.test.js         | 25 ++++------
 .../_example/customization/index.wxml         | 14 ++----
 .../_example/customization/index.wxss         |  6 +--
 src/notice-bar/_example/event/index.wxml      |  4 +-
 src/notice-bar/_example/event/index.wxss      |  6 +--
 src/notice-bar/notice-bar.less                | 11 ++---
 src/notice-bar/notice-bar.ts                  | 17 +++++--
 src/notice-bar/notice-bar.wxml                | 12 ++---
 src/notice-bar/props.ts                       |  2 +-
 src/notice-bar/type.ts                        |  4 +-
 16 files changed, 112 insertions(+), 131 deletions(-)

diff --git a/src/notice-bar/README.en-US.md b/src/notice-bar/README.en-US.md
index 614bf7711..6d98c4ad3 100644
--- a/src/notice-bar/README.en-US.md
+++ b/src/notice-bar/README.en-US.md
@@ -7,8 +7,8 @@ name | type | default | description | required
 -- | -- | -- | -- | --
 content | String / Array / Slot | - | \- | N
 direction | String | horizontal | options：horizontal/vertical | N
-external-classes | Array | - | `['t-class', 't-class-content', 't-class-prefix-icon', 't-class-extra', 't-class-suffix-icon']` | N
-extra | String / Slot | - | \- | N
+external-classes | Array | - | `['t-class', 't-class-content', 't-class-prefix-icon', 't-class-operation', 't-class-suffix-icon']` | N
+operation | String / Slot | - | \- | N
 marquee | Boolean / Object | false | Typescript：`boolean \| DrawMarquee` `interface DrawMarquee { speed?: number; loop?: number; delay?: number }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts) | N
 prefix-icon | String / Boolean/ Object / Slot | - | \- | N
 suffix-icon | String / Boolean / Object / Slot | - | \- | N
@@ -20,4 +20,4 @@ default-visible | Boolean | false | uncontrolled property | N
 
 name | params | description
 -- | -- | --
-click | `(trigger: NoticeBarTrigger)` | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts)。<br/>`type NoticeBarTrigger = 'prefix-icon' \| 'content' \| 'extra' \| 'suffix-icon';`<br/>
+click | `(trigger: NoticeBarTrigger)` | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts)。<br/>`type NoticeBarTrigger = 'prefix-icon' \| 'content' \| 'operation' \| 'suffix-icon';`<br/>
diff --git a/src/notice-bar/README.md b/src/notice-bar/README.md
index aecca15c4..d236cec4d 100644
--- a/src/notice-bar/README.md
+++ b/src/notice-bar/README.md
@@ -26,7 +26,7 @@ isComponent: true
 
 ## 代码演示
 
-### 组件类型
+### 01 组件类型
 
 纯文字的公告栏
 
@@ -36,7 +36,11 @@ isComponent: true
 
 {{ iconDemo }}
 
-带操作的公告栏
+带关闭的公告栏
+
+{{ suffixIcon }}
+
+带入口的公告栏
 
 {{ event }}
 
@@ -48,13 +52,13 @@ isComponent: true
 
 {{ customization }}
 
-### 组件状态
+### 02 组件状态
 
 公告栏类型有普通（info）、警示（warning）、成功（success）、错误（error）
 
 {{ theme }}
 
-### 可滚动公告栏
+### 03 可滚动公告栏
 
 可滚动公告栏有水平（horizontal）和垂直（vertical）
 
@@ -68,8 +72,8 @@ isComponent: true
 -- | -- | -- | -- | --
 content | String / Array / Slot | - | 文本内容 | N
 direction | String | horizontal | 滚动方向。可选项：horizontal/vertical | N
-external-classes | Array | - | 组件类名，分别用于设置 组件外层元素、文本内容、前缀图标、右侧额外信息、后缀图标 等元素类名。。`['t-class', 't-class-content', 't-class-prefix-icon', 't-class-extra', 't-class-suffix-icon']` | N
-extra | String / Slot | - | 右侧额外信息 | N
+external-classes | Array | - | 组件类名，分别用于设置 组件外层元素、文本内容、前缀图标、右侧额外信息、后缀图标 等元素类名。。`['t-class', 't-class-content', 't-class-prefix-icon', 't-class-operation', 't-class-suffix-icon']` | N
+operation | String / Slot | - | 右侧额外信息 | N
 marquee | Boolean / Object | false | 跑马灯效果。speed 指速度控制；loop 指循环播放次数，值为 -1 表示循环播放，值为 0 表示不循环播放；delay 表示延迟多久开始播放【仅在 direction='horizontal' 有效】。TS 类型：`boolean \| DrawMarquee` `interface DrawMarquee { speed?: number; loop?: number; delay?: number }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts) | N
 prefix-icon | String / Boolean / Object / Slot | - | 前缀图标。值为字符串表示图标名称，值为 `false` 表示不显示前缀图标，值为 `Object` 类型，表示透传至 `icon`，不传表示使用主题图标。| N
 suffix-icon | String / Object / Slot | - | 后缀图标。值为字符串表示图标名称。值为 `Object` 类型，表示透传至 `icon`，不传表示不显示后缀图标。 | N
@@ -81,4 +85,4 @@ default-visible | Boolean | false | 显示/隐藏。非受控属性 | N
 
 名称 | 参数 | 描述
 -- | -- | --
-click | `(trigger: NoticeBarTrigger)` | 点击事件。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts)。<br/>`type NoticeBarTrigger = 'prefix-icon' \| 'content' \| 'extra' \| 'suffix-icon';`<br/>
+click | `(trigger: NoticeBarTrigger)` | 点击事件。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/notice-bar/type.ts)。<br/>`type NoticeBarTrigger = 'prefix-icon' \| 'content' \| 'operation' \| 'suffix-icon';`<br/>
diff --git a/src/notice-bar/__test__/__snapshots__/demo.test.js.snap b/src/notice-bar/__test__/__snapshots__/demo.test.js.snap
index 34686a32d..3f132d309 100644
--- a/src/notice-bar/__test__/__snapshots__/demo.test.js.snap
+++ b/src/notice-bar/__test__/__snapshots__/demo.test.js.snap
@@ -26,37 +26,30 @@ exports[`NoticeBar NoticeBar custom demo works fine 1`] = `
 exports[`NoticeBar NoticeBar customization demo works fine 1`] = `
 <customization>
   <t-notice-bar
-    suffixIcon="slot"
     visible="{{true}}"
   >
     <wx-view
+      class="inline"
       slot="content"
     >
-      
-    提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述
-    
-      <wx-view
-        class="extra"
-      >
-        <t-link
-          content="详情"
-          navigatorProps="{{
-            Object {
-              "url": "/pages/xxx/xxx",
-            }
-          }}"
-          theme="primary"
-        />
-      </wx-view>
+       提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述 
     </wx-view>
-    <wx-view
+    <t-link
+      content="详情"
+      navigatorProps="{{
+        Object {
+          "url": "/pages/xxx/xxx",
+        }
+      }}"
+      slot="operation"
+      theme="primary"
+      underline="{{false}}"
+    />
+    <t-icon
+      name="close"
+      size="44rpx"
       slot="suffix-icon"
-    >
-      <t-icon
-        name="close"
-        size="44rpx"
-      />
-    </wx-view>
+    />
   </t-notice-bar>
 </customization>
 `;
@@ -69,21 +62,21 @@ exports[`NoticeBar NoticeBar event demo works fine 1`] = `
     bind:click="click"
   >
     <wx-view
+      class="inline"
       slot="content"
     >
        这是一条普通的通知信息 
     </wx-view>
     <t-link
-      class="extra"
       content="详情"
       navigatorProps="{{
         Object {
           "url": "/pages/xxx/xxx",
         }
       }}"
-      slot="extra"
+      slot="operation"
       theme="primary"
-      underline="{{true}}"
+      underline="{{false}}"
     />
   </t-notice-bar>
   <t-notice-bar
diff --git a/src/notice-bar/__test__/__snapshots__/index.test.js.snap b/src/notice-bar/__test__/__snapshots__/index.test.js.snap
index 5bd421747..7dd7671db 100644
--- a/src/notice-bar/__test__/__snapshots__/index.test.js.snap
+++ b/src/notice-bar/__test__/__snapshots__/index.test.js.snap
@@ -27,7 +27,7 @@ exports[`notice-bar props : marquee 1`] = `
             bind:tap="onTap"
           >
             <wx-label
-              class="t-icon-error-circle-filled t-icon-base"
+              class="t-icon-info-circle-filled t-icon-base"
             />
           </wx-view>
         </t-icon>
@@ -63,13 +63,13 @@ exports[`notice-bar props : marquee 1`] = `
           }}"
           class="t-notice-bar__content t-class-content "
         >
-           提示文字描述提示文字描述提示文字描述提示文字描述文 
+          提示文字描述提示文字描述提示文字描述提示文字描述文
+          <wx-view
+            class="t-notice-bar__operation t-class-operation"
+            catch:tap="clickOperation"
+          />
         </wx-view>
       </wx-view>
-      <wx-view
-        class="t-notice-bar__extra t-class-extra"
-        bind:tap="clickExtra"
-      />
       <wx-view
         class="t-notice-bar__suffix-icon"
         bind:tap="clickSuffixIcon"
diff --git a/src/notice-bar/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/notice-bar/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 34686a32d..3f132d309 100644
--- a/src/notice-bar/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/notice-bar/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -26,37 +26,30 @@ exports[`NoticeBar NoticeBar custom demo works fine 1`] = `
 exports[`NoticeBar NoticeBar customization demo works fine 1`] = `
 <customization>
   <t-notice-bar
-    suffixIcon="slot"
     visible="{{true}}"
   >
     <wx-view
+      class="inline"
       slot="content"
     >
-      
-    提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述
-    
-      <wx-view
-        class="extra"
-      >
-        <t-link
-          content="详情"
-          navigatorProps="{{
-            Object {
-              "url": "/pages/xxx/xxx",
-            }
-          }}"
-          theme="primary"
-        />
-      </wx-view>
+       提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述 
     </wx-view>
-    <wx-view
+    <t-link
+      content="详情"
+      navigatorProps="{{
+        Object {
+          "url": "/pages/xxx/xxx",
+        }
+      }}"
+      slot="operation"
+      theme="primary"
+      underline="{{false}}"
+    />
+    <t-icon
+      name="close"
+      size="44rpx"
       slot="suffix-icon"
-    >
-      <t-icon
-        name="close"
-        size="44rpx"
-      />
-    </wx-view>
+    />
   </t-notice-bar>
 </customization>
 `;
@@ -69,21 +62,21 @@ exports[`NoticeBar NoticeBar event demo works fine 1`] = `
     bind:click="click"
   >
     <wx-view
+      class="inline"
       slot="content"
     >
        这是一条普通的通知信息 
     </wx-view>
     <t-link
-      class="extra"
       content="详情"
       navigatorProps="{{
         Object {
           "url": "/pages/xxx/xxx",
         }
       }}"
-      slot="extra"
+      slot="operation"
       theme="primary"
-      underline="{{true}}"
+      underline="{{false}}"
     />
   </t-notice-bar>
   <t-notice-bar
diff --git a/src/notice-bar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/notice-bar/__test__/__virtualHostSnapshot__/index.test.js.snap
index 5bd421747..7dd7671db 100644
--- a/src/notice-bar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/notice-bar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -27,7 +27,7 @@ exports[`notice-bar props : marquee 1`] = `
             bind:tap="onTap"
           >
             <wx-label
-              class="t-icon-error-circle-filled t-icon-base"
+              class="t-icon-info-circle-filled t-icon-base"
             />
           </wx-view>
         </t-icon>
@@ -63,13 +63,13 @@ exports[`notice-bar props : marquee 1`] = `
           }}"
           class="t-notice-bar__content t-class-content "
         >
-           提示文字描述提示文字描述提示文字描述提示文字描述文 
+          提示文字描述提示文字描述提示文字描述提示文字描述文
+          <wx-view
+            class="t-notice-bar__operation t-class-operation"
+            catch:tap="clickOperation"
+          />
         </wx-view>
       </wx-view>
-      <wx-view
-        class="t-notice-bar__extra t-class-extra"
-        bind:tap="clickExtra"
-      />
       <wx-view
         class="t-notice-bar__suffix-icon"
         bind:tap="clickSuffixIcon"
diff --git a/src/notice-bar/__test__/index.test.js b/src/notice-bar/__test__/index.test.js
index 90e9743a8..f9e8a1935 100644
--- a/src/notice-bar/__test__/index.test.js
+++ b/src/notice-bar/__test__/index.test.js
@@ -129,15 +129,15 @@ describe('notice-bar', () => {
       expect($content.dom.textContent.trim()).toBe($noticeBar.instance.data.content);
     });
 
-    it(': extra', () => {
+    it(': operation', () => {
       const id = simulate.load({
         template: `<t-notice-bar
           class="base"
           visible="{{visible}}"
-          extra="{{extra}}"></t-notice-bar>`,
+          operation="{{operation}}"></t-notice-bar>`,
         data: {
           visible: true,
-          extra: 'notice-bar extra',
+          operation: 'notice-bar operation',
         },
         usingComponents: {
           't-notice-bar': noticeBar,
@@ -146,9 +146,9 @@ describe('notice-bar', () => {
       const comp = simulate.render(id);
       comp.attach(document.createElement('parent-wrapper'));
       const $noticeBar = comp.querySelector('.base');
-      const $extra = comp.querySelector('.base >>> .t-notice-bar__extra');
+      const $operation = comp.querySelector('.base >>> .t-notice-bar__operation');
 
-      expect($extra.dom.textContent.trim()).toBe($noticeBar.instance.data.extra);
+      expect($operation.dom.textContent.trim()).toBe($noticeBar.instance.data.operation);
     });
 
     it(': prefix-icon', () => {
@@ -262,7 +262,7 @@ describe('notice-bar', () => {
           class="base
           visible="{{visible}}"
           suffixIcon="chevron-right"
-          extra="详情"
+          operation="详情"
           content="提示文字描述提示文字描述提示文字描述"
           bind:click="click"
         ></t-notice-bar>`,
@@ -279,26 +279,21 @@ describe('notice-bar', () => {
       const comp = simulate.render(id);
       comp.attach(document.createElement('parent-wrapper'));
       const $prefixIcon = comp.querySelector('.base >>> .t-notice-bar__prefix-icon');
-      const $content = comp.querySelector('.base >>> .t-notice-bar__content');
-      const $extra = comp.querySelector('.base >>> .t-notice-bar__extra');
+      const $operation = comp.querySelector('.base >>> .t-notice-bar__operation');
       const $suffixIcon = comp.querySelector('.base >>> .t-notice-bar__suffix-icon');
       $prefixIcon.dispatchEvent('tap');
       await simulate.sleep(0);
       expect(triggerName).toBe('prefix-icon');
       expect(click).toHaveBeenCalledTimes(1);
-      $content.dispatchEvent('tap');
+      $operation.dispatchEvent('tap');
       await simulate.sleep(0);
-      expect(triggerName).toBe('content');
+      expect(triggerName).toBe('operation');
       expect(click).toHaveBeenCalledTimes(2);
-      $extra.dispatchEvent('tap');
-      await simulate.sleep(0);
-      expect(triggerName).toBe('extra');
-      expect(click).toHaveBeenCalledTimes(3);
 
       $suffixIcon.dispatchEvent('tap');
       await simulate.sleep(0);
       expect(triggerName).toBe('suffix-icon');
-      expect(click).toHaveBeenCalledTimes(4);
+      expect(click).toHaveBeenCalledTimes(3);
     });
   });
 });
diff --git a/src/notice-bar/_example/customization/index.wxml b/src/notice-bar/_example/customization/index.wxml
index c87208c23..16f66bd7d 100644
--- a/src/notice-bar/_example/customization/index.wxml
+++ b/src/notice-bar/_example/customization/index.wxml
@@ -1,12 +1,6 @@
 <!-- slot实现自定义content内容 -->
-<t-notice-bar visible="{{true}}" suffixIcon="slot">
-  <view slot="content">
-    提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述
-    <view class="extra">
-      <t-link content="详情" theme="primary" navigator-props="{{navigatorProps}}" />
-    </view>
-  </view>
-  <view slot="suffix-icon">
-    <t-icon name="close" size="44rpx"></t-icon>
-  </view>
+<t-notice-bar visible="{{true}}">
+  <view slot="content" class="inline"> 提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述提示文字描述 </view>
+  <t-link slot="operation" content="详情" theme="primary" underline="{{false}}" navigator-props="{{navigatorProps}}" />
+  <t-icon slot="suffix-icon" name="close" size="44rpx"></t-icon>
 </t-notice-bar>
diff --git a/src/notice-bar/_example/customization/index.wxss b/src/notice-bar/_example/customization/index.wxss
index 837206aac..282a76563 100644
--- a/src/notice-bar/_example/customization/index.wxss
+++ b/src/notice-bar/_example/customization/index.wxss
@@ -1,5 +1,3 @@
-.extra {
-  display: inline-block;
-  font-weight: 700;
-  color: #0052d9;
+.inline {
+  display: inline;
 }
diff --git a/src/notice-bar/_example/event/index.wxml b/src/notice-bar/_example/event/index.wxml
index 42afe9d78..5c137df24 100644
--- a/src/notice-bar/_example/event/index.wxml
+++ b/src/notice-bar/_example/event/index.wxml
@@ -1,6 +1,6 @@
 <t-notice-bar visible="{{visible}}" suffixIcon="chevron-right" bind:click="click">
-  <view slot="content"> 这是一条普通的通知信息 </view>
-  <t-link slot="extra" class="extra" content="详情" theme="primary" underline navigator-props="{{navigatorProps}}" />
+  <view slot="content" class="inline"> 这是一条普通的通知信息 </view>
+  <t-link slot="operation" content="详情" theme="primary" underline="{{false}}" navigator-props="{{navigatorProps}}" />
 </t-notice-bar>
 
 <t-notice-bar
diff --git a/src/notice-bar/_example/event/index.wxss b/src/notice-bar/_example/event/index.wxss
index 07df97afb..282a76563 100644
--- a/src/notice-bar/_example/event/index.wxss
+++ b/src/notice-bar/_example/event/index.wxss
@@ -1,5 +1,3 @@
-.extra {
-  height: 100%;
-  display: flex;
-  align-items: center;
+.inline {
+  display: inline;
 }
diff --git a/src/notice-bar/notice-bar.less b/src/notice-bar/notice-bar.less
index 822d5b632..bc6c60155 100644
--- a/src/notice-bar/notice-bar.less
+++ b/src/notice-bar/notice-bar.less
@@ -16,7 +16,7 @@
 @notice-bar-error-color: var(--td-notice-bar-error-color, @error-color-6); // 'error' 主题色
 @notice-bar-error-bg-color: var(--td-notice-bar-error-bg-color, @error-color-1); // 'error' 主题背景色
 @notice-bar-suffix-icon-color: var(--td-notice-bar-suffix-icon-color, @font-gray-3); // 后缀图标颜色
-@notice-bar-extra-font-color: var(--td-notice-bar-extra-font-color, @brand-color); // 额外信息文本颜色
+@notice-bar-operation-font-color: var(--td-notice-bar-operation-font-color, @brand-color); // 额外信息文本颜色
 
 @notice-bar: ~'@{prefix}-notice-bar';
 
@@ -34,7 +34,6 @@
   }
 
   &__content {
-    display: inline-block;
     white-space: nowrap;
   }
 
@@ -70,13 +69,13 @@
     font-size: @notice-bar-icon-font-size;
   }
 
-  &__extra {
-    color: @notice-bar-extra-font-color;
-    line-height: @notice-bar-line-height;
+  &__operation {
+    display: inline-flex;
+    vertical-align: top;
+    color: @notice-bar-operation-font-color;
     font-weight: 700;
   }
 
-  &__extra:not(:empty),
   &__suffix-icon:not(:empty) {
     padding-left: @spacer;
   }
diff --git a/src/notice-bar/notice-bar.ts b/src/notice-bar/notice-bar.ts
index 13ae776e3..9299f1398 100644
--- a/src/notice-bar/notice-bar.ts
+++ b/src/notice-bar/notice-bar.ts
@@ -6,13 +6,21 @@ import config from '../common/config';
 const { prefix } = config;
 const name = `${prefix}-notice-bar`;
 
+// 主题图标
+const THEME_ICON = {
+  info: 'info-circle-filled',
+  success: 'check-circle-filled',
+  warning: 'info-circle-filled',
+  error: 'error-circle-filled',
+};
+
 @wxComponent()
 export default class NoticeBar extends SuperComponent {
   externalClasses = [
     `${prefix}-class`,
     `${prefix}-class-content`,
     `${prefix}-class-prefix-icon`,
-    `${prefix}-class-extra`,
+    `${prefix}-class-operation`,
     `${prefix}-class-suffix-icon`,
   ];
 
@@ -171,8 +179,9 @@ export default class NoticeBar extends SuperComponent {
     },
 
     setPrefixIcon(v) {
+      const { theme } = this.properties;
       this.setData({
-        _prefixIcon: calcIcon(v, 'error-circle-filled'),
+        _prefixIcon: calcIcon(v, THEME_ICON[theme]),
       });
     },
 
@@ -188,8 +197,8 @@ export default class NoticeBar extends SuperComponent {
       this.triggerEvent('click', { trigger: 'suffix-icon' });
     },
 
-    clickExtra() {
-      this.triggerEvent('click', { trigger: 'extra' });
+    clickOperation() {
+      this.triggerEvent('click', { trigger: 'operation' });
     },
   };
 }
diff --git a/src/notice-bar/notice-bar.wxml b/src/notice-bar/notice-bar.wxml
index 2e1cbd85e..5986e43c6 100644
--- a/src/notice-bar/notice-bar.wxml
+++ b/src/notice-bar/notice-bar.wxml
@@ -40,17 +40,15 @@
       class="{{classPrefix}}__content {{prefix}}-class-content {{ !marquee ? classPrefix + '__content-wrapable' : ''}}"
       animation="{{ animationData }}"
     >
-      <block wx:if="{{content}}"> {{content}} </block>
+      <block wx:if="{{content}}">{{content}}</block>
       <slot name="content" />
+      <view class="{{classPrefix}}__operation {{prefix}}-class-operation" catch:tap="clickOperation">
+        <block wx:if="{{ operation }}">{{operation}}</block>
+        <slot name="operation" />
+      </view>
     </view>
   </view>
 
-  <!-- extra -->
-  <view class="{{classPrefix}}__extra {{prefix}}-class-extra" bind:tap="clickExtra">
-    <block wx:if="{{ extra }}"> {{extra}} </block>
-    <slot name="extra" />
-  </view>
-
   <!-- suffixIcon -->
   <view class="{{classPrefix}}__suffix-icon" bind:tap="clickSuffixIcon">
     <slot name="suffix-icon" />
diff --git a/src/notice-bar/props.ts b/src/notice-bar/props.ts
index 81e6cae48..323068816 100644
--- a/src/notice-bar/props.ts
+++ b/src/notice-bar/props.ts
@@ -20,7 +20,7 @@ const props: TdNoticeBarProps = {
     type: Array,
   },
   /** 右侧额外信息 */
-  extra: {
+  operation: {
     type: String,
   },
   /** 跑马灯效果。speed 指速度控制；loop 指循环播放次数，值为 -1 表示循环播放，值为 0 表示不循环播放；delay 表示延迟多久开始播放 */
diff --git a/src/notice-bar/type.ts b/src/notice-bar/type.ts
index ff3ecf53d..f71efec7a 100644
--- a/src/notice-bar/type.ts
+++ b/src/notice-bar/type.ts
@@ -33,12 +33,12 @@ export interface TdNoticeBarProps {
    */
   externalClasses?: {
     type: ArrayConstructor;
-    value?: ['t-class', 't-class-content', 't-class-prefix-icon', 't-class-extra', 't-class-suffix-icon'];
+    value?: ['t-class', 't-class-content', 't-class-prefix-icon', 't-class-operation', 't-class-suffix-icon'];
   };
   /**
    * 右侧额外信息
    */
-  extra?: {
+  operation?: {
     type: StringConstructor;
     value?: string;
   };

From a515aef374915edabbe62102087403c89dff5718 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Mon, 27 Feb 2023 23:37:39 +0800
Subject: [PATCH 37/62] fix(Cell): resolve demo problems (#1679)

---
 src/badge/badge.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/badge/badge.less b/src/badge/badge.less
index 7d9a2876a..0eede6773 100644
--- a/src/badge/badge.less
+++ b/src/badge/badge.less
@@ -22,7 +22,6 @@
   vertical-align: top;
 
   &--basic {
-    display: inline-block;
     z-index: 100;
     padding: 0 @badge-basic-padding;
     font-size: @badge-font-size;
@@ -59,6 +58,7 @@
   }
 
   &--ribbon {
+    display: inline-block;
     transform: rotate(45deg);
     border-radius: 0;
     // padding: 0;

From a2ee5b2d88b903eafaeba9960007522f9a2f21a4 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 00:05:28 +0800
Subject: [PATCH 38/62] chore: publish v1.0.0 (#1680)

* chore: publish v1.0.0

* chore: changelog's changes

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4242a6f8f..526bad20b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,56 @@ spline: explain
 toc: false
 docClass: timeline
 ---
+## 🌈 1.0.0 `2023-02-27` 
+### ❗ Breaking Changes
+- `Cell`: 调整 hover 状态对应的类名 @anlyyao ([#1635](https://github.com/Tencent/tdesign-miniprogram/pull/1635))
+- `Checkbox`: 属性 align 更名为 placement @anlyyao ([#1629](https://github.com/Tencent/tdesign-miniprogram/pull/1629))
+- `Toast`: 属性 theme 的枚举值 fail 替换成 error @LeeJim ([#1647](https://github.com/Tencent/tdesign-miniprogram/pull/1647))
+- `Slider`: 移除 colors 和 disabledColor，建议使用 CSS Variables 修改 @LeeJim ([#1676](https://github.com/Tencent/tdesign-miniprogram/pull/1676))
+- `Loading`: 移除 theme = error 以及 theme = bar，以及调整 DOM @LeeJim ([#1626](https://github.com/Tencent/tdesign-miniprogram/pull/1626))
+- `Picker`: 移除 `footer` 插槽 @anlyyao ([#1631](https://github.com/Tencent/tdesign-miniprogram/pull/1631))
+- `DateTimePicker`: 移除 `footer` 插槽 @anlyyao ([#1631](https://github.com/Tencent/tdesign-miniprogram/pull/1631))
+- `Radio`: 属性 align 更名为 placement @anlyyao ([#1630](https://github.com/Tencent/tdesign-miniprogram/pull/1630))
+- `RadioGroup`: 属性 align 更名为 placement @anlyyao ([#1630](https://github.com/Tencent/tdesign-miniprogram/pull/1630))
+- `Search`:  移除 `right-icon` 属性相关 @anlyyao ([#1628](https://github.com/Tencent/tdesign-miniprogram/pull/1628))
+- `Avatar`: 移除 `bordered` 属性 @anlyyao ([#1632](https://github.com/Tencent/tdesign-miniprogram/pull/1632))
+- `AvatarGroup`: `cascading` 属性默认值变更为 `left-up` @anlyyao ([#1632](https://github.com/Tencent/tdesign-miniprogram/pull/1632))
+- `Message`: 移除 `action` 属性相关，使用 `link` 代替 @anlyyao ([#1637](https://github.com/Tencent/tdesign-miniprogram/pull/1637))
+- `Footer`: `copyright` 更名为 `text` @anlyyao ([#1642](https://github.com/Tencent/tdesign-miniprogram/pull/1642))
+- `Footer`: `textLinkList` 更名为 `links` @anlyyao ([#1642](https://github.com/Tencent/tdesign-miniprogram/pull/1642))
+- `Footer`:  移除 `theme` 属性 @anlyyao ([#1642](https://github.com/Tencent/tdesign-miniprogram/pull/1642))
+- `CountDown`: `theme` 属性移除 `hightlight` @anlyyao ([#1645](https://github.com/Tencent/tdesign-miniprogram/pull/1645))
+- `Link`: 移除 `status` 属性 @anlyyao ([#1652](https://github.com/Tencent/tdesign-miniprogram/pull/1652))
+- `Rate`: 移除 variant 属性，完全依赖 icon 属性来控制图标 @LeeJim ([#1674](https://github.com/Tencent/tdesign-miniprogram/pull/1674))
+- `NoticeBar`:  `extra` 属性更名为 `operation` @anlyyao ([#1638](https://github.com/Tencent/tdesign-miniprogram/pull/1638))
+
+### 🚀 Features
+- `Search`: 新增 `clearable`，用于启用清除控件 @anlyyao ([#1628](https://github.com/Tencent/tdesign-miniprogram/pull/1628))
+- `Button`: 新增支持 suffix 插槽 @LeeJim ([#1624](https://github.com/Tencent/tdesign-miniprogram/pull/1624))
+- `Message`: 新增 `link` 属性 @anlyyao ([#1637](https://github.com/Tencent/tdesign-miniprogram/pull/1637))
+- `Link`: 新增 `disabled` 属性 @anlyyao ([#1652](https://github.com/Tencent/tdesign-miniprogram/pull/1652))
+- `Link`: 新增 `hover` 属性 @anlyyao ([#1652](https://github.com/Tencent/tdesign-miniprogram/pull/1652))
+- `Link`: 新增 `externalClasses` 属性 @anlyyao ([#1652](https://github.com/Tencent/tdesign-miniprogram/pull/1652))
+- `Drawer`: 补充 `hover` 态样式 @anlyyao ([#1673](https://github.com/Tencent/tdesign-miniprogram/pull/1673))
+- `AvatarGroup`: 头像组中默认带边框 @anlyyao ([#1678](https://github.com/Tencent/tdesign-miniprogram/pull/1678))
+### 🐞 Bug Fixes
+- `Fab`: 修复丢失style 默认值的问题 @LeeJim ([#1625](https://github.com/Tencent/tdesign-miniprogram/pull/1625))
+- `Dialog`: 修复文字按钮`hover`态圆角不正确 @anlyyao ([#1633](https://github.com/Tencent/tdesign-miniprogram/pull/1633))
+- `Switch`: 优化禁用态下 loading 的颜色 @LeeJim ([#1627](https://github.com/Tencent/tdesign-miniprogram/pull/1627))
+- `Message`: 修复主题图标不正确 @anlyyao ([#1637](https://github.com/Tencent/tdesign-miniprogram/pull/1637))
+- `NavBar`: 修复胶囊内部点击事件没反应的问题 @LeeJim ([#1641](https://github.com/Tencent/tdesign-miniprogram/pull/1641))
+- `Dialog`: 修复 confirm 的拼写错误 @zzzimooo ([#1644](https://github.com/Tencent/tdesign-miniprogram/pull/1644))
+- `CountDown`: 修复默认风格下时间单位分割的问题 @anlyyao ([#1645](https://github.com/Tencent/tdesign-miniprogram/pull/1645))
+- `Slider`: 优化无障碍访问支持 @byq1213 ([#1388](https://github.com/Tencent/tdesign-miniprogram/pull/1388))
+- `Collapse`: 修复 disabled 状态下标题颜色错误的问题 @LeeJim ([#1648](https://github.com/Tencent/tdesign-miniprogram/pull/1648))
+- `Cell`: 修复外部样式类 t-class-title 放置位置错误的问题 @LeeJim ([#1648](https://github.com/Tencent/tdesign-miniprogram/pull/1648))
+- `Tag`: 修复 `close` 与 `click` 事件一并触发的问题 @anlyyao ([#1669](https://github.com/Tencent/tdesign-miniprogram/pull/1669))
+- `Rate`: 修复 tips 偶尔会不消失的问题 @LeeJim ([#1674](https://github.com/Tencent/tdesign-miniprogram/pull/1674))
+- `BackTop`: 修复 `icon` 不显示问题 @anlyyao ([#1660](https://github.com/Tencent/tdesign-miniprogram/pull/1660))
+- `NoticeBar`: 修复主题图标不正确 @anlyyao ([#1638](https://github.com/Tencent/tdesign-miniprogram/pull/1638))
+- `Badge`: 调整 display 使用 block 替换 inline-block  @anlyyao ([#1679](https://github.com/Tencent/tdesign-miniprogram/pull/1679))
+- `DropdownMenu`: 修复下拉菜单遮罩层无法点击 @RoseyW ([#1615](https://github.com/Tencent/tdesign-miniprogram/pull/1615))
+- `Dialog`: 修复命令行方式没法调整按钮布局的问题 @zzzimooo ([#1655](https://github.com/Tencent/tdesign-miniprogram/pull/1655))
 ## 🌈 1.0.0-rc.3 `2023-02-20` 
 ### ❗ Breaking Changes
 - `Image`: 插槽的渲染需要传入对应 slot 的字符串 @LeeJim ([#1609](https://github.com/Tencent/tdesign-miniprogram/pull/1609))
diff --git a/package.json b/package.json
index 957ee30d5..f14cf2e2c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-miniprogram",
   "purename": "tdesign",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0",
   "description": "tdesign-miniprogram",
   "title": "tdesign-ßminiprogram",
   "main": "miniprogram_dist/index.js",

From e8d589ae3173e2e6137b8d8eab37253b2ebde744 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 10:00:24 +0800
Subject: [PATCH 39/62] docs: update changelog

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526bad20b..5101618b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,7 +52,6 @@ docClass: timeline
 - `BackTop`: 修复 `icon` 不显示问题 @anlyyao ([#1660](https://github.com/Tencent/tdesign-miniprogram/pull/1660))
 - `NoticeBar`: 修复主题图标不正确 @anlyyao ([#1638](https://github.com/Tencent/tdesign-miniprogram/pull/1638))
 - `Badge`: 调整 display 使用 block 替换 inline-block  @anlyyao ([#1679](https://github.com/Tencent/tdesign-miniprogram/pull/1679))
-- `DropdownMenu`: 修复下拉菜单遮罩层无法点击 @RoseyW ([#1615](https://github.com/Tencent/tdesign-miniprogram/pull/1615))
 - `Dialog`: 修复命令行方式没法调整按钮布局的问题 @zzzimooo ([#1655](https://github.com/Tencent/tdesign-miniprogram/pull/1655))
 ## 🌈 1.0.0-rc.3 `2023-02-20` 
 ### ❗ Breaking Changes
@@ -82,7 +81,6 @@ docClass: timeline
 - `Dialog`: 修复事件名，从 `overlayClick` 改成 `overlay-click` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
 - `SwiperNav`: 修复事件名，从 `navBtnChange` 改成 `nav-btn-change` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
 - `TextArea`: 修复事件名，从 `lineChange` 改成 `line-change` @LeeJim ([#1619](https://github.com/Tencent/tdesign-miniprogram/pull/1619))
-- `DropdownMenu`: 修复下拉菜单遮罩层无法点击 @RoseyW ([#1615](https://github.com/Tencent/tdesign-miniprogram/pull/1615))
 
 ## 🌈 1.0.0-rc.2 `2023-02-13` 
 ### ❗ Breaking Changes

From 8ec6f71c943f0f2fa61c111930b0f55433afb180 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 10:52:00 +0800
Subject: [PATCH 40/62] chore: update common

---
 src/_common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_common b/src/_common
index 311a7e88e..eafebccb6 160000
--- a/src/_common
+++ b/src/_common
@@ -1 +1 @@
-Subproject commit 311a7e88e2977d129a6ab9ec03684dea917840f9
+Subproject commit eafebccb6b2e9515e79bf80ce9db0263d9896d24

From eb80e2eb01d788f2a56542bc6a16c29e994bb261 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 20:44:00 +0800
Subject: [PATCH 41/62] fix(action-sheet): add close event (#1683)

---
 src/action-sheet/README.en-US.md | 2 +-
 src/action-sheet/README.md       | 2 +-
 src/action-sheet/action-sheet.ts | 3 +++
 src/action-sheet/type.ts         | 8 --------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/action-sheet/README.en-US.md b/src/action-sheet/README.en-US.md
index 7dd35c8fc..0c840670b 100644
--- a/src/action-sheet/README.en-US.md
+++ b/src/action-sheet/README.en-US.md
@@ -20,5 +20,5 @@ default-visible | Boolean | undefined | required。uncontrolled property | Y
 name | params | description
 -- | -- | --
 cancel | \- | \-
-close | \- | \-
+close | `(trigger: TriggerSource)` | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/action-sheet/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'command' \| 'select' `<br/>
 selected | `(selected: ActionSheetItem \| string, index: number)` | \-
diff --git a/src/action-sheet/README.md b/src/action-sheet/README.md
index 591accc8b..1ba2bab61 100644
--- a/src/action-sheet/README.md
+++ b/src/action-sheet/README.md
@@ -103,5 +103,5 @@ external-classes | Array | - | 组件类名，用于设置组件外层元素类
 名称 | 参数 | 描述
 -- | -- | --
 cancel | \- | 点击取消按钮时触发
-close | \- | 关闭时触发
+close | `(trigger: TriggerSource)` | 关闭时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/action-sheet/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'command' \| 'select' `<br/>
 selected | `(selected: ActionSheetItem \| string, index: number)` | 选择菜单项时触发
diff --git a/src/action-sheet/action-sheet.ts b/src/action-sheet/action-sheet.ts
index 08a14135a..fb93b550f 100644
--- a/src/action-sheet/action-sheet.ts
+++ b/src/action-sheet/action-sheet.ts
@@ -74,12 +74,14 @@ export default class ActionSheet extends SuperComponent {
 
     /** 指令调用隐藏 */
     close() {
+      this.triggerEvent('close', { trigger: 'command' });
       this._trigger('visible-change', { visible: false });
     },
 
     /** 默认点击遮罩关闭 */
     onPopupVisibleChange({ detail }) {
       if (!detail.visible) {
+        this.triggerEvent('close', { trigger: 'overlay' });
         this._trigger('visible-change', { visible: false });
       }
       if (this.autoClose) {
@@ -96,6 +98,7 @@ export default class ActionSheet extends SuperComponent {
       const realIndex = isSwiperMode ? index + currentSwiperIndex * count : index;
       if (item) {
         this.triggerEvent('selected', { selected: item, index: realIndex });
+        this.trigger('close', { trigger: 'select' });
         this._trigger('visible-change', { visible: false });
       }
     },
diff --git a/src/action-sheet/type.ts b/src/action-sheet/type.ts
index fa3b764e3..42206ec2b 100644
--- a/src/action-sheet/type.ts
+++ b/src/action-sheet/type.ts
@@ -29,14 +29,6 @@ export interface TdActionSheetProps {
     type: NumberConstructor;
     value?: number;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 动作面板描述文字
    * @default ''

From 7f50b821afb8796a980d13b4cec40b019893c6ec Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 20:45:04 +0800
Subject: [PATCH 42/62] fix(cascader): resolve events (#1685)

---
 src/cascader/README.en-US.md | 10 +++++++++-
 src/cascader/README.md       | 10 +++++++++-
 src/cascader/cascader.ts     | 13 ++++++++++---
 src/cascader/cascader.wxml   |  4 ++--
 src/cascader/type.ts         | 10 +---------
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/cascader/README.en-US.md b/src/cascader/README.en-US.md
index defa34a7c..45c9106bc 100644
--- a/src/cascader/README.en-US.md
+++ b/src/cascader/README.en-US.md
@@ -9,8 +9,16 @@ close-btn | Boolean / Slot | true | \- | N
 keys | Object | - | Typescript：`KeysType` | N
 options | Array | [] | Typescript：`Array<CascaderOption>` | N
 sub-titles | Array | [] | Typescript：`Array<string>` | N
-theme | String | 'step' | options：step/tab | N
+theme | String | step | options：step/tab | N
 title | String / Slot | - | \- | N
 value | String / Number | null | \- | N
 default-value | String / Number | undefined | uncontrolled property | N
 visible | Boolean | false | \- | N
+
+### Cascader Events
+
+name | params | description
+-- | -- | --
+change | `(value: string \| number, selectedOptions: string[])` | `1.0.1`
+close | `(trigger: TriggerSource)` | `1.0.1`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/cascader/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'close-btn' \| 'finish'`<br/>
+pick | `(value: string \| number, index: number)` | `1.0.1`
diff --git a/src/cascader/README.md b/src/cascader/README.md
index 4046af825..a5f543aba 100644
--- a/src/cascader/README.md
+++ b/src/cascader/README.md
@@ -55,8 +55,16 @@ close-btn | Boolean / Slot | true | 关闭按钮 | N
 keys | Object | - | 用来定义 value / label 在 `options` 中对应的字段别名。TS 类型：`KeysType` | N
 options | Array | [] | 可选项数据源。TS 类型：`Array<CascaderOption>` | N
 sub-titles | Array | [] | 每级展示的次标题。TS 类型：`Array<string>` | N
-theme | String | 'step' | 展示风格。可选项：step/tab | N
+theme | String | step | 展示风格。可选项：step/tab | N
 title | String / Slot | - | 标题 | N
 value | String / Number | null | 选项值 | N
 default-value | String / Number | undefined | 选项值。非受控属性 | N
 visible | Boolean | false | 是否展示 | N
+
+### Cascader Events
+
+名称 | 参数 | 描述
+-- | -- | --
+change | `(value: string \| number, selectedOptions: string[])` | `1.0.1`。值发生变更时触发
+close | `(trigger: TriggerSource)` | `1.0.1`。关闭时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/cascader/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'close-btn' \| 'finish'`<br/>
+pick | `(value: string \| number, index: number)` | `1.0.1`。选择后触发
diff --git a/src/cascader/cascader.ts b/src/cascader/cascader.ts
index 2fa4e00c7..ce3a83cf8 100644
--- a/src/cascader/cascader.ts
+++ b/src/cascader/cascader.ts
@@ -124,8 +124,15 @@ export default class Cascader extends SuperComponent {
         });
       }
     },
-    hide() {
+    hide(trigger) {
       this.setData({ visible: false });
+      this.triggerEvent('close', { trigger: trigger });
+    },
+    onVisibleChange() {
+      this.hide('overlay');
+    },
+    onClose() {
+      this.hide('close-btn');
     },
     onStepClick(e) {
       const { index } = e.currentTarget.dataset;
@@ -152,7 +159,7 @@ export default class Cascader extends SuperComponent {
       selectedIndexes[level] = index;
       selectedIndexes.length = level + 1;
 
-      this.triggerEvent('pick', item[keys?.value ?? 'value'], index);
+      this.triggerEvent('pick', { value: item[keys?.value ?? 'value'], index });
 
       if (item?.[keys?.children ?? 'children']?.length) {
         this.setData({ selectedIndexes });
@@ -165,7 +172,7 @@ export default class Cascader extends SuperComponent {
             selectedOptions: items.map((item, index) => item[selectedIndexes[index]]),
           });
         });
-        this.hide();
+        this.hide('finish');
       }
     },
   };
diff --git a/src/cascader/cascader.wxml b/src/cascader/cascader.wxml
index 735484ee0..7e2d46d1b 100644
--- a/src/cascader/cascader.wxml
+++ b/src/cascader/cascader.wxml
@@ -1,12 +1,12 @@
 <wxs src="../common/utils.wxs" module="_" />
 
-<t-popup class="class" visible="{{visible}}" placement="bottom" bind:visible-change="hide">
+<t-popup class="class" visible="{{visible}}" placement="bottom" bind:visible-change="onVisibleChange">
   <view style="{{_._style([style, customStyle])}}" class="{{name}}">
     <view class="{{name}}__title">
       <slot name="title" />
       {{title}}
     </view>
-    <view class="{{name}}__close-btn" bind:tap="hide">
+    <view class="{{name}}__close-btn" bind:tap="onClose">
       <slot name="close-btn" />
       <t-icon wx:if="{{closeBtn}}" size="24" name="close" />
     </view>
diff --git a/src/cascader/type.ts b/src/cascader/type.ts
index 39d559d28..76bad10a1 100644
--- a/src/cascader/type.ts
+++ b/src/cascader/type.ts
@@ -22,14 +22,6 @@ export interface TdCascaderProps<CascaderOption extends TreeOptionData = TreeOpt
     type: ObjectConstructor;
     value?: KeysType;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 可选项数据源
    * @default []
@@ -48,7 +40,7 @@ export interface TdCascaderProps<CascaderOption extends TreeOptionData = TreeOpt
   };
   /**
    * 展示风格
-   * @default 'step'
+   * @default step
    */
   theme?: {
     type: StringConstructor;

From aef1bff4fa71ef470b3d78844d5db4a7c8dc2bdd Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 20:47:13 +0800
Subject: [PATCH 43/62] fix(drawer): resolve close event (#1686)

---
 src/drawer/README.en-US.md | 10 +++++-----
 src/drawer/README.md       |  6 +++---
 src/drawer/drawer.ts       |  7 ++++++-
 src/drawer/props.ts        |  1 -
 src/drawer/type.ts         | 10 ----------
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/drawer/README.en-US.md b/src/drawer/README.en-US.md
index e172460fa..555fff0ee 100644
--- a/src/drawer/README.en-US.md
+++ b/src/drawer/README.en-US.md
@@ -7,18 +7,18 @@ name | type | default | description | required
 -- | -- | -- | -- | --
 close-on-overlay-click | Boolean | undefined | \- | N
 destroy-on-close | Boolean | false | \- | N
-footer | Slot | - | \- | N
-items | Array | - | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts) | N
+footer | Slot | - | `0.29.0` | N
+items | Array | - | Typescript：`DrawerItem[] ` `interface DrawerItem { title: string; icon: string; }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts) | N
 placement | String | right | options：left/right | N
 show-overlay | Boolean | true | \- | N
-title | String / Slot | '' | \- | N
+title | String / Slot | - | `0.29.0` | N
 visible | Boolean | false | \- | N
-z-index | Number | - | \- | N
+z-index | Number | 11500 | \- | N
 
 ### Drawer Events
 
 name | params | description
 -- | -- | --
-close | `(trigger: DrawerEventSource)` | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts)。<br/>`type DrawerEventSource = 'esc' \| 'close-btn' \| 'cancel' \| 'overlay'`<br/>
+close | `(trigger: TriggerSource)` | [see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts)。<br/>`type TriggerSource = 'overlay'`<br/>
 item-click | `(index: number; item: DrawerItem)` | \-
 overlay-click | \- | \-
diff --git a/src/drawer/README.md b/src/drawer/README.md
index 33f7c8d6d..2c04c105b 100644
--- a/src/drawer/README.md
+++ b/src/drawer/README.md
@@ -43,11 +43,11 @@ isComponent: true
 -- | -- | -- | -- | --
 close-on-overlay-click | Boolean | true | 点击蒙层时是否触发抽屉关闭事件 | N
 destroy-on-close | Boolean | false | 抽屉关闭时是否销毁节点 | N
-footer | Slot | - | `v0.29.0`。抽屉的底部 | N
+footer | Slot | - | `0.29.0`。抽屉的底部 | N
 items | Array | - | 抽屉里的列表项。TS 类型：`DrawerItem[] ` `interface DrawerItem { title: string; icon: string; }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts) | N
 placement | String | right | 抽屉方向。可选项：left/right | N
 show-overlay | Boolean | true | 是否显示遮罩层 | N
-title | String / Slot | '' | `v0.29.0`。抽屉的标题 | N
+title | String / Slot | - | `0.29.0`。抽屉的标题 | N
 visible | Boolean | false | 组件是否可见 | N
 z-index | Number | 11500 | 抽屉层级，样式默认为 11500 | N
 
@@ -55,6 +55,6 @@ z-index | Number | 11500 | 抽屉层级，样式默认为 11500 | N
 
 名称 | 参数 | 描述
 -- | -- | --
-close | `(trigger: DrawerEventSource)` | 关闭事件，取消按钮点击时、关闭按钮点击时、点击蒙层时均会触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts)。<br/>`type DrawerEventSource = 'esc' \| 'close-btn' \| 'cancel' \| 'overlay'`<br/>
+close | `(trigger: TriggerSource)` | 关闭时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/drawer/type.ts)。<br/>`type TriggerSource = 'overlay'`<br/>
 item-click | `(index: number; item: DrawerItem)` | 点击抽屉里的列表项
 overlay-click | \- | 如果蒙层存在，点击蒙层时触发
diff --git a/src/drawer/drawer.ts b/src/drawer/drawer.ts
index 0779b3a53..c7922d634 100644
--- a/src/drawer/drawer.ts
+++ b/src/drawer/drawer.ts
@@ -26,9 +26,13 @@ export default class Drawer extends SuperComponent {
       const { showOverlay } = this.data;
 
       this.setData({
-        visible: visible,
+        visible,
       });
 
+      if (!visible) {
+        this.triggerEvent('close', { trigger: 'overlay' });
+      }
+
       if (showOverlay) {
         this.triggerEvent('overlay-click', { visible: visible });
       }
@@ -36,6 +40,7 @@ export default class Drawer extends SuperComponent {
 
     itemClick(detail) {
       const { index, item } = detail.currentTarget.dataset;
+
       this.triggerEvent('item-click', {
         sibarItem: { index: index, item: item },
       });
diff --git a/src/drawer/props.ts b/src/drawer/props.ts
index c95480fdd..33a6755c7 100644
--- a/src/drawer/props.ts
+++ b/src/drawer/props.ts
@@ -33,7 +33,6 @@ const props: TdDrawerProps = {
   /** 抽屉的标题 */
   title: {
     type: String,
-    value: '',
   },
   /** 组件是否可见 */
   visible: {
diff --git a/src/drawer/type.ts b/src/drawer/type.ts
index d4692782c..d8f70e238 100644
--- a/src/drawer/type.ts
+++ b/src/drawer/type.ts
@@ -7,20 +7,11 @@
 export interface TdDrawerProps {
   /**
    * 点击蒙层时是否触发抽屉关闭事件
-   * @default true
    */
   closeOnOverlayClick?: {
     type: BooleanConstructor;
     value?: boolean;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 抽屉关闭时是否销毁节点
    * @default false
@@ -54,7 +45,6 @@ export interface TdDrawerProps {
   };
   /**
    * 抽屉的标题
-   * @default ''
    */
   title?: {
     type: StringConstructor;

From cb1bbefff85a40fa6676beb9eeb40210060f174d Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 28 Feb 2023 23:03:32 +0800
Subject: [PATCH 44/62] feat(picker): add close event (#1687)

* feat(picker): add close event

* test(date-time-picker): update snapshots
---
 src/date-time-picker/README.en-US.md           |  5 +++--
 src/date-time-picker/README.md                 |  3 ++-
 .../__test__/__snapshots__/index.test.js.snap  |  1 +
 src/date-time-picker/date-time-picker.ts       |  7 +++++++
 src/date-time-picker/date-time-picker.wxml     |  1 +
 src/date-time-picker/type.ts                   | 18 +++++-------------
 src/picker-item/type.ts                        |  8 --------
 src/picker/README.en-US.md                     |  1 +
 src/picker/README.md                           |  1 +
 src/picker/picker.ts                           |  9 +++++----
 src/picker/type.ts                             |  8 --------
 11 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/date-time-picker/README.en-US.md b/src/date-time-picker/README.en-US.md
index 2e48c16bd..7f31cb243 100644
--- a/src/date-time-picker/README.en-US.md
+++ b/src/date-time-picker/README.en-US.md
@@ -9,7 +9,7 @@ cancel-btn | String | 取消 | \- | N
 confirm-btn | String | - | \- | N
 end | String / Number | - | \- | N
 external-classes | Array | - | `['t-class', 't-class-confirm', 't-class-cancel', 't-class-title']` | N
-footer | Slot | true | \- | N
+footer | Slot | true | `deprecated` | N
 format | String | 'YYYY-MM-DD HH:mm:ss' | \- | N
 header | Boolean / Slot | true | \- | N
 mode | String / Array | 'date' | Typescript：`DateTimePickerMode` `type DateTimePickerMode = TimeModeValues \| Array<TimeModeValues> ` `type TimeModeValues = 'year' \| 'month' \| 'date' \| 'hour' \| 'minute' \| 'second'`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts) | N
@@ -26,5 +26,6 @@ name | params | description
 -- | -- | --
 cancel | \- | \-
 change | `(value: DateValue)` | \-
-confirm | `(value: DateValue)` | \-
+close | `(trigger: TriggerSource)` | `1.0.1`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'cancel-btn' \| 'confrim-btn'`<br/>
+confirm | `(value: DateValue)` | `1.0.1`
 pick | `(value: DateValue)` | \-
diff --git a/src/date-time-picker/README.md b/src/date-time-picker/README.md
index 480a77e74..df57b8292 100644
--- a/src/date-time-picker/README.md
+++ b/src/date-time-picker/README.md
@@ -64,5 +64,6 @@ visible | Boolean | false | 是否显示 | N
 -- | -- | --
 cancel | \- | 取消按钮点击时触发
 change | `(value: DateValue)` | 确认按钮点击时触发
-confirm | `(value: DateValue)` | 【开发中】确认按钮点击时触发
+close | `(trigger: TriggerSource)` | `1.0.1`。关闭时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'cancel-btn' \| 'confrim-btn'`<br/>
+confirm | `(value: DateValue)` | `1.0.1`。确认按钮点击时触发
 pick | `(value: DateValue)` | 选中值发生变化时触发
diff --git a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
index 27ab23fa2..3ef2dbac1 100644
--- a/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__snapshots__/index.test.js.snap
@@ -7,6 +7,7 @@ exports[`date-time-picker :base 1`] = `
       class="class t-class t-date-time-picker"
       bind:cancel="onCancel"
       bind:change="onConfirm"
+      bind:close="onClose"
       bind:pick="onColumnChange"
       bind:visible-change="onVisibleChange"
     >
diff --git a/src/date-time-picker/date-time-picker.ts b/src/date-time-picker/date-time-picker.ts
index fd5f60107..3a7d6eb29 100644
--- a/src/date-time-picker/date-time-picker.ts
+++ b/src/date-time-picker/date-time-picker.ts
@@ -360,6 +360,7 @@ export default class DateTimePicker extends SuperComponent {
 
       const value = format ? date.format(format) : date.valueOf();
       this._trigger('change', { value });
+      this.triggerEvent('confirm', { value });
       this.resetColumns();
     },
 
@@ -374,6 +375,12 @@ export default class DateTimePicker extends SuperComponent {
       }
     },
 
+    onClose(e) {
+      const { trigger } = e.detail;
+
+      this.triggerEvent('close', { trigger });
+    },
+
     resetColumns() {
       const parseDate = this.getParseDate();
 
diff --git a/src/date-time-picker/date-time-picker.wxml b/src/date-time-picker/date-time-picker.wxml
index e0897ec33..c8a4ad573 100644
--- a/src/date-time-picker/date-time-picker.wxml
+++ b/src/date-time-picker/date-time-picker.wxml
@@ -9,6 +9,7 @@
   bind:change="onConfirm"
   bind:cancel="onCancel"
   bind:visible-change="onVisibleChange"
+  bind:close="onClose"
   header="{{header}}"
   title="{{title}}"
   confirmBtn="{{confirmBtn || locale.confirm}}"
diff --git a/src/date-time-picker/type.ts b/src/date-time-picker/type.ts
index 60f196c35..0894de497 100644
--- a/src/date-time-picker/type.ts
+++ b/src/date-time-picker/type.ts
@@ -20,19 +20,11 @@ export interface TdDateTimePickerProps {
     type: StringConstructor;
     value?: string;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 选择器的最大可选时间，默认为当前时间+10年
    */
   end?: {
-    type: StringConstructor;
+    type: null;
     value?: string | number;
   };
   /**
@@ -63,7 +55,7 @@ export interface TdDateTimePickerProps {
    * @default 'date'
    */
   mode?: {
-    type: StringConstructor;
+    type: null;
     value?: DateTimePickerMode;
   };
   /**
@@ -78,7 +70,7 @@ export interface TdDateTimePickerProps {
    * 选择器的最小可选时间，默认为当前时间-10年
    */
   start?: {
-    type: StringConstructor;
+    type: null;
     value?: string | number;
   };
   /**
@@ -93,14 +85,14 @@ export interface TdDateTimePickerProps {
    * 选中值
    */
   value?: {
-    type: StringConstructor;
+    type: null;
     value?: DateValue;
   };
   /**
    * 选中值，非受控属性
    */
   defaultValue?: {
-    type: StringConstructor;
+    type: null;
     value?: DateValue;
   };
   /**
diff --git a/src/picker-item/type.ts b/src/picker-item/type.ts
index f2dc39aef..8590f6744 100644
--- a/src/picker-item/type.ts
+++ b/src/picker-item/type.ts
@@ -5,14 +5,6 @@
  * */
 
 export interface TdPickerItemProps {
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 格式化标签
    */
diff --git a/src/picker/README.en-US.md b/src/picker/README.en-US.md
index 3f9c558e3..64dbb16cb 100644
--- a/src/picker/README.en-US.md
+++ b/src/picker/README.en-US.md
@@ -23,6 +23,7 @@ name | params | description
 -- | -- | --
 cancel | - | \-
 change | `(value: Array<PickerValue>, label: string, columns: Array<{ column: number; index: number }> )` | \-
+close | `(trigger: TriggerSource)` | `1.0.1`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/picker/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'cancel-btn' \| 'confrim-btn'`<br/>
 confirm | `(value: Array<PickerValue>, label: string, columns: Array<{ column: number; index: number }> )` | \-
 pick | `(value: Array<PickerValue>, label: string, column: number, index: number)` | \-
 
diff --git a/src/picker/README.md b/src/picker/README.md
index 5a753debd..ce0539dff 100644
--- a/src/picker/README.md
+++ b/src/picker/README.md
@@ -61,6 +61,7 @@ visible | Boolean | false | 是否显示 | N
 -- | -- | --
 cancel | - | 点击取消按钮时触发
 change | `(value: Array<PickerValue>, label: string, columns: Array<{ column: number; index: number }> )` | 选中变化时候触发，即确认变化时触发
+close | `(trigger: TriggerSource)` | `1.0.1`。关闭时触发。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/picker/type.ts)。<br/>`type TriggerSource = 'overlay' \| 'cancel-btn' \| 'confrim-btn'`<br/>
 confirm | `(value: Array<PickerValue>, label: string, columns: Array<{ column: number; index: number }> )` | 点击确认按钮时触发
 pick | `(value: Array<PickerValue>, label: string, column: number, index: number)` | 任何一列选中都会触发，不同的列参数不同。`column` 表示第几列变化，`index` 表示变化那一列的选中项下标
 
diff --git a/src/picker/picker.ts b/src/picker/picker.ts
index 90a61b79a..3268b9754 100644
--- a/src/picker/picker.ts
+++ b/src/picker/picker.ts
@@ -68,7 +68,7 @@ export default class Picker extends SuperComponent {
       const [value, label] = this.getSelectedValue();
       const columns = this.getColumnIndexes();
 
-      this.close();
+      this.close('confirm-btn');
       this.triggerEvent('change', { value, label, columns });
       this.triggerEvent('confirm', { value, label, columns });
     },
@@ -79,21 +79,22 @@ export default class Picker extends SuperComponent {
     },
 
     onCancel() {
-      this.close();
+      this.close('cancel-btn');
       this.triggerEvent('cancel');
     },
 
     onPopupChange(e) {
       const { visible } = e.detail;
 
-      this.close();
+      this.close('overlay');
       this.triggerEvent('visible-change', { visible });
     },
 
-    close() {
+    close(trigger) {
       if (this.data.autoClose) {
         this.setData({ visible: false });
       }
+      this.triggerEvent('close', { trigger });
     },
   };
 
diff --git a/src/picker/type.ts b/src/picker/type.ts
index 25dbab52a..139d1fbbd 100644
--- a/src/picker/type.ts
+++ b/src/picker/type.ts
@@ -39,14 +39,6 @@ export interface TdPickerProps {
     type: null;
     value?: boolean | string | ButtonProps;
   };
-  /**
-   * 自定义组件样式
-   * @default ''
-   */
-  style?: {
-    type: StringConstructor;
-    value?: string;
-  };
   /**
    * 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容
    * @default true

From 46fa5bfe23f51dd3ae03e4ab33f61a0779698a91 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 1 Mar 2023 14:49:13 +0800
Subject: [PATCH 45/62] fix(Message): fix t-class-link invalid (#1690)

* fix: fix docs

* fix(Message): fix t-class-link invalid
---
 src/date-time-picker/README.md | 2 +-
 src/loading/README.en-US.md    | 2 +-
 src/loading/README.md          | 2 +-
 src/message/message.ts         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/date-time-picker/README.md b/src/date-time-picker/README.md
index df57b8292..f20164232 100644
--- a/src/date-time-picker/README.md
+++ b/src/date-time-picker/README.md
@@ -50,7 +50,7 @@ external-classes | Array | - | 组件类名，分别用于设置组件外层元
 footer | Slot | true | 已废弃。底部内容 | N
 format | String | 'YYYY-MM-DD HH:mm:ss' | 用于pick、change、confirm事件参数格式化[详细文档](https://day.js.org/docs/en/display/format) | N
 header | Boolean / Slot | true | 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容 | N
-mode | String / Array | 'date' | year = 年；month = 年月；date = 年月日；hour = 年月日时； minute = 年月日时分；当类型为数组时，第一个值控制年月日，第二个值控制时分秒。TS 类型：`DateTimePickerMode` `type DateTimePickerMode = TimeModeValues \| Array<TimeModeValues> ` `type TimeModeValues = 'year' \| 'month' \| 'date' \| 'hour' \| 'minute' \| 'second'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts) | N
+mode | String / Array | 'date' | year = 年；month = 年月；date = 年月日；hour = 年月日时； minute = 年月日时分；当类型为数组时，第一个值控制年月日，第二个值控制时分秒，示例：['null', 'second']或['date', 'minute']。TS 类型：`DateTimePickerMode` `type DateTimePickerMode = TimeModeValues \| Array<TimeModeValues> ` `type TimeModeValues = 'year' \| 'month' \| 'date' \| 'hour' \| 'minute' \| 'second'`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/date-time-picker/type.ts) | N
 show-week | Boolean | false | 【开发中】是否在日期旁边显示周几（如周一，周二，周日等） | N
 start | String / Number | - | 选择器的最小可选时间，默认为当前时间-10年 | N
 title | String | - | 标题 | N
diff --git a/src/loading/README.en-US.md b/src/loading/README.en-US.md
index fac34a170..1969d2e71 100644
--- a/src/loading/README.en-US.md
+++ b/src/loading/README.en-US.md
@@ -18,4 +18,4 @@ progress | Number | - | \- | N
 reverse | Boolean | - | \- | N
 size | String | '40rpx' | \- | N
 text | String / Slot | - | \- | N
-theme | String | circular | options：circular/spinner/bar/error/dots | N
+theme | String | circular | options：circular/spinner/dots | N
diff --git a/src/loading/README.md b/src/loading/README.md
index 8cd145934..9ca1917b9 100644
--- a/src/loading/README.md
+++ b/src/loading/README.md
@@ -67,4 +67,4 @@ progress | Number | - | 加载进度 | N
 reverse | Boolean | - | 加载动画是否反向 | N
 size | String | '40rpx' | 尺寸，示例：40rpx/20px | N
 text | String / Slot | - | 加载提示文案 | N
-theme | String | circular | 加载组件类型。可选项：circular/spinner/bar/error/dots | N
+theme | String | circular | 加载组件类型。可选项：circular/spinner/dots | N
diff --git a/src/message/message.ts b/src/message/message.ts
index 5d2236f08..fa9dc99a0 100644
--- a/src/message/message.ts
+++ b/src/message/message.ts
@@ -24,7 +24,7 @@ export default class Message extends SuperComponent {
     `${prefix}-class`,
     `${prefix}-class-content`,
     `${prefix}-class-icon`,
-    `${prefix}-class-action`,
+    `${prefix}-class-link`,
     `${prefix}-class-close-btn`,
   ];
 

From 5a04c665c9171555a3481ddb5e8ba55a80a2c3fc Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 1 Mar 2023 14:50:23 +0800
Subject: [PATCH 46/62] fix: fix docs (#1688)

---
 src/footer/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/footer/README.md b/src/footer/README.md
index f2a8e53de..c264d74b9 100644
--- a/src/footer/README.md
+++ b/src/footer/README.md
@@ -39,7 +39,7 @@ isComponent: true
 ### Footer Props
 
 名称 | 类型 | 默认值 | 说明 | 必传
--- | -- | -- | -- | 
+-- | -- | -- | -- | --
 text | String | '' | 版权信息。 | N
 logo | Object | - | 图标配置。`logo.icon` 表示图标链接地址，`logo.title` 表示标题文本，`logo.url` 表示链接跳转地址。TS 类型：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
 links| Array | [] | 链接列表。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N

From c9f9ad5c9abfaf46c906f7e852a9a4cbbd59f84d Mon Sep 17 00:00:00 2001
From: zhangpaopao <zhangpaopao0609@gmail.com>
Date: Wed, 1 Mar 2023 15:23:21 +0800
Subject: [PATCH 47/62] feat(upload): support aria (#1238)

* feat(upload): support aria

* chore(upload): update snap

* feat(upload): icon hidden

* feat(upload): hack

* revert(upload): revert grid

* chore(upload): update snap

* feat(upload): file.status

* feat(upload): enhance

* feat(upload): upload wxs

* feat(upload): enhance

* feat(upload): add button role

* feat(upload): remove   aria-labelledby="{{labelID}}"

* feat(upload): ariaLabel labelledby

* feat(grid): describedby

* feat(upload): optimization
---
 src/grid-item/grid-item.ts   |  4 ++--
 src/grid-item/grid-item.wxml |  5 +++--
 src/upload/upload.wxml       | 36 ++++++++++++++++++++++++++----------
 src/upload/upload.wxs        | 15 +++++++++++++++
 4 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 src/upload/upload.wxs

diff --git a/src/grid-item/grid-item.ts b/src/grid-item/grid-item.ts
index 79c387e2f..6497fbdad 100644
--- a/src/grid-item/grid-item.ts
+++ b/src/grid-item/grid-item.ts
@@ -52,7 +52,7 @@ export default class GridItem extends SuperComponent {
     gridItemContentStyle: '',
     align: 'center',
     column: 0,
-    labelID: '',
+    describedbyID: '',
   };
 
   observers = {
@@ -67,7 +67,7 @@ export default class GridItem extends SuperComponent {
   lifetimes = {
     ready() {
       this.setData({
-        labelID: getUniqueID(),
+        describedbyID: getUniqueID(),
       });
     },
   };
diff --git a/src/grid-item/grid-item.wxml b/src/grid-item/grid-item.wxml
index c919e34b2..22ebfd52b 100644
--- a/src/grid-item/grid-item.wxml
+++ b/src/grid-item/grid-item.wxml
@@ -13,7 +13,8 @@
   hover-stay-time="{{200}}"
   bindtap="onClick"
   aria-role="{{ariaRole || 'button'}}"
-  aria-labelledby="{{labelID}}"
+  aria-label="{{ariaLabel}}"
+  aria-describedby="{{describedbyID}}"
 >
   <view class="{{_.cls(classPrefix + '__wrapper', [layout])}}" style="{{gridItemWrapperStyle}}">
     <view
@@ -53,7 +54,7 @@
           />
         </view>
       </t-badge>
-      <view class="{{_.cls(classPrefix + '__words', [layout])}}" id="{{labelID}}">
+      <view class="{{_.cls(classPrefix + '__words', [layout])}}" id="{{describedbyID}}">
         <view
           wx:if="{{text}}"
           class="{{_.cls(classPrefix + '__text', [util.getImageSize(column), layout])}} {{prefix}}-class-text"
diff --git a/src/upload/upload.wxml b/src/upload/upload.wxml
index ee1bbe1b5..563b94c25 100644
--- a/src/upload/upload.wxml
+++ b/src/upload/upload.wxml
@@ -1,4 +1,5 @@
 <wxs src="../common/utils.wxs" module="_" />
+<wxs src="./upload.wxs" module="this" />
 
 <view style="{{_._style([style, customStyle])}}" class="{{classPrefix}} class {{prefix}}-class">
   <t-grid gutter="{{gutter}}" border="{{false}}" align="center" column="{{column}}">
@@ -9,8 +10,14 @@
       wx:for-item="file"
       t-class="{{classPrefix}}__grid {{classPrefix}}__grid-file"
       t-class-content="{{classPrefix}}__grid-content"
+      aria-role="presentation"
     >
-      <view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
+      <view
+        class="{{classPrefix}}__wrapper"
+        style="{{gridItemStyle}}"
+        aria-role="{{ariaRole || this.getWrapperAriaRole(file)}}"
+        aria-label="{{ariaLabel || this.getWrapperAriaLabel(file)}}"
+      >
         <t-image
           wx:if="{{file.type !== 'video'}}"
           bindtap="onProofTap"
@@ -43,26 +50,35 @@
           bind:tap="onFileClick"
         >
           <block wx:if="{{file.status == 'loading'}}">
-            <t-icon t-class="{{classPrefix}}__progress-loading" name="loading" size="24" />
+            <t-icon t-class="{{classPrefix}}__progress-loading" name="loading" size="24" aria-hidden />
             <view class="{{classPrefix}}__progress-text">{{file.percent ? file.percent + '%' : '上传中...'}}</view>
           </block>
-          <t-icon wx:else name="{{file.status == 'reload' ? 'refresh' : 'close-circle'}}" size="24" />
-          <view wx:if="{{file.status == 'reload' || file.status == 'failed'}}" class="{{classPrefix}}__progress-text"
-            >{{file.status == 'reload' ? '重新上传' : '上传失败'}}</view
-          >
-        </view>
-        <!-- 删除 -->
-        <view class="{{classPrefix}}__close-btn hotspot-expanded" bindtap="onDelete" data-index="{{index}}">
-          <t-icon name="close" size="16" color="#fff" />
+          <t-icon wx:else name="{{file.status == 'reload' ? 'refresh' : 'close-circle'}}" size="24" aria-hidden />
+          <view wx:if="{{file.status == 'reload' || file.status == 'failed'}}" class="{{classPrefix}}__progress-text">
+            {{file.status == 'reload' ? '重新上传' : '上传失败'}}
+          </view>
         </view>
       </view>
+
+      <!-- 删除 -->
+      <view
+        class="{{classPrefix}}__close-btn hotspot-expanded"
+        bindtap="onDelete"
+        data-index="{{index}}"
+        aria-role="button"
+        aria-label="删除"
+      >
+        <t-icon name="close" size="16" color="#fff" />
+      </view>
     </t-grid-item>
+
     <!-- 添加 -->
     <t-grid-item
       wx:if="{{customLimit > 0}}"
       t-class="{{classPrefix}}__grid"
       t-class-content="{{classPrefix}}__grid-content"
       bindclick="onAddTap"
+      aria-label="上传"
     >
       <view class="{{classPrefix}}__wrapper" style="{{gridItemStyle}}">
         <slot name="add-content" />
diff --git a/src/upload/upload.wxs b/src/upload/upload.wxs
new file mode 100644
index 000000000..03b321fa7
--- /dev/null
+++ b/src/upload/upload.wxs
@@ -0,0 +1,15 @@
+module.exports.getWrapperAriaRole = function (file) {
+  return file.status && file.status != 'done' ? 'text' : 'button';
+};
+
+module.exports.getWrapperAriaLabel = function (file) {
+  if (file.status && file.status != 'done') {
+    if (file.status == 'loading') {
+      return file.percent ? '上传中:' + file.percent + '%' : '上传中';
+    } else {
+      return file.status == 'reload' ? '重新上传' : '上传失败';
+    }
+  } else {
+    return file.type === 'video' ? '视频' : '图像';
+  }
+};

From 9bf9e0f71065bc8b7ae2612572f4de3f0ba0f71a Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Wed, 1 Mar 2023 19:45:11 +0800
Subject: [PATCH 48/62] fix: resolve radio placement (#1693)

---
 src/cascader/cascader.wxml           | 2 +-
 src/dropdown-item/dropdown-item.wxml | 1 -
 src/tree-select/tree-select.wxml     | 4 ++--
 src/upload/upload.json               | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/cascader/cascader.wxml b/src/cascader/cascader.wxml
index 7e2d46d1b..af1d0a4a1 100644
--- a/src/cascader/cascader.wxml
+++ b/src/cascader/cascader.wxml
@@ -51,7 +51,7 @@
               options="{{options}}"
               bind:change="handleSelect"
               data-level="{{index}}"
-              align="right"
+              placement="right"
               icon="line"
               borderless
             >
diff --git a/src/dropdown-item/dropdown-item.wxml b/src/dropdown-item/dropdown-item.wxml
index 135f8c6c6..c5df34615 100644
--- a/src/dropdown-item/dropdown-item.wxml
+++ b/src/dropdown-item/dropdown-item.wxml
@@ -32,7 +32,6 @@
           wx:key="index"
           tabindex="0"
           icon="line"
-          align="right"
           class="{{classPrefix}}__radio-item {{prefix}}-class-column-item"
           t-class="radio"
           t-class-label="{{prefix}}-class-column-item-label"
diff --git a/src/tree-select/tree-select.wxml b/src/tree-select/tree-select.wxml
index 898e9e4a0..4ffc46596 100644
--- a/src/tree-select/tree-select.wxml
+++ b/src/tree-select/tree-select.wxml
@@ -52,7 +52,7 @@
         t-class-label="{{prefix}}-class-right-item-label"
         value="{{item[valueAlias]}}"
         borderless
-        align="right"
+        placement="right"
         >{{item[labelAlias]}}</t-radio
       >
     </t-radio-group>
@@ -66,7 +66,7 @@
       <t-checkbox
         wx:for="{{treeOptions[level]}}"
         wx:key="value"
-        align="right"
+        placement="right"
         icon="line"
         class="{{prefix}}-class-right-item"
         t-class-label="{{prefix}}-class-right-item-label"
diff --git a/src/upload/upload.json b/src/upload/upload.json
index 5c0921d49..010327d30 100644
--- a/src/upload/upload.json
+++ b/src/upload/upload.json
@@ -3,7 +3,6 @@
   "usingComponents": {
     "t-grid": "../grid/grid",
     "t-grid-item": "../grid-item/grid-item",
-    "t-popup": "../popup/popup",
     "t-icon": "../icon/icon",
     "t-image": "../image/image"
   }

From b30c83a8e6630afe85b1d64ff8fe2a132c6e2902 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Wed, 1 Mar 2023 19:45:40 +0800
Subject: [PATCH 49/62] fix(Message): fix demo for message (#1694)

---
 src/message/_example/base/index.js | 7 ++++++-
 src/message/message.wxml           | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/message/_example/base/index.js b/src/message/_example/base/index.js
index 28168f484..15fe216b4 100644
--- a/src/message/_example/base/index.js
+++ b/src/message/_example/base/index.js
@@ -27,7 +27,12 @@ Component({
         offset: ['20rpx', 32],
         content: '这是一条带关闭的消息通知',
         duration: -1,
-        action: '按钮',
+        link: {
+          content: '按钮',
+          navigatorProps: {
+            url: '/page/xxx/xxx',
+          },
+        },
         closeBtn: true,
       });
     },
diff --git a/src/message/message.wxml b/src/message/message.wxml
index 1e508c99d..09726251c 100644
--- a/src/message/message.wxml
+++ b/src/message/message.wxml
@@ -31,11 +31,12 @@
       wx:if="{{_link.content}}"
       class="{{classPrefix}}__link {{prefix}}-class-link"
       style="{{_._style([_link.style, _link.customStyle])}}"
+      disabled="{{_link.disabled || false}}"
+      hover="{{_link.hover || true}}"
       theme="{{_link.theme || 'primary'}}"
       size="{{_link.size || 'medium'}}"
       prefixIcon="{{_link.prefixIcon || false}}"
       suffixIcon="{{_link.suffixIcon || false}}"
-      status="{{_link.status || 'normal'}}"
       underline="{{_link.underline || false}}"
       content="{{_link.content || ''}}"
       navigatorProps="{{_link.navigatorProps || null}}"

From 79d4126bbdd0c33349a6f2b3da77723757d4e808 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Wed, 1 Mar 2023 19:48:42 +0800
Subject: [PATCH 50/62] chore: publish v1.0.1 (#1695)

* chore: publish v1.0.1

* chore: changelog's changes

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5101618b5..d494e5cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@ spline: explain
 toc: false
 docClass: timeline
 ---
+## 🌈 1.0.1 `2023-03-01` 
+### 🚀 Features
+- `Cascader`: 新增 close 事件 @LeeJim ([#1685](https://github.com/Tencent/tdesign-miniprogram/pull/1685))
+- `Picker`: 新增 close 事件 @LeeJim ([#1687](https://github.com/Tencent/tdesign-miniprogram/pull/1687))
+- `DateTimePicker`: 新增 close 事件 @LeeJim ([#1687](https://github.com/Tencent/tdesign-miniprogram/pull/1687))
+- `Upload`: 支持无障碍访问 @zhangpaopao0609 ([#1238](https://github.com/Tencent/tdesign-miniprogram/pull/1238))
+### 🐞 Bug Fixes
+- `ActionSheet`: 补充 close 事件，增加 trigger 参数 @LeeJim ([#1683](https://github.com/Tencent/tdesign-miniprogram/pull/1683))
+- `Cascader`: 修复 pick 事件的参数 @LeeJim ([#1685](https://github.com/Tencent/tdesign-miniprogram/pull/1685))
+- `drawer`: 修复 close 事件不生效的问题 @LeeJim ([#1686](https://github.com/Tencent/tdesign-miniprogram/pull/1686))
+- `Message`: 修复外部样式类 `t-class-link` 无效问题 @anlyyao ([#1690](https://github.com/Tencent/tdesign-miniprogram/pull/1690))
+- `Cascader`: 修复 radio 图标显示位置不正确的问题 @LeeJim ([#1693](https://github.com/Tencent/tdesign-miniprogram/pull/1693))
+- `DropdownMenu`: 修复 radio 图标显示位置不正确的问题 @LeeJim ([#1693](https://github.com/Tencent/tdesign-miniprogram/pull/1693))
+- `TreeSelect`: 修复 radio 图标显示位置不正确的问题 @LeeJim ([#1693](https://github.com/Tencent/tdesign-miniprogram/pull/1693))
+- `Message`:  更新内嵌 `link` 组件的属性 @anlyyao ([#1694](https://github.com/Tencent/tdesign-miniprogram/pull/1694))
 ## 🌈 1.0.0 `2023-02-27` 
 ### ❗ Breaking Changes
 - `Cell`: 调整 hover 状态对应的类名 @anlyyao ([#1635](https://github.com/Tencent/tdesign-miniprogram/pull/1635))
diff --git a/package.json b/package.json
index f14cf2e2c..967c250eb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-miniprogram",
   "purename": "tdesign",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "tdesign-miniprogram",
   "title": "tdesign-ßminiprogram",
   "main": "miniprogram_dist/index.js",

From b57419e111bea9541fe54c1cee476f70ff5b4281 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Thu, 2 Mar 2023 17:09:30 +0800
Subject: [PATCH 51/62] chore: add test:snap-update (#1706)

---
 package.json                                  |   1 +
 .../__virtualHostSnapshot__/demo.test.js.snap |  12 +-
 .../index.test.js.snap                        |   4 +-
 .../index.test.js.snap                        |   8 +-
 .../index.test.js.snap                        |   1 +
 .../index.test.js.snap                        | 135 ++++++++----------
 .../__test__/__snapshots__/index.test.js.snap |  32 ++---
 .../__virtualHostSnapshot__/demo.test.js.snap |  19 ---
 .../__virtualHostSnapshot__/demo.test.js.snap |   2 +
 .../__virtualHostSnapshot__/demo.test.js.snap |   2 +-
 .../__virtualHostSnapshot__/demo.test.js.snap |  16 +--
 .../__virtualHostSnapshot__/demo.test.js.snap |   2 +-
 12 files changed, 100 insertions(+), 134 deletions(-)

diff --git a/package.json b/package.json
index 967c250eb..6c0a77294 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "cover": "jest --coverage",
     "test": "jest && jest -c jest.virtualHost.config.js && jest -c jest.e2e.config.js",
     "test:virtualHost": "jest -c jest.virtualHost.config.js",
+    "test:snap-update": "npm run test:virtualHost -- -u && npm run test:unit -- -u",
     "test:demo": "node gen-demo-test.js",
     "test:unit": "jest",
     "test:e2e": "jest -c jest.e2e.config.js",
diff --git a/src/button/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/button/__test__/__virtualHostSnapshot__/demo.test.js.snap
index caeac6dbb..09d357f55 100644
--- a/src/button/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/button/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -182,9 +182,9 @@ exports[`Button Button icon-btn demo works fine 1`] = `
       加载中
     </t-button>
     <t-button
-      ariaLabel="返回"
+      ariaLabel="搜索"
       class="margin"
-      icon="chevron-left"
+      icon="search"
       shape="square"
       size="large"
       theme="primary"
@@ -205,8 +205,8 @@ exports[`Button Button shape demo works fine 1`] = `
       填充按钮
     </t-button>
     <t-button
-      ariaLabel="返回"
-      icon="chevron-left"
+      ariaLabel="搜索"
+      icon="search"
       shape="square"
       size="large"
       theme="primary"
@@ -219,8 +219,8 @@ exports[`Button Button shape demo works fine 1`] = `
       填充按钮
     </t-button>
     <t-button
-      ariaLabel="返回"
-      icon="chevron-left"
+      ariaLabel="搜索"
+      icon="search"
       shape="circle"
       size="large"
       theme="primary"
diff --git a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
index a9521a796..049933a34 100644
--- a/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/cell/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -18,10 +18,10 @@ exports[`cell :base 1`] = `
         class="t-cell__left t-class-left"
       />
       <wx-view
-        class="t-cell__title t-class-title"
+        class="t-cell__title"
       >
         <wx-view
-          class="t-cell__title-text"
+          class="t-cell__title-text  t-class-title"
         />
         <wx-view
           class="t-cell__description t-class-description"
diff --git a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
index c4dd3cdc0..3c2af13a0 100644
--- a/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/collapse/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -40,10 +40,10 @@ exports[`collapse :defaultExpandAll 1`] = `
                 class="t-cell__left t-class-left"
               />
               <wx-view
-                class="t-cell__title t-class-title"
+                class="t-cell__title"
               >
                 <wx-view
-                  class="t-cell__title-text"
+                  class="t-cell__title-text  t-class-title"
                 >
                    first 
                 </wx-view>
@@ -125,10 +125,10 @@ exports[`collapse :defaultExpandAll 1`] = `
                 class="t-cell__left t-class-left"
               />
               <wx-view
-                class="t-cell__title t-class-title"
+                class="t-cell__title"
               >
                 <wx-view
-                  class="t-cell__title-text"
+                  class="t-cell__title-text  t-class-title"
                 >
                    second 
                 </wx-view>
diff --git a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
index 27ab23fa2..3ef2dbac1 100644
--- a/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/date-time-picker/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -7,6 +7,7 @@ exports[`date-time-picker :base 1`] = `
       class="class t-class t-date-time-picker"
       bind:cancel="onCancel"
       bind:change="onConfirm"
+      bind:close="onClose"
       bind:pick="onColumnChange"
       bind:visible-change="onVisibleChange"
     >
diff --git a/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap
index 9f07aa14a..66610fc4f 100644
--- a/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/image-viewer/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -17,38 +17,33 @@ exports[`image-viewer :base 1`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
@@ -87,38 +82,33 @@ exports[`image-viewer :base 2`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
@@ -157,38 +147,33 @@ exports[`image-viewer :base 3`] = `
       tClassText="t-image--loading-text"
     >
       <wx-view
-        class="class t-class"
-        style="width: 44rpx; height: 44rpx;"
+        class="class t-class t-loading t-loading--horizontal"
+        style="width: 44rpx; height: 44rpx;  color: inherit"
       >
         <wx-view
-          class="t-loading t-loading--horizontal"
-          style=""
+          ariaLabel="加载中"
+          ariaRole="img"
+          class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
+          style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
         >
           <wx-view
-            ariaLabel="加载中"
-            ariaRole="img"
-            class="t-class-indicator t-loading__spinner t-loading__spinner--dots "
-            style="width: 44rpx; height: 44rpx; color: inherit ; animation-duration: 0.8s; animation-play-state: running;"
-          >
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
-            />
-            <wx-view
-              class="t-loading__dot"
-              style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
-            />
-          </wx-view>
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0s; animation-play-state: running;"
+          />
+          <wx-view
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.26666666666666666s; animation-play-state: running;"
+          />
           <wx-view
-            ariaHidden="{{true}}"
-            ariaLabel=""
-            class="t-loading__text t-loading__text--horizontal t-class-text"
+            class="t-loading__dot"
+            style="animation-duration: 0.8s; animation-delay:0.5333333333333333s; animation-play-state: running;"
           />
         </wx-view>
+        <wx-view
+          ariaHidden="{{true}}"
+          ariaLabel=""
+          class="t-loading__text t-loading__text--horizontal t-class-text"
+        />
       </wx-view>
     </t-loading>
   </wx-view>
diff --git a/src/input/__test__/__snapshots__/index.test.js.snap b/src/input/__test__/__snapshots__/index.test.js.snap
index b25c511f6..3f0a13637 100644
--- a/src/input/__test__/__snapshots__/index.test.js.snap
+++ b/src/input/__test__/__snapshots__/index.test.js.snap
@@ -10,11 +10,7 @@ exports[`input props : clearable && label && suffix 1`] = `
     style=""
   >
     <wx-view
-      class="t-input__icon--prefix"
-    />
-    <wx-view
-      ariaHidden="{{true}}"
-      class="t-input__label"
+      class="t-input__wrap--prefix"
     >
       <wx-view
         class="t-input__icon--prefix"
@@ -23,8 +19,12 @@ exports[`input props : clearable && label && suffix 1`] = `
         ariaHidden="{{true}}"
         class="t-input__label"
       >
-        tdesign
-      </wx-text>
+        <wx-text
+          class="t-class-label"
+        >
+          tdesign
+        </wx-text>
+      </wx-view>
     </wx-view>
     <wx-view
       class="t-input__wrap"
@@ -137,11 +137,7 @@ exports[`input slots : label 1`] = `
     style=""
   >
     <wx-view
-      class="t-input__icon--prefix"
-    />
-    <wx-view
-      ariaHidden="{{true}}"
-      class="t-input__label"
+      class="t-input__wrap--prefix"
     >
       <wx-view
         class="t-input__icon--prefix"
@@ -150,13 +146,17 @@ exports[`input slots : label 1`] = `
         ariaHidden="{{true}}"
         class="t-input__label"
       >
-        标签文字
         <wx-text
-          style="color: #e34d59"
+          slot="label"
         >
-          *
+          标签文字
+          <wx-text
+            style="color: #e34d59"
+          >
+            *
+          </wx-text>
         </wx-text>
-      </wx-text>
+      </wx-view>
     </wx-view>
     <wx-view
       class="t-input__wrap"
diff --git a/src/loading/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/loading/__test__/__virtualHostSnapshot__/demo.test.js.snap
index f2d47f834..2f176b80b 100644
--- a/src/loading/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/loading/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -48,15 +48,6 @@ exports[`Loading Loading duration demo works fine 1`] = `
 </duration>
 `;
 
-exports[`Loading Loading error demo works fine 1`] = `
-<error>
-  <t-loading
-    theme="error"
-    bind:reload="reloadPage"
-  />
-</error>
-`;
-
 exports[`Loading Loading horizontal demo works fine 1`] = `
 <horizontal>
   <wx-view
@@ -79,16 +70,6 @@ exports[`Loading Loading horizontal demo works fine 1`] = `
 </horizontal>
 `;
 
-exports[`Loading Loading loadingProgress demo works fine 1`] = `
-<loadingProgress>
-  <t-loading
-    loading="{{false}}"
-    progress="{{100}}"
-    theme="bar"
-  />
-</loadingProgress>
-`;
-
 exports[`Loading Loading size demo works fine 1`] = `
 <size>
   <wx-view
diff --git a/src/navbar/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/navbar/__test__/__virtualHostSnapshot__/demo.test.js.snap
index f2e32dc4b..44e88ff13 100644
--- a/src/navbar/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/navbar/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -15,6 +15,7 @@ exports[`Navbar Navbar back-home demo works fine 1`] = `
         class="custom-capsule__icon"
         name="chevron-left"
         size="20"
+        bind:tap="onBack"
       />
       <t-icon
         ariaLabel="首页"
@@ -22,6 +23,7 @@ exports[`Navbar Navbar back-home demo works fine 1`] = `
         class="custom-capsule__icon"
         name="home"
         size="20"
+        bind:tap="onGoHome"
       />
     </wx-view>
   </t-navbar>
diff --git a/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 524dd53d7..77c90df23 100644
--- a/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -11,9 +11,9 @@ exports[`Radio Radio align demo works fine 1`] = `
     class="block"
   />
   <t-radio
-    align="right"
     defaultChecked="{{true}}"
     label="单选"
+    placement="right"
     value="radio2"
   />
 </align>
diff --git a/src/rate/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/rate/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 972ac2855..7a5d71d60 100644
--- a/src/rate/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/rate/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -17,7 +17,6 @@ exports[`Rate Rate action demo works fine 1`] = `
     </wx-view>
     <t-rate
       value="{{3.5}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -37,7 +36,6 @@ exports[`Rate Rate action demo works fine 1`] = `
     <t-rate
       allowHalf="{{true}}"
       defaultValue="{{3}}"
-      variant="filled"
     />
   </wx-view>
 </action>
@@ -55,7 +53,6 @@ exports[`Rate Rate base demo works fine 1`] = `
     </wx-view>
     <t-rate
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -75,7 +72,6 @@ exports[`Rate Rate color demo works fine 1`] = `
     <t-rate
       allowHalf="{{true}}"
       defaultValue="{{3}}"
-      variant="filled"
     />
   </wx-view>
   <wx-view
@@ -89,6 +85,12 @@ exports[`Rate Rate color demo works fine 1`] = `
     <t-rate
       color="#00a870"
       defaultValue="{{3}}"
+      icon="{{
+        Array [
+          "star-filled",
+          "star",
+        ]
+      }}"
     />
   </wx-view>
 </color>
@@ -107,7 +109,6 @@ exports[`Rate Rate count demo works fine 1`] = `
     <t-rate
       count="{{3}}"
       value="{{2}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -156,7 +157,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
         ]
       }}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -172,7 +172,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
       data-index="{{1}}"
       showText="{{true}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -188,7 +187,6 @@ exports[`Rate Rate show-text demo works fine 1`] = `
       data-index="{{2}}"
       showText="{{true}}"
       value="{{0}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -208,7 +206,6 @@ exports[`Rate Rate size demo works fine 1`] = `
     <t-rate
       data-index="{{0}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
@@ -224,7 +221,6 @@ exports[`Rate Rate size demo works fine 1`] = `
       data-index="{{1}}"
       size="{{20}}"
       value="{{3}}"
-      variant="filled"
       bind:change="onChange"
     />
   </wx-view>
diff --git a/src/toast/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/toast/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 5d591973e..fd6a188bd 100644
--- a/src/toast/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/toast/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -167,7 +167,7 @@ exports[`Toast Toast theme demo works fine 1`] = `
     variant="outline"
     bind:tap="showErrorToast"
   >
-    失败提示
+    错误提示
   </t-button>
 </theme>
 `;

From 76dbab8aaf6f40502cbd90f0b2d1a2f5bfe4f54f Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Mon, 6 Mar 2023 22:44:51 +0800
Subject: [PATCH 52/62] fix: update api for checkbox and radio (#1707)

* fix: update api for checkbox and radio

* chore: update demo

* test(radio): update snapshot
---
 src/checkbox-group/README.md                  | 59 ------------------
 src/checkbox-group/checkbox-group.ts          | 11 ++--
 src/checkbox-group/checkbox-group.wxml        | 16 ++++-
 .../__test__/__snapshots__/demo.test.js.snap  | 45 +++++++-------
 src/checkbox/_example/base/index.js           | 19 +++++-
 src/checkbox/_example/base/index.wxml         | 16 +----
 src/radio-group/README.md                     | 60 -------------------
 src/radio-group/props.ts                      |  6 +-
 src/radio-group/radio-group.wxml              | 18 ++++--
 src/radio-group/type.ts                       |  2 +-
 src/radio/README.md                           |  4 +-
 .../__test__/__snapshots__/demo.test.js.snap  | 43 ++++++-------
 src/radio/_example/base/index.js              | 30 +++++-----
 src/radio/_example/base/index.wxml            | 11 +---
 14 files changed, 119 insertions(+), 221 deletions(-)
 delete mode 100644 src/checkbox-group/README.md
 delete mode 100644 src/radio-group/README.md

diff --git a/src/checkbox-group/README.md b/src/checkbox-group/README.md
deleted file mode 100644
index da9a83f53..000000000
--- a/src/checkbox-group/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: checkbox-group
-description: 组合多选框
-spline: form
-isComponent: true
----
-
-### 特性及兼容性
-
-无
-
-## 引入
-
-### 引入组件
-
-在 `app.json` 或 `page.json` 中引入组件：
-
-```json
-"usingComponents": {
-  "t-checkbox": "tdesign-miniprogram/checkbox/checkbox",
-  "t-checkbox-group": "tdesign-miniprogram/checkbox-group/checkbox-group"
-}
-```
-
-## 用法
-
-### 组件方式
-
-```html
-<!-- page.wxml -->
-<t-checkbox-group  defaultValue="checkbox1" bind:change="onChange">
-  <t-checkbox title="单行标题" value="checkbox1" />
-  <t-checkbox title="单行标题" label="辅助信息" value="checkbox2" />
-</t-checkbox-group>
-```
- <t-checkbox title="单行标题" value="checkbox1" defaultChecked="{{true}}"/>
-## API
-
-### `<t-checkbox-group>` 组件
-
-组件路径：`tdesign-miniprogram/checkbox-group/checkbox-group`
-
-#### Props
-
-| 属性     | 值类型    | 默认值 | 必传 | 说明                   |
-| -------- | --------- | ------ | ---- | ---------------------- |
-| value    | `Array`   | `[]`   | N    | 当前选中项的标识符     |
-| name     | `String`  | -      | N    | 在表单内提交时的标识符 |
-### Slots
-
-| 名称 | 说明              |
-| ---- | ----------------- |
-| 默认 | `t-checkbox` 组件 |
-
-#### Events
-
-| 事件        | event.detail               | 说明                     |
-| ----------- | -------------------------- | ------------------------ |
-| bind:change | {names:当前选中项的标识符} | 当绑定值变化时触发的事件 |
diff --git a/src/checkbox-group/checkbox-group.ts b/src/checkbox-group/checkbox-group.ts
index 93705214e..9d40477c6 100644
--- a/src/checkbox-group/checkbox-group.ts
+++ b/src/checkbox-group/checkbox-group.ts
@@ -32,12 +32,12 @@ export default class CheckBoxGroup extends SuperComponent {
     value() {
       this.updateChildren();
     },
+    options() {
+      this.initWithOptions();
+    },
   };
 
   lifetimes = {
-    attached() {
-      this.initWithOptions();
-    },
     ready() {
       this.setCheckall();
     },
@@ -112,7 +112,7 @@ export default class CheckBoxGroup extends SuperComponent {
     },
 
     initWithOptions() {
-      const { options } = this.data;
+      const { options, value } = this.data;
 
       if (!options?.length || !Array.isArray(options)) return;
 
@@ -122,8 +122,9 @@ export default class CheckBoxGroup extends SuperComponent {
           ? {
               label: `${item}`,
               value: item,
+              checked: value?.includes(item),
             }
-          : { ...item };
+          : { ...item, checked: value?.includes(item.value) };
       });
 
       this.setData({
diff --git a/src/checkbox-group/checkbox-group.wxml b/src/checkbox-group/checkbox-group.wxml
index da8af6ea6..cf9aae8a1 100644
--- a/src/checkbox-group/checkbox-group.wxml
+++ b/src/checkbox-group/checkbox-group.wxml
@@ -5,13 +5,23 @@
   <block wx:for="{{checkboxOptions}}" wx:key="value">
     <t-checkbox
       class="{{prefix}}-checkbox-option"
+      data-item="{{item}}"
       label="{{item.label || item.text || ''}}"
       value="{{item.value || ''}}"
+      block="{{item.block || true}}"
+      check-all="{{item.checkAll || false}}"
+      checked="{{item.checked || false}}"
       content="{{item.content || ''}}"
-      check-all="{{item.checkAll}}"
+      content-disabled="{{item.contentDisabled || false}}"
+      icon="{{item.icon || 'circle'}}"
+      indeterminate="{{item.indeterminate || false}}"
       disabled="{{item.disabled}}"
-      data-item="{{item}}"
+      max-content-row="{{item.maxContentRow || 5}}"
+      max-label-row="{{item.maxLabelRow || 3}}"
+      name="{{item.name || ''}}"
+      readonly="{{item.readonly || false}}"
       bind:change="handleInnerChildChange"
-    ></t-checkbox>
+      placement="{{item.placement || 'left'}}"
+    />
   </block>
 </view>
diff --git a/src/checkbox/__test__/__snapshots__/demo.test.js.snap b/src/checkbox/__test__/__snapshots__/demo.test.js.snap
index b0785a4e9..75c814d45 100644
--- a/src/checkbox/__test__/__snapshots__/demo.test.js.snap
+++ b/src/checkbox/__test__/__snapshots__/demo.test.js.snap
@@ -40,6 +40,29 @@ exports[`Checkbox Checkbox all demo works fine 1`] = `
 exports[`Checkbox Checkbox base demo works fine 1`] = `
 <base>
   <t-checkbox-group
+    options="{{
+      Array [
+        Object {
+          "label": "多选",
+          "value": "checkbox1",
+        },
+        Object {
+          "label": "多选",
+          "value": "checkbox2",
+        },
+        Object {
+          "label": "多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行",
+          "maxLabelRow": 2,
+          "value": "checkbox3",
+        },
+        Object {
+          "content": "描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息",
+          "label": "多选",
+          "maxContentRow": 2,
+          "value": "checkbox4",
+        },
+      ]
+    }}"
     value="{{
       Array [
         "checkbox1",
@@ -47,27 +70,7 @@ exports[`Checkbox Checkbox base demo works fine 1`] = `
       ]
     }}"
     bind:change="handleGroupChange"
-  >
-    <t-checkbox
-      label="多选"
-      value="checkbox1"
-    />
-    <t-checkbox
-      label="多选"
-      value="checkbox2"
-    />
-    <t-checkbox
-      label="多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行"
-      maxLabelRow="2"
-      value="checkbox3"
-    />
-    <t-checkbox
-      content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-      label="多选"
-      maxContentRow="2"
-      value="checkbox4"
-    />
-  </t-checkbox-group>
+  />
 </base>
 `;
 
diff --git a/src/checkbox/_example/base/index.js b/src/checkbox/_example/base/index.js
index 9362543ac..1a5046cc5 100644
--- a/src/checkbox/_example/base/index.js
+++ b/src/checkbox/_example/base/index.js
@@ -1,13 +1,28 @@
 Component({
   data: {
-    demoCheckbox1: ['checkbox1', 'checkbox2'],
+    current: ['checkbox1', 'checkbox2'],
+    options: [
+      { label: '多选', value: 'checkbox1' },
+      { label: '多选', value: 'checkbox2' },
+      {
+        label: '多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行',
+        value: 'checkbox3',
+        maxLabelRow: 2,
+      },
+      {
+        label: '多选',
+        value: 'checkbox4',
+        content: '描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息',
+        maxContentRow: 2,
+      },
+    ],
   },
 
   methods: {
     handleGroupChange(event) {
       console.log('group', event.detail.value);
       this.setData({
-        demoCheckbox1: event.detail.value,
+        current: event.detail.value,
       });
     },
   },
diff --git a/src/checkbox/_example/base/index.wxml b/src/checkbox/_example/base/index.wxml
index 47aa4642a..d84e80834 100644
--- a/src/checkbox/_example/base/index.wxml
+++ b/src/checkbox/_example/base/index.wxml
@@ -1,15 +1 @@
-<t-checkbox-group value="{{demoCheckbox1}}" bind:change="handleGroupChange">
-  <t-checkbox value="checkbox1" label="多选" />
-  <t-checkbox value="checkbox2" label="多选" />
-  <t-checkbox
-    value="checkbox3"
-    label="多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行"
-    max-label-row="2"
-  />
-  <t-checkbox
-    value="checkbox4"
-    label="多选"
-    max-content-row="2"
-    content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-  />
-</t-checkbox-group>
+<t-checkbox-group value="{{current}}" bind:change="handleGroupChange" options="{{options}}" />
diff --git a/src/radio-group/README.md b/src/radio-group/README.md
deleted file mode 100644
index 24b22068d..000000000
--- a/src/radio-group/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: radio-group
-description: 组合单选框。
-spline: form
-isComponent: true
----
-
-### 特性及兼容性
-
-无
-
-## 引入
-
-### 引入组件
-
-在 `app.json` 或 `page.json` 中引入组件：
-
-```json
-"usingComponents": {
-  "t-radio": "tdesign-miniprogram/radio/radio",
-  "t-radio-group": "tdesign-miniprogram/radio-group/radio-group"
-}
-```
-
-## 用法
-
-### 组件方式
-
-```html
-<!-- page.wxml -->
-<t-radio-group  value="radio1" bind:change="onChange">
-  <t-radio title="单行标题" name="radio1" />
-  <t-radio title="单行标题" label="辅助信息" name="radio2" />
-</t-radio-group>
-```
-
-## API
-
-### `<t-radio-group>` 组件
-
-组件路径：`tdesign-miniprogram/radio-group/radio-group`
-
-#### Props
-
-| 属性     | 值类型    | 默认值 | 必传 | 说明                   |
-| -------- | --------- | ------ | ---- | ---------------------- |
-| value    | `String`  | -      | N    | 当前选中项的标识符     |
-| name     | `String`  | -      | N    | 在表单内提交时的标识符 |
-
-### Slots
-
-| 名称 | 说明           |
-| ---- | -------------- |
-| 默认 | `t-radio` 组件 |
-
-#### Events
-
-| 事件        | event.detail              | 说明                     |
-| ----------- | ------------------------- | ------------------------ |
-| bind:change | {name:当前选中项的标识符} | 当绑定值变化时触发的事件 |
diff --git a/src/radio-group/props.ts b/src/radio-group/props.ts
index 58bb4ef22..d414b3d68 100644
--- a/src/radio-group/props.ts
+++ b/src/radio-group/props.ts
@@ -9,7 +9,7 @@ const props: TdRadioGroupProps = {
   /** 复选框和内容相对位置；仅在使用 options 时生效 */
   placement: {
     type: String,
-    value: null,
+    value: 'left',
   },
   /** 是否开启无边框模式 */
   borderless: {
@@ -21,10 +21,10 @@ const props: TdRadioGroupProps = {
     type: Boolean,
     value: undefined,
   },
-  /** 自定义选中图标和非选中图标。示例：[选中态图标，非选中态图标]。值为 fill-circle 表示图标为填充型图标，值为 stroke-line 表示图标为描边型图标；仅在使用 options 时生效 */
+  /** 自定义选中图标和非选中图标。示例：[选中态图标，非选中态图标]。值为 circle 表示图标为填充型图标，值为 line 表示图标为描边型图标；仅在使用 options 时生效 */
   icon: {
     type: null,
-    value: 'fill-circle',
+    value: 'circle',
   },
   /** 用来定义 value / label 在 `options` 中对应的字段别名 */
   keys: {
diff --git a/src/radio-group/radio-group.wxml b/src/radio-group/radio-group.wxml
index beff6f6dc..d245948f0 100644
--- a/src/radio-group/radio-group.wxml
+++ b/src/radio-group/radio-group.wxml
@@ -5,14 +5,20 @@
   <block wx:for="{{radioOptions}}" wx:key="value">
     <t-radio
       class="{{prefix}}-radio-option"
-      label="{{item.label}}"
-      value="{{item.value}}"
-      checked="{{item.checked}}"
       data-index="{{index}}"
       data-value="{{item.value}}"
-      disabled="{{item.disabled}}"
-      placement="{{placement}}"
-      icon="{{icon}}"
+      block="{{item.block || true}}"
+      label="{{item.label || ''}}"
+      value="{{item.value || index}}"
+      checked="{{item.checked || false}}"
+      content="{{item.content || ''}}"
+      content-disabled="{{item.contentDisabled || false}}"
+      disabled="{{item.disabled || false}}"
+      icon="{{item.icon || icon}}"
+      placement="{{item.placement || placement}}"
+      max-content-row="{{item.maxContentRow || 5}}"
+      max-label-row="{{item.maxLabelRow || 3}}"
+      name="{{item.name || ''}}"
       borderless="{{borderless}}"
       bind:change="handleRadioChange"
     />
diff --git a/src/radio-group/type.ts b/src/radio-group/type.ts
index 3f1bc7ccd..b50e679ad 100644
--- a/src/radio-group/type.ts
+++ b/src/radio-group/type.ts
@@ -44,7 +44,7 @@ export interface TdRadioGroupProps<T = RadioValue> {
    */
   icon?: {
     type: null;
-    value?: 'fill-circle' | 'stroke-line' | Array<string>;
+    value?: 'circle' | 'line' | 'dot' | Array<string>;
   };
   /**
    * 用来定义 value / label 在 `options` 中对应的字段别名
diff --git a/src/radio/README.md b/src/radio/README.md
index d267dfbf7..8107ba811 100644
--- a/src/radio/README.md
+++ b/src/radio/README.md
@@ -78,10 +78,10 @@ change | `(checked: boolean)` | 值变化时触发
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-placement | String | null | 复选框和内容相对位置；仅在使用 options 时生效。可选项：left/right | N
+placement | String | 'left' | 复选框和内容相对位置；仅在使用 options 时生效。可选项：left/right | N
 borderless | Boolean | false | 是否开启无边框模式 | N
 disabled | Boolean | undefined | 是否禁用全部子单选框 | N
-icon | String / Array | 'fill-circle' | 自定义选中图标和非选中图标。示例：[选中态图标，非选中态图标]。值为 fill-circle 表示图标为填充型图标，值为 stroke-line 表示图标为描边型图标；仅在使用 options 时生效。TS 类型：`'fill-circle' | 'stroke-line' | Array<string>` | N
+icon | String / Array | 'circle' | 自定义选中图标和非选中图标。示例：[选中态图标，非选中态图标]。使用 String 时，值为 circle 表示填充型图标、值为 line 表示描边型图标、值为 dot 表示圆点图标；仅在使用 options 时生效。TS 类型：`'circle' | 'line' | 'dot' | Array<string>` | N
 keys | Object | - | 用来定义 value / label 在 `options` 中对应的字段别名。TS 类型：`KeysType` | N
 name | String | - | HTML 元素原生属性 | N
 options | Array | - | 单选组件按钮形式。RadioOption 数据类型为 string 或 number 时，表示 label 和 value 值相同。TS 类型：`Array<RadioOption>` `type RadioOption = string \| number \| RadioOptionObj` `interface RadioOptionObj { label?: string; value?: string \| number; disabled?: boolean }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/radio-group/type.ts) | N
diff --git a/src/radio/__test__/__snapshots__/demo.test.js.snap b/src/radio/__test__/__snapshots__/demo.test.js.snap
index 77c90df23..27e9b8a6c 100644
--- a/src/radio/__test__/__snapshots__/demo.test.js.snap
+++ b/src/radio/__test__/__snapshots__/demo.test.js.snap
@@ -22,27 +22,30 @@ exports[`Radio Radio align demo works fine 1`] = `
 exports[`Radio Radio base demo works fine 1`] = `
 <base>
   <t-radio-group
-    defaultValue="radio1"
+    options="{{
+      Array [
+        Object {
+          "label": "单选",
+          "value": 0,
+        },
+        Object {
+          "label": "单选",
+          "value": 1,
+        },
+        Object {
+          "label": "单选单选单选单选单选单选单选单选单选单选单选单选单选单选",
+          "value": 2,
+        },
+        Object {
+          "content": "描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息",
+          "label": "单选",
+          "value": 3,
+        },
+      ]
+    }}"
+    value="{{1}}"
     bind:change="onChange"
-  >
-    <t-radio
-      label="单选"
-      value="radio1"
-    />
-    <t-radio
-      label="单选"
-      value="radio2"
-    />
-    <t-radio
-      label="单选单选单选单选单选单选单选单选单选单选单选单选单选单选"
-      value="radio3"
-    />
-    <t-radio
-      content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-      label="单选"
-      value="radio4"
-    />
-  </t-radio-group>
+  />
 </base>
 `;
 
diff --git a/src/radio/_example/base/index.js b/src/radio/_example/base/index.js
index 473405d82..d847c3edc 100644
--- a/src/radio/_example/base/index.js
+++ b/src/radio/_example/base/index.js
@@ -1,20 +1,22 @@
 Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {},
-
-  /**
-   * 组件的初始数据
-   */
-  data: {},
-
-  /**
-   * 组件的方法列表
-   */
+  data: {
+    current: 1,
+    options: [
+      { value: 0, label: '单选' },
+      { value: 1, label: '单选' },
+      { value: 2, label: '单选单选单选单选单选单选单选单选单选单选单选单选单选单选' },
+      {
+        value: 3,
+        label: '单选',
+        content: '描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息',
+      },
+    ],
+  },
   methods: {
     onChange(event) {
-      console.log('radio', event.detail);
+      const { value } = event.detail;
+
+      this.setData({ current: value });
     },
   },
 });
diff --git a/src/radio/_example/base/index.wxml b/src/radio/_example/base/index.wxml
index 6373e4ce5..dd574d41d 100644
--- a/src/radio/_example/base/index.wxml
+++ b/src/radio/_example/base/index.wxml
@@ -1,10 +1 @@
-<t-radio-group bind:change="onChange" defaultValue="radio1">
-  <t-radio value="radio1" label="单选" />
-  <t-radio value="radio2" label="单选" />
-  <t-radio value="radio3" label="单选单选单选单选单选单选单选单选单选单选单选单选单选单选" />
-  <t-radio
-    value="radio4"
-    label="单选"
-    content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-  />
-</t-radio-group>
+<t-radio-group bind:change="onChange" value="{{current}}" options="{{options}}" />

From 9f53b785c830aa66e03d8393a141f1d25aaa025c Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Mon, 6 Mar 2023 23:58:33 +0800
Subject: [PATCH 53/62] fix(action-sheet): resolve click event (#1726)

---
 src/action-sheet/action-sheet.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/action-sheet/action-sheet.ts b/src/action-sheet/action-sheet.ts
index fb93b550f..43ebd5548 100644
--- a/src/action-sheet/action-sheet.ts
+++ b/src/action-sheet/action-sheet.ts
@@ -98,7 +98,7 @@ export default class ActionSheet extends SuperComponent {
       const realIndex = isSwiperMode ? index + currentSwiperIndex * count : index;
       if (item) {
         this.triggerEvent('selected', { selected: item, index: realIndex });
-        this.trigger('close', { trigger: 'select' });
+        this.triggerEvent('close', { trigger: 'select' });
         this._trigger('visible-change', { visible: false });
       }
     },

From df7b9bd9fe972c66a5c0b062c9bc844d927e1676 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 7 Mar 2023 16:20:22 +0800
Subject: [PATCH 54/62] feat: update used page (#1734)

---
 site/pages/used.vue  | 206 +++++++++++++++++++++++++++++++++++++++++++
 site/site.config.mjs |   2 +-
 site/vite.config.ts  |   1 +
 3 files changed, 208 insertions(+), 1 deletion(-)
 create mode 100644 site/pages/used.vue

diff --git a/site/pages/used.vue b/site/pages/used.vue
new file mode 100644
index 000000000..39aed4682
--- /dev/null
+++ b/site/pages/used.vue
@@ -0,0 +1,206 @@
+<template>
+  <td-doc-content ref="tdDocContent" platform="mobile" page-status="hidden">
+    <td-doc-header platform="mobile" slot="doc-header" ref="tdDocHeader"></td-doc-header>
+    <div class="content">
+      <h3>上线项目案例</h3>
+      <p>目前已上线 400+ 个小程序，部分小程序二维码如下。如果你也在使用 TDesign 搭建你的小程序，也欢迎添加你的项目: <a
+          href="https://github.com/Tencent/tdesign-miniprogram/discussions/1094" target="_blank">添加项目</a></p>
+
+      <div class="projects">
+        <div v-for="p in projects" :key="p.name" class="card">
+          <div class="card__infos">
+            <div class="card__title">
+              <a v-if="p.url" :href="p.url" class="card__link" target="_blank">{{ p.name }}</a>
+              <template v-else>{{ p.name }}</template>
+            </div>
+            <ul class="card__tags">
+              <li class="card__tag" v-for="t in p.tags">{{ t }}</li>
+            </ul>
+          </div>
+          <div class="card__imgs">
+            <div class="card__preview">
+              <img :src="p.preview[0]" :alt="p.name + '预览图'">
+            </div>
+            <div class="card__qrcode">
+              <img :src="p.qrcode" :alt="p.name + '二维码'">
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </td-doc-content>
+</template>
+
+<script lang="ts">
+import { onMounted } from 'vue';
+
+export default {
+  data() {
+    return {
+      projects: [
+        {
+          name: '未来运动场',
+          tags: ['趣味游戏'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/weilaiyundongchang.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/weilaiyundongchang-code.jpg',
+        },
+        {
+          name: '程序员做饭指南',
+          tags: ['效率工具', '开源项目'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/zuofanzhinan.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/zuofanzhinan-code.jpg',
+          url: 'https://github.com/LeeJim/HowToCookOnMiniprogram',
+        },
+        {
+          name: '小云卡片',
+          tags: ['效率工具'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/xiaoyunkapian.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/xiaoyunkapian-code.jpg'
+        },
+        {
+          name: '小楼助教',
+          tags: ['效率工具'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/xiaolouzhujiao.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/xiaolouzhujiao-code.png'
+        },
+        {
+          name: 'frmall',
+          tags: ['电商', '开源项目'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/frmall.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/frmall-code.jpg',
+        },
+        {
+          name: 'Coding 鱼塘',
+          tags: ['效率工具'],
+          preview: ['https://tdesign.gtimg.com/miniprogram/case/codingyutang.png'],
+          qrcode: 'https://tdesign.gtimg.com/miniprogram/case/codingyutang-code.jpg',
+        },
+      ]
+    }
+  },
+  mounted() {
+    const { tdDocContent, tdDocHeader, tdDocTabs } = this.$refs;
+
+    this.$emit('loaded', () => {
+      tdDocHeader.docInfo = {
+        title: '谁在用', desc: ''
+      }
+      tdDocContent.pageStatus = 'show';
+    });
+  }
+}
+</script>
+
+<style lang="less" scoped>
+h1 {
+  padding: 30px 40px;
+  font-size: 20px;
+  color: #000;
+  border-bottom: 1px solid #dcdcdc;
+}
+
+ul {
+  list-style: none;
+}
+
+.content {
+  padding: 46px 0;
+  color: #181818;
+
+  h3 {
+    font-size: 20px;
+    line-height: 28px;
+  }
+
+  p {
+    font-size: 14px;
+    line-height: 20px;
+    margin-top: 8px;
+    font-weight: 500;
+  }
+}
+
+.projects {
+  width: 864px;
+  margin-top: 40px;
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 24px;
+}
+
+.card {
+  position: relative;
+  width: 420px;
+  border-radius: 12px;
+  background: linear-gradient(-1.8deg, #f1f2f5 0%, #f1f2f5 100%);
+  padding: 32px 44px 0;
+  box-sizing: border-box;
+
+  &__link {
+    text-decoration: none;
+
+    &:hover {
+      color: var(--brand-main);
+    }
+  }
+
+  &__infos {
+    display: flex;
+  }
+
+  &__title {
+    font-size: 18px;
+    font-weight: 600;
+  }
+
+  &__tag {
+    padding: 2px 8px;
+    border-radius: 3px;
+    background: #fff;
+    font-size: 12px;
+    cursor: pointer;
+    margin-left: 8px;
+
+    &s {
+      margin-left: auto;
+      display: flex;
+    }
+  }
+
+  &__imgs {
+    margin: 20px 0 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  &__preview {
+    width: 180px;
+    box-sizing: border-box;
+    height: 260px;
+    border-radius: 12px 12px 0 0;
+    overflow: hidden;
+    border: 8px solid #f7f7f9;
+    border-bottom: 0;
+
+    img {
+      width: 100%;
+    }
+  }
+
+  &__qrcode {
+    width: 140px;
+    height: 140px;
+    border-radius: 50%;
+    background: #ffffff;
+    box-shadow: 0 14.74px 22.11px 0 #e3e6eb;
+    padding: 16px;
+    box-sizing: border-box;
+    overflow: hidden;
+
+    img {
+      width: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/site/site.config.mjs b/site/site.config.mjs
index 665340efe..854d8148b 100644
--- a/site/site.config.mjs
+++ b/site/site.config.mjs
@@ -23,7 +23,7 @@ export default {
           name: 'used',
           meta: { docType: 'explain' },
           path: '/miniprogram/used',
-          component: () => import('@/../USED.md'),
+          component: () => import('@pages/used.vue'),
         },
         {
           title: '更新日志',
diff --git a/site/vite.config.ts b/site/vite.config.ts
index 83148d5a9..4e595f412 100644
--- a/site/vite.config.ts
+++ b/site/vite.config.ts
@@ -23,6 +23,7 @@ export default ({ mode }: any) => {
         '@common': path.resolve(__dirname, '../common'),
         '@components': path.resolve(__dirname, './components'),
         '@docs': path.resolve(__dirname, './docs'),
+        '@pages': path.resolve(__dirname, './pages'),
       },
     },
     server: {

From c92849d1013e35f1f062079c86936cf2ee822ab8 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Tue, 7 Mar 2023 16:22:05 +0800
Subject: [PATCH 55/62] fix(Swiper): resolve border radius invalid (#1733)

---
 src/swiper/swiper.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/swiper/swiper.less b/src/swiper/swiper.less
index 4d5b92829..afbeb9f3e 100644
--- a/src/swiper/swiper.less
+++ b/src/swiper/swiper.less
@@ -9,6 +9,7 @@
   &-host {
     border-radius: @swiper-radius;
     overflow: hidden;
+    transform: translateY(0);
   }
 
   &__item {

From 764a15685b0769cdfe6b14f8b91cf7db17d0a305 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 7 Mar 2023 16:42:02 +0800
Subject: [PATCH 56/62] docs: update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a673d1917..733595046 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ docClass: timeline
 
 ## 🌈 1.0.0 `2023-02-27` 
 ### ❗ Breaking Changes
+- 主题色 CSS Variables 命名从 `--td-primary-color` 改成 `--td-brand-color` @LeeJim ([#1623](https://github.com/Tencent/tdesign-miniprogram/pull/1623))
 - `Cell`: 调整 hover 状态对应的类名 @anlyyao ([#1635](https://github.com/Tencent/tdesign-miniprogram/pull/1635))
 - `Checkbox`: 属性 align 更名为 placement @anlyyao ([#1629](https://github.com/Tencent/tdesign-miniprogram/pull/1629))
 - `Toast`: 属性 theme 的枚举值 fail 替换成 error @LeeJim ([#1647](https://github.com/Tencent/tdesign-miniprogram/pull/1647))

From 010f34de0f20f215ceb5a4b8d6b03f71f0e11180 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 7 Mar 2023 16:54:08 +0800
Subject: [PATCH 57/62] fix(navbar): resolve extenal class (#1735)

* fix(navbar): resolve extenal class

* test(navbar): update snapshot
---
 src/navbar/README.en-US.md                           |  2 +-
 src/navbar/README.md                                 |  2 +-
 src/navbar/__test__/__snapshots__/index.test.js.snap | 10 +++++-----
 src/navbar/navbar.wxml                               |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/navbar/README.en-US.md b/src/navbar/README.en-US.md
index 9607f569a..dccf25e52 100644
--- a/src/navbar/README.en-US.md
+++ b/src/navbar/README.en-US.md
@@ -8,7 +8,7 @@ name | type | default | description | required
 animation | Boolean | true | \- | N
 capsule | Slot | - | \- | N
 delta | Number | 1 | \- | N
-external-classes | Array | - | `['t-class', 't-class-title', 't-class-left-icon', 't-class-home-icon', 't-class-capsule']` | N
+external-classes | Array | - | `['t-class', 't-class-title', 't-class-left', 't-class-center', 't-class-capsule']` | N
 fixed | Boolean | true | \- | N
 left | Slot | - | `0.26.0` | N
 left-arrow | Boolean | false | `0.26.0` | N
diff --git a/src/navbar/README.md b/src/navbar/README.md
index 37126be01..793fae08e 100644
--- a/src/navbar/README.md
+++ b/src/navbar/README.md
@@ -50,7 +50,7 @@ isComponent: true
 animation | Boolean | true | 是否添加动画效果 | N
 capsule | Slot | - | 左侧胶囊区域 | N
 delta | Number | 1 | 后退按钮后退层数，含义参考 [wx.navigateBack](https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateBack.html)，特殊的，传入 0 不会发生执行 wx.navigateBack | N
-external-classes | Array | - | 组件类名，分别用于设置组件外层元素、标题、左侧图标、首页图标、胶囊等元素类名。`['t-class', 't-class-title', 't-class-left-icon', 't-class-home-icon', 't-class-capsule']` | N
+external-classes | Array | - | 组件类名，分别用于设置组件外层元素、标题、左侧图标、首页图标、胶囊等元素类名。`['t-class', 't-class-title', 't-class-left', 't-class-center', 't-class-capsule']` | N
 fixed | Boolean | true | 是否固定在顶部 | N
 left | Slot | - | `0.26.0`。左侧内容区域 | N
 left-arrow | Boolean | false | `0.26.0`。是否展示左侧箭头 | N
diff --git a/src/navbar/__test__/__snapshots__/index.test.js.snap b/src/navbar/__test__/__snapshots__/index.test.js.snap
index 141416919..18d9bf08e 100644
--- a/src/navbar/__test__/__snapshots__/index.test.js.snap
+++ b/src/navbar/__test__/__snapshots__/index.test.js.snap
@@ -17,7 +17,7 @@ exports[`navbar :base 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -52,7 +52,7 @@ exports[`navbar :base 2`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -87,7 +87,7 @@ exports[`navbar :base 3`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -122,7 +122,7 @@ exports[`navbar :fixed 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -157,7 +157,7 @@ exports[`navbar :menu button 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
diff --git a/src/navbar/navbar.wxml b/src/navbar/navbar.wxml
index 5455da7a9..588039a2a 100644
--- a/src/navbar/navbar.wxml
+++ b/src/navbar/navbar.wxml
@@ -10,13 +10,13 @@
         <t-icon name="chevron-left" class="{{classPrefix}}__left-arrow" />
       </view>
       <slot name="left" />
-      <view class="{{classPrefix}}__capsule">
+      <view class="{{classPrefix}}__capsule {{prefix}}-class-capsule">
         <slot name="capsule" />
       </view>
     </view>
-    <view class="{{classPrefix}}__center t-class-center">
+    <view class="{{classPrefix}}__center {{prefix}}-class-center">
       <slot name="title" />
-      <text wx:if="{{title}}" class="{{classPrefix}}__center-title t-class-title">{{showTitle}}</text>
+      <text wx:if="{{title}}" class="{{classPrefix}}__center-title {{prefix}}-class-title">{{showTitle}}</text>
     </view>
   </view>
 </view>

From efe64e5c4bc52e0cd723dba6d74e566453301520 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Tue, 7 Mar 2023 17:23:58 +0800
Subject: [PATCH 58/62] docs(Footer): update docs (#1737)

---
 src/footer/README.en-US.md | 3 +++
 src/footer/README.md       | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/footer/README.en-US.md b/src/footer/README.en-US.md
index dc05b80d4..8063c226c 100644
--- a/src/footer/README.en-US.md
+++ b/src/footer/README.en-US.md
@@ -5,6 +5,9 @@
 
 name | type | default | description | required
 -- | -- | -- | -- | --
+copyright | String | '' | \- | N
 text | String | '' | \- | N
 logo | Object | - | Typescript：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+text-link-list | Array | [] | Typescript：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
 links | Array | [] | Typescript：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+theme | String | 'text' | options：text/logo | N
diff --git a/src/footer/README.md b/src/footer/README.md
index c264d74b9..d2e7c37db 100644
--- a/src/footer/README.md
+++ b/src/footer/README.md
@@ -40,6 +40,9 @@ isComponent: true
 
 名称 | 类型 | 默认值 | 说明 | 必传
 -- | -- | -- | -- | --
-text | String | '' | 版权信息。 | N
+copyright | String | '' | 已废弃。版权信息，type 为`text`生效 | N
+text | String | '' | `1.0.0` 版权信息。 | N
 logo | Object | - | 图标配置。`logo.icon` 表示图标链接地址，`logo.title` 表示标题文本，`logo.url` 表示链接跳转地址。TS 类型：`FooterLogo` `interface FooterLogo { icon: string; title?: string; titleUrl?: string }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
-links| Array | [] | 链接列表。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+text-link-list | Array | [] | 已废弃。链接列表，type 为`text`生效。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+links| Array | [] | `1.0.0` 链接列表。name 表示链接名称， url 表示链接 page 路径，目前只支持小程序内部跳转，openType 表示跳转方式。TS 类型：`Array<LinkObj>` `interface LinkObj { name: string; url?: string; openType?: 'navigate' \| 'redirect' \| 'relaunch' \| 'switchTab' \| 'navigateBack' }`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/footer/type.ts) | N
+theme | String | 'text' | 已废弃。页脚展示类型。可选项：text/logo | N

From 5009073c89066891a386ef1b4c6e5e67d1349dd3 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Tue, 7 Mar 2023 17:24:57 +0800
Subject: [PATCH 59/62] fix(Swiper): the image is disappears when the version
 is lower than 2.19.2 (#1736)

---
 .../__virtualHostSnapshot__/demo.test.js.snap | 45 ++++++++++---------
 src/common/template/image.wxml                |  8 +++-
 .../index.test.js.snap                        | 10 ++---
 .../__virtualHostSnapshot__/demo.test.js.snap | 43 +++++++++---------
 4 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
index b0785a4e9..75c814d45 100644
--- a/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/checkbox/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -40,6 +40,29 @@ exports[`Checkbox Checkbox all demo works fine 1`] = `
 exports[`Checkbox Checkbox base demo works fine 1`] = `
 <base>
   <t-checkbox-group
+    options="{{
+      Array [
+        Object {
+          "label": "多选",
+          "value": "checkbox1",
+        },
+        Object {
+          "label": "多选",
+          "value": "checkbox2",
+        },
+        Object {
+          "label": "多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行",
+          "maxLabelRow": 2,
+          "value": "checkbox3",
+        },
+        Object {
+          "content": "描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息",
+          "label": "多选",
+          "maxContentRow": 2,
+          "value": "checkbox4",
+        },
+      ]
+    }}"
     value="{{
       Array [
         "checkbox1",
@@ -47,27 +70,7 @@ exports[`Checkbox Checkbox base demo works fine 1`] = `
       ]
     }}"
     bind:change="handleGroupChange"
-  >
-    <t-checkbox
-      label="多选"
-      value="checkbox1"
-    />
-    <t-checkbox
-      label="多选"
-      value="checkbox2"
-    />
-    <t-checkbox
-      label="多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行多选标题多行"
-      maxLabelRow="2"
-      value="checkbox3"
-    />
-    <t-checkbox
-      content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-      label="多选"
-      maxContentRow="2"
-      value="checkbox4"
-    />
-  </t-checkbox-group>
+  />
 </base>
 `;
 
diff --git a/src/common/template/image.wxml b/src/common/template/image.wxml
index cbbbc2ba8..7c78c4a8c 100644
--- a/src/common/template/image.wxml
+++ b/src/common/template/image.wxml
@@ -1,6 +1,12 @@
 <template name="image">
   <t-image
+    class="{{class}}"
+    t-class="{{tClass}}"
+    t-class-load="{{tClassLoad}}"
     style="{{style || ''}}"
+    customStyle="{{customStyle || ''}}"
+    height="{{height || ''}}"
+    width="{{width || ''}}"
     error="{{error || 'default'}}"
     lazy="{{lazy || false}}"
     loading="{{count || 'default'}}"
@@ -11,7 +17,5 @@
     showMenuByLongpress="{{showMenuByLongpress || false}}"
     bind:error="{{binderror}}"
     bind:load="{{bindload}}"
-    t-class="{{class}} {{tClass}}"
-    t-class-load="{{tClassLoad}}"
   />
 </template>
diff --git a/src/navbar/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/navbar/__test__/__virtualHostSnapshot__/index.test.js.snap
index 141416919..18d9bf08e 100644
--- a/src/navbar/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/navbar/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -17,7 +17,7 @@ exports[`navbar :base 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -52,7 +52,7 @@ exports[`navbar :base 2`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -87,7 +87,7 @@ exports[`navbar :base 3`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -122,7 +122,7 @@ exports[`navbar :fixed 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
@@ -157,7 +157,7 @@ exports[`navbar :menu button 1`] = `
           class="t-navbar__left t-class-left"
         >
           <wx-view
-            class="t-navbar__capsule"
+            class="t-navbar__capsule t-class-capsule"
           />
         </wx-view>
         <wx-view
diff --git a/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap b/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
index 77c90df23..27e9b8a6c 100644
--- a/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
+++ b/src/radio/__test__/__virtualHostSnapshot__/demo.test.js.snap
@@ -22,27 +22,30 @@ exports[`Radio Radio align demo works fine 1`] = `
 exports[`Radio Radio base demo works fine 1`] = `
 <base>
   <t-radio-group
-    defaultValue="radio1"
+    options="{{
+      Array [
+        Object {
+          "label": "单选",
+          "value": 0,
+        },
+        Object {
+          "label": "单选",
+          "value": 1,
+        },
+        Object {
+          "label": "单选单选单选单选单选单选单选单选单选单选单选单选单选单选",
+          "value": 2,
+        },
+        Object {
+          "content": "描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息",
+          "label": "单选",
+          "value": 3,
+        },
+      ]
+    }}"
+    value="{{1}}"
     bind:change="onChange"
-  >
-    <t-radio
-      label="单选"
-      value="radio1"
-    />
-    <t-radio
-      label="单选"
-      value="radio2"
-    />
-    <t-radio
-      label="单选单选单选单选单选单选单选单选单选单选单选单选单选单选"
-      value="radio3"
-    />
-    <t-radio
-      content="描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息描述信息"
-      label="单选"
-      value="radio4"
-    />
-  </t-radio-group>
+  />
 </base>
 `;
 

From 61a2ff81792155b956a13a2c5f5ed6d990181428 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Tue, 7 Mar 2023 22:40:26 +0800
Subject: [PATCH 60/62] chore(ImageViewer): resolved imageViewer display is
 incomplete (#1656)

* chore(ImageViewer): remove backgroundColor attribute

* fix(ImageViewer): update images

* fix: fix cr

* fix(image-viewer): recover background-colorproperty

---------

Co-authored-by: leejimqiu <leejimqiu@gmail.com>
---
 src/image-viewer/README.md                |  4 ++--
 src/image-viewer/_example/base/index.js   |  7 ++-----
 src/image-viewer/_example/delete/index.js |  8 ++------
 src/image-viewer/image-viewer.ts          | 16 ++++++++++++----
 src/image-viewer/image-viewer.wxml        |  6 +++---
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/image-viewer/README.md b/src/image-viewer/README.md
index e3ddbd5e0..1c63132b8 100644
--- a/src/image-viewer/README.md
+++ b/src/image-viewer/README.md
@@ -52,7 +52,7 @@ delete-btn | Boolean / String / Object / Slot | false | 是否显示删除操作
 close-btn | Boolean / String / Object / Slot | false | 是否显示关闭操作，前提需要开启页码。值为字符串表示图标名称，值为 `true` 表示使用默认图标 `close`，值为 `Object` 类型，表示透传至 `icon` ，不传表示不显示图标。 | N
  | N
 visible | Boolean | false | 隐藏/显示预览 | N
-default-visible | Boolean | undefined | 隐藏/显示预览。非受控属性 |
+default-visible | Boolean | undefined | 隐藏/显示预览。非受控属性 | N
 
 
 ### ImageViewer Events
@@ -60,6 +60,6 @@ default-visible | Boolean | undefined | 隐藏/显示预览。非受控属性 |
 名称 | 参数 | 描述
 -- | -- | --
 change | `(index: Number)` | 翻页时回调
-close | `(trigger: 'overlay' | 'button' , visible: Boolean, index: Number)` | 点击操作按钮button或者overlay时触发
+close | `(trigger: 'overlay' \| 'button' , visible: Boolean, index: Number)` | 点击操作按钮button或者overlay时触发
 delete | `(index: Number)` | 点击删除操作按钮时触发
 
diff --git a/src/image-viewer/_example/base/index.js b/src/image-viewer/_example/base/index.js
index fc90fe4de..e71b933a6 100644
--- a/src/image-viewer/_example/base/index.js
+++ b/src/image-viewer/_example/base/index.js
@@ -12,11 +12,8 @@ Component({
     clickHandle() {
       this.setData({
         images: [
-          'https://tdesign.gtimg.com/miniprogram/images/preview6.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview1.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview2.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview3.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview4.png',
+          'https://tdesign.gtimg.com/miniprogram/images/swiper1.png',
+          'https://tdesign.gtimg.com/miniprogram/images/swiper2.png',
         ],
         showIndex: true,
         visible: true,
diff --git a/src/image-viewer/_example/delete/index.js b/src/image-viewer/_example/delete/index.js
index 4dfcd5040..f44e30b80 100644
--- a/src/image-viewer/_example/delete/index.js
+++ b/src/image-viewer/_example/delete/index.js
@@ -12,12 +12,8 @@ Component({
     clickHandle() {
       this.setData({
         images: [
-          'https://tdesign.gtimg.com/miniprogram/images/preview6.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview5.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview1.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview2.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview3.png',
-          'https://tdesign.gtimg.com/miniprogram/images/preview4.png',
+          'https://tdesign.gtimg.com/miniprogram/images/swiper1.png',
+          'https://tdesign.gtimg.com/miniprogram/images/swiper2.png',
         ],
         showIndex: true,
         visible: true,
diff --git a/src/image-viewer/image-viewer.ts b/src/image-viewer/image-viewer.ts
index 7e70188d2..875f1a512 100644
--- a/src/image-viewer/image-viewer.ts
+++ b/src/image-viewer/image-viewer.ts
@@ -20,7 +20,8 @@ export default class ImageViewer extends SuperComponent {
     currentSwiperIndex: 0,
     windowHeight: 0,
     windowWidth: 0,
-    imagesShape: {},
+    swiperStyle: {},
+    imagesStyle: {},
   };
 
   options = {
@@ -108,10 +109,17 @@ export default class ImageViewer extends SuperComponent {
         },
       } = e;
       const { mode, styleObj } = this.calcImageDisplayStyle(width, height);
-      const origin = this.data.imagesShape;
+      const originImagesStyle = this.data.imagesStyle;
+      const originSwiperStyle = this.data.swiperStyle;
       this.setData({
-        imagesShape: {
-          ...origin,
+        swiperStyle: {
+          ...originSwiperStyle,
+          [index]: {
+            style: `height: ${styleObj.height}`,
+          },
+        },
+        imagesStyle: {
+          ...originImagesStyle,
           [index]: {
             mode,
             style: styles({ ...styleObj }),
diff --git a/src/image-viewer/image-viewer.wxml b/src/image-viewer/image-viewer.wxml
index c8133fa9e..4379fd5a4 100644
--- a/src/image-viewer/image-viewer.wxml
+++ b/src/image-viewer/image-viewer.wxml
@@ -14,10 +14,10 @@
     style="{{ 'background-color: ' + backgroundColor }}"
   />
   <block wx:if="{{images && images.length}}">
-    <view slot="content" class="{{classPrefix}}__content">
+    <view class="{{classPrefix}}__content">
       <swiper
-        height="{{windowHeight * 2}}"
         class="swiper"
+        style="{{swiperStyle[currentSwiperIndex].style}}"
         autoplay="{{false}}"
         current="{{currentSwiperIndex}}"
         bindchange="onSwiperChange"
@@ -25,7 +25,7 @@
         <swiper-item wx:for="{{images}}" wx:key="index" class="{{classPrefix}}__preview-image">
           <t-image
             t-class="t-image--external"
-            style="{{imagesShape[index].style}}"
+            style="{{imagesStyle[index].style || ''}}"
             mode="aspectFit"
             lazy
             src="{{item}}"

From dc4fb645e5ee1a8754bafd17bafe8fe904c24587 Mon Sep 17 00:00:00 2001
From: Y <anly_yaw@163.com>
Date: Tue, 7 Mar 2023 22:44:40 +0800
Subject: [PATCH 61/62] fix(Input): resolve maxLength invalid (#1732)

* fix(Input): resolve maxlength invalid

* chore(Input): clear event uses touchstart

* test: update snapshots
---
 src/input/README.md                                           | 2 +-
 src/input/__test__/__snapshots__/index.test.js.snap           | 4 +++-
 src/input/__test__/__virtualHostSnapshot__/index.test.js.snap | 4 +++-
 src/input/__test__/index.test.js                              | 2 +-
 src/input/input.wxml                                          | 3 ++-
 src/input/props.ts                                            | 3 ++-
 src/input/type.ts                                             | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/input/README.md b/src/input/README.md
index 2716827e7..8357473c3 100644
--- a/src/input/README.md
+++ b/src/input/README.md
@@ -88,7 +88,7 @@ external-classes | Array | - | 组件类名，用于设置组件外层元素、
 format | Function | - | 【开发中】指定输入框展示值的格式。TS 类型：`InputFormatType` `type InputFormatType = (value: InputValue) => number | string`。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/input/type.ts) | N
 label | String / Slot | - | 左侧文本。 | N
 maxcharacter | Number | - | 用户最多可以输入的字符个数，一个中文汉字表示两个字符长度。`maxcharacter` 和 `maxlength` 二选一使用 | N
-maxlength | Number | - | 用户最多可以输入的文本长度，一个中文等于一个计数长度。值为空，则表示不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用 | N
+maxlength | Number | -1 | 用户最多可以输入的文本长度，一个中文等于一个计数长度。默认为 -1，不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用 | N
 placeholder | String | undefined | 占位符 | N
 prefix-icon | String / Object / Slot | - | 组件前置图标。值为字符串表示图标名称，值为 `Object` 类型，表示透传至 `icon`。 | N
 readonly | Boolean | false | 【开发中】只读状态 | N
diff --git a/src/input/__test__/__snapshots__/index.test.js.snap b/src/input/__test__/__snapshots__/index.test.js.snap
index 3f0a13637..82ab64581 100644
--- a/src/input/__test__/__snapshots__/index.test.js.snap
+++ b/src/input/__test__/__snapshots__/index.test.js.snap
@@ -47,6 +47,7 @@ exports[`input props : clearable && label && suffix 1`] = `
           disabled="{{false}}"
           focus="{{false}}"
           holdKeyboard="{{false}}"
+          maxlength="{{-1}}"
           password="{{false}}"
           placeholder=""
           placeholderClass="t-input__placeholder input-placeholder"
@@ -69,7 +70,7 @@ exports[`input props : clearable && label && suffix 1`] = `
         />
         <wx-view
           class="t-input__wrap--clearable-icon"
-          bind:tap="clearInput"
+          bind:touchstart="clearInput"
         >
           <t-icon
             class=""
@@ -179,6 +180,7 @@ exports[`input slots : label 1`] = `
           disabled="{{false}}"
           focus="{{false}}"
           holdKeyboard="{{false}}"
+          maxlength="{{-1}}"
           password="{{false}}"
           placeholder=""
           placeholderClass="t-input__placeholder input-placeholder"
diff --git a/src/input/__test__/__virtualHostSnapshot__/index.test.js.snap b/src/input/__test__/__virtualHostSnapshot__/index.test.js.snap
index 3f0a13637..82ab64581 100644
--- a/src/input/__test__/__virtualHostSnapshot__/index.test.js.snap
+++ b/src/input/__test__/__virtualHostSnapshot__/index.test.js.snap
@@ -47,6 +47,7 @@ exports[`input props : clearable && label && suffix 1`] = `
           disabled="{{false}}"
           focus="{{false}}"
           holdKeyboard="{{false}}"
+          maxlength="{{-1}}"
           password="{{false}}"
           placeholder=""
           placeholderClass="t-input__placeholder input-placeholder"
@@ -69,7 +70,7 @@ exports[`input props : clearable && label && suffix 1`] = `
         />
         <wx-view
           class="t-input__wrap--clearable-icon"
-          bind:tap="clearInput"
+          bind:touchstart="clearInput"
         >
           <t-icon
             class=""
@@ -179,6 +180,7 @@ exports[`input slots : label 1`] = `
           disabled="{{false}}"
           focus="{{false}}"
           holdKeyboard="{{false}}"
+          maxlength="{{-1}}"
           password="{{false}}"
           placeholder=""
           placeholderClass="t-input__placeholder input-placeholder"
diff --git a/src/input/__test__/index.test.js b/src/input/__test__/index.test.js
index afad87f0a..8477a6091 100644
--- a/src/input/__test__/index.test.js
+++ b/src/input/__test__/index.test.js
@@ -190,7 +190,7 @@ describe('input', () => {
       comp.attach(document.createElement('parent-wrapper'));
 
       const clearable = comp.querySelector('.base >>> .t-input__wrap--clearable-icon');
-      clearable.dispatchEvent('tap');
+      clearable.dispatchEvent('touchstart');
       await simulate.sleep(0);
       expect(handleClear.mock.calls[0][0].detail).toStrictEqual({});
     });
diff --git a/src/input/input.wxml b/src/input/input.wxml
index 1479775b9..381788413 100644
--- a/src/input/input.wxml
+++ b/src/input/input.wxml
@@ -26,6 +26,7 @@
   <view class="{{classPrefix}}__wrap">
     <view class="{{classPrefix}}__content {{classPrefix}}--{{status}}">
       <input
+        maxlength="{{maxlength}}"
         disabled="{{disabled}}"
         placeholder="{{placeholder}}"
         placeholder-style="{{placeholderStyle}}"
@@ -68,7 +69,7 @@
       <view
         wx:if="{{_clearIcon && value.length > 0}}"
         class="{{classPrefix}}__wrap--clearable-icon"
-        bind:tap="clearInput"
+        bind:touchstart="clearInput"
       >
         <template
           is="icon"
diff --git a/src/input/props.ts b/src/input/props.ts
index 61dc69609..61a6c00a8 100644
--- a/src/input/props.ts
+++ b/src/input/props.ts
@@ -52,9 +52,10 @@ const props: TdInputProps = {
   maxcharacter: {
     type: Number,
   },
-  /** 用户最多可以输入的文本长度，一个中文等于一个计数长度。值为空，则表示不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用 */
+  /** 用户最多可以输入的文本长度，一个中文等于一个计数长度，默认为 -1，不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用 */
   maxlength: {
     type: Number,
+    value: -1,
   },
   /** 占位符 */
   placeholder: {
diff --git a/src/input/type.ts b/src/input/type.ts
index efb34bffe..d379aee32 100644
--- a/src/input/type.ts
+++ b/src/input/type.ts
@@ -91,7 +91,8 @@ export interface TdInputProps {
     value?: number;
   };
   /**
-   * 用户最多可以输入的文本长度，一个中文等于一个计数长度。值小于等于 0 的时候，则表示不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用
+   * 用户最多可以输入的文本长度，一个中文等于一个计数长度，默认为 -1，不限制输入长度。`maxcharacter` 和 `maxlength` 二选一使用
+   * @default -1
    */
   maxlength?: {
     type: NumberConstructor;

From 9ba003861de1f91a68e3b380651babd83ff31023 Mon Sep 17 00:00:00 2001
From: leejimqiu <leejimqiu@gmail.com>
Date: Tue, 7 Mar 2023 23:05:41 +0800
Subject: [PATCH 62/62] chore: publish v1.0.2 (#1740)

* chore: publish v1.0.2

* docs: update changelog
---
 CHANGELOG.md | 14 ++++++++++++++
 package.json |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 733595046..0a14e1389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,20 @@ spline: explain
 toc: false
 docClass: timeline
 ---
+## 🌈 1.0.2 `2023-03-07` 
+### 🐞 Bug Fixes
+- `Radio`: 修复使用 options 时可传入的属性不齐的问题 @LeeJim ([#1707](https://github.com/Tencent/tdesign-miniprogram/pull/1707))
+- `Checkbox`: 修复使用 options 时可传入的属性不齐的问题 @LeeJim ([#1707](https://github.com/Tencent/tdesign-miniprogram/pull/1707))
+- `RadioGroup`: 修复 placement 默认值错误的问题 @LeeJim ([#1707](https://github.com/Tencent/tdesign-miniprogram/pull/1707))
+- `RadioGroup`: 修复 icon 消失的问题 @LeeJim ([#1707](https://github.com/Tencent/tdesign-miniprogram/pull/1707))
+- `ActionSheet`: 修复点击报错的问题 @LeeJim ([#1726](https://github.com/Tencent/tdesign-miniprogram/pull/1726))
+- `Swiper`: 修复在真机上圆角无效问题 @anlyyao ([#1733](https://github.com/Tencent/tdesign-miniprogram/pull/1733))
+- `NavBar`: 修复外部样式类不可用的问题 @LeeJim ([#1735](https://github.com/Tencent/tdesign-miniprogram/pull/1735))
+- `Footer`: 补齐 API 文档描述 @anlyyao ([#1737](https://github.com/Tencent/tdesign-miniprogram/pull/1737))
+- `Swiper`: 修复基础调试库低于2.19.2时，图片不显示问题 @anlyyao ([#1736](https://github.com/Tencent/tdesign-miniprogram/pull/1736))
+- `ImageViewer`: 修复图片显示不全的问题 @anlyyao ([#1656](https://github.com/Tencent/tdesign-miniprogram/pull/1656))
+- `Input`: 修复 `maxLength` 无效问题，并将默认值变更为 -1 @anlyyao ([#1732](https://github.com/Tencent/tdesign-miniprogram/pull/1732))
+- `Input`: 修复键盘弹起时，点击 clear 没反应的问题 @anlyyao ([#1732](https://github.com/Tencent/tdesign-miniprogram/pull/1732))
 
 ## 🌈 1.0.1 `2023-03-01` 
 ### 🚀 Features
diff --git a/package.json b/package.json
index 6c0a77294..ed3ac4a58 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tdesign-miniprogram",
   "purename": "tdesign",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "tdesign-miniprogram",
   "title": "tdesign-ßminiprogram",
   "main": "miniprogram_dist/index.js",