github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dataeaseShu 2025-02-07 15:53:43 +08:00 committed by 王嘉豪
parent a17c3335fe
commit 34ff33e03e
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/api/dataset.ts
View File

@ -99,7 +99,7 @@ export const enumValueObj = async (data: EnumValue): Promise<Record<string, stri
}) })
} }
export const enumValueDs = async (data: EnumValue): Promise<Record<string, string>[]> => { export const enumValueDs = async (data: any): Promise<Record<string, string>[]> => {
return request.post({ url: '/datasetData/enumValueDs', data }).then(res => { return request.post({ url: '/datasetData/enumValueDs', data }).then(res => {
return res?.data return res?.data
}) })

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

@ -15,6 +15,7 @@ import icon_copy_outlined from '@/assets/svg/icon_copy_outlined.svg'
import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg' import icon_deleteTrash_outlined from '@/assets/svg/icon_delete-trash_outlined.svg'
import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg' import icon_edit_outlined from '@/assets/svg/icon_edit_outlined.svg'
import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg' import icon_info_outlined from '@/assets/svg/icon_info_outlined.svg'
import dayjs from 'dayjs'
import { enumValueDs } from '@/api/dataset' import { enumValueDs } from '@/api/dataset'
import { import {
ref, ref,
@ -492,6 +493,8 @@ const delFieldById = arr => {
return false return false
}) })
} }
delGroupIds()
} }
const delFieldByIdFake = (arr, fakeAllfields) => { const delFieldByIdFake = (arr, fakeAllfields) => {
@ -890,6 +893,18 @@ const setFieldAll = () => {
fieldUnion.value?.clearState() fieldUnion.value?.clearState()
} }
const delGroupIds = () => {
const delIds = []
const fields = allfields.value.map(ele => ele.id)
const groupIds = allfields.value.filter(ele => ele.extField === 3)
groupIds.forEach(ele => {
if (!fields.includes(ele.originName)) {
delIds.push(ele.id)
}
})
allfields.value = allfields.value.filter(ele => !delIds.includes(ele.id))
}
const dfsNode = (arr, id) => { const dfsNode = (arr, id) => {
return arr.reduce((pre, next) => { return arr.reduce((pre, next) => {
if (next.id === id) { if (next.id === id) {
@ -1009,12 +1024,12 @@ const validatePass = (_: any, value: any, callback: any) => {
result = !name || !text.length result = !name || !text.length
break break
case 1: case 1:
result = !time.length result = !name || !time.length
break break
case 2: case 2:
case 3: case 3:
case 4: case 4:
result = min === null || max === null result = !name || min === null || max === null
break break
default: default:
break break
@ -1090,7 +1105,10 @@ const handleFieldschange = val => {
currentGroupField.deTypeOrigin = deType currentGroupField.deTypeOrigin = deType
if (deType !== 0) return if (deType !== 0) return
enumValueLoading.value = true enumValueLoading.value = true
enumValueDs(field) const arr = []
const allfieldsCopy = cloneDeep(unref(allfields))
dfsNodeList(arr, datasetDrag.value.getNodeList())
enumValueDs({ dataset: { union: arr, allFields: allfieldsCopy }, field })
.then(res => { .then(res => {
enumValue.value = res || [] enumValue.value = res || []
}) })
@ -1144,8 +1162,8 @@ const confirmGroupField = () => {
} }
if (currentGroupField.deTypeOrigin === 1) { if (currentGroupField.deTypeOrigin === 1) {
const [startTime, endTime] = time const [startTime, endTime] = time
obj.startTime = new Date(startTime).toLocaleString() obj.startTime = dayjs(startTime).format('YYYY-MM-DD HH:mm:ss')
obj.endTime = new Date(endTime).toLocaleString() obj.endTime = dayjs(endTime).format('YYYY-MM-DD HH:mm:ss')
} }
groupList.push(obj) groupList.push(obj)
}) })