From 1057086df32a9b86c12f493fadeca187e2978655 Mon Sep 17 00:00:00 2001
From: yusongH <549962989@qq.com>
Date: Wed, 23 Nov 2022 20:51:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(progress):=20=E4=BF=AE=E5=A4=8Dpercentage?=
 =?UTF-8?q?=E5=80=BC=E4=B8=BA100=E6=97=B6,=E4=BC=9A=E5=BF=BD=E7=95=A5statu?=
 =?UTF-8?q?s=E8=AE=BE=E7=BD=AE=E7=9A=84=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__snapshots__/index.test.jsx.snap         | 136 ++++++++++++++++++
 src/progress/__tests__/index.test.jsx         |  11 ++
 src/progress/progress.tsx                     |   2 +-
 3 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/src/progress/__tests__/__snapshots__/index.test.jsx.snap b/src/progress/__tests__/__snapshots__/index.test.jsx.snap
index ef4c33f38..c0e1a117d 100644
--- a/src/progress/__tests__/__snapshots__/index.test.jsx.snap
+++ b/src/progress/__tests__/__snapshots__/index.test.jsx.snap
@@ -373,6 +373,31 @@ exports[`Progress > :props > :status > :status is active 1`] = `
 </div>
 `;
 
+exports[`Progress > :props > :status > :status is active and percentage is 100 1`] = `
+<div
+  class="t-progress"
+>
+  <div
+    class="t-progress--thin t-progress--status--active"
+  >
+    <div
+      class="t-progress__bar"
+      style="border-radius: undefinedpx;"
+    >
+      <div
+        class="t-progress__inner"
+        style="width: 100%;"
+      />
+    </div>
+    <div
+      class="t-progress__info"
+    >
+      100%
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Progress > :props > :status > :status is error 1`] = `
 <div
   class="t-progress"
@@ -410,6 +435,43 @@ exports[`Progress > :props > :status > :status is error 1`] = `
 </div>
 `;
 
+exports[`Progress > :props > :status > :status is error and percentage is 100 1`] = `
+<div
+  class="t-progress"
+>
+  <div
+    class="t-progress--thin t-progress--status--error"
+  >
+    <div
+      class="t-progress__bar"
+      style="border-radius: undefinedpx;"
+    >
+      <div
+        class="t-progress__inner"
+        style="width: 100%;"
+      />
+    </div>
+    <div
+      class="t-progress__info"
+    >
+      <svg
+        class="t-icon t-icon-close-circle-filled t-progress__icon"
+        fill="none"
+        height="1em"
+        viewBox="0 0 16 16"
+        width="1em"
+      >
+        <path
+          d="M15 8A7 7 0 101 8a7 7 0 0014 0zM5.67 4.95L8 7.29l2.33-2.34.7.7L8.7 8l2.34 2.35-.71.7L8 8.71l-2.33 2.34-.7-.7L7.3 8 4.96 5.65l.71-.7z"
+          fill="currentColor"
+          fill-opacity="0.9"
+        />
+      </svg>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Progress > :props > :status > :status is success 1`] = `
 <div
   class="t-progress"
@@ -447,6 +509,43 @@ exports[`Progress > :props > :status > :status is success 1`] = `
 </div>
 `;
 
+exports[`Progress > :props > :status > :status is success and percentage is 100 1`] = `
+<div
+  class="t-progress"
+>
+  <div
+    class="t-progress--thin t-progress--status--success"
+  >
+    <div
+      class="t-progress__bar"
+      style="border-radius: undefinedpx;"
+    >
+      <div
+        class="t-progress__inner"
+        style="width: 100%;"
+      />
+    </div>
+    <div
+      class="t-progress__info"
+    >
+      <svg
+        class="t-icon t-icon-check-circle-filled t-progress__icon"
+        fill="none"
+        height="1em"
+        viewBox="0 0 16 16"
+        width="1em"
+      >
+        <path
+          d="M8 15A7 7 0 108 1a7 7 0 000 14zM4.5 8.2l.7-.7L7 9.3l3.8-3.8.7.7L7 10.7 4.5 8.2z"
+          fill="currentColor"
+          fill-opacity="0.9"
+        />
+      </svg>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Progress > :props > :status > :status is warning 1`] = `
 <div
   class="t-progress"
@@ -484,6 +583,43 @@ exports[`Progress > :props > :status > :status is warning 1`] = `
 </div>
 `;
 
+exports[`Progress > :props > :status > :status is warning and percentage is 100 1`] = `
+<div
+  class="t-progress"
+>
+  <div
+    class="t-progress--thin t-progress--status--warning"
+  >
+    <div
+      class="t-progress__bar"
+      style="border-radius: undefinedpx;"
+    >
+      <div
+        class="t-progress__inner"
+        style="width: 100%;"
+      />
+    </div>
+    <div
+      class="t-progress__info"
+    >
+      <svg
+        class="t-icon t-icon-error-circle-filled t-progress__icon"
+        fill="none"
+        height="1em"
+        viewBox="0 0 16 16"
+        width="1em"
+      >
+        <path
+          d="M15 8A7 7 0 101 8a7 7 0 0014 0zM8.5 4v5.5h-1V4h1zm-1.1 7h1.2v1.2H7.4V11z"
+          fill="currentColor"
+          fill-opacity="0.9"
+        />
+      </svg>
+    </div>
+  </div>
+</div>
+`;
+
 exports[`Progress > :props > :strokeWidth > :strokeWidth is Number, equal to 50 1`] = `
 <div
   class="t-progress"
diff --git a/src/progress/__tests__/index.test.jsx b/src/progress/__tests__/index.test.jsx
index 5f09a2e63..91fd61acc 100644
--- a/src/progress/__tests__/index.test.jsx
+++ b/src/progress/__tests__/index.test.jsx
@@ -173,6 +173,17 @@ describe('Progress', () => {
           expect(wrapper.findComponent(Progress).vm.status).toBe(status);
           expect(wrapper.element).toMatchSnapshot();
         });
+
+        it(`:status is ${status} and percentage is 100`, () => {
+          const wrapper = mount({
+            render() {
+              return <Progress status={status} percentage={100}></Progress>;
+            },
+          });
+          expect(wrapper.findComponent(Progress).vm.percentage).toBe(100);
+          expect(wrapper.findComponent(Progress).vm.status).toBe(status);
+          expect(wrapper.element).toMatchSnapshot();
+        });
       });
     });
 
diff --git a/src/progress/progress.tsx b/src/progress/progress.tsx
index 41c2335f5..7b1a02407 100644
--- a/src/progress/progress.tsx
+++ b/src/progress/progress.tsx
@@ -27,7 +27,7 @@ export default mixins(classPrefixMixins, getGlobalIconMixins()).extend({
 
   computed: {
     statusStyle(): string {
-      if (this.percentage >= 100) {
+      if (!this.status && this.percentage >= 100) {
         return 'success';
       }
       return this.status;