From 37541fdcd69884274921d33795a6a82a4466891d Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 26 Sep 2023 11:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96gantt=E7=9A=84=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E4=B8=BA=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_gantt/static/src/js/gantt_renderer.js | 3 ++- web_gantt/static/src/js/gantt_row.js | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web_gantt/static/src/js/gantt_renderer.js b/web_gantt/static/src/js/gantt_renderer.js index f5b9ccc2..dae981c6 100644 --- a/web_gantt/static/src/js/gantt_renderer.js +++ b/web_gantt/static/src/js/gantt_renderer.js @@ -684,10 +684,11 @@ export default AbstractRenderer.extend(WidgetAdapterMixin, { const stopDate = this.state.stopDate; let day = this.state.startDate; const dates = []; + const shift_time = 8; if (this.state.scale == "day") { while (day <= stopDate) { dates.push(day); - day = day.clone().add(8, token); + day = day.clone().add(shift_time, token); } } else { while (day <= stopDate) { diff --git a/web_gantt/static/src/js/gantt_row.js b/web_gantt/static/src/js/gantt_row.js index 1d7058e1..efff4af2 100644 --- a/web_gantt/static/src/js/gantt_row.js +++ b/web_gantt/static/src/js/gantt_row.js @@ -463,19 +463,20 @@ var GanttRow = Widget.extend({ this.pills.forEach(function (pill) { let widthPill; let margin; + const shift_time = 8; switch (self.state.scale) { case 'day': // left = pill.startDate.diff(pill.startDate.clone().startOf('hour'), 'minutes'); - left = pill.startDate.diff(pill.startDate.clone().startOf('day'), 'minutes') % (8 * 60); + left = pill.startDate.diff(pill.startDate.clone().startOf('day'), 'minutes') % (shift_time * 60); console.log('left', left) - pill.leftMargin = (left / 480) * 100; + pill.leftMargin = (left / (shift_time * 60)) * 100; console.log('pill.leftMargin', pill.leftMargin) diff = pill.stopDate.diff(pill.startDate, 'minutes'); console.log('diff', diff) - var gapSize = pill.stopDate.diff(pill.startDate, 'hours') - 8; // Eventually compensate border(s) width + var gapSize = pill.stopDate.diff(pill.startDate, 'hours') - shift_time; // Eventually compensate border(s) width console.log('gapSize', gapSize) - widthPill = (diff / 480) * 100; + widthPill = (diff / (shift_time * 60)) * 100; console.log('widthPill', widthPill) margin = pill.aggregatedPills ? 0 : 4; console.log('margin', margin)