|
|
|
@ -115,10 +115,11 @@ function autoAddColumnOne(){ |
|
|
|
if(defaultOneFlag.value){ |
|
|
|
if(orgAndManTreeLoadedFlag.value){ |
|
|
|
//alert(1) |
|
|
|
addColumn() |
|
|
|
//console.error("autoAddColumnOne") |
|
|
|
addColumn2() |
|
|
|
defaultOneAddedFlag.value = true |
|
|
|
}else{ |
|
|
|
console.log("wait autoAddColumnOne") |
|
|
|
//console.log("wait autoAddColumnOne") |
|
|
|
if(defaultOneAddedFlag.value){ |
|
|
|
|
|
|
|
}else{ |
|
|
|
@ -146,7 +147,8 @@ function autoAddColumnOne(){ |
|
|
|
function waitProvideFormPropsModelDo(){ |
|
|
|
setTimeout(()=>{ |
|
|
|
if(tableDataNew){ |
|
|
|
addColumn() |
|
|
|
//console.error("waitProvideFormPropsModelDo") |
|
|
|
addColumn2() |
|
|
|
defaultOneAddedFlag.value = true |
|
|
|
}else{ |
|
|
|
waitProvideFormPropsModelDo |
|
|
|
@ -156,7 +158,8 @@ function waitProvideFormPropsModelDo(){ |
|
|
|
} |
|
|
|
|
|
|
|
const addColumn = () => { |
|
|
|
console.log("如果编辑页禁用时--------->",tableDataNew.value) |
|
|
|
/* console.error("addColumn") |
|
|
|
console.log("如果编辑页禁用时--------->",tableDataNew.value) */ |
|
|
|
const temp: any = {} |
|
|
|
if (props.data.list) { |
|
|
|
console.log(props.data.list) |
|
|
|
@ -168,6 +171,34 @@ const addColumn = () => { |
|
|
|
//console.log(temp) |
|
|
|
|
|
|
|
tableDataNew.value.push(jsonParseStringify(temp)) |
|
|
|
//console.log(tableDataNew.value) |
|
|
|
addBtnFlag.value = false |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
const addColumn2 = () => { |
|
|
|
/* console.error("addColumn") |
|
|
|
console.log("如果编辑页禁用时--------->", tableDataNew.value) */ |
|
|
|
const temp: any = {} |
|
|
|
if (props.data.list) { |
|
|
|
//console.log(props.data.list) |
|
|
|
props.data.list.forEach((item: any) => { |
|
|
|
if (item.name) { |
|
|
|
temp[item.name] = item.control.modelValue |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
// 核心新逻辑:检测数组是否已有元素(长度是否大于0),无元素时才执行push |
|
|
|
if (tableDataNew.value.length === 0) { |
|
|
|
// 仅当数组为空时,才添加新元素 |
|
|
|
tableDataNew.value.push(jsonParseStringify(temp)); |
|
|
|
//console.log("数组为空,已添加最新元素:", tableDataNew.value); |
|
|
|
} else { |
|
|
|
// 数组已有元素,不执行添加操作,可添加日志提示 |
|
|
|
//console.log("数组中已存在元素,不重复添加"); |
|
|
|
} |
|
|
|
|
|
|
|
console.log(tableDataNew.value) |
|
|
|
addBtnFlag.value = false |
|
|
|
} |
|
|
|
} |
|
|
|
|