p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Subform modal 弹出效果优化 & 解决按钮多了个 } 的问题

This commit is contained in:
liaoxuezhi 2019-10-22 17:12:10 +08:00
parent c35d08783b
commit 0cf5cbbfcd
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/renderers/Form/SubForm.tsx
View File

@ -179,15 +179,17 @@ export default class SubFormControl extends React.PureComponent<SubFormProps, Su
data-tooltip="编辑详情"
data-position="bottom"
>
{(value && labelField && value[labelField] && stripTag(value[labelField]))
|| render('label',
{
type: 'tpl',
tpl: btnLabel
},
{
data
})}
{(value && labelField && value[labelField] && stripTag(value[labelField])) ||
render(
'label',
{
type: 'tpl',
tpl: btnLabel
},
{
data
}
)}
</span>
</div>
))
@ -225,16 +227,17 @@ export default class SubFormControl extends React.PureComponent<SubFormProps, Su
data-position="bottom"
>
<span className={`${ns}SubForm-valueLabel`}>
{(value && labelField && value[labelField] && stripTag(value[labelField]))
|| render('label',
{
type: 'tpl',
tpl: btnLabel
},
{
data
}
)}}
{(value && labelField && value[labelField] && stripTag(value[labelField])) ||
render(
'label',
{
type: 'tpl',
tpl: btnLabel
},
{
data
}
)}
</span>
</div>
</div>
@ -248,16 +251,12 @@ export default class SubFormControl extends React.PureComponent<SubFormProps, Su
return (
<div className={cx(`${ns}SubFormControl`, className)}>
{multiple ? this.renderMultipe() : this.renderSingle()}
{openedIndex !== -1
? render(`dalog/${openedIndex}`, this.buildDialogSchema(), {
onClose: this.close,
onConfirm: this.handleDialogConfirm,
data: createObject(
data,
(multiple ? Array.isArray(value) && value[openedIndex] : value) || {}
)
})
: null}
{render(`dalog/${openedIndex}`, this.buildDialogSchema(), {
show: openedIndex !== -1,
onClose: this.close,
onConfirm: this.handleDialogConfirm,
data: createObject(data, (multiple ? Array.isArray(value) && value[openedIndex] : value) || {})
})}
</div>
);
}