Merge branch 'lwx_v27'

src/components/DesignForm/public/expand/org.vue

@@ -325,6 +325,7 @@ const multiple = props.data.control.multiple=='1'
     collapse-tags
     collapse-tags-tooltip
     :max-collapse-tags="4"
+    :disabled="props.data.control.connectUserComponent.length>0"
   />
   <div></div>
 </template>

src/components/DesignForm/public/form/form.vue

@@ -1778,11 +1778,12 @@ function updateLocation(currentValue: any,currentComp:any) {
   location.value = currentValue+currentComp
   let deepCopyedCurrentValue:string = JSON.stringify(toRaw(currentValue))
   let workNumber = getParenthesesContent(deepCopyedCurrentValue)
-  console.log(workNumber)
+  //console.log(workNumber)
   let mainOrg = 309
   getMainOrgByWorkNumber({workNumber:workNumber}).then(({ data }) => {
-    console.log(data)
+    //console.log(data)
     mainOrg = data*1
+    
   }).finally(()=>{
     
     //找到关联此 user 组件的所有 org 组件
@@ -1809,20 +1810,32 @@ function updateLocation(currentValue: any,currentComp:any) {
           
         }
       });
+      
       if(element.path==""){
-        model.value[element.name] = mainOrg
+        if(workNumber==""){
+          model.value[element.name] = undefined
+        }else{
+          model.value[element.name] = mainOrg
+        }
+        
       }else{
-        let length = model.value[element.path].length
-        //console.log(length)
+        
         model.value[element.path].forEach((x:any) => {
-          x[element.name] = mainOrg
+
+          if(workNumber==""){
+            x[element.name] = undefined
+          }else{
+            x[element.name] = mainOrg
+          }
+
+          
         });
-        //model.value[element.path][element.name] = 309
+        
       }
       
     });
     //console.log(deepCopyedConnectOrgs)
-    console.log(model.value)
+    //console.log(model.value)
 
     });