From 1bc49b327e75c6c3fd8aad7deeebc64069d4cca1 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Wed, 10 Jul 2024 11:55:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=95=B0=E6=8D=AE=E6=A0=87=E9=A2=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=B6=88=E9=99=A4=E5=AD=90=E8=A1=A8=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=202.=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=87=E9=A2=98=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/formControlAttr.vue | 13 +++-
 .../DesignForm/formControlPropertiNew.vue     | 17 +++++-
 .../DesignForm/public/form/formGroup.vue      |  2 +-
 .../associatedforms/associatedForms.vue       | 61 ++++++++++++++++---
 src/widget/associatedforms/index.vue          |  2 +-
 5 files changed, 81 insertions(+), 14 deletions(-)

diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 38941689c..a6f7f5b03 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -2034,6 +2034,7 @@ function formidChangedOptionsValue3(){
 }
 
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+const associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>()
 const associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
 let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>()
 let resDataForGlxxszExceptself: any[] = []
@@ -2047,6 +2048,7 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)
+        let resDataNoTable = JSON.parse(JSON.stringify(data.children))
         //let rootid_ = data.value.label
         associatedFormsCurrentFormFieldTree.value = [{
             id: 'rootid_'+data.label,
@@ -2056,6 +2058,15 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
             treeAttrs: data.treeAttrs,
         }]
 
+        resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table")
+        
+        associatedFormsCurrentFormFieldTreeNoTable.value = [{
+            id: 'rootid_'+data.label,
+            label: '当前表单-'+data.treeAttrs.show,
+            children: [...resDataNoTable],
+            treeAttrs: data.treeAttrs,
+        }]
+
         let resDataForGlxxsz = ref(data.children.slice(8))
         
         resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
@@ -3477,7 +3488,7 @@ const disabledIstrue = (val:string) => {
                                         multiple
                                         clearable
                                         collapse-tags
-                                        :data="associatedFormsCurrentFormFieldTree"
+                                        :data="associatedFormsCurrentFormFieldTreeNoTable"
                                         :render-after-expand="false"
                                         style="width: 240px"
                                     />
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 8f0552262..8299cf1b5 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -2076,6 +2076,7 @@ function formidChangedOptionsValue3(){
 }
 
 const associatedFormsCurrentFormFieldTree = ref<Tree[]>()
+const associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>()
 const associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
 let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>()
 let resDataForGlxxszExceptself: any[] = []
@@ -2089,20 +2090,30 @@ getAssociatedFormsCurrentFieldTree().then(({ data }) => {
         //alert("cfid为空")
     }else{
         let resData = ref(data.children)
+        let resDataNoTable = JSON.parse(JSON.stringify(data.children))
+        
         //let rootid_ = data.value.label
         associatedFormsCurrentFormFieldTree.value = [{
             id: 'rootid_'+data.label,
-            //label: '当前表单',
             label: '当前表单-'+data.treeAttrs.show,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
         }]
+        
+        resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table")
+        
+        associatedFormsCurrentFormFieldTreeNoTable.value = [{
+            id: 'rootid_'+data.label,
+            label: '当前表单-'+data.treeAttrs.show,
+            children: [...resDataNoTable],
+            treeAttrs: data.treeAttrs,
+        }]
 
         let resDataForGlxxsz = ref(data.children.slice(8))
         
         resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
         
-        // console.log(resDataForGlxxszExceptself)
+        
         
         
         
@@ -3526,7 +3537,7 @@ const disabledIstrue = (val:string) => {
                                         multiple
                                         clearable
                                         collapse-tags
-                                        :data="associatedFormsCurrentFormFieldTree"
+                                        :data="associatedFormsCurrentFormFieldTreeNoTable"
                                         :render-after-expand="false"
                                         style="width: 240px"
                                     />
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 4830e0d58..5f2ca1ab6 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -576,7 +576,7 @@ function optionsValue3Get1(data: any,fieldName: string){
 
 
 
-				<AssociatedForms  v-else-if="element.type === 'associatedForms'" :data="element" />
+				<AssociatedForms  v-else-if="element.type === 'associatedForms'" :data="element" :form-props="formProps" :tablekey="props.tableinfo" />
 
 				<LowcodeImage  v-else-if="element.type === 'lowcodeImage'" :data="element" />
 				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer'" :data="element" />
diff --git a/src/widget/associatedforms/associatedForms.vue b/src/widget/associatedforms/associatedForms.vue
index a993a2de6..a7acd0a8d 100644
--- a/src/widget/associatedforms/associatedForms.vue
+++ b/src/widget/associatedforms/associatedForms.vue
@@ -8,15 +8,32 @@
 
 </template>
 
-<script setup>
+<script lang='ts' setup>
+import request from '@/utils/request';
+import { formProps } from 'element-plus';
 
-
-const props = defineProps({
+import { FormItem, FormList } from '@/api/DesignForm/types'
+/* const props = defineProps({
   // eslint-disable-next-line vue/require-default-prop
   data: {
     type: Object,
-  }
-})
+  },
+  formProps:{
+    type: Object,
+  },
+  tableKey:{
+    type: Object,
+  },
+}) */
+
+const props = withDefaults(
+    defineProps<{
+		data: FormList
+    formProps:Object
+		tablekey: any
+    }>(),
+    {}
+)
 
 const value1 = ref('')
 
@@ -43,10 +60,38 @@ const options = [
   },
 ]
 onMounted(()=>{
-	 console.log(props.data.control.hideConditionHtml)
-   console.log(props.data.control.dataRangeConditionHtml)
+    console.log(props.data.control)
+    if(props.data.control.formid!=null&&props.data.control.formid!=""){
+      getAsfDataTitles().then(({ data }) => {   
+        console.log(data)
+      });
+    }
+    
+    
 })
-
+function getAsfDataTitles() {
+  let dataTitle = ''
+  if(props.tablekey.dataTitle!=null&&props.tablekey.dataTitle.length>0){
+    for(let i = 0;i<props.tablekey.dataTitle.length;i++){
+      dataTitle = dataTitle+props.tablekey.dataTitle[i]+"###"
+    }
+    
+  }
+  
+  return request({ 
+      url: '/javasys/lowCode/AssociatedForms/getAsfDataTitles',
+      method: 'post',
+      data: {
+        formId:props.data.control.formid,
+        dataTitle:dataTitle,
+        rangeFormula:props.data.control.dataRangeGongShi.mathsFormula,
+        rangeString:props.data.control.dataRangeGongShi.mathsString,
+        hideFormula:props.data.control.hideGongShi.mathsFormula,
+        hideString:props.data.control.hideGongShi.mathsString,
+        
+      },
+  });
+}
 </script>
 
 <style></style>
\ No newline at end of file
diff --git a/src/widget/associatedforms/index.vue b/src/widget/associatedforms/index.vue
index 162b8041a..577cf84da 100644
--- a/src/widget/associatedforms/index.vue
+++ b/src/widget/associatedforms/index.vue
@@ -14,7 +14,7 @@
         <input  v-model="value" type="hidden" >
     </el-form-item>
 
-    <AssociatedForms :data="props.data"></AssociatedForms>
+    <AssociatedForms :data="props.data" :form-props="formProps" :tablekey="props.tablekey"></AssociatedForms>
 </template>
 <script lang='ts' setup>
 import AssociatedForms   from './associatedForms.vue';