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

feat(数据集): 数据集增加分组字段功能

Browse Source
This commit is contained in:
dataeaseShu
2025-02-07 14:40:25 +08:00
committed by Junjun
parent 647add0153
commit 8d5f915faf
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
View File

@@ -2934,7 +2934,7 @@ defineExpose({
</el-option>
</el-select>
</div>
<div class="value flex-align-center">
<div style="display: flex; align-items: center" class="value">
<span :title="t('v_query.display_field')" class="label ellipsis">{{
t('v_query.display_field')
}}</span>

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

@@ -480,7 +480,7 @@ const delFieldById = arr => {
}, [])
const allfieldsId = allfields.value.map(ele => ele.id).concat(paramsId)
allfields.value = allfields.value.filter(ele => {
if (ele.extField !== 2) return true
if (![2, 3].includes(ele.extField)) return true
const idMap = ele.originName.match(/\[(.+?)\]/g)
if (!idMap) return true
const result = idMap.every(itm => {
@@ -503,7 +503,7 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
fakeAllfields = fakeAllfields.filter(ele => ele.id !== targetId)
const allfieldsId = fakeAllfields.map(ele => ele.id)
fakeAllfields = fakeAllfields.filter(ele => {
if (ele.extField !== 2) return true
if (![2, 3].includes(ele.extField)) return true
const idMap = ele.originName.match(/\[(.+?)\]/g)
if (
!idMap ||
@@ -527,7 +527,7 @@ const delFieldByIdFake = (arr, fakeAllfields) => {
const deleteField = item => {
let tip = ''
const idArr = allfields.value.reduce((pre, next) => {
if (next.extField !== 2) return pre
if (![2, 3].includes(next.extField)) return pre
let idMap = next.originName.match(/\[(.+?)\]/g) || []
idMap = idMap.filter(itx => !next.params?.map(element => element.id).includes(itx.slice(1, -1)))
const result = idMap.map(itm => {
@@ -855,8 +855,10 @@ const dfsFields = (arr, list) => {
const getDelIdArr = (newArr, oldArr) => {
const idMapNew = newArr.map(ele => ele.id)
return [
...oldArr.filter(ele => ele.extField !== 2).filter(ele => !idMapNew.includes(ele.id)),
...oldArr.filter(ele => ele.extField === 2)
...oldArr
.filter(ele => ![2, 3].includes(ele.extField))
.filter(ele => !idMapNew.includes(ele.id)),
...oldArr.filter(ele => [2, 3].includes(ele.extField))
]
}
@@ -865,7 +867,7 @@ const diffArr = (newArr, oldArr) => {
const idMapOld = oldArr.map(ele => ele.id)
const arr = newArr.filter(ele => !idMapOld.includes(ele.id))
return cloneDeep([
...oldArr.filter(ele => ele.extField === 2),
...oldArr.filter(ele => [2, 3].includes(ele.extField)),
...arr,
...oldArr.filter(ele => idMapNew.includes(ele.id))
])
@@ -955,7 +957,7 @@ const confirmEditUnion = () => {
cancelButtonText: t('common.cancel'),
showCancelButton: true,
tip: `${t('data_set.field')}: ${allfields.value
.filter(ele => [...new Set(idArr)].includes(ele.id) && ele.extField !== 2)
.filter(ele => [...new Set(idArr)].includes(ele.id) && ![2, 3].includes(ele.extField))
.map(ele => ele.name)
.join(',')}, ${t('data_set.confirm_the_deletion')}`,
confirmButtonType: 'danger',
@@ -1029,7 +1031,8 @@ const fieldGroupRules = {
name: [{ required: true, message: t('dataset.input_edit_name'), trigger: 'blur' }],
groupList: [{ validator: validatePass }]
}
const currentGroupField = reactive({
const defaultObj = {
name: '',
id: +new Date(),
datasourceId: '',
@@ -1054,7 +1057,8 @@ const currentGroupField = reactive({
max: null
}
]
})
}
const currentGroupField = reactive(cloneDeep(defaultObj))
const ruleGroupFieldRef = ref()
const editGroupField = ref(false)
const enumValueLoading = ref(false)
@@ -1062,6 +1066,8 @@ const groupFields = shallowRef([])
const enumValue = shallowRef([])
const addGroupField = () => {
groupFields.value = allfields.value.filter(ele => ![2, 3].includes(ele.extField))
Object.assign(currentGroupField, cloneDeep(defaultObj))
currentGroupField.id = guid()
editGroupField.value = true
}
const handleFieldschange = val => {