Commit 07b02bc0 authored by 涂伟's avatar 涂伟

fix: '1.关联表单配置优化2.xform组件升级'

parent e101f825
Pipeline #67911 waiting for manual action with stages
......@@ -122,7 +122,7 @@
"js-calendar-converter": "0.0.4",
"lodash": "4.17.11",
"minimist": "1.2.0",
"panda-xform": "^1.5.9",
"panda-xform": "^2.1.1",
"parseForm": "^2.2.4",
"prop-types": "15.7.2",
"quill": "^1.3.7",
......
......@@ -236,7 +236,7 @@ const AddModal = props => {
// 提交
const onSubmit = () => {
setSaveBtnLoading(true)
setSaveBtnLoading(true);
// 不切换树
if (valueData.length == 0) {
formAdd.validateFields().then(validate1 => {
......@@ -510,7 +510,7 @@ const AddModal = props => {
description: res.msg,
});
}
setSaveBtnLoading(false)
setSaveBtnLoading(false);
});
}
});
......@@ -3043,6 +3043,10 @@ const AddModal = props => {
const mapTree1 = org => {
if (org.children) {
// 如果当前形态是关联表单 字段名过滤掉本形态字段名
if(Shape === '关联表单') {
org.children = org.children.filter(item => item !== pramData.Name)
}
return (
<TreeNode value={org.name} title={org.name} disabled>
{org.children.map(item => mapTreeSelect(item))}
......@@ -3307,7 +3311,7 @@ const AddModal = props => {
}}
footer={
<Space>
<Button onClick={onSubmit} loading={saveBtnLoading} type="primary">
<Button onClick={onSubmit} loading={saveBtnLoading} type="primary">
保存
</Button>
</Space>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment