From 8263584a7ee13eac12277dfef168d32e976d733b Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 15 Aug 2024 11:06:50 +0800
Subject: [PATCH 1/8] chore: save

---
 packages/nutui-taro-demo/bin/ts-node                | 1 +
 packages/nutui-taro-demo/bin/ts-node-cwd            | 1 +
 packages/nutui-taro-demo/bin/ts-node-esm            | 1 +
 packages/nutui-taro-demo/bin/ts-node-script         | 1 +
 packages/nutui-taro-demo/bin/ts-node-transpile-only | 1 +
 packages/nutui-taro-demo/bin/ts-script              | 1 +
 src/config.json                                     | 2 +-
 src/packages/trendarrow/demo.taro.tsx               | 9 +++++++--
 src/packages/trendarrow/trendarrow.taro.tsx         | 9 +++++----
 9 files changed, 19 insertions(+), 7 deletions(-)
 create mode 120000 packages/nutui-taro-demo/bin/ts-node
 create mode 120000 packages/nutui-taro-demo/bin/ts-node-cwd
 create mode 120000 packages/nutui-taro-demo/bin/ts-node-esm
 create mode 120000 packages/nutui-taro-demo/bin/ts-node-script
 create mode 120000 packages/nutui-taro-demo/bin/ts-node-transpile-only
 create mode 120000 packages/nutui-taro-demo/bin/ts-script

