f0c30785 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents b45632cc 64ce8ccc
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-18 14:22:06
* @LastEditTime: 2024-01-18 15:03:56
-->
<template>
<div>
......@@ -181,6 +181,7 @@
that.tableDataList = _.cloneDeep([])
} else {
that.tableDataList = _.cloneDeep(val)
that.key++
}
})
},
......@@ -193,6 +194,7 @@
if (newVal == 0) {
this.column = _.cloneDeep(dataList);
this.tableDataList = _.cloneDeep(this.tableData);
this.key++
} else if (newVal == "1" || newVal == "3") {
this.column = dataList;
} else {
......
......@@ -181,6 +181,7 @@
that.tableDataList = _.cloneDeep([])
} else {
that.tableDataList = _.cloneDeep(val)
that.key++
}
})
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2024-01-18 14:51:42
* @LastEditTime: 2024-01-18 15:03:10
-->
<template>
<div>
......@@ -126,6 +126,7 @@
if (val.length == 0 || !val) {
} else {
that.tableDataList = _.cloneDeep(val)
this.key++
}
})
},
......@@ -138,6 +139,7 @@
if (newVal == 0) {
this.column = _.cloneDeep(dataList)
this.tableDataList = _.cloneDeep(this.tableData)
this.key++
} else if ((newVal == '1' || newVal == '3')) {
this.column = dataList
} else {
......