@visactor/vtable-gantt 1.19.3 → 1.19.4-alpha.1

package/cjs/index.d.ts

@@ -6,5 +6,5 @@ import * as tools from './tools';
 import * as VRender from './vrender';
 import * as VTable from './vtable';
 import * as plugins from './plugins';
-export declare const version = "1.19.3";
+export declare const version = "1.19.4-alpha.1";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools, VRender, VTable, plugins };

package/cjs/index.js

@@ -56,5 +56,5 @@ exports.VTable = VTable;
 
 const plugins = __importStar(require("./plugins"));
 
-exports.plugins = plugins, exports.version = "1.19.3";
+exports.plugins = plugins, exports.version = "1.19.4-alpha.1";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAwBlC,sBAAK;AAVP,mCAAgC;AAY9B,sFAZO,aAAK,OAYP;AAXP,+CAAiC;AAuB/B,sBAAK;AAtBP,mDAAqC;AAuBnC,0BAAO;AAtBT,iDAAmC;AAuBjC,wBAAM;AAtBR,mDAAqC;AAuBnC,0BAAO;AAtBI,QAAA,OAAO,GAAG,QAAQ,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nimport * as plugins from './plugins';\nexport const version = \"1.19.3\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable,\n  plugins\n};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAwBlC,sBAAK;AAVP,mCAAgC;AAY9B,sFAZO,aAAK,OAYP;AAXP,+CAAiC;AAuB/B,sBAAK;AAtBP,mDAAqC;AAuBnC,0BAAO;AAtBT,iDAAmC;AAuBjC,wBAAM;AAtBR,mDAAqC;AAuBnC,0BAAO;AAtBI,QAAA,OAAO,GAAG,gBAAgB,CAAC","file":"index.js","sourcesContent":["import type { GanttConstructorOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType\n} from '@visactor/vtable';\nimport { Gantt } from './Gantt';\nimport * as tools from './tools';\nimport * as VRender from './vrender';\nimport * as VTable from './vtable';\nimport * as plugins from './plugins';\nexport const version = \"1.19.4-alpha.1\";\n/**\n * @namespace VTable\n */\nexport {\n  TYPES,\n  GanttConstructorOptions,\n  Gantt,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  tools,\n  VRender,\n  VTable,\n  plugins\n};\n"]}

package/dist/vtable-gantt.js

@@ -35785,6 +35785,16 @@
     function traverseObject(obj, childrenProperty, callback) {
       callback(obj), (null == obj ? void 0 : obj[childrenProperty]) && Array.isArray(null == obj ? void 0 : obj[childrenProperty]) && obj[childrenProperty].forEach(child => traverseObject(child, childrenProperty, callback));
     }
+    function computeChildrenNodeLength(indexKey, hierarchyState, nodeData) {
+      let size = 0;
+      if (!hierarchyState || hierarchyState === HierarchyState.collapse || hierarchyState === HierarchyState.none) return size;
+      const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
+      if (children) for (let i = 0; i < children.length; i++) {
+        size += 1;
+        size += computeChildrenNodeLength(Array.isArray(indexKey) ? indexKey.concat([i]) : [indexKey, i], children[i].hierarchyState, children[i]);
+      }
+      return size;
+    }
 
     const isNode = "undefined" == typeof window || void 0 === window.window;
     let arrayFind, arrayFindIndex;
@@ -38056,17 +38066,8 @@
           state = this.getHierarchyState(index),
           data = this.getOriginalRecord(indexed);
         if (this.clearSortedIndexMap(), state === HierarchyState.collapse) data.hierarchyState = HierarchyState.expand, this.pushChildrenNode(indexed, HierarchyState.expand, data), this.hasHierarchyStateExpand = !0;else if (state === HierarchyState.expand) {
-          let childrenLength = 0;
-          const computeChildrenNodeLength = (indexKey, hierarchyState, nodeData) => {
-            if (!hierarchyState || hierarchyState === HierarchyState.collapse || hierarchyState === HierarchyState.none) return;
-            const children = nodeData.filteredChildren ? nodeData.filteredChildren : nodeData.children;
-            if (children) for (let i = 0; i < children.length; i++) {
-              childrenLength += 1;
-              const childIndex = Array.isArray(indexKey) ? indexKey.concat([i]) : [indexKey, i];
-              computeChildrenNodeLength(childIndex, children[i].hierarchyState, children[i]);
-            }
-          };
-          computeChildrenNodeLength(indexed, state, data), this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexed) + 1, childrenLength), data.hierarchyState = HierarchyState.collapse;
+          const childrenLength = computeChildrenNodeLength(indexed, state, data);
+          this.currentIndexedData.splice(this.currentIndexedData.indexOf(indexed) + 1, childrenLength), data.hierarchyState = HierarchyState.collapse;
         }
         this.updatePagerData();
         const add = [],
