From 538586258407d4769a31d01e89bc9d1d754e487d Mon Sep 17 00:00:00 2001
From: 07akioni <07akioni2@gmail.com>
Date: Thu, 11 Feb 2021 19:55:54 +0800
Subject: [PATCH] feat(progress): font-weight-circle

---
 src/progress/src/Progress.tsx          |  2 ++
 src/progress/src/styles/index.cssr.ts  | 16 ++++++----------
 src/progress/styles/dark.ts            |  4 +++-
 src/progress/styles/light.ts           |  4 +++-
 themes/tusimple/src/theme-overrides.ts |  1 +
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/progress/src/Progress.tsx b/src/progress/src/Progress.tsx
index ac497a080..799396e52 100644
--- a/src/progress/src/Progress.tsx
+++ b/src/progress/src/Progress.tsx
@@ -108,6 +108,7 @@ export default defineComponent({
             textColorLineInner,
             textColorLineOuter,
             lineBgProcessing,
+            fontWeightCircle,
             [createKey('iconColor', status)]: iconColor,
             [createKey('fillColor', status)]: fillColor
           }
@@ -117,6 +118,7 @@ export default defineComponent({
           '--fill-color': fillColor,
           '--font-size': fontSize,
           '--font-size-circle': fontSizeCircle,
+          '--font-weight-circle': fontWeightCircle,
           '--icon-color': iconColor,
           '--icon-size-circle': iconSizeCircle,
           '--icon-size-line': iconSizeLine,
diff --git a/src/progress/src/styles/index.cssr.ts b/src/progress/src/styles/index.cssr.ts
index 753657856..c52a4cda1 100644
--- a/src/progress/src/styles/index.cssr.ts
+++ b/src/progress/src/styles/index.cssr.ts
@@ -1,10 +1,11 @@
-import { c, cB, cE, cM } from '../../../_utils/cssr'
+import { c, cB, cM } from '../../../_utils/cssr'
 
 // vars
 // --bezier
 // --fill-color
 // --font-size
 // --font-size-circle
+// --font-weight-circle
 // --icon-color
 // --icon-size-circle
 // --icon-size-line
@@ -74,18 +75,12 @@ export default c([
         display: flex;
         align-items: center;
         color: inherit;
-        font-size: 36px;
+        font-size: var(--font-size-circle);
         color: var(--text-color-circle);
+        font-weight: var(--font-weight-circle);
         transition: color .3s var(--bezier);
         white-space: nowrap;
-      `, [
-        cE('percentage', `
-          font-size: var(--font-size-circle);
-        `),
-        cE('unit', `
-          font-size: var(--font-size-circle);
-        `)
-      ]),
+      `),
       cB('progress-icon', `
         position: absolute;
         left: 50%;
@@ -102,6 +97,7 @@ export default c([
       color: 'inherit'
     }, [
       cB('progress-text', `
+        font-weight: var(--font-weight-circle);
         color: var(--text-color-circle);
         position: absolute;
         left: 50%;
diff --git a/src/progress/styles/dark.ts b/src/progress/styles/dark.ts
index bed24e806..149fb1968 100644
--- a/src/progress/styles/dark.ts
+++ b/src/progress/styles/dark.ts
@@ -12,9 +12,11 @@ const progressDark: ProgressTheme = {
       errorColor,
       textColor2,
       progressRailColorOverlay,
-      fontSize
+      fontSize,
+      fontWeight
     } = vars
     return {
+      fontWeightCircle: fontWeight,
       fontSize,
       fontSizeCircle: '28px',
       railColor: progressRailColorOverlay,
diff --git a/src/progress/styles/light.ts b/src/progress/styles/light.ts
index 8024708f7..9ed92660e 100644
--- a/src/progress/styles/light.ts
+++ b/src/progress/styles/light.ts
@@ -10,11 +10,13 @@ const self = (vars: ThemeCommonVars) => {
     errorColor,
     textColor2,
     progressRailColor,
-    fontSize
+    fontSize,
+    fontWeight
   } = vars
   return {
     fontSize,
     fontSizeCircle: '28px',
+    fontWeightCircle: fontWeight,
     railColor: progressRailColor,
     railHeight: '8px',
     iconSizeCircle: '36px',
diff --git a/themes/tusimple/src/theme-overrides.ts b/themes/tusimple/src/theme-overrides.ts
index 665b4158d..79a1b234c 100644
--- a/themes/tusimple/src/theme-overrides.ts
+++ b/themes/tusimple/src/theme-overrides.ts
@@ -358,6 +358,7 @@ export const themeOverrides: GlobalThemeOverrides = {
     spaceArrow: '14px'
   },
   Progress: {
+    fontWeightCircle: '700',
     railHeight: '4px',
     fontSizeCircle: '24px',
     iconSizeCircle: '30px',