feat: 代码合并

main
wu.jian2 2 years ago
parent 59fb106b97
commit 6d6b5b9d6a

@ -1,6 +1,6 @@
{
"name": "@gcpaas/data-room-ui",
"version": "1.0.1-2023072704-Alpha",
"version": "1.0.1-2023072801-Alpha",
"description": "自定义大屏",
"author": "gcpaas",
"license": "MIT",

@ -229,6 +229,7 @@
</template>
<script>
import { cloneDeep } from 'lodash'
import LabelEdit from './LabelConfigEdit'
import LabelTypeEdit from './LabelTypeEdit.vue'
import { pageMixins } from 'data-room-ui/js/mixins/page'
@ -283,8 +284,8 @@ export default {
// id
if (this.datasetId) {
getLabelListByDatasetId(this.datasetId).then((data) => {
this.selectLabelListInitial = _.cloneDeep(data)
this.selectLabelList = _.cloneDeep(data)
this.selectLabelListInitial = cloneDeep(data)
this.selectLabelList = cloneDeep(data)
const idList = []
data.forEach((item) => {
idList.push(item.id)
@ -403,7 +404,7 @@ export default {
if (this.selectLabelList.some(item => item.id === id)) {
this.selectLabelList = this.selectLabelList.filter(item => item.id !== id)
}
this.selectLabelListInitial = _.cloneDeep(this.selectLabelList)
this.selectLabelListInitial = cloneDeep(this.selectLabelList)
})
}).catch(() => {
})
@ -487,7 +488,7 @@ export default {
* 弹窗关闭
*/
handleClose () {
this.selectLabelList = _.cloneDeep(this.selectLabelListInitial)
this.selectLabelList = cloneDeep(this.selectLabelListInitial)
this.dialogFormVisible = false
},
/**
@ -496,7 +497,7 @@ export default {
commitLabel () {
this.labelCheckLoading = false
this.dialogFormVisible = false
this.selectLabelListInitial = _.cloneDeep(this.selectLabelList)
this.selectLabelListInitial = cloneDeep(this.selectLabelList)
this.$emit('commit', this.idListCopy)
},
/**

Loading…
Cancel
Save