提交 9027c58d authored 作者: 徐立's avatar 徐立

优化代码

上级 074be2ba
...@@ -67,7 +67,8 @@ export default class ZdyTable extends Component { ...@@ -67,7 +67,8 @@ export default class ZdyTable extends Component {
} }
let val = postData let val = postData
/** try{
/**
* 数据源不同进行以下区别处理 * 数据源不同进行以下区别处理
* this.props.table有传入值表明需要渲染流程中最新表单 * this.props.table有传入值表明需要渲染流程中最新表单
*/ */
...@@ -211,6 +212,9 @@ export default class ZdyTable extends Component { ...@@ -211,6 +212,9 @@ export default class ZdyTable extends Component {
this.props.form.setFieldsValue(formDeafault) this.props.form.setFieldsValue(formDeafault)
} }
}); });
} catch(e) {
console.log(`公式配置有误`, e)
}
} }
componentWillReceiveProps(nextProps){ componentWillReceiveProps(nextProps){
let { let {
...@@ -226,53 +230,91 @@ export default class ZdyTable extends Component { ...@@ -226,53 +230,91 @@ export default class ZdyTable extends Component {
return return
} }
let val = postData try{
/** let val = postData
* 数据源不同进行以下区别处理 /**
* this.props.table有传入值表明需要渲染流程中最新表单 * 数据源不同进行以下区别处理
*/ * this.props.table有传入值表明需要渲染流程中最新表单
if(isForm){ // 由表格的操作按钮进入 */
const mapData = {}; if(isForm){ // 由表格的操作按钮进入
const sqlData={} const mapData = {};
const dataObjs = val.form.dataObjModels; const sqlData={}
for (var i = 0; i < dataObjs.length; i++) { const dataObjs = val.form.dataObjModels;
const dob = dataObjs[i]; for (var i = 0; i < dataObjs.length; i++) {
for (var j = 0; j < dob.columnModels.length; j++) { const dob = dataObjs[i];
mapData[dob.columnModels[j].base52] = dob.columnModels[j]; for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j];
}
}
const sqls = val.form.sqlModels
for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
}
} }
const obj = JSON.parse(val.form.content);
const xxx = obj.datas[obj.init];
this.setState({
datas:obj.datas,
width: this.props.table?obj.datas[val.formKey].width:xxx.width,
isBorder:this.props.table?obj.datas[val.formKey].isBorder:xxx.isBorder,
mapData,
currentFormKey:this.props.table?val.formKey:obj.init,
sqlData,
isEdit:this.props.formKey?false:true,
items: this.props.table?obj.datas[val.formKey].items:xxx.items,
defaultValues:val.form.defaultValues,
appId: val.appId,
isReady:true,
formConfig:xxx
});
return
} }
const sqls = val.form.sqlModels if(isCg === 'yes'){// 用户从编辑按钮进入
for (var i = 0; i < sqls.length; i++) { const mapData = {};
const dob = sqls[i].dataObjModel; const sqlData={};
for (var j = 0; j < dob.columnModels.length; j++) { const sqls = val.unifiedServicePatternModel.sqlModels
for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j]; sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
}
}
const dataObjs = val.unifiedServicePatternModel.dataObjModels;
for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i];
for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j];
}
} }
const obj = JSON.parse(val.unifiedServicePatternModel.content);
const xxx = obj.datas[obj.init];
this.setState({
items: xxx.items,
init: {...this.state.init,...JSON.parse(val.content)},
datas:obj.datas,
isEdit:this.props.formKey?false:true,
currentFormKey:obj.init,
width: xxx.width,
isBorder: xxx.isBorder,
mapData,sqlData,defaultValues:val.unifiedServicePatternModel.defaultValues,
appId: val.appId,
isReady:true,
formConfig:xxx,
defaultBinds:this.props.table?obj.datas[val.taskFormKey].defaultBinds:xxx.defaultBinds,
});
return
} }
const obj = JSON.parse(val.form.content);
const xxx = obj.datas[obj.init];
this.setState({
datas:obj.datas,
width: this.props.table?obj.datas[val.formKey].width:xxx.width,
isBorder:this.props.table?obj.datas[val.formKey].isBorder:xxx.isBorder,
mapData,
currentFormKey:this.props.table?val.formKey:obj.init,
sqlData,
isEdit:this.props.formKey?false:true,
items: this.props.table?obj.datas[val.formKey].items:xxx.items,
defaultValues:val.form.defaultValues,
appId: val.appId,
isReady:true,
formConfig:xxx
});
return
}
if(isCg === 'yes'){// 用户从编辑按钮进入
const mapData = {}; const mapData = {};
const sqlData={}; const sqlData={};
const sqls = val.unifiedServicePatternModel.sqlModels const sqls = val.unifiedServicePatternModel.sqlModels
for (var i = 0; i < sqls.length; i++) { for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel; const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) { for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j]; sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
} }
...@@ -280,65 +322,31 @@ export default class ZdyTable extends Component { ...@@ -280,65 +322,31 @@ export default class ZdyTable extends Component {
const dataObjs = val.unifiedServicePatternModel.dataObjModels; const dataObjs = val.unifiedServicePatternModel.dataObjModels;
for (var i = 0; i < dataObjs.length; i++) { for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i]; const dob = dataObjs[i];
for (var j = 0; j < dob.columnModels.length; j++) { for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j]; mapData[dob.columnModels[j].base52] = dob.columnModels[j];
} }
} }
const obj = JSON.parse(val.unifiedServicePatternModel.content); const obj = JSON.parse(val.unifiedServicePatternModel.content);
const xxx = obj.datas[obj.init]; const xxx = obj.datas[this.props.formKey?this.props.formKey:obj.init]; // 是否是存在历史表单传入值
this.setState({ this.setState({
items: xxx.items, appId: val.id,
init: {...this.state.init,...JSON.parse(val.content)}, datas:obj.datas,
datas:obj.datas, mapData,sqlData, defaultValues:val.unifiedServicePatternModel.defaultValues,
isEdit:this.props.formKey?false:true, isEdit:this.props.formKey?false:true,
currentFormKey:obj.init, currentFormKey:this.props.formKey?this.props.formKey:val.taskFormKey?val.taskFormKey:obj.init,
width: xxx.width, defaultBinds:this.props.table?obj.datas[val.taskFormKey].defaultBinds:xxx.defaultBinds,
isBorder: xxx.isBorder, width: this.props.table?obj.datas[val.taskFormKey].width:xxx.width,
mapData,sqlData,defaultValues:val.unifiedServicePatternModel.defaultValues, isBorder: this.props.table?obj.datas[val.taskFormKey].isBorder:xxx.isBorder,
appId: val.appId, items: this.props.table?obj.datas[val.taskFormKey].items:xxx.items,
isReady:true, isReady:true,
formConfig:xxx, init: {...this.state.init,...val.isSecond?this.props.obj:{}},
defaultBinds:this.props.table?obj.datas[val.taskFormKey].defaultBinds:xxx.defaultBinds, formConfig:xxx
// init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置
}); });
return } catch(e) {
} console.log(`公式配置有误`, e)
const mapData = {};
const sqlData={};
const sqls = val.unifiedServicePatternModel.sqlModels
for (var i = 0; i < sqls.length; i++) {
const dob = sqls[i].dataObjModel;
for (var j = 0; j < dob.columnModels.length; j++) {
sqlData[dob.columnModels[j].base52] = dob.columnModels[j];
}
}
const dataObjs = val.unifiedServicePatternModel.dataObjModels;
for (var i = 0; i < dataObjs.length; i++) {
const dob = dataObjs[i];
for (var j = 0; j < dob.columnModels.length; j++) {
mapData[dob.columnModels[j].base52] = dob.columnModels[j];
}
} }
const obj = JSON.parse(val.unifiedServicePatternModel.content);
const xxx = obj.datas[this.props.formKey?this.props.formKey:obj.init]; // 是否是存在历史表单传入值
this.setState({
appId: val.id,
datas:obj.datas,
mapData,sqlData, defaultValues:val.unifiedServicePatternModel.defaultValues,
isEdit:this.props.formKey?false:true,
currentFormKey:this.props.formKey?this.props.formKey:val.taskFormKey?val.taskFormKey:obj.init,
defaultBinds:this.props.table?obj.datas[val.taskFormKey].defaultBinds:xxx.defaultBinds,
width: this.props.table?obj.datas[val.taskFormKey].width:xxx.width,
isBorder: this.props.table?obj.datas[val.taskFormKey].isBorder:xxx.isBorder,
items: this.props.table?obj.datas[val.taskFormKey].items:xxx.items,
isReady:true,
init: {...this.state.init,...val.isSecond?this.props.obj:{}},
formConfig:xxx
// init:this.props.get==="mobile"?!!val.content?JSON.parse(val.content):'':{},// 移动端默认值设置
});
} }
checkAllHidden = (row) => { checkAllHidden = (row) => {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论