fix: make changes to tooling

This commit is contained in:
Safwan Samsudeen 2024-09-18 17:36:44 +05:30
parent 1cd9456e25
commit fc97f3121c
9 changed files with 3234 additions and 6989 deletions

View File

@ -303,7 +303,8 @@ class O {
)); ));
} }
draw_progress_bar() { draw_progress_bar() {
if (this.invalid) return; if (this.invalid)
return;
this.$bar_progress = c("rect", { this.$bar_progress = c("rect", {
x: this.x, x: this.x,
y: this.y, y: this.y,
@ -359,7 +360,8 @@ class O {
}); });
} }
draw_resize_handles() { draw_resize_handles() {
if (this.invalid || this.gantt.options.readonly) return; if (this.invalid || this.gantt.options.readonly)
return;
const t = this.$bar, e = 8; const t = this.$bar, e = 8;
if (this.gantt.options.dates_readonly || (c("rect", { if (this.gantt.options.dates_readonly || (c("rect", {
x: t.getX() + t.getWidth() + e - 4, x: t.getX() + t.getWidth() + e - 4,
@ -422,7 +424,8 @@ class O {
}); });
} }
show_popup(t) { show_popup(t) {
if (this.gantt.bar_being_dragged) return; if (this.gantt.bar_being_dragged)
return;
const e = h.format( const e = h.format(
this.task._start, this.task._start,
"MMM D", "MMM D",
@ -548,7 +551,8 @@ class O {
)); ));
} }
update_handle_position() { update_handle_position() {
if (this.invalid || this.gantt.options.readonly) return; if (this.invalid || this.gantt.options.readonly)
return;
const t = this.$bar; 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); 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"); const e = this.group.querySelector(".handle.progress");
@ -942,7 +946,8 @@ class B {
const { x: t, date: e } = this.computeGridHighlightDimensions( const { x: t, date: e } = this.computeGridHighlightDimensions(
this.options.view_mode this.options.view_mode
); );
if (!this.dates.find((o) => o.getTime() == e.getTime())) return; if (!this.dates.find((o) => o.getTime() == e.getTime()))
return;
const s = this.options.header_height + this.options.padding / 2, i = (this.options.bar_height + this.options.padding) * this.tasks.length; const s = this.options.header_height + this.options.padding / 2, i = (this.options.bar_height + this.options.padding) * this.tasks.length;
this.$current_highlight = this.create_el({ this.$current_highlight = this.create_el({
top: s, top: s,
@ -1068,7 +1073,8 @@ class B {
let e = []; let e = [];
e = t.dependencies.map((s) => { e = t.dependencies.map((s) => {
const i = this.get_task(s); const i = this.get_task(s);
if (!i) return; if (!i)
return;
const r = new C( const r = new C(
this, this,
this.bars[i._index], this.bars[i._index],
@ -1097,7 +1103,8 @@ class B {
typeof t == "string" && (t = h.parse(t)); typeof t == "string" && (t = h.parse(t));
} }
const e = this.$svg.parentElement; const e = this.$svg.parentElement;
if (!e) return; if (!e)
return;
const i = (h.diff(t, this.gantt_start, "hour") + 24) / this.options.step * this.options.column_width - this.options.column_width; const i = (h.diff(t, this.gantt_start, "hour") + 24) / this.options.step * this.options.column_width - this.options.column_width;
e.scrollTo({ left: i, behavior: "smooth" }); e.scrollTo({ left: i, behavior: "smooth" });
} }
@ -1158,7 +1165,8 @@ class B {
}); });
})), s = p.currentTarget.scrollLeft; })), s = p.currentTarget.scrollLeft;
}), _.on(this.$svg, "mousemove", (p) => { }), _.on(this.$svg, "mousemove", (p) => {
if (!d()) return; if (!d())
return;
const g = (p.offsetX || p.layerX) - e; const g = (p.offsetX || p.layerX) - e;
a.forEach((u) => { a.forEach((u) => {
const f = u.$bar; const f = u.$bar;
@ -1186,7 +1194,8 @@ class B {
const p = _.closest(".bar-wrapper", a).getAttribute("data-id"); const p = _.closest(".bar-wrapper", a).getAttribute("data-id");
s = this.get_bar(p), i = s.$bar_progress, r = s.$bar, i.finaldx = 0, i.owidth = i.getWidth(), i.min_dx = -i.getWidth(), i.max_dx = r.getWidth() - i.getWidth(); s = this.get_bar(p), i = s.$bar_progress, r = s.$bar, i.finaldx = 0, i.owidth = i.getWidth(), i.min_dx = -i.getWidth(), i.max_dx = r.getWidth() - i.getWidth();
}), _.on(this.$svg, "mousemove", (o) => { }), _.on(this.$svg, "mousemove", (o) => {
if (!e) return; if (!e)
return;
let a = (o.offsetX || o.layerX) - t; let a = (o.offsetX || o.layerX) - t;
a > i.max_dx && (a = i.max_dx), a < i.min_dx && (a = i.min_dx); a > i.max_dx && (a = i.max_dx), a < i.min_dx && (a = i.min_dx);
const d = s.$handle_progress; const d = s.$handle_progress;
@ -1228,7 +1237,7 @@ class B {
this.popup && this.popup.hide(); this.popup && this.popup.hide();
} }
trigger_event(t, e) { trigger_event(t, e) {
this.options["on_" + t] && this.options["on_" + t].apply(null, e); this.options["on_" + t] && this.options["on_" + t].apply(this, e);
} }
/** /**
* Gets the oldest starting date from the list of tasks * Gets the oldest starting date from the list of tasks

File diff suppressed because one or more lines are too long

View File

@ -23,8 +23,8 @@
background-color: #252525; background-color: #252525;
} }
</style> </style>
<link rel="stylesheet" href="dist/style.css" /> <link rel="stylesheet" href="dist/frappe-gantt.css" />
<script src="dist/frappe-gantt.umd.cjs"></script> <script src="dist/frappe-gantt.umd.js"></script>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
@ -34,8 +34,6 @@
<div class="gantt-target"></div> <div class="gantt-target"></div>
</div> </div>
<script type="module"> <script type="module">
// import Gantt from "./dist/frappe-gantt.js";
let tasks = [ let tasks = [
{ {
start: '2024-04-01', start: '2024-04-01',
@ -106,7 +104,7 @@
let gantt_chart = new Gantt('.gantt-target', tasks, { let gantt_chart = new Gantt('.gantt-target', tasks, {
on_click: (task) => { on_click: (task) => {
console.log('Click', task); console.log('Click', task, this);
}, },
// on_double_click: (task) => { // on_double_click: (task) => {
// console.log("Double Click", task); // console.log("Double Click", task);

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "frappe-gantt", "name": "frappe-gantt",
"version": "0.7", "version": "0.8.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "frappe-gantt", "name": "frappe-gantt",
"version": "0.7", "version": "0.8.0",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"eslint": "^4.17.0", "eslint": "^4.17.0",

View File

@ -17,7 +17,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/frappe/gantt.git" "url": "git+https://github.com/frappe/gantt.git"
}, },
"files": [ "files": [
"src", "src",
@ -26,7 +26,6 @@
], ],
"exports": { "exports": {
".": { ".": {
"import": "./dist/frappe-gantt.es.js",
"require": "./dist/frappe-gantt.umd.js" "require": "./dist/frappe-gantt.umd.js"
} }
}, },

View File

@ -1292,7 +1292,7 @@ export default class Gantt {
trigger_event(event, args) { trigger_event(event, args) {
if (this.options['on_' + event]) { if (this.options['on_' + event]) {
this.options['on_' + event].apply(null, args); this.options['on_' + event].apply(this, args);
} }
} }

View File

@ -9,11 +9,10 @@ export default defineConfig({
fileName: 'frappe-gantt', fileName: 'frappe-gantt',
}, },
rollupOptions: { rollupOptions: {
external: ['vue'],
output: { output: {
globals: { format: 'cjs',
vue: 'Vue' assetFileNames: 'frappe-gantt[extname]',
} entryFileNames: 'frappe-gantt.[format].js'
}, },
}, },
}, },

10168
yarn.lock

File diff suppressed because it is too large Load Diff