允许直接选择被矩阵填充的字段

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

@@ -646,7 +646,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute }: any)
   }
   // })
 
-  showOrHide(data);
+  showOrHide(data,value);
 
   if (typeof props.changeKeyVal === "function") {
     props.changeKeyVal(key, value, type, attribute);
@@ -688,8 +688,25 @@ function isEmptyPlainObject(obj) {
 }
 
 
-function showOrHide(data: any) {
-  //console.log(data)
+function showOrHide(data: any,currentDataNameValue?:any) {
+  
+  let dataObjFlag = false//data是否是对象
+  if(data=="onMounted"||data=="kong"){
+    
+  }else{
+    console.log(data)
+    dataObjFlag = true
+    console.log(data.name)
+  }
+  if(dataObjFlag){
+    if(data.type=="select"||data.type=="radio"||data.type=="checkbox"||data.type=="switch"){
+
+    }else{
+      return
+    }
+    
+  }
+  
 
   /* 
 		企管部有当前用户,
@@ -1292,6 +1309,13 @@ nextTick(()=>{
     //console.log(rowValue)
     let columnValue = model.value[tby]
     //console.log(columnValue)
+
+    /* if(dataObjFlag && element.name==data.name && currentDataNameValue!=""){//允许直接选择被矩阵填充的字段
+      console.log(data.name)
+      console.log("直接选择被矩阵填充的字段,允许")
+      model.value[element.name] = currentDataNameValue
+      return
+    }else{ */
       if(tbx!=""&&tby!=""){
       
         let cellValue = getTableCellValue(element.tableData, rowValue, columnValue)
@@ -1308,6 +1332,10 @@ nextTick(()=>{
         model.value[element.name] = cellValue*1
       }
 
+    //}
+
+    
+    
     
 
     //console.log(getTableCellValueV2(element.tableData, 3, 2));