Commit 8c457290 by zhaochengxiang

修改模型问题

parent 848f7482
...@@ -87,7 +87,8 @@ const ImportAction = (props) => { ...@@ -87,7 +87,8 @@ const ImportAction = (props) => {
setModelerData(newModelerData) setModelerData(newModelerData)
onChange && onChange(newModelerData); onChange && onChange(newModelerData);
validateDataModel({ ...newModelerData, ...(form.getFieldsValue()) }); validateDataModel(newModelerData);
} }
}) })
} }
...@@ -172,8 +173,7 @@ const ImportAction = (props) => { ...@@ -172,8 +173,7 @@ const ImportAction = (props) => {
const onHeaderChange = (changedValues, allValues) => { const onHeaderChange = (changedValues, allValues) => {
if (changedValues.hasOwnProperty('name')) { if (changedValues.hasOwnProperty('name')) {
const newModelerData = {...modelerData, name: allValues.name, cnName: allValues.cnName}; validateDataModel(modelerData);
validateDataModel(newModelerData);
} }
} }
...@@ -193,10 +193,13 @@ const ImportAction = (props) => { ...@@ -193,10 +193,13 @@ const ImportAction = (props) => {
} }
const validateDataModel = (data) => { const validateDataModel = (data) => {
const row = form.getFieldsValue();
dispatch({ dispatch({
type: 'datamodel.validateDataModel', type: 'datamodel.validateDataModel',
payload: { payload: {
data: data, data: { ...data, name: row.name||'', cnName: row.cnName||'' },
}, },
callback: _data => { callback: _data => {
setValidateReports(_data||[]); setValidateReports(_data||[]);
......
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