diff --git a/packages/nutui-taro-demo/bin/ts-node b/packages/nutui-taro-demo/bin/ts-node
new file mode 120000
index 0000000000..d46990f434
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-node
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-cwd b/packages/nutui-taro-demo/bin/ts-node-cwd
new file mode 120000
index 0000000000..de7ad0382d
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-node-cwd
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin-cwd.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-esm b/packages/nutui-taro-demo/bin/ts-node-esm
new file mode 120000
index 0000000000..fbe47daeb9
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-node-esm
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin-esm.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-script b/packages/nutui-taro-demo/bin/ts-node-script
new file mode 120000
index 0000000000..37b1e8a9d6
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-node-script
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin-script.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-transpile-only b/packages/nutui-taro-demo/bin/ts-node-transpile-only
new file mode 120000
index 0000000000..7916f9c1d4
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-node-transpile-only
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin-transpile.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-script b/packages/nutui-taro-demo/bin/ts-script
new file mode 120000
index 0000000000..e09e9c1d4b
--- /dev/null
+++ b/packages/nutui-taro-demo/bin/ts-script
@@ -0,0 +1 @@
+../lib/node_modules/ts-node/dist/bin-script-deprecated.js
\ No newline at end of file
diff --git a/src/config.json b/src/config.json
index 0f1959164d..b97cce3f82 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1206,7 +1206,7 @@
           "author": "zhaoqian16"
         },
         {
-          "version": "2.0.0",
+          "version": "3.0.0",
           "name": "TrendArrow",
           "type": "component",
           "cName": "趋势箭头",
diff --git a/src/packages/trendarrow/demo.taro.tsx b/src/packages/trendarrow/demo.taro.tsx
index 413855baf0..ddaa45e85c 100644
--- a/src/packages/trendarrow/demo.taro.tsx
+++ b/src/packages/trendarrow/demo.taro.tsx
@@ -12,6 +12,7 @@ import Demo5 from './demos/taro/demo5'
 import Demo6 from './demos/taro/demo6'
 import Demo7 from './demos/taro/demo7'
 import Demo8 from './demos/taro/demo8'
+import { harmonyAndRn } from '@/utils/platform-taro'
 
 const TrendArrowDemo = () => {
   const [translated] = useTranslate({
@@ -64,8 +65,12 @@ const TrendArrowDemo = () => {
         <Demo6 />
         <View className="h2">{translated.title7}</View>
         <Demo7 />
-        <View className="h2">{translated.title8}</View>
-        <Demo8 />
+        {!harmonyAndRn() && (
+          <>
+            <View className="h2">{translated.title8}</View>
+            <Demo8 />
+          </>
+        )}
       </ScrollView>
     </>
   )
diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index 5367083266..842ab8821f 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -1,5 +1,6 @@
 import React, { FunctionComponent, useRef } from 'react'
 import { TriangleDown, TriangleUp } from '@nutui/icons-react-taro'
+import { View, Text } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
 
 export interface TrendArrowProps extends BasicComponent {
@@ -96,16 +97,16 @@ export const TrendArrow: FunctionComponent<
   const renderContent = (left: boolean) => {
     const classNameSuffix = !left ? 'icon-after' : 'icon-before'
     return (
-      <span
+      <Text
         className={`${classPrefix}-${classNameSuffix} ${classPrefix}-value`}
         style={calcStyle}
       >
         {calcRate}
-      </span>
+      </Text>
     )
   }
   return (
-    <div className={`${classPrefix} ${className}`} style={style} {...rest}>
+    <View className={`${classPrefix} ${className}`} style={style} {...rest}>
       {!left && renderContent(!left)}
       {Number(value) !== 0 && (
         <>
@@ -117,7 +118,7 @@ export const TrendArrow: FunctionComponent<
         </>
       )}
       {left && renderContent(!left)}
-    </div>
+    </View>
   )
 }
 

From 339acdc89e10639835d41d3e893b2f3b4de20252 Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 15 Aug 2024 13:40:33 +0800
Subject: [PATCH 2/8] chore: update

---
 src/packages/trendarrow/trendarrow.scss     |  3 ++-
 src/packages/trendarrow/trendarrow.taro.tsx | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/packages/trendarrow/trendarrow.scss b/src/packages/trendarrow/trendarrow.scss
index 6c613fa574..a4781498a8 100644
--- a/src/packages/trendarrow/trendarrow.scss
+++ b/src/packages/trendarrow/trendarrow.scss
@@ -1,5 +1,6 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
   color: $color-title;
   font-size: $trendarrow-font-size;
diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index 842ab8821f..08bc6e13e5 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -2,6 +2,7 @@ import React, { FunctionComponent, useRef } from 'react'
 import { TriangleDown, TriangleUp } from '@nutui/icons-react-taro'
 import { View, Text } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
+import { harmonyAndRn } from '@/utils/platform-taro'
 
 export interface TrendArrowProps extends BasicComponent {
   value: number
@@ -25,8 +26,8 @@ const defaultProps = {
   left: false,
   sync: true,
   color: '#333',
-  riseColor: 'var(--nutui-brand-6)',
-  dropColor: 'var(--nutui-secondary-1)',
+  riseColor: '#ff0f23',
+  dropColor: '#14cc33',
   riseIcon: null,
   dropIcon: null,
 } as TrendArrowProps
@@ -111,9 +112,17 @@ export const TrendArrow: FunctionComponent<
       {Number(value) !== 0 && (
         <>
           {rateTrend.current ? (
-            <>{riseIcon || <TriangleUp color={calcIconProps.color} />}</>
+            <>
+              {riseIcon ||
+                (!harmonyAndRn() && <TriangleUp color={calcIconProps.color} />)}
+            </>
           ) : (
-            <>{dropIcon || <TriangleDown color={calcIconProps.color} />}</>
+            <>
+              {dropIcon ||
+                (!harmonyAndRn() && (
+                  <TriangleDown color={calcIconProps.color} />
+                ))}
+            </>
           )}
         </>
       )}

From fe2f90305bd65a5c98545a0606ef0067fcce6c9f Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Wed, 21 Aug 2024 16:40:17 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat:=20icon=E5=8D=A0=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/trendarrow/trendarrow.harmony.css |  5 +++--
 src/packages/trendarrow/trendarrow.taro.tsx    | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/packages/trendarrow/trendarrow.harmony.css b/src/packages/trendarrow/trendarrow.harmony.css
index c9dbdd3969..82584e5490 100644
--- a/src/packages/trendarrow/trendarrow.harmony.css
+++ b/src/packages/trendarrow/trendarrow.harmony.css
@@ -1,7 +1,8 @@
 .nut-trendarrow {
-  display: inline-flex;
+  display: flex;
+  flex-direction: row;
   align-items: center;
-  color: #1A1A1A;
+  color: #1a1a1a;
   font-size: 14px;
 }
 .nut-trendarrow-icon-before {
diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index 08bc6e13e5..b6593eea22 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -114,12 +114,18 @@ export const TrendArrow: FunctionComponent<
           {rateTrend.current ? (
             <>
               {riseIcon ||
-                (!harmonyAndRn() && <TriangleUp color={calcIconProps.color} />)}
+                (harmonyAndRn() ? (
+                  <Text>⬆️</Text>
+                ) : (
+                  <TriangleUp color={calcIconProps.color} />
+                ))}
             </>
           ) : (
             <>
               {dropIcon ||
-                (!harmonyAndRn() && (
+                (harmonyAndRn() ? (
+                  <Text>⬇️</Text>
+                ) : (
                   <TriangleDown color={calcIconProps.color} />
                 ))}
             </>

From 3a22efe8bd0b2d85ad5bc2f4cfdb65956a1f0a67 Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Thu, 31 Oct 2024 13:48:48 +0800
Subject: [PATCH 4/8] fix: build

---
 src/packages/trendarrow/trendarrow.taro.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index b6593eea22..689fddc3a5 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -107,7 +107,11 @@ export const TrendArrow: FunctionComponent<
     )
   }
   return (
-    <View className={`${classPrefix} ${className}`} style={style} {...rest}>
+    <View
+      className={`${classPrefix} ${className}`}
+      style={style}
+      {...(rest as any)}
+    >
       {!left && renderContent(!left)}
       {Number(value) !== 0 && (
         <>

From da9e6bc78a28ed70828a7658d8540b1707620f51 Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Mon, 4 Nov 2024 13:52:42 +0800
Subject: [PATCH 5/8] chore: delete useless

---
 packages/nutui-taro-demo/bin/ts-node                | 1 -
 packages/nutui-taro-demo/bin/ts-node-cwd            | 1 -
 packages/nutui-taro-demo/bin/ts-node-esm            | 1 -
 packages/nutui-taro-demo/bin/ts-node-script         | 1 -
 packages/nutui-taro-demo/bin/ts-node-transpile-only | 1 -
 packages/nutui-taro-demo/bin/ts-script              | 1 -
 6 files changed, 6 deletions(-)
 delete mode 120000 packages/nutui-taro-demo/bin/ts-node
 delete mode 120000 packages/nutui-taro-demo/bin/ts-node-cwd
 delete mode 120000 packages/nutui-taro-demo/bin/ts-node-esm
 delete mode 120000 packages/nutui-taro-demo/bin/ts-node-script
 delete mode 120000 packages/nutui-taro-demo/bin/ts-node-transpile-only
 delete mode 120000 packages/nutui-taro-demo/bin/ts-script

diff --git a/packages/nutui-taro-demo/bin/ts-node b/packages/nutui-taro-demo/bin/ts-node
deleted file mode 120000
index d46990f434..0000000000
--- a/packages/nutui-taro-demo/bin/ts-node
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-cwd b/packages/nutui-taro-demo/bin/ts-node-cwd
deleted file mode 120000
index de7ad0382d..0000000000
--- a/packages/nutui-taro-demo/bin/ts-node-cwd
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin-cwd.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-esm b/packages/nutui-taro-demo/bin/ts-node-esm
deleted file mode 120000
index fbe47daeb9..0000000000
--- a/packages/nutui-taro-demo/bin/ts-node-esm
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin-esm.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-script b/packages/nutui-taro-demo/bin/ts-node-script
deleted file mode 120000
index 37b1e8a9d6..0000000000
--- a/packages/nutui-taro-demo/bin/ts-node-script
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin-script.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-node-transpile-only b/packages/nutui-taro-demo/bin/ts-node-transpile-only
deleted file mode 120000
index 7916f9c1d4..0000000000
--- a/packages/nutui-taro-demo/bin/ts-node-transpile-only
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin-transpile.js
\ No newline at end of file
diff --git a/packages/nutui-taro-demo/bin/ts-script b/packages/nutui-taro-demo/bin/ts-script
deleted file mode 120000
index e09e9c1d4b..0000000000
--- a/packages/nutui-taro-demo/bin/ts-script
+++ /dev/null
@@ -1 +0,0 @@
-../lib/node_modules/ts-node/dist/bin-script-deprecated.js
\ No newline at end of file

From d45c48e90bc20466f22191c65a362f83e7b7232f Mon Sep 17 00:00:00 2001
From: huxiyang3 <1872591453@qq.com>
Date: Wed, 6 Nov 2024 10:18:01 +0800
Subject: [PATCH 6/8] fix: arrow

---
 src/packages/trendarrow/trendarrow.taro.tsx | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index 689fddc3a5..b1c707fd68 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -2,7 +2,6 @@ import React, { FunctionComponent, useRef } from 'react'
 import { TriangleDown, TriangleUp } from '@nutui/icons-react-taro'
 import { View, Text } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 export interface TrendArrowProps extends BasicComponent {
   value: number
@@ -116,23 +115,9 @@ export const TrendArrow: FunctionComponent<
       {Number(value) !== 0 && (
         <>
           {rateTrend.current ? (
-            <>
-              {riseIcon ||
-                (harmonyAndRn() ? (
-                  <Text>⬆️</Text>
-                ) : (
-                  <TriangleUp color={calcIconProps.color} />
-                ))}
-            </>
+            <>{riseIcon || <TriangleUp color={calcIconProps.color} />}</>
           ) : (
-            <>
-              {dropIcon ||
-                (harmonyAndRn() ? (
-                  <Text>⬇️</Text>
-                ) : (
-                  <TriangleDown color={calcIconProps.color} />
-                ))}
-            </>
+            <>{dropIcon || <TriangleDown color={calcIconProps.color} />}</>
           )}
         </>
       )}

From b6e72f7b88f4ecc6b59b3b8b0d4f439c4ffd2bad Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Thu, 7 Nov 2024 17:55:25 +0800
Subject: [PATCH 7/8] chore: cr

---
 src/packages/trendarrow/trendarrow.taro.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/packages/trendarrow/trendarrow.taro.tsx b/src/packages/trendarrow/trendarrow.taro.tsx
index b1c707fd68..f9afd3eeeb 100644
--- a/src/packages/trendarrow/trendarrow.taro.tsx
+++ b/src/packages/trendarrow/trendarrow.taro.tsx
@@ -2,6 +2,7 @@ import React, { FunctionComponent, useRef } from 'react'
 import { TriangleDown, TriangleUp } from '@nutui/icons-react-taro'
 import { View, Text } from '@tarojs/components'
 import { BasicComponent, ComponentDefaults } from '@/utils/typings'
+import { harmony } from '@/utils/platform-taro'
 
 export interface TrendArrowProps extends BasicComponent {
   value: number
@@ -25,8 +26,8 @@ const defaultProps = {
   left: false,
   sync: true,
   color: '#333',
-  riseColor: '#ff0f23',
-  dropColor: '#14cc33',
+  riseColor: harmony() ? '#ff0f23' : 'var(--nutui-brand-6)',
+  dropColor: harmony() ? '#14cc33' : 'var(--nutui-secondary-1)',
   riseIcon: null,
   dropIcon: null,
 } as TrendArrowProps

From 9230ab2dc5d7f93e1301cf9e9fd1e5b2035fbc21 Mon Sep 17 00:00:00 2001
From: "Alex.hxy" <1872591453@qq.com>
Date: Thu, 7 Nov 2024 17:57:20 +0800
Subject: [PATCH 8/8] chore: cr

---
 src/packages/trendarrow/demo.taro.tsx | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/packages/trendarrow/demo.taro.tsx b/src/packages/trendarrow/demo.taro.tsx
index ddaa45e85c..413855baf0 100644
--- a/src/packages/trendarrow/demo.taro.tsx
+++ b/src/packages/trendarrow/demo.taro.tsx
@@ -12,7 +12,6 @@ import Demo5 from './demos/taro/demo5'
 import Demo6 from './demos/taro/demo6'
 import Demo7 from './demos/taro/demo7'
 import Demo8 from './demos/taro/demo8'
-import { harmonyAndRn } from '@/utils/platform-taro'
 
 const TrendArrowDemo = () => {
   const [translated] = useTranslate({
@@ -65,12 +64,8 @@ const TrendArrowDemo = () => {
         <Demo6 />
         <View className="h2">{translated.title7}</View>
         <Demo7 />
-        {!harmonyAndRn() && (
-          <>
-            <View className="h2">{translated.title8}</View>
-            <Demo8 />
-          </>
-        )}
+        <View className="h2">{translated.title8}</View>
+        <Demo8 />
       </ScrollView>
     </>
   )