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

Merge pull request #9411 from dataease/pr@dev-v2_st

Browse Source 
fix(数据集): 修复MySQL 和 SQL Server 数据库的表跨源关联后，MySQL 数据表的字段重复显示，SQL Server…
This commit is contained in:
dataeaseShu 2024-04-28 16:50:12 +08:00 committed by GitHub
commit f8256e3ee7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,10 +701,10 @@ let num = +new Date()
const expandedD = ref(true)
const expandedQ = ref(true)
const setGuid = (arr, id, datasourceId) => {
const setGuid = (arr, id, datasourceId, oldArr) => {
arr.forEach(ele => {
if (!ele.id) {
ele.id = `${++num}`
ele.id = oldArr.find(itx => itx.originName === ele.originName)?.id || `${++num}`
ele.datasetTableId = id
ele.datasourceId = datasourceId
}
@ -756,6 +756,17 @@ const setFieldAll = () => {
tabChange('manage')
fieldUnion.value?.clearState()
}
const dfsNode = (arr, id) => {
return arr.reduce((pre, next) => {
if (next.id === id) {
pre = [...next.currentDsFields]
} else if (next.children?.length) {
pre = dfsNode(next.children, id)
}
return pre
}, [])
}
const confirmEditUnion = () => {
const { node, parent } = fieldUnion.value
const to = node.id
@ -770,8 +781,11 @@ const confirmEditUnion = () => {
return
}
setGuid(node.currentDsFields, node.id, node.datasourceId)
setGuid(parent.currentDsFields, parent.id, parent.datasourceId)
const nodeOldCurrentDsFields = dfsNode(datasetDrag.value.getNodeList(), to)
const parentOldCurrentDsFields = dfsNode(datasetDrag.value.getNodeList(), from)
setGuid(node.currentDsFields, node.id, node.datasourceId, nodeOldCurrentDsFields)
setGuid(parent.currentDsFields, parent.id, parent.datasourceId, parentOldCurrentDsFields)
const top = cloneDeep(node)
const bottom = cloneDeep(parent)
datasetDrag.value.setStateBack(top, bottom)