github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat(图表): 视图时间格式"日期显示"中增加：月日

Browse Source 
#13682
This commit is contained in:
ulleo 2024-12-09 15:07:58 +08:00
parent a5924c7824
commit 2a6ce316a2
7 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
View File

@ -1649,6 +1649,8 @@ public class ChartDataBuild {
return "yyyy" + split + "MM";
case "y_M_d":
return "yyyy" + split + "MM" + split + "dd";
case "M_d":
return "MM" + split + "dd";
case "H_m_s":
return "HH:mm:ss";
case "y_M_d_H":
@ -1726,6 +1728,7 @@ public class ChartDataBuild {
}
return StringUtils.join(list, splitter);
case "y_M_d":
case "M_d":
return dayGapStr;
case "y_M_d_H":
if (!dayGapStr.isEmpty()) {

2
core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java
View File

@ -146,6 +146,8 @@ public class Utils {
return "%Y" + split + "%u";
case "y_M_d":
return "yyyy" + split + "MM" + split + "dd";
case "M_d":
return "MM" + split + "dd";
case "H_m_s":
return "HH:mm:ss";
case "y_M_d_H_m":

1
core/core-frontend/src/locales/en.ts
View File

@ -1363,6 +1363,7 @@ export default {
y_Q: 'Year Quarter',
y_W: 'Year Week',
y_M_d: 'Year Month Day',
M_d: 'Month Day',
H_m_s: 'Hours Minutes Seconds',
y_M_d_H_m: 'Year Month Day Hours Minutes',
y_M_d_H_m_s: 'Year Month Day Hours Minutes Seconds',

1
core/core-frontend/src/locales/tw.ts
View File

@ -1335,6 +1335,7 @@ export default {
y_Q: '年季度',
y_W: '年周',
y_M_d: '年月日',
M_d: '月日',
H_m_s: '時分秒',
y_M_d_H_m: '年月日時分',
y_M_d_H_m_s: '年月日時分秒',

1
core/core-frontend/src/locales/zh-CN.ts
View File

@ -1337,6 +1337,7 @@ export default {
y_Q: '年季度',
y_W: '年周',
y_M_d: '年月日',
M_d: '月日',
H_m_s: '时分秒',
y_M_d_H_m: '年月日时分',
y_M_d_H_m_s: '年月日时分秒',

1
core/core-frontend/src/utils/timeUitils.ts
View File

@ -12,6 +12,7 @@ export const getRange = (outerTimeValue, timeGranularity) => {
return getMonthEnd(selectValue)
case 'date':
case 'y_M_d':
case 'M_d':
return getDayEnd(selectValue)
case 'hour':
case 'y_M_d_H':

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

@ -491,7 +491,28 @@ onMounted(() => {
</el-dropdown-item>
<el-dropdown-item
class="menu-item-padding"
v-if="!chart.type.includes('bar-range')"
v-if="
!(chart.type.includes('bar-range') && ['quota', 'quotaExt'].includes(type))
"
:command="beforeDateStyle('M_d')"
>
<span
class="sub-menu-content"
:class="'M_d' === item.dateStyle ? 'content-active' : ''"
>
{{ t('chart.M_d') }}
<el-icon class="sub-menu-content--icon">
<Icon name="icon_done_outlined" v-if="'M_d' === item.dateStyle"
><icon_done_outlined class="svg-icon"
/></Icon>
</el-icon>
</span>
</el-dropdown-item>
<el-dropdown-item
class="menu-item-padding"
v-if="
!(chart.type.includes('bar-range') && ['quota', 'quotaExt'].includes(type))
"
:command="beforeDateStyle('H_m_s')"
divided
>
@ -510,7 +531,9 @@ onMounted(() => {
<el-dropdown-item
class="menu-item-padding"
:command="beforeDateStyle('y_M_d_H_m')"
:divided="chart.type.includes('bar-range')"
:divided="
chart.type.includes('bar-range') && ['quota', 'quotaExt'].includes(type)
"
>
<span
class="sub-menu-content"