@@ -50493,7 +50494,13 @@
     function startMoveCol(col, row, x, y, state, event) {
       var _a;
       if (!("canMoveHeaderPosition" in state.table.internalProps.layoutMap)) return;
-      state.columnMove.moving = !0, state.columnMove.colSource = col, state.columnMove.rowSource = row, state.columnMove.x = x - state.table.tableX, state.columnMove.y = y - state.table.tableY;
+      if (state.columnMove.moving = !0, state.columnMove.colSource = col, state.columnMove.rowSource = row, state.table.isListTable()) {
+        const nodeIndex = state.table.getRecordIndexByCell(col, row),
+          nodeData = state.table.getRecordByCell(col, row),
+          hierarchyState = state.table.getRecordHierarchyState(col, row);
+        state.columnMove.rowSourceSize = computeChildrenNodeLength(nodeIndex, hierarchyState, nodeData) + 1;
+      }
+      state.columnMove.x = x - state.table.tableX, state.columnMove.y = y - state.table.tableY;
       const cellLocation = state.table.getCellLocation(col, row),
         delta = "columnHeader" === cellLocation ? state.columnMove.x : "rowHeader" === cellLocation || state.table.internalProps.layoutMap.isSeriesNumberInBody(col, row) ? state.columnMove.y : 0,
         {
@@ -50532,8 +50539,14 @@
         col: targetCell.col,
         row: targetCell.row
       })) {
+        if (state.columnMove.x = x - state.table.tableX, state.columnMove.y = y - state.table.tableY, state.columnMove.colTarget = targetCell.col, state.columnMove.rowTarget = targetCell.row, state.table.isListTable()) {
+          const nodeIndex = state.table.getRecordIndexByCell(targetCell.col, targetCell.row),
+            nodeData = state.table.getRecordByCell(targetCell.col, targetCell.row),
+            hierarchyState = state.table.getRecordHierarchyState(targetCell.col, targetCell.row);
+          state.columnMove.rowTargetSize = computeChildrenNodeLength(nodeIndex, hierarchyState, nodeData) + 1;
+        }
         let lineX, backX, lineY, backY;
-        state.columnMove.x = x - state.table.tableX, state.columnMove.y = y - state.table.tableY, state.columnMove.colTarget = targetCell.col, state.columnMove.rowTarget = targetCell.row, state.updateCursor("grabbing");
+        state.updateCursor("grabbing");
         const cellLocation = state.table.getCellLocation(state.columnMove.colSource, state.columnMove.rowSource);
         "columnHeader" === cellLocation ? (backX = state.columnMove.x, lineX = state.table.isLeftFrozenColumn(col) ? state.columnMove.colTarget >= state.columnMove.colSource ? state.table.getColsWidth(0, state.columnMove.colTarget) : state.table.getColsWidth(0, state.columnMove.colTarget - 1) : state.table.isRightFrozenColumn(col) ? state.table.tableNoFrameWidth - state.table.getColsWidth(targetCell.col + 1, state.table.colCount - 1) : (state.columnMove.colTarget >= state.columnMove.colSource ? state.table.getColsWidth(0, state.columnMove.colTarget) : state.table.getColsWidth(0, state.columnMove.colTarget - 1)) - state.table.stateManager.scroll.horizontalBarPos) : ("rowHeader" === cellLocation || state.table.internalProps.layoutMap.isSeriesNumberInBody(col, row)) && (backY = state.columnMove.y, lineY = state.table.isFrozenRow(row) ? state.columnMove.rowTarget >= state.columnMove.rowSource ? state.table.getRowsHeight(0, state.columnMove.rowTarget) : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1) : state.table.isBottomFrozenRow(row) ? state.table.tableNoFrameHeight - state.table.getRowsHeight(targetCell.row + 1, state.table.rowCount - 1) : (state.columnMove.rowTarget >= state.columnMove.rowSource ? state.table.getRowsHeight(0, state.columnMove.rowTarget) : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1)) - state.table.stateManager.scroll.verticalBarPos), state.table.scenegraph.component.updateMoveCol(backX, lineX, backY, lineY), state.table.fireListeners(TABLE_EVENT_TYPE.CHANGING_HEADER_POSITION, {
           col: col,
@@ -51062,6 +51075,8 @@
           colTarget: -1,
           rowSource: -1,
           rowTarget: -1,
+          rowSourceSize: 0,
+          rowTargetSize: 0,
           x: 0,
           y: 0,
           moving: !1
@@ -51127,6 +51142,8 @@
           colTarget: -1,
           rowSource: -1,
           rowTarget: -1,
+          rowSourceSize: 0,
+          rowTargetSize: 0,
           x: 0,
           y: 0,
           moving: !1
@@ -52022,28 +52039,44 @@
     }
 
     function fireMoveColEventListeners(table, endMoveColSuccess, e) {
-      var _a, _b, _c, _d;
-      endMoveColSuccess && -1 !== (null === (_a = table.stateManager.columnMove) || void 0 === _a ? void 0 : _a.colSource) && -1 !== (null === (_b = table.stateManager.columnMove) || void 0 === _b ? void 0 : _b.rowSource) && -1 !== (null === (_c = table.stateManager.columnMove) || void 0 === _c ? void 0 : _c.colTarget) && -1 !== (null === (_d = table.stateManager.columnMove) || void 0 === _d ? void 0 : _d.rowTarget) ? table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION) && table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
-        target: {
-          col: table.stateManager.columnMove.colTarget,
-          row: table.stateManager.columnMove.rowTarget
-        },
-        source: {
-          col: table.stateManager.columnMove.colSource,
-          row: table.stateManager.columnMove.rowSource
-        },
-        event: e
-      }) : endMoveColSuccess || table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL) && table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
-        target: {
-          col: table.stateManager.columnMove.colTarget,
-          row: table.stateManager.columnMove.rowTarget
-        },
-        source: {
-          col: table.stateManager.columnMove.colSource,
-          row: table.stateManager.columnMove.rowSource
-        },
-        event: e
-      });
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      if (endMoveColSuccess && -1 !== (null === (_a = table.stateManager.columnMove) || void 0 === _a ? void 0 : _a.colSource) && -1 !== (null === (_b = table.stateManager.columnMove) || void 0 === _b ? void 0 : _b.rowSource) && -1 !== (null === (_c = table.stateManager.columnMove) || void 0 === _c ? void 0 : _c.colTarget) && -1 !== (null === (_d = table.stateManager.columnMove) || void 0 === _d ? void 0 : _d.rowTarget)) {
+        if (table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
+          const {
+              colSource: colSource,
+              rowSource: rowSource,
+              colTarget: colTarget,
+              rowTarget: rowTarget
+            } = table.stateManager.columnMove,
+            rowSourceSize = null !== (_e = table.stateManager.columnMove.rowSourceSize) && void 0 !== _e ? _e : 0,
+            rowTargetSize = null !== (_f = table.stateManager.columnMove.rowTargetSize) && void 0 !== _f ? _f : 0;
+          table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
+            target: {
+              col: colTarget,
+              row: rowTarget + rowTargetSize - rowSourceSize
+            },
+            source: {
+              col: colSource,
+              row: rowSource
+            },
+            event: e
+          });
+        }
+      } else if (!endMoveColSuccess && table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL)) {
+        const rowSourceSize = null !== (_g = table.stateManager.columnMove.rowSourceSize) && void 0 !== _g ? _g : 0,
+          rowTargetSize = null !== (_h = table.stateManager.columnMove.rowTargetSize) && void 0 !== _h ? _h : 0;
+        table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_FAIL, {
+          target: {
+            col: table.stateManager.columnMove.colTarget,
+            row: table.stateManager.columnMove.rowTarget + rowTargetSize - rowSourceSize
+          },
+          source: {
+            col: table.stateManager.columnMove.colSource,
+            row: table.stateManager.columnMove.rowSource
+          },
+          event: e
+        });
+      }
     }
 
     function bindTableGroupListener$1(eventManager) {
@@ -56259,7 +56292,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.19.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.19.4-alpha.1", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env.mode ? (options = container, container = null) : container instanceof HTMLElement || (options = container, container = container.container ? container.container : null), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         this.pluginManager = new PluginManager$1(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container
@@ -61449,6 +61482,10 @@
         const index = this.getRecordShowIndexByCell(col, row);
         return this.dataSource.getHierarchyState(index);
       }
+      getRecordHierarchyState(col, row) {
+        let recordIndex;
+        return this.transpose ? this.getRecordShowIndexByCell(col, 0) : recordIndex = this.getRecordShowIndexByCell(0, row), this.dataSource.getHierarchyState(recordIndex);
+      }
       toggleHierarchyState(col, row, recalculateColWidths = !0) {
         this.stateManager.updateHoverIcon(col, row, void 0, void 0);
         const hierarchyState = this.getHierarchyState(col, row);
@@ -72519,7 +72556,7 @@
         PluginManager: PluginManager
     });
 
-    const version = "1.19.3";
+    const version = "1.19.4-alpha.1";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$4;