feat(next/antd): add options param in SelectTable onChange props (#2842)

alibaba · Feb 21, 2022 · 89d8026 · 89d8026
1 parent 28a5853
commit 89d8026
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 34 deletions.
diff --git a/packages/antd/docs/components/SelectTable.md b/packages/antd/docs/components/SelectTable.md
@@ -86,7 +86,6 @@ export default () => {
           x-component-props={{
             bordered: false,
             showSearch: true,
-            optionFilterProp: 'name',
             optionAsValue: true,
           }}
           enum={[

diff --git a/packages/antd/docs/components/SelectTable.zh-CN.md b/packages/antd/docs/components/SelectTable.zh-CN.md
@@ -86,7 +86,6 @@ export default () => {
           x-component-props={{
             bordered: false,
             showSearch: true,
-            optionFilterProp: 'name',
             optionAsValue: true,
           }}
           enum={[

diff --git a/packages/antd/src/select-table/index.tsx b/packages/antd/src/select-table/index.tsx
@@ -30,7 +30,7 @@ export interface ISelectTableProps extends TableProps<any> {
   filterOption?: IFilterOption
   filterSort?: IFilterSort
   onSearch?: (keyword: string) => void
-  onChange?: (value: any) => void
+  onChange?: (value: any, options: any) => void
   value?: any
 }
 
@@ -146,15 +146,17 @@ export const SelectTable: ComposedSelectTable = observer((props) => {
     if (readOnly) {
       return
     }
-    let outputValue = optionAsValue
-      ? records.map((item) => {
-          const validItem = { ...item }
-          delete validItem['__formily_key__']
-          return validItem
-        })
-      : selectedRowKeys
-    outputValue = mode === 'single' ? outputValue[0] : outputValue
-    onChange?.(outputValue)
+    let outputOptions = records.map((item) => {
+      const validItem = { ...item }
+      delete validItem['__formily_key__']
+      return validItem
+    })
+    let outputValue = optionAsValue ? outputOptions : selectedRowKeys
+    if (mode === 'single') {
+      outputValue = outputValue[0]
+      outputOptions = outputOptions[0]
+    }
+    onChange?.(outputValue, outputOptions)
   }
 
   const onRowClick = (record) => {

diff --git a/packages/next/docs/components/SelectTable.md b/packages/next/docs/components/SelectTable.md
@@ -86,7 +86,6 @@ export default () => {
           x-component-props={{
             hasBorder: false,
             showSearch: true,
-            optionFilterProp: 'name',
             optionAsValue: true,
           }}
           enum={[

diff --git a/packages/next/docs/components/SelectTable.zh-CN.md b/packages/next/docs/components/SelectTable.zh-CN.md
@@ -86,7 +86,6 @@ export default () => {
           x-component-props={{
             hasBorder: false,
             showSearch: true,
-            optionFilterProp: 'name',
             optionAsValue: true,
           }}
           enum={[

diff --git a/packages/next/src/select-table/index.tsx b/packages/next/src/select-table/index.tsx
@@ -20,7 +20,8 @@ export interface ISelectTableColumnProps extends ColumnProps {
   key: React.ReactText
 }
 
-export interface ISelectTableProps extends Omit<TableProps, 'primaryKey'> {
+export interface ISelectTableProps
+  extends Omit<TableProps, 'primaryKey' | 'onChange'> {
   mode?: 'multiple' | 'single'
   dataSource?: any[]
   optionAsValue?: boolean
@@ -30,7 +31,7 @@ export interface ISelectTableProps extends Omit<TableProps, 'primaryKey'> {
   filterOption?: IFilterOption
   filterSort?: IFilterSort
   onSearch?: (keyword: string) => void
-  onChange?: (value: any) => void
+  onChange?: (value: any, options: any) => void
   value?: any
   rowSelection?: TableProps['rowSelection'] & {
     checkStrictly?: boolean
@@ -149,15 +150,17 @@ export const SelectTable: ComposedSelectTable = observer((props) => {
     if (readOnly) {
       return
     }
-    let outputValue = optionAsValue
-      ? records.map((item) => {
-          const validItem = { ...item }
-          delete validItem['__formily_key__']
-          return validItem
-        })
-      : selectedRowKeys
-    outputValue = mode === 'single' ? outputValue[0] : outputValue
-    onChange?.(outputValue)
+    let outputOptions = records.map((item) => {
+      const validItem = { ...item }
+      delete validItem['__formily_key__']
+      return validItem
+    })
+    let outputValue = optionAsValue ? outputOptions : selectedRowKeys
+    if (mode === 'single') {
+      outputValue = outputValue[0]
+      outputOptions = outputOptions[0]
+    }
+    onChange?.(outputValue, outputOptions)
   }
 
   const onRowClick = (record) => {

diff --git a/packages/next/src/select-table/useCheckSlackly.tsx b/packages/next/src/select-table/useCheckSlackly.tsx
@@ -1,3 +1,5 @@
+import { isArr } from '@formily/shared'
+
 /**
  * 获取该字段Checkbox的indeterminate属性
  * @param record 字段项
@@ -29,15 +31,17 @@ const getCheckedProps = (record: any, primaryKey: string, selected: any[]) => {
  * @param primaryKey 键名称
  * @returns 键值数组集合
  */
-const getTreeKeys = (tree: any[] = [], primaryKey: string) =>
-  tree.reduce(
-    (prev, current) => [
-      ...prev,
-      current[primaryKey],
-      ...getTreeKeys(current?.children, primaryKey),
-    ],
-    []
-  )
+const getTreeKeys = (tree: any[], primaryKey: string) =>
+  isArr(tree)
+    ? tree.reduce(
+        (prev, current) => [
+          ...prev,
+          current[primaryKey],
+          ...getTreeKeys(current?.children, primaryKey),
+        ],
+        []
+      )
+    : []
 
 /**
  * 获取最终选中值（添加选中所有子元素的父元素，或移除未选中所有子元素的父元素）