|
|
|
@ -326,7 +326,7 @@ provide(constControlChange, ({ key, value, data, tProp, type, attribute, label } |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
showOrHide(data); |
|
|
|
showOrHide(data,value); |
|
|
|
|
|
|
|
if (typeof props.changeKeyVal === "function") { |
|
|
|
props.changeKeyVal(key, value, type, attribute); |
|
|
|
@ -1048,8 +1048,24 @@ let mustBeHidden: any = []; |
|
|
|
|
|
|
|
let newModelKeyArr: string[] = []; |
|
|
|
|
|
|
|
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 |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* |
|
|
|
企管部有当前用户, |
|
|
|
@ -1647,6 +1663,16 @@ function showOrHide(data: any) { |
|
|
|
//console.log(rowValue) |
|
|
|
let columnValue = model.value[tby] |
|
|
|
//console.log(columnValue) |
|
|
|
|
|
|
|
|
|
|
|
if(rowValue==""){ |
|
|
|
rowValue="notChosen" |
|
|
|
} |
|
|
|
|
|
|
|
if(columnValue==""){ |
|
|
|
columnValue="notChosen" |
|
|
|
} |
|
|
|
|
|
|
|
if(tbx!=""&&tby!=""){ |
|
|
|
|
|
|
|
let cellValue = getTableCellValue(element.tableData, rowValue, columnValue) |
|
|
|
|