@xpyjs/gantt-core 0.0.1-rc.1 → 0.0.1-rc.3

package/dist/x-gantt.js

@@ -5,7 +5,7 @@ import G from "dayjs";
 import { default as ai } from "dayjs";
 import { merge as rt, isArray as X, isString as K, isFunction as j, cloneDeep as Z, isObject as Et, isNumber as Ut, omit as yt, throttle as wt, isBoolean as ht, debounce as Xt } from "lodash-es";
 import S from "konva";
-const Ct = "0.0.1-rc.1";
+const Ct = "0.0.1-rc.3";
 function Kt() {
   const f = "#eca710", t = "#ffffff", e = "#e7209e", i = "#ffffff", s = "#1c42e8";
   [
@@ -548,8 +548,8 @@ class mt {
   }
   /** 切换展示模式时，需要调整时间 */
   updateMode() {
-    let t = !1;
-    return this.data[this.fields.startTime] && (!this.startTime || !this.startTime.isSame(G(this.data[this.fields.startTime]))) && (this.startTime = G(this.data[this.fields.startTime]), t = !0), this.data[this.fields.endTime] && (!this.endTime || !this.endTime.isSame(G(this.data[this.fields.endTime]))) && (this.endTime = G(this.data[this.fields.endTime]), t = !0), this.startTime && this.endTime && this.duration === 0 && (this.duration = this.endTime.diff(this.startTime)), this.isMilestone() && (!this.endTime || !this.endTime.isSame(this.startTime)) && (this.endTime = this.startTime, t = !0), t;
+    let t = !1, e = !1;
+    return this.data[this.fields.startTime] && (!this.startTime || !this.startTime.isSame(G(this.data[this.fields.startTime]))) && (this.startTime = G(this.data[this.fields.startTime]), t = !0, e = !0), this.data[this.fields.endTime] && (!this.endTime || !this.endTime.isSame(G(this.data[this.fields.endTime]))) && (this.endTime = G(this.data[this.fields.endTime]), t = !0, e = !0), e && this.store.updateTime(this.startTime, this.endTime), this.startTime && this.endTime && this.duration === 0 && (this.duration = this.endTime.diff(this.startTime)), this.isMilestone() && (!this.endTime || !this.endTime.isSame(this.startTime)) && (this.endTime = this.startTime, t = !0), t;
   }
   updateData(t) {
     this.data = t;
@@ -686,40 +686,38 @@ class Jt {
    * 初始化任务
    */
   initTasks(t = !1) {
-    t ? (this.dataLevel = 0, this.tasks = [], this.taskMap.clear(), this.collapsedTaskIds.clear(), this.rawData.forEach((e) => {
+    this.dataLevel = 0, this.tasks = [], this.taskMap.clear(), this.collapsedTaskIds.clear(), this.rawData.forEach((e) => {
       this.tasks.push(this.createTask(e));
-    })) : this.rawData.length > 0 ? this.updateTask(this.rawData, this.tasks) : (this.tasks = [], this.taskMap.clear(), this.collapsedTaskIds.clear());
+    });
   }
-  createTask(t, e) {
-    const i = this.store.getOptionManager().getOptions().fields, s = new mt(this.store, this.event, t, e);
-    return Array.isArray(t[i.children]) && (s.children = t[i.children].map(
-      (n) => this.createTask(n, s)
-    )), this.taskMap.set(s.id, s), this.dataLevel = Math.max(this.dataLevel, s.level), s;
+  createTask(t, e, i = !0) {
+    const s = this.store.getOptionManager().getOptions().fields, n = new mt(this.store, this.event, t, e);
+    return i && Array.isArray(t[s.children]) && (n.children = t[s.children].map(
+      (o) => this.createTask(o, n)
+    )), this.taskMap.set(n.id, n), this.dataLevel = Math.max(this.dataLevel, n.level), n;
   }
   updateTask(t, e, i) {
     let s = 0;
     for (; s < t.length; ) {
       const n = t[s], o = e[s];
       if (n && !o) {
-        const r = this.createTask(n, i);
-        e.push(r), this.taskMap.set(r.id, r), this.dataLevel = Math.max(this.dataLevel, r.level);
-      } else !n && o ? (this.taskMap.delete(o.id), e.splice(s, 1)) : n && o && (n[this.store.getOptionManager().getOptions().fields.id] === o.id ? (o.updateData(n), this.dataLevel = Math.max(this.dataLevel, o.level)) : (this.taskMap.delete(o.id), e[s] = this.createTask(n, o.parent), this.taskMap.set(e[s].id, e[s]), this.dataLevel = Math.max(this.dataLevel, e[s].level)));
-      if (n[this.store.getOptionManager().getOptions().fields.children]) {
-        const r = n[this.store.getOptionManager().getOptions().fields.children];
+        const h = this.createTask(n, i, !1);
+        e.push(h), this.dataLevel = Math.max(this.dataLevel, h.level);
+      } else !n && o ? e.splice(s, 1) : n && o && (n[this.store.getOptionManager().getOptions().fields.id] === o.id ? (o.updateData(n), this.taskMap.set(o.id, o), this.dataLevel = Math.max(this.dataLevel, o.level)) : (e[s] = this.createTask(n, o.parent, !1), this.dataLevel = Math.max(this.dataLevel, e[s].level)));
+      const r = n[this.store.getOptionManager().getOptions().fields.children];
+      if (r)
         if (o && o.children)
           this.updateTask(r, o.children, o);
         else {
           const h = r.map(
-            (c) => this.createTask(c, e[s])
+            (c) => this.createTask(c, e[s], !1)
           );
           e[s].children = h;
         }
-      } else o && o.children && (o.children = []);
+      else o && o.children && (o.children = []);
       s++;
     }
-    e.length >= s && e.splice(s).forEach((o) => {
-      this.taskMap.delete(o.id);
-    });
+    e.length >= s && e.splice(s);
   }
   /**
    * 获取源数据
@@ -733,6 +731,10 @@ class Jt {
   getTasks(t = !0) {
     return t ? this.tasks : Array.from(this.taskMap.values());
   }
+  /** 获取数据规模 */
+  getDataSize() {
+    return this.taskMap.size;
+  }
   /**
    * 通过 ID 获取任务
    */
@@ -844,6 +846,18 @@ class Jt {
     };
     return this.tasks.forEach((s) => i(s)), this.visibleTasksCache = t, this.isDirty = !1, t;
   }
+  /**
+   * 获取一个任务是否可展示
+   */
+  isTaskVisible(t) {
+    let e = t.parent;
+    for (; e; ) {
+      if (this.collapsedTaskIds.has(e.id))
+        return !1;
+      e = e.parent;
+    }
+    return !0;
+  }
   /**
    * 获取可展示任务数量
    */
@@ -5086,20 +5100,21 @@ class Fe {
    * 高亮指定行
    */
   highlightRow(t) {
-    if (this.highlightedRowId === t) return;
-    this.highlightedRowId = t;
-    const e = this.rowsCache.get(`chart-row-${t}`);
-    if (!e) return;
+    if (this.highlightedRowId === t || (this.highlightedRowId = t, !this.rowsCache.get(`chart-row-${t}`))) return;
     this.highlightRect && this.highlightRect.destroy();
-    const s = e.task.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
-    this.selectedRowId !== t && (this.highlightRect = new S.Rect({
-      x: 0,
-      y: s + this.offsetY,
-      width: this.width,
-      height: this.context.getOptions().row.height,
-      fill: B(this.context.getOptions().row.hover.backgroundColor).alpha(this.context.getOptions().row.hover.opacity).toHex(),
-      name: "highlight-rect"
-    }), this.layer.add(this.highlightRect), this.highlightRect.moveToBottom(), this.layer.batchDraw());
+    const i = this.context.store.getDataManager().getTaskById(t);
+    if (i) {
+      const n = i.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
+      if (this.selectedRowId === t) return;
+      this.highlightRect = new S.Rect({
+        x: 0,
+        y: n + this.offsetY,
+        width: this.width,
+        height: this.context.getOptions().row.height,
+        fill: B(this.context.getOptions().row.hover.backgroundColor).alpha(this.context.getOptions().row.hover.opacity).toHex(),
+        name: "highlight-rect"
+      }), this.layer.add(this.highlightRect), this.highlightRect.moveToBottom(), this.layer.batchDraw();
+    }
   }
   /**
    * 取消行高亮
@@ -5120,8 +5135,13 @@ class Fe {
     if (t)
       this.highlightRect.y(this.highlightRect.y() + t);
     else {
-      const s = e.task.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
-      this.highlightRect.y(s + this.offsetY);
+      const i = this.context.store.getDataManager().getTaskById(e.task.id);
+      if (!i) {
+        this.clearHighlight();
+        return;
+      }
+      const n = i.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
+      this.highlightRect.y(n + this.offsetY);
     }
     this.layer.batchDraw();
   }
@@ -5135,15 +5155,15 @@ class Fe {
    * 选中指定行
    */
   selectRow(t) {
-    var n;
-    this.selectedRowId = t;
-    const e = this.rowsCache.get(`chart-row-${t}`);
-    if (!e) return;
-    this.selectedRect && this.selectedRect.destroy(), this.selectedRowId === this.highlightedRowId && ((n = this.highlightRect) == null || n.fill("transparent"));
-    const s = e.task.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
+    var o;
+    if (this.selectedRowId = t, !this.rowsCache.get(`chart-row-${t}`)) return;
+    this.selectedRect && this.selectedRect.destroy(), this.selectedRowId === this.highlightedRowId && ((o = this.highlightRect) == null || o.fill("transparent"));
+    const i = this.context.store.getDataManager().getTaskById(t);
+    if (!i) return;
+    const n = i.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
     this.selectedRect = new S.Rect({
       x: 0,
-      y: s + this.offsetY,
+      y: n + this.offsetY,
       width: this.width,
       height: this.context.getOptions().row.height,
       fill: B(this.context.getOptions().row.select.backgroundColor).alpha(this.context.getOptions().row.select.opacity).toHex(),
@@ -5163,7 +5183,7 @@ class Fe {
     if (!this.selectedRect || this.selectedRowId === null) return;
     const e = this.rowsCache.get(`chart-row-${this.selectedRowId}`);
     if (e)
-      if (this.tasks.find((i) => i.id === e.task.id)) {
+      if (this.context.store.getDataManager().getTaskById(e.task.id)) {
         const s = e.task.flatIndex * this.context.getOptions().row.height + this.context.getOptions().header.height;
         this.selectedRect.y(s + this.offsetY), this.layer.batchDraw();
       } else
@@ -5921,22 +5941,23 @@ class Ye {
     const i = Q();
     e.forEach((s) => {
       var g, d, l, m, p, u, y, x;
+      if (s.valid === !1) return;
       const n = this.createId(s), o = this.context.store.getDataManager().getTaskById(s.from), r = this.context.store.getDataManager().getTaskById(s.to);
       if (!o) {
         O.warn(
           `No corresponding FROM task [${s.from}] was found for the link. Info:`,
           s
-        );
+        ), s.valid = !1;
         return;
       }
       if (!r) {
         O.warn(
           `No corresponding TO task [${s.to}] was found for the link. Info:`,
           s
-        );
+        ), s.valid = !1;
         return;
       }
-      if (o.flatIndex < this.tasks[0].flatIndex && r.flatIndex < this.tasks[0].flatIndex || o.flatIndex > this.tasks[this.tasks.length - 1].flatIndex && r.flatIndex > this.tasks[this.tasks.length - 1].flatIndex)
+      if (!this.context.store.getDataManager().isTaskVisible(o) || !this.context.store.getDataManager().isTaskVisible(r) || o.flatIndex < this.tasks[0].flatIndex && r.flatIndex < this.tasks[0].flatIndex || o.flatIndex > this.tasks[this.tasks.length - 1].flatIndex && r.flatIndex > this.tasks[this.tasks.length - 1].flatIndex)
         return;
       const h = Math.max(0, -this.offsetX), c = h + this.width;
       if (!(this.context.store.getTimeAxis().getTimeLeft(((g = s.type) == null ? void 0 : g[0]) === "S" ? o.startTime : o.endTime) < h && this.context.store.getTimeAxis().getTimeLeft(((d = s.type) == null ? void 0 : d[1]) === "F" ? r.endTime : r.startTime) < h) && !(this.context.store.getTimeAxis().getTimeLeft(((l = s.type) == null ? void 0 : l[0]) === "S" ? o.startTime : o.endTime) > c && this.context.store.getTimeAxis().getTimeLeft(((m = s.type) == null ? void 0 : m[1]) === "F" ? r.endTime : r.startTime) > c) && this.context.store.getOptionManager().unpackFunc(this.context.getOptions().bar.show, o) && this.context.store.getOptionManager().unpackFunc(this.context.getOptions().bar.show, r)) {
@@ -7588,7 +7609,7 @@ class si {
    * 获取当前数据量总数。该数量为所有数据展开后的数据条数
    */
   getDataSize() {
-    return this.context.store.getDataManager().getVisibleSize();
+    return this.context.store.getDataManager().getDataSize();
   }
 }
 Kt();