public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-16 05:50:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(数据集): 删除包含计算字段的节点报错

Browse Source
This commit is contained in:
dataeaseShu
2025-06-13 09:26:32 +08:00
committed by xuwei-fit2cloud
parent 175bdb59b7
commit 36bcc92508
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/visualization/JumpSetOuterContentEditor.vue
View File

@@ -40,7 +40,7 @@ const setNameIdTrans = (from, to, originName, name2Auto?: string[]) => {
pre[next[from]] = next[to]
return pre
}, {})
const on = originName.match(/\[(.+?)\]/g)
const on = originName.match(/\[(.+?)\]/g) || []
if (on) {
on.forEach(itm => {
const ele = itm.slice(1, -1)

2
core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue
View File

@@ -370,7 +370,7 @@ const jumpTargetAdaptor = () => {
const assignment = content => {
if (content) {
const on = content?.match(/\[(.+?)\]/g)
const on = content?.match(/\[(.+?)\]/g) || []
if (on) {
const thresholdStyleInfo = conditionAdaptor(state.viewDataInfo)
on.forEach(itm => {

2
core/core-frontend/src/utils/canvasUtils.ts
View File

@@ -660,7 +660,7 @@ export function setIdValueTrans(from, to, content, colList) {
pre[next[from]] = next[to]
return pre
}, {})
const on = content?.match(/\[(.+?)\]/g)
const on = content?.match(/\[(.+?)\]/g) || []
if (on) {
on.forEach(itm => {
const ele = itm.slice(1, -1)

2
core/core-frontend/src/views/chart/components/editor/editor-style/components/table/CustomAggrEdit.vue
View File

@@ -81,7 +81,7 @@ const setNameIdTrans = (from, to, originName, name2Auto?: string[]) => {
pre[next[from]] = next[to]
return pre
}, {})
const on = originName.match(/\[(.+?)\]/g)
const on = originName.match(/\[(.+?)\]/g) || []
if (on) {
on.forEach(itm => {
const ele = itm.slice(1, -1)

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

@@ -140,7 +140,7 @@ const setNameIdTrans = (from, to, originName, name2Auto?: string[]) => {
pre[next[from]] = next[to]
return pre
}, {})
const on = originName.match(/\[(.+?)\]/g)
const on = originName.match(/\[(.+?)\]/g) || []
if (on) {
on.forEach(itm => {
const ele = itm.slice(1, -1)

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

@@ -374,7 +374,7 @@ const confirmEditUnion = () => {
if (!!ids.length) {
const idArr = allfields.value.reduce((pre, next) => {
if (next.extField === 2) {
let idMap = next.originName.match(/\[(.+?)\]/g)
let idMap = next.originName.match(/\[(.+?)\]/g) || []
idMap = idMap.filter(
itx => !next.params?.map(element => element.id).includes(itx.slice(1, -1))
)
@@ -462,7 +462,7 @@ const handleCommand = (ele, command) => {
if (!!fakeDelId.length) {
const idArr = allfields.value.reduce((pre, next) => {
if (next.extField === 2) {
const idMap = next.originName.match(/\[(.+?)\]/g)
const idMap = next.originName.match(/\[(.+?)\]/g) || []
const result = idMap.map(itm => {
return itm.slice(1, -1)
})

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

@@ -493,7 +493,7 @@ const delFieldById = arr => {
const allfieldsId = allfields.value.map(ele => ele.id).concat(paramsId)
allfields.value = allfields.value.filter(ele => {
if (![2, 3].includes(ele.extField)) return true
const idMap = ele.originName.match(/\[(.+?)\]/g)
const idMap = ele.originName.match(/\[(.+?)\]/g) || []
if (!idMap) return true
const result = idMap.every(itm => {
const id = itm.slice(1, -1)
@@ -518,7 +518,7 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
const allfieldsId = fakeAllfields.map(ele => ele.id)
fakeAllfields = fakeAllfields.filter(ele => {
if (![2, 3].includes(ele.extField)) return true
const idMap = ele.originName.match(/\[(.+?)\]/g)
const idMap = ele.originName.match(/\[(.+?)\]/g) || []
if (
!idMap ||
idMap.every(itx => ele.params?.map(element => element.id).includes(itx.slice(1, -1)))
@@ -971,7 +971,7 @@ const confirmEditUnion = () => {
if (!!idList.length) {
const idArr = allfields.value.reduce((pre, next) => {
if (idList.includes(next.id)) {
const idMap = next.originName.match(/\[(.+?)\]/g)
const idMap = next.originName.match(/\[(.+?)\]/g) || []
const result = idMap.map(itm => {
return itm.slice(1, -1)
})