diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 333388a97..68312a620 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -1787,7 +1787,6 @@ function getAssociatedFormsCurrentFieldTree() { cfid:props.customerformid }, }); - } function getAssociatedFormsOrgAndManTree() { @@ -1810,32 +1809,36 @@ function getAssociatedFormsRoleTree() { }); } -const associatedFormsCurrentFormFieldTree = ref() +function getAsfasfFieldTree() { + return request({ + url: '/javasys/lowCode/AssociatedForms/getFieldTree', + method: 'post', + data: { + //cfid:'13' + cfid:controlData.value.control.formid + }, + }); +} - getAssociatedFormsCurrentFieldTree().then(({ data }) => { - - if(data.id==="cfid为空"){ - //alert("cfid为空") - }else{ - - - - let resData = ref(data.children) - //let rootid_ = data.value.label - associatedFormsCurrentFormFieldTree.value = [{ - id: 'rootid_'+data.label, - label: '当前表单', - children: [...resData.value], - treeAttrs: data.treeAttrs, - }] - - - } - - - - }); +const asfasfFieldTree = ref() + +const associatedFormsCurrentFormFieldTree = ref() +getAssociatedFormsCurrentFieldTree().then(({ data }) => { + + if(data.id==="cfid为空"){ + //alert("cfid为空") + }else{ + let resData = ref(data.children) + //let rootid_ = data.value.label + associatedFormsCurrentFormFieldTree.value = [{ + id: 'rootid_'+data.label, + label: '当前表单', + children: [...resData.value], + treeAttrs: data.treeAttrs, + }] + } +}); @@ -1853,27 +1856,27 @@ getCustomerFormList().then(({ data }) => { const orgAndManTree = ref() - getAssociatedFormsOrgAndManTree().then(({ data }) => { - let resData = ref(data.children) - orgAndManTree.value = [{ - id: data.id, - //label: data.label, - label: '组织机构', - children: [...resData.value] - }] +getAssociatedFormsOrgAndManTree().then(({ data }) => { + let resData = ref(data.children) + orgAndManTree.value = [{ + id: data.id, + //label: data.label, + label: '组织机构', + children: [...resData.value] + }] }); const roleTree = ref() - getAssociatedFormsRoleTree().then(({ data }) => { - let resData = ref(data.children) - //console.log("roleTree=============="+resData.value); - roleTree.value = [{ - id: data.id, - //label: data.label, - label: '角色', - children: [...resData.value] - }] - }); +getAssociatedFormsRoleTree().then(({ data }) => { + let resData = ref(data.children) + //console.log("roleTree=============="+resData.value); + roleTree.value = [{ + id: data.id, + //label: data.label, + label: '角色', + children: [...resData.value] + }] +}); // field const fieldTreeSearchFlag = ref(false) @@ -2005,6 +2008,28 @@ function associatedFormsDataRangeDialoghandle(){ aftRange.value.focusEditor() }) }else{ */ + + + + + getAsfasfFieldTree().then(({ data }) => { + + if(data.id==="cfid为空"){ + //alert("cfid为空") + }else{ + let resData = ref(data.children) + //let rootid_ = data.value.label + asfasfFieldTree.value = [{ + id: 'rootid_'+data.label, + label: '关联的表单-'+data.label, + children: [...resData.value], + treeAttrs: data.treeAttrs, + }] + } + }); + + + associatedFormsDataRangeDialogFlag.value = true controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml @@ -2554,6 +2579,7 @@ const loadNextPage = () => { filterable /> + @@ -3380,7 +3406,7 @@ const loadNextPage = () => { - + />