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

修改bug

上级 93a0e870
...@@ -39,7 +39,9 @@ export default class isNewTable extends Component { ...@@ -39,7 +39,9 @@ export default class isNewTable extends Component {
concealModel, concealModel,
taskAssignee, taskAssignee,
currentFormTitle, currentFormTitle,
getCellValue getCellValue,
hfInstance,
getCurrentFormTitle
} = this.props; } = this.props;
if (!isEdit) { if (!isEdit) {
// 展示栏 暂不做处理 // 展示栏 暂不做处理
...@@ -91,6 +93,7 @@ export default class isNewTable extends Component { ...@@ -91,6 +93,7 @@ export default class isNewTable extends Component {
i={i} i={i}
j={j} j={j}
index={index} index={index}
getCurrentFormTitle
fatherCode={fatherCode} fatherCode={fatherCode}
datas={datas} datas={datas}
isEdit={isEdit} isEdit={isEdit}
...@@ -98,6 +101,8 @@ export default class isNewTable extends Component { ...@@ -98,6 +101,8 @@ export default class isNewTable extends Component {
formKey={currentFormKey} formKey={currentFormKey}
currentFormTitle currentFormTitle
getCellValue getCellValue
hfInstance
initExcel={this.props.initExcel}
init={init} init={init}
get={get} get={get}
key={j} key={j}
...@@ -168,9 +173,12 @@ export default class isNewTable extends Component { ...@@ -168,9 +173,12 @@ export default class isNewTable extends Component {
fatherCode={fatherCode} fatherCode={fatherCode}
datas={datas} datas={datas}
isEdit={isEdit} isEdit={isEdit}
getCurrentFormTitle
importExcel={this.props.importExcel}
fatherObj={this.props.fatherObj} fatherObj={this.props.fatherObj}
formKey={currentFormKey} formKey={currentFormKey}
currentFormTitle currentFormTitle
hfInstance
getCellValue getCellValue
init={init} init={init}
get={get} get={get}
...@@ -214,9 +222,12 @@ export default class isNewTable extends Component { ...@@ -214,9 +222,12 @@ export default class isNewTable extends Component {
datas={datas} datas={datas}
modalInit={modalInit} modalInit={modalInit}
isEdit={isEdit} isEdit={isEdit}
getCurrentFormTitle
fatherObj={this.props.fatherObj} fatherObj={this.props.fatherObj}
formKey={currentFormKey} formKey={currentFormKey}
importExcel={this.props.importExcel}
currentFormTitle currentFormTitle
hfInstance
getCellValue getCellValue
init={init} init={init}
get={get} get={get}
......
...@@ -1144,6 +1144,7 @@ export default class tableCom extends Component { ...@@ -1144,6 +1144,7 @@ export default class tableCom extends Component {
moment: moment, moment: moment,
sql: this.sqlUtil.bind(this, base52, json, callback), sql: this.sqlUtil.bind(this, base52, json, callback),
message: message, message: message,
importExcel:this.props.importExcel,
router: router, router: router,
uuid: UUID, uuid: UUID,
setValues: this.setValues.bind(this, base52, json), setValues: this.setValues.bind(this, base52, json),
...@@ -1483,12 +1484,16 @@ export default class tableCom extends Component { ...@@ -1483,12 +1484,16 @@ export default class tableCom extends Component {
if (formKey == fk) { if (formKey == fk) {
return <>片段表单key不能和自身相同</>; return <>片段表单key不能和自身相同</>;
} }
return ( return (
<> <>
{this.props.form.getFieldDecorator(this.props.uuid, { {this.props.form.getFieldDecorator(this.props.uuid, {
initialValue: fk, initialValue: fk,
})(<Input type="hidden" />)}{' '} })(<Input type="hidden" />)}{' '}
<ZdyTable <ZdyTable
hfInstance={this.props.hfInstance}
currentFormTitle={this.props.getCurrentFormTitle(fk)}
getCellValue={getCellValue}
taskAssignee={taskAssignee} taskAssignee={taskAssignee}
isWebPrint={this.props.isWebPrint || false} isWebPrint={this.props.isWebPrint || false}
userId={userId} userId={userId}
...@@ -2571,7 +2576,6 @@ export default class tableCom extends Component { ...@@ -2571,7 +2576,6 @@ export default class tableCom extends Component {
break; break;
case 'Select': case 'Select':
console.log();
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
rules: rules:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论