github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 视图支持计算字段

Browse Source
This commit is contained in:
junjun 2022-06-23 10:41:13 +08:00
parent 46f8cd634d
commit 96c501db0c
3 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/src/views/chart/view/CalcChartFieldEdit.vue
View File

@ -11,7 +11,17 @@
<el-col :span="14" style="height: 100%">
<el-row>
<el-row v-show="mode === 'normal'">
<span>{{ $t('dataset.field_exp') }}</span>
<span>
{{ $t('dataset.field_exp') }}
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
表达式语法请遵循该数据源对应的数据库语法。
<br>
字段类型将使用原始类型，如有需要，请在表达式中自行转换。
</div>
<i class="el-icon-info" style="cursor: pointer;" />
</el-tooltip>
</span>
<codemirror
ref="myCm"
v-model="fieldForm.originName"
@ -25,7 +35,15 @@
<el-row style="margin-top: 10px;">
<el-form ref="form" :model="fieldForm" size="mini" class="row-style">
<el-form-item>
<span style="width: 80px;font-size: 12px">{{ $t('dataset.data_type') }}</span>
<span style="width: 80px;font-size: 12px">
{{ $t('dataset.data_type') }}
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
若字段表达式中使用聚合函数，则字段不能设置为维度使用。
</div>
<i class="el-icon-info" style="cursor: pointer;" />
</el-tooltip>
</span>
<el-radio-group v-model="fieldForm.groupType" size="mini">
<el-radio-button label="d">{{ $t('chart.dimension') }}</el-radio-button>
<el-radio-button label="q">{{ $t('chart.quota') }}</el-radio-button>
@ -97,14 +115,14 @@
:title="item.name"
@click="insertFieldToCodeMirror('['+item.name+']')"
>
<svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="item.deExtractType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deExtractType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon
v-if="item.deType === 2 || item.deType === 3"
v-if="item.deExtractType === 2 || item.deExtractType === 3"
icon-class="field_value"
class="field-icon-value"
/>
<svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
<svg-icon v-if="item.deExtractType === 5" icon-class="field_location" class="field-icon-location" />
{{ item.name }}
</span>
</transition-group>
@ -127,14 +145,14 @@
:title="item.name"
@click="insertFieldToCodeMirror('['+item.name+']')"
>
<svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon v-if="item.deExtractType === 0" icon-class="field_text" class="field-icon-text" />
<svg-icon v-if="item.deExtractType === 1" icon-class="field_time" class="field-icon-time" />
<svg-icon
v-if="item.deType === 2 || item.deType === 3"
v-if="item.deExtractType === 2 || item.deExtractType === 3"
icon-class="field_value"
class="field-icon-value"
/>
<svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
<svg-icon v-if="item.deExtractType === 5" icon-class="field_location" class="field-icon-location" />
<span>{{ item.name }}</span>
</span>
</transition-group>

26
frontend/src/views/chart/view/ChartFieldEdit.vue
View File

@ -141,7 +141,18 @@
<span v-if="scope.row.extField === 2" class="from-type-span">{{ $t('chart.calc_field') }}</span>
</template>
</el-table-column>
<el-table-column property="groupType" :label="$t('dataset.d_q_trans')" width="120">
<el-table-column property="groupType" width="120">
<template slot="header">
<span style="font-size: 12px;">
{{ $t('dataset.d_q_trans') }}
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
若字段表达式中使用聚合函数，则字段不能设置为维度使用。
</div>
<i class="el-icon-info" style="cursor: pointer;" />
</el-tooltip>
</span>
</template>
<template slot-scope="scope">
<el-button
icon="el-icon-sort"
@ -284,7 +295,18 @@
<span v-if="scope.row.extField === 2" class="from-type-span">{{ $t('chart.calc_field') }}</span>
</template>
</el-table-column>
<el-table-column property="groupType" :label="$t('dataset.d_q_trans')" width="120">
<el-table-column property="groupType" width="120">
<template slot="header">
<span style="font-size: 12px;">
{{ $t('dataset.d_q_trans') }}
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
若字段表达式中使用聚合函数，则字段不能设置为维度使用。
</div>
<i class="el-icon-info" style="cursor: pointer;" />
</el-tooltip>
</span>
</template>
<template slot-scope="scope">
<el-button
icon="el-icon-sort"

12
frontend/src/views/dataset/data/CalcFieldEdit.vue
View File

@ -11,7 +11,17 @@
<el-col :span="14" style="height: 100%">
<el-row>
<el-row>
<span>{{ $t('dataset.field_exp') }}</span>
<span>
{{ $t('dataset.field_exp') }}
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
表达式语法请遵循该数据源对应的数据库语法。
<br>
数据集中不支持聚合运算。
</div>
<i class="el-icon-info" style="cursor: pointer;" />
</el-tooltip>
</span>
<codemirror
ref="myCm"
v-model="fieldForm.originName"