Commit 8843c41d by zhaochengxiang

微调

parent 062d3703
...@@ -83,7 +83,7 @@ const ImportAction = (props) => { ...@@ -83,7 +83,7 @@ const ImportAction = (props) => {
}, },
callback: data => { callback: data => {
let newModelerData = {...(data||{})}; let newModelerData = {...(data||{})};
newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesWhenTableChange(newModelerData) } newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesAfterTableChange(newModelerData) }
setModelerData(newModelerData) setModelerData(newModelerData)
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
...@@ -174,7 +174,7 @@ const ImportAction = (props) => { ...@@ -174,7 +174,7 @@ const ImportAction = (props) => {
let newModelerData = {...modelerData, ...{easyDataModelerDataModelAttributes: data}}; let newModelerData = {...modelerData, ...{easyDataModelerDataModelAttributes: data}};
newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesWhenTableChange(newModelerData) }; newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesAfterTableChange(newModelerData) };
setModelerData(newModelerData); setModelerData(newModelerData);
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
...@@ -203,7 +203,7 @@ const ImportAction = (props) => { ...@@ -203,7 +203,7 @@ const ImportAction = (props) => {
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
} }
const getIndicesWhenTableChange = (newModelerData) => { const getIndicesAfterTableChange = (newModelerData) => {
const newEasyDataModelerIndices = [...(newModelerData.easyDataModelerIndices||[])]; const newEasyDataModelerIndices = [...(newModelerData.easyDataModelerIndices||[])];
(newModelerData.easyDataModelerIndices||[]).forEach((easyDataModelerIndex, index) => { (newModelerData.easyDataModelerIndices||[]).forEach((easyDataModelerIndex, index) => {
......
...@@ -48,7 +48,7 @@ const AttributesInputItem = ({ indexedAttribute = null, indexedAttributeOrder = ...@@ -48,7 +48,7 @@ const AttributesInputItem = ({ indexedAttribute = null, indexedAttributeOrder =
</Select> </Select>
</Col> </Col>
<Col span={1}></Col> <Col span={1}></Col>
<Col span={2}> <Col span={1}>
<Tooltip title="删除"> <Tooltip title="删除">
<Button type="text" icon={<DeleteOutlined />} onClick={onDelete} /> <Button type="text" icon={<DeleteOutlined />} onClick={onDelete} />
</Tooltip> </Tooltip>
...@@ -466,6 +466,11 @@ const ImportActionIndex = (props) => { ...@@ -466,6 +466,11 @@ const ImportActionIndex = (props) => {
); );
} }
}, },
{
title: '',
dataIndex: '',
width: 200,
}
]; ];
const editableColumn = [ const editableColumn = [
......
...@@ -262,9 +262,7 @@ const ImportModal = (props) => { ...@@ -262,9 +262,7 @@ const ImportModal = (props) => {
title={title} title={title}
width={step===2?1300:520} width={step===2?1300:520}
maskClosable={false} maskClosable={false}
destroyOnClose
onCancel={() => { onCancel={() => {
setStep(0);
reset(); reset();
onCancel && onCancel(); onCancel && onCancel();
}} }}
......
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