center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 数据复制报错

Browse Source
This commit is contained in:
dataeaseShu 2023-11-10 14:00:45 +08:00
parent da3412fa04
commit f22f4cb164
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
View File

@ -410,7 +410,7 @@ const flatPathList = computed(() => {
return flatArr
})
const dfsNode = (arr, nodeListLocation, x = 0, y = 0) => {
const dfsNode = (arr = [], nodeListLocation, x = 0, y = 0) => {
arr.map((ele, index) => {
const pre = nodeListLocation[index - 1]
if (!ele.children?.length) {

11
core/core-frontend/src/views/visualized/data/dataset/form/index.vue
View File

@ -1,6 +1,7 @@
<script lang="tsx" setup>
import {
ref,
toRaw,
unref,
nextTick,
reactive,
@ -881,6 +882,7 @@ const resetAllfieldsId = arr => {
const id = guid()
idMap[allfields.value[i].id] = id
allfields.value[i].id = id
allfields.value[i].datasetGroupId = ''
}
resetDfsFields(arr, idMap)
return idMap
@ -888,12 +890,15 @@ const resetAllfieldsId = arr => {
const resetAllfieldsUnionId = (arr, idMap) => {
let strUnion = JSON.stringify(arr) as string
let strNodeList = JSON.stringify(toRaw(datasetDrag.value.nodeList)) as string
let strAllfields = JSON.stringify(unref(allfields.value)) as string
Object.entries(idMap).forEach(([key, value]) => {
strUnion = strUnion.replace(key, value as string)
strAllfields = strAllfields.replace(key, value as string)
strNodeList = strNodeList.replace(key, value as string)
})
allfields.value = JSON.parse(strAllfields)
datasetDrag.value.initState(JSON.parse(strNodeList))
return JSON.parse(strUnion)
}
@ -1023,11 +1028,6 @@ const cascaderChangeArr = val => {
const [deType, dateFormat] = val
dimensionsSelection.value = dimensionsTable.value.getSelectionRows().map(ele => ele.id)
quotaSelection.value = quotaTable.value.getSelectionRows().map(ele => ele.id)
console.log(
'dimensionsSelection.value',
[...dimensionsSelection.value],
[...quotaSelection.value]
)
const arr = [...quotaSelection.value, ...dimensionsSelection.value]
if (dateFormat === 'custom') {
@ -1122,6 +1122,7 @@ const finish = res => {
pid,
name
}
allfields.value = res.allFields || []
}
const errorTips = ref('')