fix(next/antd): fix single value invalid in PreviewText.Cascader (#2940)

alibaba · Mar 16, 2022 · 33a54e7 · 33a54e7
1 parent 2883c33
commit 33a54e7
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 42 deletions.
diff --git a/packages/antd/docs/components/PreviewText.md b/packages/antd/docs/components/PreviewText.md
@@ -81,15 +81,17 @@ export default () => {
             x-decorator="FormItem"
             title="Cascader Preview"
             x-component="PreviewText.Cascader"
-            default={['hangzhou', 'yuhang']}
+            default={'yuhang'}
             enum={[
               {
                 label: 'Hangzhou',
                 value: 'hangzhou',
-              },
-              {
-                label: 'Yuhang',
-                value: 'yuhang',
+                children: [
+                  {
+                    label: 'Yuhang',
+                    value: 'yuhang',
+                  },
+                ],
               },
             ]}
           />
@@ -170,15 +172,17 @@ export default () => {
               x-decorator="FormItem"
               title="Cascader Preview"
               x-component="PreviewText.Cascader"
-              default={['hangzhou', 'yuhang']}
+              default={'yuhang'}
               enum={[
                 {
                   label: 'Hangzhou',
                   value: 'hangzhou',
-                },
-                {
-                  label: 'Yuhang',
-                  value: 'yuhang',
+                  children: [
+                    {
+                      label: 'Yuhang',
+                      value: 'yuhang',
+                    },
+                  ],
                 },
               ]}
             />

diff --git a/packages/antd/docs/components/PreviewText.zh-CN.md b/packages/antd/docs/components/PreviewText.zh-CN.md
@@ -80,15 +80,17 @@ export default () => {
             x-decorator="FormItem"
             title="Cascader预览"
             x-component="PreviewText.Cascader"
-            default={['hangzhou', 'yuhang']}
+            default={'yuhang'}
             enum={[
               {
                 label: '杭州',
                 value: 'hangzhou',
-              },
-              {
-                label: '余杭',
-                value: 'yuhang',
+                children: [
+                  {
+                    label: '余杭',
+                    value: 'yuhang',
+                  },
+                ],
               },
             ]}
           />
@@ -169,15 +171,17 @@ export default () => {
               x-decorator="FormItem"
               title="Cascader预览"
               x-component="PreviewText.Cascader"
-              default={['hangzhou', 'yuhang']}
+              default={'yuhang'}
               enum={[
                 {
                   label: '杭州',
                   value: 'hangzhou',
-                },
-                {
-                  label: '余杭',
-                  value: 'yuhang',
+                  children: [
+                    {
+                      label: '余杭',
+                      value: 'yuhang',
+                    },
+                  ],
                 },
               ]}
             />

diff --git a/packages/antd/src/preview-text/index.tsx b/packages/antd/src/preview-text/index.tsx
@@ -213,7 +213,7 @@ const Cascader: React.FC<CascaderProps> = observer((props) => {
     ? props.options
     : []
   const getSelected = () => {
-    return isArr(props.value) ? props.value : []
+    return isArr(props.value) ? props.value : [props.value]
   }
   const getLabels = () => {
     const selected = getSelected()

diff --git a/packages/next/docs/components/PreviewText.md b/packages/next/docs/components/PreviewText.md
@@ -53,15 +53,17 @@ export default () => {
             x-decorator="FormItem"
             title="Cascader Preview"
             x-component="PreviewText.Cascader"
-            default={['hangzhou', 'yuhang']}
+            default={'yuhang'}
             enum={[
               {
                 label: 'Hangzhou',
                 value: 'hangzhou',
-              },
-              {
-                label: 'Yuhang',
-                value: 'yuhang',
+                children: [
+                  {
+                    label: 'Yuhang',
+                    value: 'yuhang',
+                  },
+                ],
               },
             ]}
           />
@@ -142,15 +144,17 @@ export default () => {
               x-decorator="FormItem"
               title="Cascader Preview"
               x-component="PreviewText.Cascader"
-              default={['hangzhou', 'yuhang']}
+              default={'yuhang'}
               enum={[
                 {
                   label: 'Hangzhou',
                   value: 'hangzhou',
-                },
-                {
-                  label: 'Yuhang',
-                  value: 'yuhang',
+                  children: [
+                    {
+                      label: 'Yuhang',
+                      value: 'yuhang',
+                    },
+                  ],
                 },
               ]}
             />

diff --git a/packages/next/docs/components/PreviewText.zh-CN.md b/packages/next/docs/components/PreviewText.zh-CN.md
@@ -53,15 +53,17 @@ export default () => {
             x-decorator="FormItem"
             title="Cascader预览"
             x-component="PreviewText.Cascader"
-            default={['hangzhou', 'yuhang']}
+            default={'yuhang'}
             enum={[
               {
                 label: '杭州',
                 value: 'hangzhou',
-              },
-              {
-                label: '余杭',
-                value: 'yuhang',
+                children: [
+                  {
+                    label: '余杭',
+                    value: 'yuhang',
+                  },
+                ],
               },
             ]}
           />
@@ -142,15 +144,17 @@ export default () => {
               x-decorator="FormItem"
               title="Cascader预览"
               x-component="PreviewText.Cascader"
-              default={['hangzhou', 'yuhang']}
+              default={'yuhang'}
               enum={[
                 {
                   label: '杭州',
                   value: 'hangzhou',
-                },
-                {
-                  label: '余杭',
-                  value: 'yuhang',
+                  children: [
+                    {
+                      label: '余杭',
+                      value: 'yuhang',
+                    },
+                  ],
                 },
               ]}
             />

diff --git a/packages/next/src/preview-text/index.tsx b/packages/next/src/preview-text/index.tsx
@@ -208,7 +208,7 @@ const Cascader: React.FC<CascaderProps> = observer((props) => {
     ? props.dataSource
     : []
   const getSelected = () => {
-    return isArr(props.value) ? props.value : []
+    return isArr(props.value) ? props.value : [props.value]
   }
   const getLabels = () => {
     const selected = getSelected()