提交 5124493b authored 作者: 徐立's avatar 徐立

修复bug

上级 07ef83e1
...@@ -621,8 +621,7 @@ export default class ZdyTable extends Component { ...@@ -621,8 +621,7 @@ export default class ZdyTable extends Component {
...styles, ...styles,
display: display:
cell.content && cell.content &&
(cell.content.comName === 'InputHidden' || cell.content.comName === 'InputHidden' &&
cell.content.comName === 'PartForm') &&
'none', 'none',
}} }}
> >
......
...@@ -129,11 +129,7 @@ export default class isNewTable extends Component { ...@@ -129,11 +129,7 @@ export default class isNewTable extends Component {
return ( return (
<Col <Col
style={{ style={{
display: display: ary.content && ary.content.comName === 'InputHidden' && 'none',
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
...styles, ...styles,
}} }}
span={ary.content?.labelSpan} span={ary.content?.labelSpan}
...@@ -175,11 +171,7 @@ export default class isNewTable extends Component { ...@@ -175,11 +171,7 @@ export default class isNewTable extends Component {
<Col <Col
span={24} span={24}
style={{ style={{
display: display: ary.content && ary.content.comName === 'InputHidden' && 'none',
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
...styles, ...styles,
}} }}
> >
...@@ -256,11 +248,7 @@ export default class isNewTable extends Component { ...@@ -256,11 +248,7 @@ export default class isNewTable extends Component {
width: '100%', width: '100%',
height: '100%', height: '100%',
...styles, ...styles,
display: display: ary.content && ary.content.comName === 'InputHidden' && 'none',
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
}} }}
> >
<TableCom <TableCom
...@@ -300,11 +288,7 @@ export default class isNewTable extends Component { ...@@ -300,11 +288,7 @@ export default class isNewTable extends Component {
<Card.Body <Card.Body
style={{ style={{
// textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right' // textAlign:ary.content&&ary.content.comName === 'Table'?"left":'right'
display: display: ary.content && ary.content.comName === 'InputHidden' && 'none',
ary.content &&
(ary.content.comName === 'InputHidden' ||
ary.content.comName === 'PartForm') &&
'none',
}} }}
> >
{' '} {' '}
......
...@@ -1469,7 +1469,6 @@ export default class tableCom extends Component { ...@@ -1469,7 +1469,6 @@ export default class tableCom extends Component {
} }
if (json.comName == 'PartForm') { if (json.comName == 'PartForm') {
const fk = this.props.form.getFieldValue(this.props.uuid) || json.childFormKey; const fk = this.props.form.getFieldValue(this.props.uuid) || json.childFormKey;
if (fk == null) { if (fk == null) {
return <></>; return <></>;
} }
...@@ -1947,6 +1946,9 @@ export default class tableCom extends Component { ...@@ -1947,6 +1946,9 @@ export default class tableCom extends Component {
if (end != null) ivs.push(moment(parseInt(init[end.base52]))); if (end != null) ivs.push(moment(parseInt(init[end.base52])));
} }
if (begin != null && end != null) { if (begin != null && end != null) {
if (!obj[begin.base52]) {
cm = <span>暂无</span>;
} else {
cm = ( cm = (
<span> <span>
{moment(parseInt(obj[begin.base52])).format( {moment(parseInt(obj[begin.base52])).format(
...@@ -1958,6 +1960,7 @@ export default class tableCom extends Component { ...@@ -1958,6 +1960,7 @@ export default class tableCom extends Component {
)} )}
</span> </span>
); );
}
} else { } else {
cm = ''; cm = '';
} }
...@@ -2858,7 +2861,8 @@ export default class tableCom extends Component { ...@@ -2858,7 +2861,8 @@ export default class tableCom extends Component {
case 'RichText': case 'RichText':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: { editorState: changeToDraftState(initValue) }, initialValue: { editorState: changeToDraftState(initValue) },
rules: json.vlds && json.vlds.length > 0 rules:
json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请输入' }], : [{ required: required, message: '请输入' }],
})(<DraftEditor placeholder={json.placeholder} />); })(<DraftEditor placeholder={json.placeholder} />);
...@@ -2877,7 +2881,8 @@ export default class tableCom extends Component { ...@@ -2877,7 +2881,8 @@ export default class tableCom extends Component {
case 'LocationCom': case 'LocationCom':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: {}, initialValue: {},
rules: json.vlds && json.vlds.length > 0 rules:
json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请进行定位' }], : [{ required: required, message: '请进行定位' }],
})( })(
...@@ -2939,7 +2944,8 @@ export default class tableCom extends Component { ...@@ -2939,7 +2944,8 @@ export default class tableCom extends Component {
case 'ImgUploadCom': case 'ImgUploadCom':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
rules: json.vlds && json.vlds.length > 0 rules:
json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请上传图片' }], : [{ required: required, message: '请上传图片' }],
})(<ImgUploadCom json={json} disabled={disabled} />); })(<ImgUploadCom json={json} disabled={disabled} />);
...@@ -2958,7 +2964,8 @@ export default class tableCom extends Component { ...@@ -2958,7 +2964,8 @@ export default class tableCom extends Component {
case 'Signature': case 'Signature':
cm = getFieldDecorator(dataColumn.base52, { cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue, initialValue: initValue,
rules: json.vlds && json.vlds.length > 0 rules:
json.vlds && json.vlds.length > 0
? json.vlds ? json.vlds
: [{ required: required, message: '请进行签名' }], : [{ required: required, message: '请进行签名' }],
})( })(
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论