fix(next/designable-antd): fix Select bug && designable-antd spelling…

… error (#1934) * fix(next): fix Select cannot be selected when children is empty * fix(designable-antd): fix English spelling error
alibaba · Aug 3, 2021 · 739e8c1 · 739e8c1
1 parent 65259a0
commit 739e8c1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/designable/antd/playground/widgets/ActionsWidget.tsx b/designable/antd/playground/widgets/ActionsWidget.tsx
@@ -11,7 +11,7 @@ export const ActionsWidget = observer(() => (
       value={GlobalRegistry.getDesignerLanguage()}
       optionType="button"
       options={[
-        { label: 'Engligh', value: 'en-us' },
+        { label: 'English', value: 'en-us' },
         { label: '简体中文', value: 'zh-cn' },
       ]}
       onChange={(e) => {

diff --git a/packages/next/src/select/index.tsx b/packages/next/src/select/index.tsx
@@ -1,13 +1,33 @@
 import { connect, mapReadPretty, mapProps } from '@formily/react'
+import { isVoidField } from '@formily/core'
 import { Select as NextSelect } from '@alifd/next'
 import { PreviewText } from '../preview-text'
 import { mapSize, mapStatus } from '../__builtins__'
 
+const patchDataSource = (dataSource: any = []) => {
+  const removeEmptyChildren = (data: any) => {
+    const result = { ...data }
+    if (!result.children || result.children.length === 0) {
+      delete result.children
+    } else {
+      result.children = result.children.map(removeEmptyChildren)
+    }
+    return result
+  }
+  return dataSource.map(removeEmptyChildren)
+}
+
 export const Select = connect(
   NextSelect,
   mapProps(
-    {
-      dataSource: true,
+    (props, field) => {
+      if (isVoidField(field)) {
+        return props
+      }
+      return {
+        ...props,
+        dataSource: patchDataSource(props.dataSource ?? field?.dataSource),
+      }
     },
     mapSize,
     mapStatus