Commit 1e367e13 authored by TZW's avatar TZW

Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

parents b824a20f 6ae71855
...@@ -1539,7 +1539,8 @@ function TableSelect({ item, value, onChange, params = {} }) { ...@@ -1539,7 +1539,8 @@ function TableSelect({ item, value, onChange, params = {} }) {
} }
/> />
); );
const Todo = (
const Todo = () => (
<EditTable <EditTable
actionRef={actionRef} actionRef={actionRef}
defaultValue={value} //调用接口合并初始值 defaultValue={value} //调用接口合并初始值
...@@ -1590,7 +1591,7 @@ function TableSelect({ item, value, onChange, params = {} }) { ...@@ -1590,7 +1591,7 @@ function TableSelect({ item, value, onChange, params = {} }) {
/> />
); );
const Done = ( const Done = () => (
<EditTable <EditTable
value={value} value={value}
rowKey={rowKey} rowKey={rowKey}
...@@ -1641,6 +1642,7 @@ function TableSelect({ item, value, onChange, params = {} }) { ...@@ -1641,6 +1642,7 @@ function TableSelect({ item, value, onChange, params = {} }) {
return ( return (
<div className="selecttable"> <div className="selecttable">
<Tabs <Tabs
destroyInactiveTabPane={true}
tabBarExtraContent={ tabBarExtraContent={
<div className="center"> <div className="center">
<Dropdown overlay={menu(value ?? [])}> <Dropdown overlay={menu(value ?? [])}>
...@@ -1663,10 +1665,12 @@ function TableSelect({ item, value, onChange, params = {} }) { ...@@ -1663,10 +1665,12 @@ function TableSelect({ item, value, onChange, params = {} }) {
} }
onChange={setactivetab} onChange={setactivetab}
items={[ items={[
{ label: '数据选择', key: 1, children: activetab == 1 && Todo }, { label: '数据选择', key: 1 },
{ label: `选择结果${value?.length ?? 0}`, key: 2, children: activetab == 2 && Done }, { label: `选择结果${value?.length ?? 0}`, key: 2 },
]} ]}
/> />
{activetab == 1 && <Todo />}
{activetab == 2 && <Done />}
</div> </div>
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment