mirror of
https://github.com/dataease/dataease.git
synced 2026-05-16 05:50:45 +08:00
feat(数据集): 数据集增加分组字段功能
This commit is contained in:
committed by
fit2cloud-chenyw
parent
3953b19451
commit
281701fd02
@@ -2298,6 +2298,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
|
||||
origin_type: 'Physical field type',
|
||||
field_diff: 'The selected field types are inconsistent and do not support conversion',
|
||||
create_grouping_field: 'Create a new grouping field',
|
||||
editing_grouping_field: 'Editing Grouping Fields',
|
||||
grouping_field: 'Grouping field',
|
||||
grouping_settings: 'Grouping settings',
|
||||
ungrouped_value: 'Ungrouped value',
|
||||
|
||||
@@ -2241,6 +2241,7 @@ export default {
|
||||
origin_type: '物理字段類型',
|
||||
field_diff: '所選字段類型不一致,不支持轉換',
|
||||
create_grouping_field: '新建分組字段',
|
||||
editing_grouping_field: '編輯分組字段',
|
||||
grouping_field: '分組欄位',
|
||||
grouping_settings: '分組設定',
|
||||
ungrouped_value: '未分組的值',
|
||||
|
||||
@@ -2243,6 +2243,7 @@ export default {
|
||||
origin_type: '物理字段类型',
|
||||
field_diff: '所选字段类型不一致,不支持转换',
|
||||
create_grouping_field: '新建分组字段',
|
||||
editing_grouping_field: '编辑分组字段',
|
||||
grouping_field: '分组字段',
|
||||
grouping_settings: '分组设置',
|
||||
ungrouped_value: '未分组的值',
|
||||
|
||||
@@ -1084,6 +1084,7 @@ const addGroupField = () => {
|
||||
groupFields.value = allfields.value.filter(ele => ![2, 3].includes(ele.extField))
|
||||
Object.assign(currentGroupField, cloneDeep(defaultObj))
|
||||
currentGroupField.id = guid()
|
||||
titleForGroup.value = t('dataset.create_grouping_field')
|
||||
editGroupField.value = true
|
||||
}
|
||||
const handleFieldschange = val => {
|
||||
@@ -1121,6 +1122,8 @@ const closeGroupField = () => {
|
||||
editGroupField.value = false
|
||||
}
|
||||
|
||||
const titleForGroup = ref(t('dataset.create_grouping_field'))
|
||||
|
||||
const initGroupField = val => {
|
||||
groupFields.value = allfields.value.filter(ele => ![2, 3].includes(ele.extField))
|
||||
Object.assign(currentGroupField, val)
|
||||
@@ -1145,6 +1148,7 @@ const initGroupField = val => {
|
||||
handleFieldschange(currentGroupField.originName)
|
||||
|
||||
currentGroupField.groupList = groupList
|
||||
titleForGroup.value = t('dataset.editing_grouping_field')
|
||||
editGroupField.value = true
|
||||
}
|
||||
|
||||
@@ -2044,8 +2048,13 @@ const getDsIconName = data => {
|
||||
>
|
||||
<template #default="scope">
|
||||
<div class="column-style">
|
||||
<span v-if="scope.row.extField === 0">{{ scope.row.originName }}</span>
|
||||
<span style="color: #8d9199" v-else>{{ t('dataset.calc_field') }}</span>
|
||||
<span style="color: #8d9199" v-if="scope.row.extField === 2">{{
|
||||
t('dataset.calc_field')
|
||||
}}</span>
|
||||
<span style="color: #8d9199" v-else-if="scope.row.extField === 3">{{
|
||||
t('dataset.grouping_field')
|
||||
}}</span>
|
||||
<span v-else>{{ scope.row.originName }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -2144,7 +2153,11 @@ const getDsIconName = data => {
|
||||
placement="top"
|
||||
>
|
||||
<template #default>
|
||||
<el-button text @click="handleFieldMore(scope.row, 'translate')">
|
||||
<el-button
|
||||
v-if="![3].includes(scope.row.extField)"
|
||||
text
|
||||
@click="handleFieldMore(scope.row, 'translate')"
|
||||
>
|
||||
<template #icon>
|
||||
<Icon name="icon_switch_outlined"
|
||||
><icon_switch_outlined class="svg-icon"
|
||||
@@ -2545,7 +2558,7 @@ const getDsIconName = data => {
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
class="create-dialog group-fields_dialog"
|
||||
:title="t('dataset.create_grouping_field')"
|
||||
:title="titleForGroup"
|
||||
v-model="editGroupField"
|
||||
width="1000px"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user