forked from github/dataease
parent
f3827772a8
commit
6ee6b9dfb0
@ -412,6 +412,7 @@ onMounted(() => {
|
|||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<el-dropdown-item
|
<el-dropdown-item
|
||||||
class="menu-item-padding"
|
class="menu-item-padding"
|
||||||
|
v-if="!chart.type.includes('bar-range')"
|
||||||
:command="beforeDateStyle('H_m_s')"
|
:command="beforeDateStyle('H_m_s')"
|
||||||
divided
|
divided
|
||||||
>
|
>
|
||||||
@ -428,6 +429,7 @@ onMounted(() => {
|
|||||||
<el-dropdown-item
|
<el-dropdown-item
|
||||||
class="menu-item-padding"
|
class="menu-item-padding"
|
||||||
:command="beforeDateStyle('y_M_d_H_m')"
|
:command="beforeDateStyle('y_M_d_H_m')"
|
||||||
|
:divided="chart.type.includes('bar-range')"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
class="sub-menu-content"
|
class="sub-menu-content"
|
||||||
|
@ -123,6 +123,35 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
|
|||||||
|
|
||||||
const isDate = !!chart.data.isDate
|
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 minTime = chart.data.minTime
|
||||||
const maxTime = chart.data.maxTime
|
const maxTime = chart.data.maxTime
|
||||||
|
|
||||||
@ -143,7 +172,7 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
|
|||||||
type: 'time',
|
type: 'time',
|
||||||
min: minTime,
|
min: minTime,
|
||||||
max: maxTime,
|
max: maxTime,
|
||||||
mask: 'YYYY-MM-DD HH:mm:ss'
|
mask: dateFormat
|
||||||
},
|
},
|
||||||
tempId: {
|
tempId: {
|
||||||
key: true
|
key: true
|
||||||
@ -153,7 +182,7 @@ export class RangeBar extends G2PlotChartView<BarOptions, Bar> {
|
|||||||
values: {
|
values: {
|
||||||
min: minNumber,
|
min: minNumber,
|
||||||
max: maxNumber,
|
max: maxNumber,
|
||||||
mask: 'YYYY-MM-DD HH:mm:ss'
|
mask: dateFormat
|
||||||
},
|
},
|
||||||
tempId: {
|
tempId: {
|
||||||
key: true
|
key: true
|
||||||
|
Loading…
Reference in New Issue
Block a user