jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化gantt的间隔为变量

Browse Source
This commit is contained in:
mgw
2023-09-26 11:34:03 +08:00
parent b574175a56
commit 37541fdcd6
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web_gantt/static/src/js/gantt_renderer.js
View File

@@ -684,10 +684,11 @@ export default AbstractRenderer.extend(WidgetAdapterMixin, {
const stopDate = this.state.stopDate; const stopDate = this.state.stopDate;
let day = this.state.startDate; let day = this.state.startDate;
const dates = []; const dates = [];
const shift_time = 8;
if (this.state.scale == "day") { if (this.state.scale == "day") {
while (day <= stopDate) { while (day <= stopDate) {
dates.push(day); dates.push(day);
day = day.clone().add(8, token); day = day.clone().add(shift_time, token);
} }
} else { } else {
while (day <= stopDate) { while (day <= stopDate) {

9
web_gantt/static/src/js/gantt_row.js
View File

@@ -463,19 +463,20 @@ var GanttRow = Widget.extend({
this.pills.forEach(function (pill) { this.pills.forEach(function (pill) {
let widthPill; let widthPill;
let margin; let margin;
const shift_time = 8;
switch (self.state.scale) { switch (self.state.scale) {
case 'day': case 'day':
// left = pill.startDate.diff(pill.startDate.clone().startOf('hour'), 'minutes'); // 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) console.log('left', left)
pill.leftMargin = (left / 480) * 100; pill.leftMargin = (left / (shift_time * 60)) * 100;
console.log('pill.leftMargin', pill.leftMargin) console.log('pill.leftMargin', pill.leftMargin)
diff = pill.stopDate.diff(pill.startDate, 'minutes'); diff = pill.stopDate.diff(pill.startDate, 'minutes');
console.log('diff', diff) 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) console.log('gapSize', gapSize)
widthPill = (diff / 480) * 100; widthPill = (diff / (shift_time * 60)) * 100;
console.log('widthPill', widthPill) console.log('widthPill', widthPill)
margin = pill.aggregatedPills ? 0 : 4; margin = pill.aggregatedPills ? 0 : 4;
console.log('margin', margin) console.log('margin', margin)