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

Merge pull request #11575 from ulleo/dev-v2

Browse Source 
feat(图表): 区间条形图选择时间范围后，横轴格式跟随指标的日期显示设置
This commit is contained in:
ulleo 2024-08-15 14:34:11 +08:00 committed by GitHub
commit 6be5e7f2bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue
View File

@ -412,6 +412,7 @@ onMounted(() => {
</el-dropdown-item>
<el-dropdown-item
class="menu-item-padding"
v-if="!chart.type.includes('bar-range')"
:command="beforeDateStyle('H_m_s')"
divided
>
@ -428,6 +429,7 @@ onMounted(() => {
<el-dropdown-item
class="menu-item-padding"
:command="beforeDateStyle('y_M_d_H_m')"
:divided="chart.type.includes('bar-range')"
>
<span
class="sub-menu-content"

33
core/core-frontend/src/views/chart/components/js/panel/charts/bar/range-bar.ts
View File

@ -123,6 +123,35 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
const isDate = !!chart.data.isDate
const axis = chart.yAxis ?? chart.yAxisExt ?? []
let dateFormat: string
const dateSplit = axis[0]?.datePattern === 'date_split' ? '/' : '-'
switch (axis[0]?.dateStyle) {
case 'y':
dateFormat = 'YYYY'
break
case 'y_M':
dateFormat = 'YYYY' + dateSplit + 'MM'
break
case 'y_M_d':
dateFormat = 'YYYY' + dateSplit + 'MM' + dateSplit + 'DD'
break
// case 'H_m_s':
// dateFormat = 'HH:mm:ss'
// break
case 'y_M_d_H':
dateFormat = 'YYYY' + dateSplit + 'MM' + dateSplit + 'DD' + ' HH'
break
case 'y_M_d_H_m':
dateFormat = 'YYYY' + dateSplit + 'MM' + dateSplit + 'DD' + ' HH:mm'
break
case 'y_M_d_H_m_s':
dateFormat = 'YYYY' + dateSplit + 'MM' + dateSplit + 'DD' + ' HH:mm:ss'
break
default:
dateFormat = 'YYYY-MM-dd HH:mm:ss'
}
const minTime = chart.data.minTime
const maxTime = chart.data.maxTime
@ -143,7 +172,7 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
type: 'time',
min: minTime,
max: maxTime,
mask: 'YYYY-MM-DD HH:mm:ss'
mask: dateFormat
},
tempId: {
key: true
@ -153,7 +182,7 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
values: {
min: minNumber,
max: maxNumber,
mask: 'YYYY-MM-DD HH:mm:ss'
mask: dateFormat
},
tempId: {
key: true