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

修复bug

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