From 2344462dfc73569e47c55e1e49275b58ad33204b Mon Sep 17 00:00:00 2001
From: Administrator <lucky_ma2017@163.com>
Date: Fri, 6 Sep 2024 16:23:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?docs(image):=20loading=E6=97=B6=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=8A=A0=E8=BD=BD=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/image/README.en-US.md |  2 +
 src/image/README.md       |  2 +
 src/image/image.less      | 12 +++--
 src/image/image.ts        |  2 +-
 src/image/image.wxml      | 98 ++++++++++++++++++++-------------------
 5 files changed, 63 insertions(+), 53 deletions(-)

diff --git a/src/image/README.en-US.md b/src/image/README.en-US.md
index b7c76178f..46e7da93d 100644
--- a/src/image/README.en-US.md
+++ b/src/image/README.en-US.md
@@ -32,6 +32,8 @@ className | Description
 -- | --
 t-class | \-
 t-class-load | \-
+t-class-image | \-
+t-class-error | \-
 
 ### CSS Variables
 
diff --git a/src/image/README.md b/src/image/README.md
index a047a0228..55be345c2 100644
--- a/src/image/README.md
+++ b/src/image/README.md
@@ -77,6 +77,8 @@ load | - | 图片加载完成时触发
 -- | --
 t-class | 根节点样式类
 t-class-load | 加载样式类
+t-class-image | 图片样式类
+t-class-error | 加载失败样式类
 
 ### CSS Variables
 
diff --git a/src/image/image.less b/src/image/image.less
index 1e35a0420..c05781707 100644
--- a/src/image/image.less
+++ b/src/image/image.less
@@ -5,13 +5,14 @@
 @image-loading-color: var(--td-image-loading-color, @text-color-placeholder);
 @image-round-radius: var(--td-image-round-radius, @radius-default);
 
