提交 d8b1bc74 authored 作者: 徐立's avatar 徐立

解决场景设计器使用时崩溃问题

上级 6c26bef9
......@@ -1163,8 +1163,8 @@ export default class tableCom extends Component {
formCode: this.props.formCode,
formId: this.props.formId,
isEdit: this.props.isEdit,
taskAssignee:this.props.taskAssignee,
userId:this.props.userId
taskAssignee: this.props.taskAssignee,
userId: this.props.userId,
},
this.props.index,
this.props.fatherCode,
......@@ -1181,7 +1181,7 @@ export default class tableCom extends Component {
closeModal: this.closeModal,
render: this.getRender,
base64: getBase64,
form:this.props.form
form: this.props.form,
},
functionObj,
this.props.routerState,
......@@ -1454,17 +1454,17 @@ export default class tableCom extends Component {
isEdit,
datas,
taskAssignee,
userId
userId,
} = this.props;
const { options, labels, selectDis, modalCode, modalTitle, modalInit, modalProps } = this.state;
const { getFieldDecorator, getFieldError, getFieldProps } = this.props.form;
const disabled = json != null ? json.disabled : false;
const permRank = json !=null ?(json.permRank!=null?json.permRank:0):0;
const permRank = json != null ? (json.permRank != null ? json.permRank : 0) : 0;
if (json == null) {
return <></>;
}
//私有
if(!isEdit&&permRank==1&&taskAssignee!=userId){
if (!isEdit && permRank == 1 && taskAssignee != userId) {
return <></>;
}
if (json.comName == 'QRCode') {
......@@ -1504,8 +1504,8 @@ export default class tableCom extends Component {
initialValue: fk,
})(<Input type="hidden" />)}{' '}
<ZdyTable
taskAssignee={taskAssignee}
userId={userId}
taskAssignee={taskAssignee}
userId={userId}
key={fk}
modalInit={modalInit}
datas={datas}
......@@ -1641,7 +1641,10 @@ export default class tableCom extends Component {
<>
<ul>
{files.map((f, index2) => {
if (!this.props.isPrint&&(f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1)){
if (
!this.props.isPrint &&
(f.path.indexOf('.png') != -1 || f.path.indexOf('.jpg') != -1)
) {
return (
<img
key={index2}
......@@ -2056,7 +2059,7 @@ export default class tableCom extends Component {
// />
// );
// }
if (get === 'web'&&!this.props.isPrint) {
if (get === 'web' && !this.props.isPrint) {
return (
<li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} />
......@@ -2088,7 +2091,7 @@ export default class tableCom extends Component {
// />
// );
// }
if (get === 'web'||!this.props.isPrint) {
if (get === 'web' || !this.props.isPrint) {
return (
<li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} />
......@@ -2615,6 +2618,7 @@ export default class tableCom extends Component {
break;
case 'Select':
console.log();
cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue,
rules:
......@@ -2630,7 +2634,7 @@ export default class tableCom extends Component {
style={{ width: json.width }}
optionFilterProp="children"
getPopupContainer={
this.props.isDynamic
this.props.isDynamic && document.querySelector('#dynamic_div')
? () => {
return document.querySelector('#dynamic_div');
}
......@@ -3181,8 +3185,8 @@ export default class tableCom extends Component {
title={modalTitle}
>
<ZdyTable
taskAssignee={taskAssignee}
userId={userId}
taskAssignee={taskAssignee}
userId={userId}
modalInit={modalInit}
key={modalCode}
datas={datas}
......@@ -3215,8 +3219,8 @@ export default class tableCom extends Component {
title={modalTitle}
>
<ZdyTable
taskAssignee={taskAssignee}
userId={userId}
taskAssignee={taskAssignee}
userId={userId}
modalInit={modalInit}
key={modalCode}
datas={datas}
......@@ -3257,8 +3261,8 @@ export default class tableCom extends Component {
title={modalTitle}
>
<ZdyTable
taskAssignee={taskAssignee}
userId={userId}
taskAssignee={taskAssignee}
userId={userId}
modalInit={modalInit}
key={modalCode}
datas={datas}
......@@ -3293,8 +3297,8 @@ export default class tableCom extends Component {
title={modalTitle}
>
<ZdyTable
taskAssignee={taskAssignee}
userId={userId}
taskAssignee={taskAssignee}
userId={userId}
modalInit={modalInit}
key={modalCode}
datas={datas}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论