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

fix(数据集): 删除一个计算字段将全部计算都删除了
This commit is contained in:
dataeaseShu 2024-08-21 14:04:20 +08:00 committed by GitHub
commit e7353df82c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions

View File

@ -58,6 +58,7 @@ const defaultForm = {
deType: 0, //
extField: 2,
id: '',
params: [],
checked: true
}
@ -149,6 +150,7 @@ const setNameIdTrans = (from, to, originName, name2Auto?: string[]) => {
let quotaDataList = []
let dimensionDataList = []
const initEdit = (obj, dimensionData, quotaData) => {
formQuota.id = null
Object.assign(fieldForm, { ...defaultForm, ...obj })
state.dimensionData = dimensionData
state.quotaData = quotaData.concat(fieldForm.params || [])

View File

@ -426,7 +426,13 @@ const delFieldById = arr => {
const [targetId] = delId
delId.shift()
allfields.value = allfields.value.filter(ele => ele.id !== targetId)
const allfieldsId = allfields.value.map(ele => ele.id)
const paramsId = allfields.value.reduce((pre, next) => {
if (next.extField === 2) {
pre = [...pre, ...(next.params || []).map(element => element.id)]
}
return pre
}, [])
const allfieldsId = allfields.value.map(ele => ele.id).concat(paramsId)
allfields.value = allfields.value.filter(ele => {
if (ele.extField !== 2) return true
const idMap = ele.originName.match(/\[(.+?)\]/g)