-:host {
+.@{prefix}-image {
   position: relative;
-}
+  display: inline-block;
 
-.@{prefix}-image {
-  color: @image-color;
-  vertical-align: top;
+  &__img {
+    color: @image-color;
+    vertical-align: top;
+  }
 
   &__mask {
     display: flex;
@@ -34,6 +35,7 @@
   &--lazy {
     position: absolute;
     top: 0;
+    left: 0;
     z-index: -1;
   }
 
diff --git a/src/image/image.ts b/src/image/image.ts
index b84da048a..980929d03 100644
--- a/src/image/image.ts
+++ b/src/image/image.ts
@@ -7,7 +7,7 @@ const { prefix } = config;
 const name = `${prefix}-image`;
 @wxComponent()
 export default class Image extends SuperComponent {
-  externalClasses = [`${prefix}-class`, `${prefix}-class-load`];
+  externalClasses = [`${prefix}-class`, `${prefix}-class-load`, `${prefix}-class-image`, `${prefix}-class-error`];
 
   options = {
     multipleSlots: true,
diff --git a/src/image/image.wxml b/src/image/image.wxml
index 2a519cdbb..6507ef766 100644
--- a/src/image/image.wxml
+++ b/src/image/image.wxml
@@ -1,52 +1,56 @@
 <wxs src="../common/utils.wxs" module="_" />
 
-<!-- 加载中占位 -->
-<view
-  wx:if="{{isLoading}}"
-  style="{{_._style([innerStyle, style, customStyle])}}"
-  class="class {{prefix}}-class {{classPrefix}} {{classPrefix}}__mask {{classPrefix}}--loading {{classPrefix}}--shape-{{shape}}"
-  aria-hidden="{{ariaHidden}}"
->
-  <t-loading
-    wx:if="{{loading === 'default'}}"
-    theme="dots"
-    size="44rpx"
-    loading
-    inherit-color
-    t-class="t-class-load"
-    t-class-text="{{classPrefix}}--loading-text"
-  ></t-loading>
-  <view wx:elif="{{loading !== '' && loading !== 'slot'}}" class="{{classPrefix}}__common {{prefix}}-class-load">
-    {{loading}}
+<view class="class {{prefix}}-class {{classPrefix}}">
+  <!-- 加载中占位 -->
+  <view
+    wx:if="{{isLoading}}"
+    style="{{_._style([innerStyle, style, customStyle])}}"
+    class="{{classPrefix}}__img {{classPrefix}}__mask {{classPrefix}}--loading {{classPrefix}}--shape-{{shape}}"
+    aria-hidden="{{ariaHidden}}"
+  >
+    <t-loading
+      wx:if="{{loading === 'default'}}"
+      theme="dots"
+      size="44rpx"
+      loading
+      inherit-color
+      t-class="t-class-load"
+      t-class-text="{{classPrefix}}--loading-text"
+    ></t-loading>
+    <view wx:elif="{{loading !== '' && loading !== 'slot'}}" class="{{classPrefix}}__common {{prefix}}-class-load">
+      {{loading}}
+    </view>
+    <slot wx:else name="loading" />
   </view>
-  <slot wx:else name="loading" />
-</view>
-<!-- 加载失败占位 -->
-<view
-  wx:elif="{{isFailed}}"
-  style="{{_._style([innerStyle, style, customStyle])}}"
-  class="class {{prefix}}-class {{classPrefix}} {{classPrefix}}__mask {{classPrefix}}--failed {{classPrefix}}--shape-{{shape}}"
-  aria-hidden="{{ariaHidden}}"
->
-  <view wx:if="{{error === 'default'}}" style="font-size: 44rpx" class="{{prefix}}-class-load">
-    <t-icon name="close" aria-role="img" aria-label="加载失败" />
+  <!-- 加载失败占位 -->
+  <view
+    wx:elif="{{isFailed}}"
+    style="{{_._style([innerStyle, style, customStyle])}}"
+    class="{{classPrefix}}__img {{prefix}}-class-error {{classPrefix}}__mask {{classPrefix}}--failed {{classPrefix}}--shape-{{shape}}"
+    aria-hidden="{{ariaHidden}}"
+  >
+    <view wx:if="{{error === 'default'}}" style="font-size: 44rpx" class="{{prefix}}-class-load">
+      <t-icon name="close" aria-role="img" aria-label="加载失败" />
+    </view>
+    <view wx:elif="{{error && error !== 'slot'}}" class="{{classPrefix}}__common {{prefix}}-class-load">
+      {{error}}
+    </view>
+    <slot wx:else name="error" />
   </view>
-  <view wx:elif="{{error && error !== 'slot'}}" class="{{classPrefix}}__common {{prefix}}-class-load"> {{error}} </view>
-  <slot wx:else name="error" />
+  <!-- 图片 -->
+  <image
+    id="{{tId||'image'}}"
+    wx:if="{{ !isFailed }}"
+    class="{{classPrefix}}__img {{classPrefix}}--shape-{{shape}} {{isLoading ? classPrefix + '--lazy' : ''}}"
+    src="{{src}}"
+    style="{{_._style([innerStyle, style, customStyle])}}"
+    mode="{{mode}}"
+    webp="{{webp}}"
+    lazy-load="{{lazy}}"
+    bind:load="onLoaded"
+    bind:error="onLoadError"
+    show-menu-by-longpress="{{showMenuByLongpress}}"
+    aria-hidden="{{ariaHidden || isLoading || isFailed}}"
+    aria-label="{{ariaLabel}}"
+  />
 </view>
-<!-- 图片 -->
-<image
-  id="{{tId||'image'}}"
-  wx:if="{{ !isFailed }}"
-  class="class {{prefix}}-class {{classPrefix}} {{classPrefix}}--shape-{{shape}} {{isLoading ? classPrefix + '--lazy' : ''}}"
-  src="{{src}}"
-  style="{{_._style([innerStyle, style, customStyle])}}"
-  mode="{{mode}}"
-  webp="{{webp}}"
-  lazy-load="{{lazy}}"
-  bind:load="onLoaded"
-  bind:error="onLoadError"
-  show-menu-by-longpress="{{showMenuByLongpress}}"
-  aria-hidden="{{ariaHidden || isLoading || isFailed}}"
-  aria-label="{{ariaLabel}}"
-/>

From f1e8e14cf84c4c5a381789296b5c9127ab246f1e Mon Sep 17 00:00:00 2001
From: Administrator <lucky_ma2017@163.com>
Date: Mon, 9 Sep 2024 15:33:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?docs(progress):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=A6=96=E6=AC=A1=E8=BF=9B=E5=85=A5=E6=97=B6=E4=B8=8E=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84stroke-width=E7=9A=84=E5=BB=B6=E8=BF=9F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=92=8C=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/progress/progress.ts   | 2 ++
 src/progress/progress.wxml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/progress/progress.ts b/src/progress/progress.ts
index b9342f33f..8c74cac3e 100644
--- a/src/progress/progress.ts
+++ b/src/progress/progress.ts
@@ -25,6 +25,7 @@ export default class Progress extends SuperComponent {
     computedStatus: '',
     computedProgress: 0,
     isIOS: false,
+    strokeCircleWidth: '',
   };
 
   attached() {
@@ -64,6 +65,7 @@ export default class Progress extends SuperComponent {
       }
       this.setData({
         heightBar: unitConvert(strokeWidth),
+        strokeCircleWidth: Number.isNaN(strokeWidth) ? '' : `${strokeWidth}px`,
       });
     },
 
diff --git a/src/progress/progress.wxml b/src/progress/progress.wxml
index cb8488be8..9812b9bf3 100644
--- a/src/progress/progress.wxml
+++ b/src/progress/progress.wxml
@@ -80,7 +80,7 @@
     >
       <view
         class="{{classPrefix}}__canvas--inner {{prefix}}-class-bar"
-        style="{{innerDiameter? 'width:'+ innerDiameter*2 + 'rpx;' + 'height:'+ innerDiameter*2 + 'rpx;': ''}}"
+        style="{{strokeCircleWidth? '--td-progress-stroke-circle-width:'+ strokeCircleWidth : ''}}"
       >
         <view wx:if="{{label}}" class="{{classPrefix}}__info {{prefix}}-class-label" aria-hidden="{{ true }}">
           <template

From ede856d31225ffdc4b7277f234ca083ed0b2a6d8 Mon Sep 17 00:00:00 2001
From: hxh <1047739781>
Date: Wed, 11 Sep 2024 09:29:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(progress):=20=C2=A0=E7=A7=BB=E9=99=A4ge?=
 =?UTF-8?q?tInnerDiameter()=20=E5=B9=B6=E6=94=B9=E4=BD=BF=E7=94=A8heightBa?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/progress/progress.ts   | 20 --------------------
 src/progress/progress.wxml |  2 +-
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/progress/progress.ts b/src/progress/progress.ts
index 8c74cac3e..574e7055b 100644
--- a/src/progress/progress.ts
+++ b/src/progress/progress.ts
@@ -25,7 +25,6 @@ export default class Progress extends SuperComponent {
     computedStatus: '',
     computedProgress: 0,
     isIOS: false,
-    strokeCircleWidth: '',
   };
 
   attached() {
@@ -65,15 +64,9 @@ export default class Progress extends SuperComponent {
       }
       this.setData({
         heightBar: unitConvert(strokeWidth),
-        strokeCircleWidth: Number.isNaN(strokeWidth) ? '' : `${strokeWidth}px`,
       });
     },
 
-    theme(theme) {
-      if (theme === 'circle') {
-        this.getInnerDiameter();
-      }
-    },
 
     trackColor(trackColor) {
       this.setData({
@@ -82,17 +75,4 @@ export default class Progress extends SuperComponent {
     },
   };
 
-  methods = {
-    getInnerDiameter() {
-      const { strokeWidth } = this.properties;
-      const wrapID = `.${name}__canvas--circle`;
-      if (strokeWidth) {
-        getRect(this, wrapID).then((wrapRect) => {
-          this.setData({
-            innerDiameter: wrapRect.width - unitConvert(strokeWidth) * 2,
-          });
-        });
-      }
-    },
-  };
 }
diff --git a/src/progress/progress.wxml b/src/progress/progress.wxml
index 9812b9bf3..b84469050 100644
--- a/src/progress/progress.wxml
+++ b/src/progress/progress.wxml
@@ -80,7 +80,7 @@
     >
       <view
         class="{{classPrefix}}__canvas--inner {{prefix}}-class-bar"
-        style="{{strokeCircleWidth? '--td-progress-stroke-circle-width:'+ strokeCircleWidth : ''}}"
+        style="{{heightBar? '--td-progress-stroke-circle-width:' + heightBar + 'px' : ''}}"
       >
         <view wx:if="{{label}}" class="{{classPrefix}}__info {{prefix}}-class-label" aria-hidden="{{ true }}">
           <template