fix: a bug
This commit is contained in:
Safwan Samsudeen
parent
9cd3633dd7
commit
30a8d5a78b
20
dist/frappe-gantt.js
vendored
20
dist/frappe-gantt.js
vendored
@ -1,4 +1,4 @@
|
||||
const k = "year", D = "month", v = "day", E = "hour", Y = "minute", A = "second", L = "millisecond", T = {
|
||||
const M = "year", D = "month", v = "day", E = "hour", Y = "minute", A = "second", L = "millisecond", T = {
|
||||
January: "Jan",
|
||||
February: "Feb",
|
||||
March: "Mar",
|
||||
@ -95,7 +95,7 @@ const k = "year", D = "month", v = "day", E = "hour", Y = "minute", A = "second"
|
||||
add(n, t, e) {
|
||||
t = parseInt(t, 10);
|
||||
const s = [
|
||||
n.getFullYear() + (e === k ? t : 0),
|
||||
n.getFullYear() + (e === M ? t : 0),
|
||||
n.getMonth() + (e === D ? t : 0),
|
||||
n.getDate() + (e === v ? t : 0),
|
||||
n.getHours() + (e === E ? t : 0),
|
||||
@ -107,7 +107,7 @@ const k = "year", D = "month", v = "day", E = "hour", Y = "minute", A = "second"
|
||||
},
|
||||
start_of(n, t) {
|
||||
const e = {
|
||||
[k]: 6,
|
||||
[M]: 6,
|
||||
[D]: 5,
|
||||
[v]: 4,
|
||||
[E]: 3,
|
||||
@ -121,7 +121,7 @@ const k = "year", D = "month", v = "day", E = "hour", Y = "minute", A = "second"
|
||||
}
|
||||
const i = [
|
||||
n.getFullYear(),
|
||||
s(k) ? 0 : n.getMonth(),
|
||||
s(M) ? 0 : n.getMonth(),
|
||||
s(D) ? 1 : n.getDate(),
|
||||
s(v) ? 0 : n.getHours(),
|
||||
s(E) ? 0 : n.getMinutes(),
|
||||
@ -554,7 +554,7 @@ class O {
|
||||
const t = this.$bar;
|
||||
this.handle_group.querySelector(".handle.left").setAttribute("x", t.getX() - 12), this.handle_group.querySelector(".handle.right").setAttribute("x", t.getEndX() + 4);
|
||||
const e = this.group.querySelector(".handle.progress");
|
||||
e && e.setAttribute("points", this.get_progress_polygon_points());
|
||||
console.log(e, this.$bar_progress.getEndX()), e && e.setAttribute("cx", this.$bar_progress.getEndX());
|
||||
}
|
||||
update_arrow_position() {
|
||||
this.arrows = this.arrows || [];
|
||||
@ -685,7 +685,7 @@ class F {
|
||||
e = t;
|
||||
else
|
||||
throw new TypeError(
|
||||
"Frappé Gantt only supports usage of a string CSS selector, HTML DOM element or SVG DOM element for the 'element' parameter"
|
||||
"Frappe Gantt only supports usage of a string CSS selector, HTML DOM element or SVG DOM element for the 'element' parameter"
|
||||
);
|
||||
e ? (this.$svg = e, this.$svg.classList.add("gantt")) : this.$svg = c("svg", {
|
||||
append_to: s,
|
||||
@ -1101,7 +1101,7 @@ class F {
|
||||
bind_grid_click() {
|
||||
_.on(
|
||||
this.$svg,
|
||||
this.options.popup_trigger,
|
||||
"click",
|
||||
".grid-row, .grid-header",
|
||||
() => {
|
||||
this.unselect_all(), this.hide_popup();
|
||||
@ -1145,10 +1145,10 @@ class F {
|
||||
if (x && !x.classList.contains("current-upper")) {
|
||||
const m = document.querySelector(".current-upper");
|
||||
m && (m.classList.remove("current-upper"), m.style.left = this.upper_texts_x[m.textContent] + "px", m.style.top = this.options.header_height - 50 + "px"), x.classList.add("current-upper");
|
||||
let M = this.$svg.getBoundingClientRect();
|
||||
x.style.left = M.x + this.$container.scrollLeft + 10 + "px", x.style.top = M.y + this.options.header_height - 50 + "px";
|
||||
let k = this.$svg.getBoundingClientRect();
|
||||
x.style.left = k.x + this.$container.scrollLeft + 10 + "px", x.style.top = k.y + this.options.header_height - 50 + "px";
|
||||
}
|
||||
Array.prototype.forEach.call(g, function(m, M) {
|
||||
Array.prototype.forEach.call(g, function(m, k) {
|
||||
f.push(m.getAttribute("data-id"));
|
||||
}), w && (u = f.map((m) => this.get_bar(m)), this.options.auto_move_label && u.forEach((m) => {
|
||||
m.update_label_position_on_horizontal_scroll({
|
||||
|
||||
12
dist/frappe-gantt.umd.cjs
vendored
12
dist/frappe-gantt.umd.cjs
vendored
File diff suppressed because one or more lines are too long
@ -7,6 +7,7 @@
|
||||
"scripts": {
|
||||
"start": "yarn run dev",
|
||||
"dev": "vite",
|
||||
"build-dev": "vite build --watch",
|
||||
"build": "vite build",
|
||||
"test": "jest",
|
||||
"lint": "eslint src/**/*.js",
|
||||
|
||||
29
src/bar.js
29
src/bar.js
@ -31,8 +31,8 @@ export default class Bar {
|
||||
this.width = this.gantt.options.column_width * this.duration;
|
||||
this.progress_width =
|
||||
this.gantt.options.column_width *
|
||||
this.duration *
|
||||
(this.task.progress / 100) || 0;
|
||||
this.duration *
|
||||
(this.task.progress / 100) || 0;
|
||||
this.group = createSVG('g', {
|
||||
class:
|
||||
'bar-wrapper' +
|
||||
@ -72,8 +72,8 @@ export default class Bar {
|
||||
this.compute_expected_progress();
|
||||
this.expected_progress_width =
|
||||
this.gantt.options.column_width *
|
||||
this.duration *
|
||||
(this.expected_progress / 100) || 0;
|
||||
this.duration *
|
||||
(this.expected_progress / 100) || 0;
|
||||
}
|
||||
|
||||
draw() {
|
||||
@ -102,7 +102,7 @@ export default class Bar {
|
||||
class:
|
||||
'bar' +
|
||||
(/^((?!chrome|android).)*safari/i.test(navigator.userAgent) &&
|
||||
!this.task.important
|
||||
!this.task.important
|
||||
? ' safari'
|
||||
: ''),
|
||||
append_to: this.bar_group,
|
||||
@ -287,12 +287,12 @@ export default class Bar {
|
||||
this.group,
|
||||
'mouseenter',
|
||||
(e) =>
|
||||
(timeout = setTimeout(() => {
|
||||
this.show_popup(e.offsetX || e.layerX);
|
||||
document.getElementById(
|
||||
`${task_id}-highlight`,
|
||||
).style.display = 'block';
|
||||
}, 200)),
|
||||
(timeout = setTimeout(() => {
|
||||
this.show_popup(e.offsetX || e.layerX);
|
||||
document.getElementById(
|
||||
`${task_id}-highlight`,
|
||||
).style.display = 'block';
|
||||
}, 200)),
|
||||
);
|
||||
|
||||
$.on(this.group, 'mouseleave', () => {
|
||||
@ -567,8 +567,8 @@ export default class Bar {
|
||||
this.$expected_bar_progress.setAttribute(
|
||||
'width',
|
||||
this.gantt.options.column_width *
|
||||
this.duration *
|
||||
(this.expected_progress / 100) || 0,
|
||||
this.duration *
|
||||
(this.expected_progress / 100) || 0,
|
||||
);
|
||||
}
|
||||
|
||||
@ -634,8 +634,9 @@ export default class Bar {
|
||||
.querySelector('.handle.right')
|
||||
.setAttribute('x', bar.getEndX() + 4);
|
||||
const handle = this.group.querySelector('.handle.progress');
|
||||
console.log(handle, this.$bar_progress.getEndX())
|
||||
handle &&
|
||||
handle.setAttribute('points', this.get_progress_polygon_points());
|
||||
handle.setAttribute('cx', this.$bar_progress.getEndX());
|
||||
}
|
||||
|
||||
update_arrow_position() {
|
||||
|
||||
40
src/index.js
40
src/index.js
@ -77,8 +77,8 @@ export default class Gantt {
|
||||
svg_element = element;
|
||||
} else {
|
||||
throw new TypeError(
|
||||
'Frappé Gantt only supports usage of a string CSS selector,' +
|
||||
" HTML DOM element or SVG DOM element for the 'element' parameter",
|
||||
'Frappe Gantt only supports usage of a string CSS selector,' +
|
||||
" HTML DOM element or SVG DOM element for the 'element' parameter",
|
||||
);
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ export default class Gantt {
|
||||
if (diff < 0) {
|
||||
throw Error(
|
||||
"start of task can't be after end of task: in task #, " +
|
||||
(i + 1),
|
||||
(i + 1),
|
||||
);
|
||||
}
|
||||
// make task invalid if duration too large
|
||||
@ -390,7 +390,7 @@ export default class Gantt {
|
||||
this.options.header_height +
|
||||
this.options.padding +
|
||||
(this.options.bar_height + this.options.padding) *
|
||||
this.tasks.length;
|
||||
this.tasks.length;
|
||||
|
||||
createSVG('rect', {
|
||||
x: 0,
|
||||
@ -621,7 +621,7 @@ export default class Gantt {
|
||||
x +
|
||||
(date_utils.diff(today, this.gantt_start, 'hour') /
|
||||
this.options.step) *
|
||||
this.options.column_width,
|
||||
this.options.column_width,
|
||||
date: today,
|
||||
};
|
||||
}
|
||||
@ -776,10 +776,10 @@ export default class Gantt {
|
||||
date.getDate() !== last_date.getDate()
|
||||
? date.getMonth() !== last_date.getMonth()
|
||||
? date_utils.format(
|
||||
date,
|
||||
'D MMM',
|
||||
this.options.language,
|
||||
)
|
||||
date,
|
||||
'D MMM',
|
||||
this.options.language,
|
||||
)
|
||||
: date_utils.format(date, 'D', this.options.language)
|
||||
: '',
|
||||
Day_upper:
|
||||
@ -801,7 +801,7 @@ export default class Gantt {
|
||||
};
|
||||
let column_width = this.view_is(VIEW_MODE.MONTH)
|
||||
? (date_utils.get_days_in_month(date) * this.options.column_width) /
|
||||
30
|
||||
30
|
||||
: this.options.column_width;
|
||||
const base_pos = {
|
||||
x: last_date_info
|
||||
@ -833,17 +833,17 @@ export default class Gantt {
|
||||
base_pos_x: base_pos.x,
|
||||
upper_text: this.options.lower_text
|
||||
? this.options.upper_text(
|
||||
date,
|
||||
this.options.view_mode,
|
||||
date_text[`${this.options.view_mode}_upper`],
|
||||
)
|
||||
date,
|
||||
this.options.view_mode,
|
||||
date_text[`${this.options.view_mode}_upper`],
|
||||
)
|
||||
: date_text[`${this.options.view_mode}_upper`],
|
||||
lower_text: this.options.lower_text
|
||||
? this.options.lower_text(
|
||||
date,
|
||||
this.options.view_mode,
|
||||
date_text[`${this.options.view_mode}_lower`],
|
||||
)
|
||||
date,
|
||||
this.options.view_mode,
|
||||
date_text[`${this.options.view_mode}_lower`],
|
||||
)
|
||||
: date_text[`${this.options.view_mode}_lower`],
|
||||
upper_x: base_pos.x + x_pos[`${this.options.view_mode}_upper`],
|
||||
upper_y: base_pos.upper_y,
|
||||
@ -919,7 +919,7 @@ export default class Gantt {
|
||||
|
||||
const scroll_pos =
|
||||
(hours_before_first_task / this.options.step) *
|
||||
this.options.column_width -
|
||||
this.options.column_width -
|
||||
this.options.column_width;
|
||||
parent_element.scrollTo({ left: scroll_pos, behavior: 'smooth' });
|
||||
}
|
||||
@ -931,7 +931,7 @@ export default class Gantt {
|
||||
bind_grid_click() {
|
||||
$.on(
|
||||
this.$svg,
|
||||
this.options.popup_trigger,
|
||||
'click',
|
||||
'.grid-row, .grid-header',
|
||||
() => {
|
||||
this.unselect_all();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user