fix(progress): fix style & support icon demo

packages/nutui-taro-demo/src/app.config.ts

@@ -1,43 +1,41 @@
-
 const subPackages = [
   {
-    "root": "base",
-    "pages": [
+    root: "base",
+    pages: [
       "pages/button/index",
       "pages/cell/index",
       "pages/configprovider/index",
       "pages/icon/index",
       "pages/image/index",
-      "pages/overlay/index"
-    ]
+      "pages/overlay/index",
+    ],
   },
   {
-    "root": "layout",
-    "pages": [
+    root: "layout",
+    pages: [
       "pages/divider/index",
       "pages/grid/index",
       "pages/layout/index",
       "pages/safearea/index",
       "pages/space/index",
-      "pages/sticky/index"
-    ]
+      "pages/sticky/index",
+    ],
   },
   {
-    "root": "nav",
-    "pages": [
+    root: "nav",
+    pages: [
       "pages/backtop/index",
       "pages/elevator/index",
       "pages/fixednav/index",
-      "pages/hoverbutton/index",
       "pages/navbar/index",
       "pages/sidenavbar/index",
       "pages/tabbar/index",
-      "pages/tabs/index"
-    ]
+      "pages/tabs/index",
+    ],
   },
   {
-    "root": "dentry",
-    "pages": [
+    root: "dentry",
+    pages: [
       "pages/address/index",
       "pages/calendar/index",
       "pages/calendarcard/index",
@@ -46,12 +44,12 @@ const subPackages = [
       "pages/datepicker/index",
       "pages/form/index",
       "pages/input/index",
-      "pages/inputnumber/index"
-    ]
+      "pages/inputnumber/index",
+    ],
   },
   {
-    "root": "dataentry",
-    "pages": [
+    root: "dentry1",
+    pages: [
       "pages/menu/index",
       "pages/numberkeyboard/index",
       "pages/picker/index",
@@ -63,12 +61,12 @@ const subPackages = [
       "pages/signature/index",
       "pages/switch/index",
       "pages/textarea/index",
-      "pages/uploader/index"
-    ]
+      "pages/uploader/index",
+    ],
   },
   {
-    "root": "feedback",
-    "pages": [
+    root: "feedback",
+    pages: [
       "pages/actionsheet/index",
       "pages/badge/index",
       "pages/dialog/index",
@@ -81,15 +79,14 @@ const subPackages = [
       "pages/popover/index",
       "pages/popup/index",
       "pages/pulltorefresh/index",
-      "pages/resultpage/index",
       "pages/skeleton/index",
       "pages/swipe/index",
-      "pages/toast/index"
-    ]
+      "pages/toast/index",
+    ],
   },
   {
-    "root": "exhibition",
-    "pages": [
+    root: "exhibition",
+    pages: [
       "pages/animate/index",
       "pages/animatingnumbers/index",
       "pages/avatar/index",
@@ -108,32 +105,29 @@ const subPackages = [
       "pages/tag/index",
       "pages/tour/index",
       "pages/video/index",
-      "pages/virtuallist/index"
-    ]
+      "pages/virtuallist/index",
+    ],
   },
   {
-    "root": "business",
-    "pages": [
+    root: "business",
+    pages: [
       "pages/avatarcropper/index",
       "pages/barrage/index",
       "pages/card/index",
       "pages/timeselect/index",
       "pages/trendarrow/index",
-      "pages/watermark/index"
-    ]
-  }
-];
+      "pages/watermark/index",
+    ],
+  },
+]
 
 export default defineAppConfig({
-  pages: ['pages/index/index'],
+  pages: ["pages/index/index"],
   subPackages,
   window: {
-    backgroundTextStyle: 'light',
-    navigationBarBackgroundColor: '#fff',
-    navigationBarTitleText: 'NutUI-React',
-    navigationBarTextStyle: 'black'
+    backgroundTextStyle: "light",
+    navigationBarBackgroundColor: "#fff",
+    navigationBarTitleText: "NutUI-React",
+    navigationBarTextStyle: "black",
   },
-  components: ['pages/index/index', ...(subPackages.map(subPackage => {
-    return subPackage.pages.map(page => `${subPackage.root}/${page}`)
-  }).flat())]
-})
+})

src/packages/progress/demo.taro.tsx

@@ -56,12 +56,8 @@ const ProgressDemo = () => {
         <Demo2 />
         <View className="h2">{translated.noShowPercentage}</View>
         <Demo3 />
-        {!harmonyAndRn() && (
-          <>
-            <View className="h2">{translated.customContent}</View>
-            <Demo4 />
-          </>
-        )}
+        <View className="h2">{translated.customContent}</View>
+        <Demo4 />
         <View className="h2">{translated.customSize}</View>
         <Demo5 />
         <View className="h2">{translated.statusDisplay}</View>

src/packages/progress/demos/taro/demo4.tsx

@@ -1,13 +1,14 @@
 import React from 'react'
 import { Progress, Image, Cell } from '@nutui/nutui-react-taro'
+import pxTransform from '@/utils/px-transform'
 
 const Demo4 = () => {
   return (
     <Cell>
       <Progress percent={60} showText>
         <Image
-          width="30px"
-          height="30px"
+          width={pxTransform(20)}
+          height={pxTransform(20)}
           src="https://img12.360buyimg.com/imagetools/jfs/t1/229362/18/22746/11607/669f8bfeF5fcbeaab/d4162bbf29bb1b00.png"
         />
       </Progress>

src/packages/progress/demos/taro/demo6.tsx

@@ -2,8 +2,14 @@ import React from 'react'
 import { Progress, Cell } from '@nutui/nutui-react-taro'
 import { Checked, Tips } from '@nutui/icons-react-taro'
 import { harmonyAndRn } from '@/utils/platform-taro'
+import pxTransform from '@/utils/px-transform'
 
 const Demo6 = () => {
+  const iconStyle = {
+    marginTop: 0,
+    marginLeft: pxTransform(5),
+    marginRight: pxTransform(5),
+  }
   return (
     <>
       <Cell>
@@ -19,22 +25,11 @@ const Demo6 = () => {
       </Cell>
       <Cell align="center">
         <Progress percent={100} />
-        {!harmonyAndRn() && (
-          <Checked color="green" style={{ margin: '0 5px' }} />
-        )}
+        <Checked color="green" style={iconStyle} />
       </Cell>
       <Cell align="center">
         <Progress percent={100} color="#AAFF00" strokeWidth="15" />
-        {!harmonyAndRn() && (
-          <Tips
-            color={
-              harmonyAndRn()
-                ? 'red'
-                : 'linear-gradient(90deg, rgba(180,236,81,1) 0%,rgba(66,147,33,1) 100%)'
-            }
-            style={{ margin: '0 5px' }}
-          />
-        )}
+        <Tips color="#FF0000" style={iconStyle} />
       </Cell>
     </>
   )

src/packages/progress/progress.scss

@@ -39,7 +39,7 @@
     top: $progress-text-position-top;
     bottom: $progress-text-position-bottom;
     transition: all 0.4s;
-    // transform: translate(-50%);
+    transform: translate(-50%);
 
     &-inner {
       display: flex;

src/packages/progress/progress.taro.tsx

@@ -160,8 +160,7 @@ export const Progress: FunctionComponent<
     }
   }, [])
   const getTextStyle = () => {
-    const value = harmony() ? '93%' : '99%'
-    return rtl ? { right: value } : { left: value }
+    return rtl ? { right: '100%' } : { left: '100%' }
   }
   const computeRight = () => {
     if (children) {