center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

feat: AntV时间条形图 时间类型限制

Browse Source
This commit is contained in:
ulleo 2023-12-14 12:04:11 +08:00
parent 8cac74bca3
commit c6d31241a6
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/frontend/src/views/chart/components/dragItem/DimensionExtItem.vue
View File

@ -119,11 +119,18 @@
>{{ $t('chart.y_W') }}</el-dropdown-item> >{{ $t('chart.y_W') }}</el-dropdown-item>
<el-dropdown-item :command="beforeDateStyle('y_M_d')">{{ $t('chart.y_M_d') }}</el-dropdown-item> <el-dropdown-item :command="beforeDateStyle('y_M_d')">{{ $t('chart.y_M_d') }}</el-dropdown-item>
<el-dropdown-item <el-dropdown-item
v-if="!hideSpecial"
:command="beforeDateStyle('H_m_s')" :command="beforeDateStyle('H_m_s')"
divided divided
>{{ $t('chart.H_m_s') }}</el-dropdown-item> >{{ $t('chart.H_m_s') }}</el-dropdown-item>
<el-dropdown-item :command="beforeDateStyle('y_M_d_H')">{{ $t('chart.y_M_d_H') }}</el-dropdown-item> <el-dropdown-item
<el-dropdown-item :command="beforeDateStyle('y_M_d_H_m')">{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item> v-if="!hideSpecial"
:command="beforeDateStyle('y_M_d_H')"
>{{ $t('chart.y_M_d_H') }}</el-dropdown-item>
<el-dropdown-item
:command="beforeDateStyle('y_M_d_H_m')"
:divided="hideSpecial"
>{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item>
<el-dropdown-item :command="beforeDateStyle('y_M_d_H_m_s')">{{ $t('chart.y_M_d_H_m_s') }}</el-dropdown-item> <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m_s')">{{ $t('chart.y_M_d_H_m_s') }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
@ -210,6 +217,11 @@ export default {
showDateExt: false showDateExt: false
} }
}, },
computed: {
hideSpecial() {
return this.chart.type === 'bar-time-range'
}
},
watch: { watch: {
dimensionData: function() { dimensionData: function() {
this.getItemTagType() this.getItemTagType()

12
core/frontend/src/views/chart/view/ChartEdit.vue
View File

@ -746,7 +746,7 @@
:dimension-data="dimension" :dimension-data="dimension"
:quota-data="quota" :quota-data="quota"
:chart="chart" :chart="chart"
@onDimensionItemChange="dimensionItemChange" @onDimensionItemChange="dimensionExtItemChange"
@onDimensionItemRemove="dimensionItemRemove" @onDimensionItemRemove="dimensionItemRemove"
@editItemFilter="showDimensionEditFilter" @editItemFilter="showDimensionEditFilter"
@onNameEdit="showRename" @onNameEdit="showRename"
@ -2853,6 +2853,16 @@ export default {
this.calcData(true) this.calcData(true)
}, },
dimensionExtItemChange(item) {
if (this.view.type === 'bar-time-range') {
this.view.xaxisExt.forEach(ext => {
ext.dateStyle = item.dateStyle
ext.datePattern = item.datePattern
})
}
this.calcData(true)
},
dimensionItemRemove(item) { dimensionItemRemove(item) {
if (item.removeType === 'dimension') { if (item.removeType === 'dimension') {
this.view.xaxis.splice(item.index, 1) this.view.xaxis.splice(item.index, 1)