fix(antd/next): fix PreviewText.Cascader bug (#2969)

alibaba · Mar 22, 2022 · 9990b66 · 9990b66
1 parent 06629b0
commit 9990b66
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/antd/src/preview-text/index.tsx b/packages/antd/src/preview-text/index.tsx
@@ -213,13 +213,15 @@ const Cascader: React.FC<CascaderProps> = observer((props) => {
     ? props.options
     : []
   const getSelected = () => {
-    return isArr(props.value) ? props.value : [props.value]
+    return props.multiple
+      ? props.value.map((item) => item[item.length - 1])
+      : props.value.slice(props.value.length - 1)
   }
   const getLabels = () => {
     const selected = getSelected()
     const labels = getValueByValue(dataSource, selected)
       ?.filter((item) => isValid(item))
-      ?.map((item) => item?.whole.join('/'))
+      ?.map((item) => item?.whole?.join('/'))
       .join(', ')
     return labels || placeholder
   }

diff --git a/packages/next/src/preview-text/index.tsx b/packages/next/src/preview-text/index.tsx
@@ -208,13 +208,13 @@ const Cascader: React.FC<CascaderProps> = observer((props) => {
     ? props.dataSource
     : []
   const getSelected = () => {
-    return isArr(props.value) ? props.value : [props.value]
+    return props.multiple ? props.value : [props.value]
   }
   const getLabels = () => {
     const selected = getSelected()
     const labels = getValueByValue(dataSource, selected)
       ?.filter((item) => isValid(item))
-      ?.map((item) => item?.whole.join('/'))
+      ?.map((item) => item?.whole?.join('/'))
       .join(', ')
     return labels || placeholder
   }