From b4eb57f3dfd9092366d2d6efad52646b36fbb3ce Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Wed, 30 Aug 2023 17:52:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=9F=E7=94=9Fgantt?= =?UTF-8?q?=E5=9B=BE=E6=A0=B7=E5=BC=8F=EF=BC=88=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=AD=89=E5=8E=BB=E7=AC=A6=E5=90=88=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E4=B9=A0=E6=83=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_gantt/static/src/js/gantt_renderer.js | 6 ++++-- web_gantt/static/src/js/gantt_view.js | 2 +- web_gantt/static/src/xml/web_gantt.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web_gantt/static/src/js/gantt_renderer.js b/web_gantt/static/src/js/gantt_renderer.js index 0627dd88..4ef5b845 100644 --- a/web_gantt/static/src/js/gantt_renderer.js +++ b/web_gantt/static/src/js/gantt_renderer.js @@ -637,8 +637,10 @@ export default AbstractRenderer.extend(WidgetAdapterMixin, { case 'day': return focusDate.format('dddd, MMMM DD, YYYY'); case 'week': - const dateStart = focusDate.clone().startOf('week').format('DD MMMM YYYY'); - const dateEnd = focusDate.clone().endOf('week').format('DD MMMM YYYY'); + // const dateStart = focusDate.clone().startOf('week').format('DD MMMM YYYY'); + const dateStart = focusDate.clone().startOf('week').format('YYYY MMMM DD '); + // const dateEnd = focusDate.clone().endOf('week').format('DD MMMM YYYY'); + const dateEnd = focusDate.clone().endOf('week').format('YYYY MMMM DD '); return _.str.sprintf('%s - %s', dateStart, dateEnd); case 'month': return focusDate.format('MMMM YYYY'); diff --git a/web_gantt/static/src/js/gantt_view.js b/web_gantt/static/src/js/gantt_view.js index 10c0fa83..5bc085b7 100644 --- a/web_gantt/static/src/js/gantt_view.js +++ b/web_gantt/static/src/js/gantt_view.js @@ -112,7 +112,7 @@ const GanttView = AbstractView.extend({ allowedScales = Object.keys(this.SCALES); } - const scale = params.context.default_scale || arch.attrs.default_scale || 'month'; + const scale = params.context.default_scale || arch.attrs.default_scale || 'week'; const initialDate = moment(params.context.initialDate || params.initialDate || arch.attrs.initial_date || new Date()); const offset = arch.attrs.offset; if (offset && scale) { diff --git a/web_gantt/static/src/xml/web_gantt.xml b/web_gantt/static/src/xml/web_gantt.xml index aa1e13bb..264a37ae 100644 --- a/web_gantt/static/src/xml/web_gantt.xml +++ b/web_gantt/static/src/xml/web_gantt.xml @@ -69,7 +69,7 @@
- +