From 4a6bce8d495b4cc2a3094399885ca0871b3b6e74 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Mon, 24 Mar 2025 10:00:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(indicator):=20=E5=A2=9E=E5=8A=A0=20UI?=
 =?UTF-8?q?=20=E5=8F=98=E4=BD=93=E7=9A=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.json                             |  2 +-
 src/packages/indicator/demos/h5/demo1.tsx   | 17 ++++++++++++++---
 src/packages/indicator/demos/taro/demo1.tsx | 17 ++++++++++++++---
 src/packages/indicator/indicator.taro.tsx   |  2 +-
 src/packages/indicator/indicator.tsx        |  2 +-
 src/types/spec/indicator/base.ts            |  2 +-
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/config.json b/src/config.json
index 84a46e709e..eb3cd6d5c1 100644
--- a/src/config.json
+++ b/src/config.json
@@ -989,7 +989,7 @@
           "taro": true,
           "v15": 10,
           "author": "oasis",
-          "dd": false
+          "dd": true
         },
         {
           "version": "3.0.0",
diff --git a/src/packages/indicator/demos/h5/demo1.tsx b/src/packages/indicator/demos/h5/demo1.tsx
index 597cfdb08b..9d4cbf10bd 100644
--- a/src/packages/indicator/demos/h5/demo1.tsx
+++ b/src/packages/indicator/demos/h5/demo1.tsx
@@ -8,13 +8,24 @@ const Demo1 = () => {
         <Indicator total={3} current={0} />
       </Cell>
       <Cell>
-        <Indicator total={2} current={0} />
+        <Indicator total={2} type="firstScreen" current={0} />
       </Cell>
       <Cell>
-        <Indicator total={2} current={0} direction="vertical" />
+        <Indicator
+          total={2}
+          type="firstScreen"
+          current={0}
+          direction="vertical"
+        />
       </Cell>
       <Cell style={{ background: '#C2C4CC' }}>
-        <Indicator total={2} current={1} direction="vertical" color="default" />
+        <Indicator
+          total={2}
+          type="firstScreen"
+          current={1}
+          direction="vertical"
+          color="default"
+        />
       </Cell>
     </>
   )
diff --git a/src/packages/indicator/demos/taro/demo1.tsx b/src/packages/indicator/demos/taro/demo1.tsx
index 37a454979f..212af408ca 100644
--- a/src/packages/indicator/demos/taro/demo1.tsx
+++ b/src/packages/indicator/demos/taro/demo1.tsx
@@ -8,13 +8,24 @@ const Demo1 = () => {
         <Indicator total={3} current={0} />
       </Cell>
       <Cell>
-        <Indicator total={2} current={0} />
+        <Indicator total={2} type="firstScreen" current={0} />
       </Cell>
       <Cell>
-        <Indicator total={2} current={1} direction="vertical" />
+        <Indicator
+          total={2}
+          type="firstScreen"
+          current={1}
+          direction="vertical"
+        />
       </Cell>
       <Cell style={{ background: '#C2C4CC' }}>
-        <Indicator total={2} current={1} direction="vertical" color="default" />
+        <Indicator
+          total={2}
+          type="firstScreen"
+          current={1}
+          direction="vertical"
+          color="default"
+        />
       </Cell>
     </>
   )
diff --git a/src/packages/indicator/indicator.taro.tsx b/src/packages/indicator/indicator.taro.tsx
index 36228a7f0e..f15e009456 100644
--- a/src/packages/indicator/indicator.taro.tsx
+++ b/src/packages/indicator/indicator.taro.tsx
@@ -80,7 +80,7 @@ export const Indicator: FunctionComponent<
   }
 
   function maybeFixedWidth() {
-    if (total === 2 || type === 'slide') {
+    if (type === 'firstScreen' || type === 'slide') {
       return `${classPrefix}-fixed-width`
     }
     return ''
diff --git a/src/packages/indicator/indicator.tsx b/src/packages/indicator/indicator.tsx
index 04e4720814..3df00764b8 100644
--- a/src/packages/indicator/indicator.tsx
+++ b/src/packages/indicator/indicator.tsx
@@ -75,7 +75,7 @@ export const Indicator: FunctionComponent<Partial<WebIndicatorProps>> = (
   }
 
   function maybeFixedWidth() {
-    if (total === 2 || type === 'slide') {
+    if (type === 'firstScreen' || type === 'slide') {
       return `${classPrefix}-fixed-width`
     }
     return ''
diff --git a/src/types/spec/indicator/base.ts b/src/types/spec/indicator/base.ts
index f9e9a2e1e1..12fddfefb2 100644
--- a/src/types/spec/indicator/base.ts
+++ b/src/types/spec/indicator/base.ts
@@ -1,7 +1,7 @@
 import { BaseProps } from '../../base/props'
 import { UIType } from '../../base/atoms'
 
-export type IndicatorType = 'anchor' | 'slide'
+export type IndicatorType = 'anchor' | 'slide' | 'firstScreen'
 export type IndicatorColor = Extract<UIType, 'primary' | 'default'>
 
 export interface BaseIndicator extends BaseProps {

From d3f97f35827cd660da3b55792cc4d0de8b92b814 Mon Sep 17 00:00:00 2001
From: oasis <suanbanren@foxmail.com>
Date: Tue, 25 Mar 2025 12:16:19 +0800
Subject: [PATCH 2/2] fix: review

---
 src/packages/indicator/demos/h5/demo1.tsx   | 20 --------------------
 src/packages/indicator/demos/h5/demo6.tsx   |  5 ++++-
 src/packages/indicator/demos/taro/demo1.tsx | 20 --------------------
 src/packages/indicator/demos/taro/demo6.tsx |  5 ++++-
 src/packages/indicator/doc.en-US.md         |  2 +-
 src/packages/indicator/doc.md               |  2 +-
 src/packages/indicator/doc.taro.md          |  2 +-
 src/packages/indicator/doc.zh-TW.md         |  2 +-
 src/packages/indicator/indicator.taro.tsx   |  2 +-
 src/packages/indicator/indicator.tsx        |  2 +-
 src/types/spec/indicator/base.ts            |  2 +-
 11 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/src/packages/indicator/demos/h5/demo1.tsx b/src/packages/indicator/demos/h5/demo1.tsx
index 9d4cbf10bd..dcdbe124cd 100644
--- a/src/packages/indicator/demos/h5/demo1.tsx
+++ b/src/packages/indicator/demos/h5/demo1.tsx
@@ -7,26 +7,6 @@ const Demo1 = () => {
       <Cell>
         <Indicator total={3} current={0} />
       </Cell>
-      <Cell>
-        <Indicator total={2} type="firstScreen" current={0} />
-      </Cell>
-      <Cell>
-        <Indicator
-          total={2}
-          type="firstScreen"
-          current={0}
-          direction="vertical"
-        />
-      </Cell>
-      <Cell style={{ background: '#C2C4CC' }}>
-        <Indicator
-          total={2}
-          type="firstScreen"
-          current={1}
-          direction="vertical"
-          color="default"
-        />
-      </Cell>
     </>
   )
 }
diff --git a/src/packages/indicator/demos/h5/demo6.tsx b/src/packages/indicator/demos/h5/demo6.tsx
index 2fe8b28862..7551aa0d38 100644
--- a/src/packages/indicator/demos/h5/demo6.tsx
+++ b/src/packages/indicator/demos/h5/demo6.tsx
@@ -8,7 +8,10 @@ const Demo6 = () => {
         <Indicator total={3} current={2} type="slide" />
       </Cell>
       <Cell>
-        <Indicator total={3} current={2} type="slide" direction="vertical" />
+        <Indicator total={2} type="dualScreen" current={0} />
+      </Cell>
+      <Cell style={{ background: '#C2C4CC' }}>
+        <Indicator total={2} type="dualScreen" current={1} color="default" />
       </Cell>
     </>
   )
diff --git a/src/packages/indicator/demos/taro/demo1.tsx b/src/packages/indicator/demos/taro/demo1.tsx
index 212af408ca..54c9bd8d67 100644
--- a/src/packages/indicator/demos/taro/demo1.tsx
+++ b/src/packages/indicator/demos/taro/demo1.tsx
@@ -7,26 +7,6 @@ const Demo1 = () => {
       <Cell>
         <Indicator total={3} current={0} />
       </Cell>
-      <Cell>
-        <Indicator total={2} type="firstScreen" current={0} />
-      </Cell>
-      <Cell>
-        <Indicator
-          total={2}
-          type="firstScreen"
-          current={1}
-          direction="vertical"
-        />
-      </Cell>
-      <Cell style={{ background: '#C2C4CC' }}>
-        <Indicator
-          total={2}
-          type="firstScreen"
-          current={1}
-          direction="vertical"
-          color="default"
-        />
-      </Cell>
     </>
   )
 }
diff --git a/src/packages/indicator/demos/taro/demo6.tsx b/src/packages/indicator/demos/taro/demo6.tsx
index 7f282ea05c..6757a41a08 100644
--- a/src/packages/indicator/demos/taro/demo6.tsx
+++ b/src/packages/indicator/demos/taro/demo6.tsx
@@ -8,7 +8,10 @@ const Demo6 = () => {
         <Indicator total={3} current={2} type="slide" />
       </Cell>
       <Cell>
-        <Indicator total={3} current={2} type="slide" direction="vertical" />
+        <Indicator total={2} type="dualScreen" current={0} />
+      </Cell>
+      <Cell style={{ background: '#C2C4CC' }}>
+        <Indicator total={2} type="dualScreen" current={1} color="default" />
       </Cell>
     </>
   )
diff --git a/src/packages/indicator/doc.en-US.md b/src/packages/indicator/doc.en-US.md
index e5fbfb7647..c31be85650 100644
--- a/src/packages/indicator/doc.en-US.md
+++ b/src/packages/indicator/doc.en-US.md
@@ -68,7 +68,7 @@ import { Indicator } from '@nutui/nutui-react'
 | total | step total size | `number` | `3` |
 | direction | display directory,default is horizontal | `horizontal` \| `vertical` | `horizontal` |
 | color | color | `primary` \| `default` | `primary` |
-| type | interactivity Type | `anchor` \| `slide` | `anchor` |
+| type | interactivity Type | `anchor` \| `slide`\| `dualScreen` | `anchor` |
 
 ## Theming
 
diff --git a/src/packages/indicator/doc.md b/src/packages/indicator/doc.md
index ea899bc12f..295660e849 100644
--- a/src/packages/indicator/doc.md
+++ b/src/packages/indicator/doc.md
@@ -68,7 +68,7 @@ import { Indicator } from '@nutui/nutui-react'
 | total | 总页数 | `number` | `2` |
 | direction | 方向，默认为水平方向 | `horizontal` \| `vertical` | `horizontal` |
 | color | 颜色 | `primary` \| `default` | `primary` |
-| type | 交互类型 | `anchor` \| `slide` | `anchor` |
+| type | 交互类型 | `anchor` \| `slide`\| `dualScreen` | `anchor` |
 
 ## 主题定制
 
diff --git a/src/packages/indicator/doc.taro.md b/src/packages/indicator/doc.taro.md
index 6a57b64e53..6de815d619 100644
--- a/src/packages/indicator/doc.taro.md
+++ b/src/packages/indicator/doc.taro.md
@@ -68,7 +68,7 @@ import { Indicator } from '@nutui/nutui-react-taro'
 | total | 总页数 | `number` | `2` |
 | direction | 方向，默认为水平方向 | `horizontal` \| `vertical` | `horizontal` |
 | color | 颜色 | `primary` \| `default` | `primary` |
-| type | 交互类型 | `anchor` \| `slide` | `anchor` |
+| type | 交互类型 | `anchor` \| `slide`\| `dualScreen` | `anchor` |
 
 ## 主题定制
 
diff --git a/src/packages/indicator/doc.zh-TW.md b/src/packages/indicator/doc.zh-TW.md
index 02c034ddbd..5647afb61c 100644
--- a/src/packages/indicator/doc.zh-TW.md
+++ b/src/packages/indicator/doc.zh-TW.md
@@ -68,7 +68,7 @@ import { Indicator } from '@nutui/nutui-react'
 | total | 總頁數 | `number` | `2` |
 | direction | 方向，預設為水平方向 | `horizontal` \| `vertical` | `horizontal` |
 | color | 顏色 | `primary` \| `default` | `primary` |
-| type | 互動類型 | `anchor` \| `slide` | `anchor` |
+| type | 互動類型 | `anchor` \| `slide`\| `dualScreen` | `anchor` |
 
 ## 主題定製
 
diff --git a/src/packages/indicator/indicator.taro.tsx b/src/packages/indicator/indicator.taro.tsx
index f15e009456..6a54bfbe8a 100644
--- a/src/packages/indicator/indicator.taro.tsx
+++ b/src/packages/indicator/indicator.taro.tsx
@@ -80,7 +80,7 @@ export const Indicator: FunctionComponent<
   }
 
   function maybeFixedWidth() {
-    if (type === 'firstScreen' || type === 'slide') {
+    if (type === 'dualScreen' || type === 'slide') {
       return `${classPrefix}-fixed-width`
     }
     return ''
diff --git a/src/packages/indicator/indicator.tsx b/src/packages/indicator/indicator.tsx
index 3df00764b8..cb099eb335 100644
--- a/src/packages/indicator/indicator.tsx
+++ b/src/packages/indicator/indicator.tsx
@@ -75,7 +75,7 @@ export const Indicator: FunctionComponent<Partial<WebIndicatorProps>> = (
   }
 
   function maybeFixedWidth() {
-    if (type === 'firstScreen' || type === 'slide') {
+    if (type === 'dualScreen' || type === 'slide') {
       return `${classPrefix}-fixed-width`
     }
     return ''
diff --git a/src/types/spec/indicator/base.ts b/src/types/spec/indicator/base.ts
index 12fddfefb2..99ed251bbe 100644
--- a/src/types/spec/indicator/base.ts
+++ b/src/types/spec/indicator/base.ts
@@ -1,7 +1,7 @@
 import { BaseProps } from '../../base/props'
 import { UIType } from '../../base/atoms'
 
-export type IndicatorType = 'anchor' | 'slide' | 'firstScreen'
+export type IndicatorType = 'anchor' | 'slide' | 'dualScreen'
 export type IndicatorColor = Extract<UIType, 'primary' | 'default'>
 
 export interface BaseIndicator extends BaseProps {