Commit 117bd796 by zhaochengxiang

模型字段修改 分区字段跟着同步

parent 39f0fa62
...@@ -119,7 +119,9 @@ const ImportAction = (props) => { ...@@ -119,7 +119,9 @@ const ImportAction = (props) => {
}, },
callback: data => { callback: data => {
let newModelerData = {...(data||{})}; let newModelerData = {...(data||{})};
newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesAfterTableChange(newModelerData) } newModelerData = { ...newModelerData, ...{ easyDataModelerIndices: getIndicesAfterTableChange(newModelerData), partition: getPartitionAfterTableChange(newModelerData) } };
onPartitionChange(newModelerData.partition);
setModelerData(newModelerData) setModelerData(newModelerData)
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
...@@ -288,7 +290,9 @@ const ImportAction = (props) => { ...@@ -288,7 +290,9 @@ const ImportAction = (props) => {
let newModelerData = {...modelerData, ...{easyDataModelerDataModelAttributes: data}}; let newModelerData = {...modelerData, ...{easyDataModelerDataModelAttributes: data}};
newModelerData = { ...newModelerData, easyDataModelerIndices: getIndicesAfterTableChange(newModelerData) }; newModelerData = { ...newModelerData, ...{ easyDataModelerIndices: getIndicesAfterTableChange(newModelerData), partition: getPartitionAfterTableChange(newModelerData) } };
onPartitionChange(newModelerData.partition);
setModelerData(newModelerData); setModelerData(newModelerData);
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
...@@ -370,6 +374,28 @@ const ImportAction = (props) => { ...@@ -370,6 +374,28 @@ const ImportAction = (props) => {
return newEasyDataModelerIndices.filter(item => (item.indexedEasyDataModelAttributes||[]).length > 0); return newEasyDataModelerIndices.filter(item => (item.indexedEasyDataModelAttributes||[]).length > 0);
} }
const getPartitionAfterTableChange = (newModelerData) => {
const newPartition = {...newModelerData.partition};
const newKeys = [];
(newPartition.keys||[]).forEach((item, index) => {
const _index = (newModelerData.easyDataModelerDataModelAttributes||[]).findIndex(_item => item.iid === _item.iid);
if (_index !== -1) {
newKeys.push({...newModelerData.easyDataModelerDataModelAttributes[_index]});
}
})
newPartition.keys = newKeys;
if ((newKeys||[]).length === 0) return null;
return newPartition;
}
const onTabChange = (key) => { const onTabChange = (key) => {
setTabKey(key); setTabKey(key);
} }
......
...@@ -208,9 +208,7 @@ const ImportActionPartition = (props) => { ...@@ -208,9 +208,7 @@ const ImportActionPartition = (props) => {
setAttributes(modelerData.easyDataModelerDataModelAttributes||[]); setAttributes(modelerData.easyDataModelerDataModelAttributes||[]);
if (modelerData?.partition) { setData(modelerData?.partition);
setData(modelerData.partition);
}
}, [modelerData]) }, [modelerData])
......
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