diff --git a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java index 99e95aaee5..191edf9071 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java +++ b/core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java @@ -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()) { diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index 35ac11ecd5..6dfe0935f7 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -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": diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 64fcead8ec..8c1267f9c6 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -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', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index c183df69b5..fe859b68fc 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -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: '年月日時分秒', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 9a1a1ed3e6..97df81cfbc 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -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: '年月日时分秒', diff --git a/core/core-frontend/src/utils/timeUitils.ts b/core/core-frontend/src/utils/timeUitils.ts index 1acf5a2732..de7c5fc263 100644 --- a/core/core-frontend/src/utils/timeUitils.ts +++ b/core/core-frontend/src/utils/timeUitils.ts @@ -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': diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index 3371fffb7f..5c4acb4e39 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -491,7 +491,28 @@ onMounted(() => { + + {{ t('chart.M_d') }} + + + + + + @@ -510,7 +531,9 @@ onMounted(() => {