提交 f304f334 authored 作者: tb53863844's avatar tb53863844

修改bug

上级 d80fc563
...@@ -98,7 +98,7 @@ export default class ZdyTable extends Component { ...@@ -98,7 +98,7 @@ export default class ZdyTable extends Component {
isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol, isRowCol: this.props.table ? obj.datas[val.formKey].isRowCol : xxx.isRowCol,
mapData, mapData,
currentFormKey: fk, currentFormKey: fk,
currentFormTitle:getCurrentFormTitle(obj,fk), currentFormTitle:this.getCurrentFormTitle(obj,fk),
sqlData, sqlData,
isEdit: !this.props.formKey, isEdit: !this.props.formKey,
items: this.props.table ? obj.datas[val.formKey].items : xxx.items, items: this.props.table ? obj.datas[val.formKey].items : xxx.items,
...@@ -150,7 +150,7 @@ export default class ZdyTable extends Component { ...@@ -150,7 +150,7 @@ export default class ZdyTable extends Component {
datas: obj.datas, datas: obj.datas,
isEdit: !this.props.formKey, isEdit: !this.props.formKey,
currentFormKey: obj.init, currentFormKey: obj.init,
currentFormTitle:getCurrentFormTitle(obj,obj.init), currentFormTitle:this.getCurrentFormTitle(obj,obj.init),
width: xxx.width, width: xxx.width,
isBorder: xxx.isBorder, isBorder: xxx.isBorder,
isRowCol: xxx.isRowCol, isRowCol: xxx.isRowCol,
...@@ -215,7 +215,7 @@ export default class ZdyTable extends Component { ...@@ -215,7 +215,7 @@ export default class ZdyTable extends Component {
defaultValues: val.unifiedServicePatternModel.defaultValues, defaultValues: val.unifiedServicePatternModel.defaultValues,
isEdit: !this.props.formKey, isEdit: !this.props.formKey,
currentFormKey: fk, currentFormKey: fk,
currentFormTitle:getCurrentFormTitle(obj,fk), currentFormTitle:this.getCurrentFormTitle(obj,fk),
defaultBinds: this.props.table defaultBinds: this.props.table
? obj.datas[val.taskFormKey].defaultBinds ? obj.datas[val.taskFormKey].defaultBinds
: xxx.defaultBinds, : xxx.defaultBinds,
......
...@@ -125,7 +125,6 @@ export default class ChildForm extends React.Component { ...@@ -125,7 +125,6 @@ export default class ChildForm extends React.Component {
if (datas == null) { if (datas == null) {
return <div>还没有配置子表单key</div>; return <div>还没有配置子表单key</div>;
} }
if (isMobile) { if (isMobile) {
return ( return (
<WingBlank size="lg"> <WingBlank size="lg">
......
...@@ -341,7 +341,7 @@ export default class tableCom extends Component { ...@@ -341,7 +341,7 @@ export default class tableCom extends Component {
return false; return false;
} }
} }
console.log('这不是个字符串');
}; };
/** /**
* 上传文件输入 * 上传文件输入
...@@ -1108,6 +1108,7 @@ export default class tableCom extends Component { ...@@ -1108,6 +1108,7 @@ export default class tableCom extends Component {
fun, fun,
); );
let obj; let obj;
if (!this.props.isEdit && this.props.fatherCode) { if (!this.props.isEdit && this.props.fatherCode) {
obj = { obj = {
...this.props.fatherObj, ...this.props.fatherObj,
...@@ -1116,6 +1117,7 @@ export default class tableCom extends Component { ...@@ -1116,6 +1117,7 @@ export default class tableCom extends Component {
}; };
} else { } else {
obj = { obj = {
...(this.props.fatherObj?this.props.fatherObj:{}),
...this.props.obj, ...this.props.obj,
...this.props.form.getFieldsValue(), ...this.props.form.getFieldsValue(),
...this.props.defaultValues[this.props.formKey], ...this.props.defaultValues[this.props.formKey],
...@@ -2172,7 +2174,7 @@ export default class tableCom extends Component { ...@@ -2172,7 +2174,7 @@ export default class tableCom extends Component {
case 'ChildForm': case 'ChildForm':
const xxxxx = obj[dataColumn.base52]; const xxxxx = obj[dataColumn.base52];
if (xxxxx == null) { if (xxxxx == null) {
cm = <></>; cm = <></>;Chil
break; break;
} }
if (Object.keys(xxxxx).length > 0) { if (Object.keys(xxxxx).length > 0) {
...@@ -2917,6 +2919,7 @@ export default class tableCom extends Component { ...@@ -2917,6 +2919,7 @@ export default class tableCom extends Component {
<ChildForm <ChildForm
rights={json.rights || []} rights={json.rights || []}
isMobile={get === 'mobile'} isMobile={get === 'mobile'}
fatherObj={obj}
isPreview={isPreview} isPreview={isPreview}
num={json.num} num={json.num}
min={json.min} min={json.min}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论