From 50751136faacb021f8322645364f4bcc3f3453d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Fri, 12 Jul 2024 15:20:30 +0800
Subject: [PATCH] fix(form): Digit support stringMode

close https://github.com/ant-design/pro-components/issues/8553
---
 packages/field/src/components/Digit/index.tsx |  7 +-
 .../FieldSet/demos/components-other.tsx       | 42 +++++++++
 tests/form/__snapshots__/demo.test.ts.snap    | 94 +++++++++++++++++++
 3 files changed, 142 insertions(+), 1 deletion(-)

diff --git a/packages/field/src/components/Digit/index.tsx b/packages/field/src/components/Digit/index.tsx
index 1b907882d416..306435777841 100644
--- a/packages/field/src/components/Digit/index.tsx
+++ b/packages/field/src/components/Digit/index.tsx
@@ -58,9 +58,14 @@ const FieldDigit: ProFieldFC<FieldDigitProps> = (
       ...fractionDigits,
       ...(fieldProps?.intlProps || {}),
     }).format(Number(text) as number);
-    const dom = (
+
+    // 如果是 string 模式，什么都不要处理了
+    const dom = !fieldProps?.stringMode ? (
       <span ref={ref}>{fieldProps?.formatter?.(digit) || digit}</span>
+    ) : (
+      <span>{text}</span>
     );
+
     if (render) {
       return render(text, { mode: type, ...fieldProps }, dom);
     }
diff --git a/packages/form/src/components/FieldSet/demos/components-other.tsx b/packages/form/src/components/FieldSet/demos/components-other.tsx
index bf1943bf6a36..aef77663d297 100644
--- a/packages/form/src/components/FieldSet/demos/components-other.tsx
+++ b/packages/form/src/components/FieldSet/demos/components-other.tsx
@@ -1,5 +1,6 @@
 import {
   ProForm,
+  ProFormCascader,
   ProFormCheckbox,
   ProFormColorPicker,
   ProFormDigit,
@@ -171,6 +172,47 @@ const Demo = () => {
               },
             ]}
           />
+          <ProFormCascader
+            label="地址"
+            request={async () => [
+              {
+                value: 'zhejiang',
+                label: '浙江',
+                children: [
+                  {
+                    value: 'hangzhou',
+                    label: '杭州',
+                    children: [
+                      {
+                        value: 'xihu',
+                        label: '西湖',
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                value: 'jiangsu',
+                label: 'Jiangsu',
+                children: [
+                  {
+                    value: 'nanjing',
+                    label: 'Nanjing',
+                    children: [
+                      {
+                        value: 'zhonghuamen',
+                        label: 'Zhong Hua Men',
+                      },
+                    ],
+                  },
+                ],
+              },
+            ]}
+            fieldProps={{
+              changeOnSelect: true,
+            }}
+            name="area"
+          />
 
           <ProFormRadio.Group
             name="radio"
diff --git a/tests/form/__snapshots__/demo.test.ts.snap b/tests/form/__snapshots__/demo.test.ts.snap
index bf9c23e4ebbf..bb0952640baa 100644
--- a/tests/form/__snapshots__/demo.test.ts.snap
+++ b/tests/form/__snapshots__/demo.test.ts.snap
@@ -2605,6 +2605,100 @@ exports[`form demos > 📸 renders ./packages/form/src/components/FieldSet/demos
                   </div>
                 </div>
               </div>
+              <div
+                class="ant-space-item"
+              >
+                <div
+                  class="ant-form-item"
+                >
+                  <div
+                    class="ant-row ant-form-item-row"
+                  >
+                    <div
+                      class="ant-col ant-form-item-label"
+                    >
+                      <label
+                        class=""
+                        for="validate_other_area"
+                        title="地址"
+                      >
+                        地址
+                      </label>
+                    </div>
+                    <div
+                      class="ant-col ant-form-item-control"
+                    >
+                      <div
+                        class="ant-form-item-control-input"
+                      >
+                        <div
+                          class="ant-form-item-control-input-content"
+                        >
+                          <div
+                            class="ant-select ant-cascader ant-select-outlined ant-select-in-form-item ant-pro-field-cascader ant-select-single ant-select-allow-clear ant-select-show-arrow"
+                          >
+                            <div
+                              class="ant-select-selector"
+                            >
+                              <span
+                                class="ant-select-selection-search"
+                              >
+                                <input
+                                  aria-autocomplete="list"
+                                  aria-controls="validate_other_area_list"
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="validate_other_area_list"
+                                  autocomplete="off"
+                                  class="ant-select-selection-search-input"
+                                  id="validate_other_area"
+                                  readonly=""
+                                  role="combobox"
+                                  style="opacity: 0;"
+                                  type="search"
+                                  unselectable="on"
+                                  value=""
+                                />
+                              </span>
+                              <span
+                                class="ant-select-selection-placeholder"
+                              >
+                                请选择
+                              </span>
+                            </div>
+                            <span
+                              aria-hidden="true"
+                              class="ant-select-arrow"
+                              style="user-select: none;"
+                              unselectable="on"
+                            >
+                              <span
+                                aria-label="down"
+                                class="anticon anticon-down ant-select-suffix"
+                                role="img"
+                              >
+                                <svg
+                                  aria-hidden="true"
+                                  data-icon="down"
+                                  fill="currentColor"
+                                  focusable="false"
+                                  height="1em"
+                                  viewBox="64 64 896 896"
+                                  width="1em"
+                                >
+                                  <path
+                                    d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+                                  />
+                                </svg>
+                              </span>
+                            </span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
               <div
                 class="ant-space-item"
               >