@visactor/vtable-gantt 1.7.2 → 1.7.3

package/cjs/index.d.ts

@@ -3,5 +3,5 @@ import * as TYPES from './ts-types';
 import type { ColumnDefine, ColumnsDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType } from '@visactor/vtable';
 import { Gantt } from './Gantt';
 import * as tools from './tools';
-export declare const version = "1.7.2";
+export declare const version = "1.7.3";
 export { TYPES, GanttConstructorOptions, Gantt, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, tools };

package/cjs/index.js

@@ -44,5 +44,5 @@ Object.defineProperty(exports, "Gantt", {
 
 const tools = __importStar(require("./tools"));
 
-exports.tools = tools, exports.version = "1.7.2";
+exports.tools = tools, exports.version = "1.7.3";
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAqBlC,sBAAK;AAPP,mCAAgC;AAS9B,sFATO,aAAK,OASP;AARP,+CAAiC;AAoB/B,sBAAK;AAnBM,QAAA,OAAO,GAAG,OAAO,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';\nexport const version = \"1.7.2\";\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};\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoC;AAqBlC,sBAAK;AAPP,mCAAgC;AAS9B,sFATO,aAAK,OASP;AARP,+CAAiC;AAoB/B,sBAAK;AAnBM,QAAA,OAAO,GAAG,OAAO,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';\nexport const version = \"1.7.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};\n"]}

package/cjs/tools/isx.js

@@ -113,4 +113,5 @@ exports.isDocument = isDocument;
 
 const isGlobal = v => (0, exports.isIt)(v, "global");
 
-exports.isGlobal = isGlobal;
+exports.isGlobal = isGlobal;
+//# sourceMappingURL=isx.js.map

package/cjs/ts-types/events.js

@@ -2,5 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-});
-//# sourceMappingURL=events.js.map
+});

package/dist/vtable-gantt.js

@@ -27300,7 +27300,7 @@
       var _a;
       let cellGroup,
         isAsync = !1;
-      if (isPromise(value) && (value = table.getCellValue(col, row), isAsync = !0), "text" === type || "link" === type) {
+      if (isPromise(value) && (value = table.getCellValue(col, row), isAsync = !0), "text" === type || "link" === type || customResult) {
         if ("link" === type) {
           const cellValue = value,
             headerStyle = table._getCellStyle(col, row);
@@ -29540,10 +29540,13 @@
             globalCompositeOperation: "destination-out"
           }), borderRect.addChild(shadowRect);
           const hackRect = createRect({
-            width: 1,
-            height: 1,
+            x: borderLeft / 2,
+            y: borderTop / 2,
+            width: group.attribute.width,
+            height: group.attribute.height,
             fill: "transparent",
-            pickable: !1
+            pickable: !1,
+            globalCompositeOperation: "source-over"
           });
           borderRect.addChild(hackRect);
         } else borderRect = createRect(rectAttributes), borderRect.name = "table-border-rect";
@@ -30105,8 +30108,12 @@
           cellDisable && (selectMode = void 0);
         }
       } else if ("replace" === state.table.theme.selectionStyle.selectionFillMode) for (let i = 0; i < ranges.length; i++) {
-        const range = ranges[i];
-        if (range.start.col <= col && range.start.row <= row && range.end.col >= col && range.end.row >= row) {
+        const range = ranges[i],
+          rangeColStart = Math.min(range.start.col, range.end.col),
+          rangeColEnd = Math.max(range.start.col, range.end.col),
+          rangeRowStart = Math.min(range.start.row, range.end.row),
+          rangeRowEnd = Math.max(range.start.row, range.end.row);
+        if (rangeColStart <= col && rangeRowStart <= row && rangeColEnd >= col && rangeRowEnd >= row) {
           selectMode = "cellBgColor";
           break;
         }
@@ -33784,11 +33791,13 @@
       updateCheckboxCellState(col, row, checked) {
         var _a, _b;
         if (this.table.transpose) null === (_a = this.bodyGroup.children) || void 0 === _a || _a.forEach(columnGroup => {
-          columnGroup.getChildAt(row).getChildren().forEach(node => {
+          var _a;
+          null === (_a = columnGroup.getChildAt(row)) || void 0 === _a || _a.getChildren().forEach(node => {
             "checkbox" === node.name && node.setAttribute("checked", checked);
           });
         });else {
-          null === (_b = this.getColGroup(col).children) || void 0 === _b || _b.forEach(cellNode => {
+          const columnGroup = this.getColGroup(col);
+          null === (_b = null == columnGroup ? void 0 : columnGroup.children) || void 0 === _b || _b.forEach(cellNode => {
             cellNode.getChildren().find(node => {
               "checkbox" === node.name && node.setAttribute("checked", checked);
             });
@@ -34087,12 +34096,12 @@
         let cell;
         if (!cellGroup) {
           const drawRange = this.table.getDrawRange();
-          return abstractY >= drawRange.top && abstractY <= drawRange.bottom ? (cell = this.table.getCellAtRelativePosition(abstractX - offset, abstractY), cell) : {
+          return abstractY >= drawRange.top && abstractY <= drawRange.bottom && (cell = this.table.getCellAtRelativePosition(abstractX - offset, abstractY), cell.col === this.table.colCount - 1) ? cell : {
             col: -1,
             row: -1
           };
         }
-        return abstractX < cellGroup.globalAABBBounds.x1 + offset ? cell = {
+        return cellGroup.stage ? (abstractX < cellGroup.globalAABBBounds.x1 + offset ? cell = {
           col: cellGroup.col - 1,
           row: cellGroup.row,
           x: cellGroup.globalAABBBounds.x1
@@ -34100,7 +34109,10 @@
           col: cellGroup.col,
           row: cellGroup.row,
           x: cellGroup.globalAABBBounds.x2
-        }), cell && this.table.rightFrozenColCount > 0 && cell.col === this.table.colCount - this.table.rightFrozenColCount - 1 && this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() + this.table.scrollLeft < this.bodyGroup.attribute.width && (cell.col = cell.col + 1, cell.rightFrozen = !0), cell || {
+        }), cell && this.table.rightFrozenColCount > 0 && cell.col >= this.table.colCount - this.table.rightFrozenColCount - 1 && this.table.tableNoFrameWidth - this.table.getFrozenColsWidth() - this.table.getRightFrozenColsWidth() + this.table.scrollLeft < this.bodyGroup.attribute.width && (cell.col = cell.col + 1, cell.rightFrozen = !0), cell || {
+          col: -1,
+          row: -1
+        }) : {
           col: -1,
           row: -1
         };
@@ -34117,7 +34129,7 @@
             col: cellGroup.col,
             row: cellGroup.row,
             y: cellGroup.globalAABBBounds.y2
-          }), cell && this.table.bottomFrozenRowCount > 0 && cell.row === this.table.rowCount - this.table.bottomFrozenRowCount - 1 && this.table.tableNoFrameHeight - this.table.getFrozenRowsHeight() - this.table.getBottomFrozenRowsHeight() + this.table.scrollTop < this.bodyGroup.attribute.height && (cell.row = cell.row + 1, cell.bottomFrozen = !0), cell) return cell;
+          }), cell && this.table.bottomFrozenRowCount > 0 && cell.row >= this.table.rowCount - this.table.bottomFrozenRowCount - 1 && this.table.tableNoFrameHeight - this.table.getFrozenRowsHeight() - this.table.getBottomFrozenRowsHeight() + this.table.scrollTop < this.bodyGroup.attribute.height && (cell.row = cell.row + 1, cell.bottomFrozen = !0), cell) return cell;
         }
         return {
           col: -1,
@@ -34808,7 +34820,7 @@
         }
         rightColWidth - detaX < state.table.internalProps.limitMinWidth && (detaX = rightColWidth - state.table.internalProps.limitMinWidth);
       }
-      detaX = Math.ceil(detaX), state.columnResize.col < state.table.rowHeaderLevelCount || state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount ? updateResizeColForColumn(detaX, state) : "indicator" === state.table.internalProps.columnResizeType ? updateResizeColForIndicator$1(detaX, state) : "indicatorGroup" === state.table.internalProps.columnResizeType ? updateResizeColForIndicatorGroup$1(detaX, state) : "all" === state.table.internalProps.columnResizeType ? updateResizeColForAll$1(detaX, state) : updateResizeColForColumn(detaX, state), state.columnResize.x = xInTable, state.table.scenegraph.component.updateResizeCol(state.columnResize.col, yInTable, state.columnResize.isRightFrozen), state.columnResize.col < state.table.frozenColCount && !state.table.isPivotTable() && !state.table.transpose ? state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen) : state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount && !state.table.isPivotTable() && !state.table.transpose ? state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount) : state.table.options.frozenColCount ? state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1) : state.table.options.rightFrozenColCount && state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount), state.table.scenegraph.updateNextFrame();
+      detaX = Math.ceil(detaX), state.columnResize.col < state.table.rowHeaderLevelCount || state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount ? updateResizeColForColumn(detaX, state) : "indicator" === state.table.internalProps.columnResizeType ? updateResizeColForIndicator$1(detaX, state) : "indicatorGroup" === state.table.internalProps.columnResizeType ? updateResizeColForIndicatorGroup$1(detaX, state) : "all" === state.table.internalProps.columnResizeType ? updateResizeColForAll$1(detaX, state) : updateResizeColForColumn(detaX, state), state.columnResize.x = xInTable, state.table.scenegraph.component.updateResizeCol(state.columnResize.col, yInTable, state.columnResize.isRightFrozen), state.columnResize.col < state.table.frozenColCount && !state.table.isPivotTable() && !state.table.transpose ? state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1, state.columnResize.isRightFrozen) : state.table.options.frozenColCount && state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1), (state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount && !state.table.isPivotTable() && !state.table.transpose || state.table.options.rightFrozenColCount) && state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount), state.table.scenegraph.updateNextFrame();
     }
     function updateResizeColForColumn(detaX, state) {
       "adaptive" === state.table.widthMode && state.columnResize.col < state.table.colCount - 1 ? (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX), state.table.scenegraph.updateColWidth(state.columnResize.col + 1, -detaX), state.table.internalProps._widthResizedColMap.add(state.columnResize.col), state.table.internalProps._widthResizedColMap.add(state.columnResize.col + 1)) : (state.table.scenegraph.updateColWidth(state.columnResize.col, detaX), state.table.internalProps._widthResizedColMap.add(state.columnResize.col));
@@ -35785,7 +35797,7 @@
         horizontal: 1,
         vertical: 1
       });
-      (optimizedDeltaX || optimizedDeltaY) && state.interactionState !== InteractionState.scrolling && state.updateInteractionState(InteractionState.scrolling), optimizedDeltaX && (state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event), state.showHorizontalScrollBar(!0)), optimizedDeltaY && (state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event), state.showVerticalScrollBar(!0)), isWheelEvent && state.resetInteractionState(), event.cancelable && ("none" === state.table.internalProps.overscrollBehavior || Math.abs(deltaY) >= Math.abs(deltaX) && 0 !== deltaY && isVerticalScrollable(deltaY, state) || Math.abs(deltaY) <= Math.abs(deltaX) && 0 !== deltaX && isHorizontalScrollable(deltaX, state)) && event.preventDefault();
+      (optimizedDeltaX || optimizedDeltaY) && state.interactionState !== InteractionState.scrolling && state.updateInteractionState(InteractionState.scrolling), optimizedDeltaX && (state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event), state.showHorizontalScrollBar(!0)), optimizedDeltaY && (state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event), state.showVerticalScrollBar(!0)), isWheelEvent && state.resetInteractionState(), event.nativeEvent.cancelable && ("none" === state.table.internalProps.overscrollBehavior || Math.abs(deltaY) >= Math.abs(deltaX) && 0 !== deltaY && isVerticalScrollable(deltaY, state) || Math.abs(deltaY) <= Math.abs(deltaX) && 0 !== deltaX && isHorizontalScrollable(deltaX, state)) && event.nativeEvent.preventDefault();
     }
     function optimizeScrollXY(x, y, ratio) {
       var _a, _b;
@@ -36456,7 +36468,7 @@
             if (stateManager.select.cellPos.col === table.colCount - 1 ? (targetRow = Math.min(table.rowCount - 1, stateManager.select.cellPos.row + 1), targetCol = table.rowHeaderLevelCount) : stateManager.select.cellPos.row === table.rowCount - 1 ? (targetRow = table.rowCount - 1, targetCol = table.rowHeaderLevelCount) : (targetRow = stateManager.select.cellPos.row, targetCol = stateManager.select.cellPos.col + 1), isCellDisableSelect(table, targetCol, targetRow)) return;
             table.selectCell(targetCol, targetRow), (null === (_t = table.editorManager) || void 0 === _t ? void 0 : _t.editingEditor) && (table.editorManager.completeEdit(), table.getElement().focus(), table.getEditor(targetCol, targetRow) && table.editorManager.startEditCell(targetCol, targetRow));
           }
-        } else {
+        } else if (!(e.ctrlKey || e.metaKey || e.shiftKey)) {
           const editCellTrigger = table.options.editCellTrigger;
           if (("keydown" === editCellTrigger || Array.isArray(editCellTrigger) && editCellTrigger.includes("keydown")) && !(null === (_u = table.editorManager) || void 0 === _u ? void 0 : _u.editingEditor)) {
             const allowedKeys = /^[a-zA-Z0-9+\-*\/%=.,\s]$/;
@@ -38066,14 +38078,18 @@
       }
       arrangeCustomCellStyle(cellPos, customStyleId) {
         const index = this.customCellStyleArrangement.findIndex(style => style.cellPosition.range && cellPos.range ? style.cellPosition.range.start.col === cellPos.range.start.col && style.cellPosition.range.start.row === cellPos.range.start.row && style.cellPosition.range.end.col === cellPos.range.end.col && style.cellPosition.range.end.row === cellPos.range.end.row : style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row);
-        if (-1 === index ? this.customCellStyleArrangement.push({
+        if (-1 === index) this.customCellStyleArrangement.push({
           cellPosition: {
             col: cellPos.col,
             row: cellPos.row,
             range: cellPos.range
           },
           customStyleId: customStyleId
-        }) : this.customCellStyleArrangement[index].customStyleId = customStyleId, cellPos.range) for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) this.table.scenegraph.updateCellContent(col, row);else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
+        });else {
+          if (this.customCellStyleArrangement[index].customStyleId === customStyleId) return;
+          this.customCellStyleArrangement[index].customStyleId = customStyleId;
+        }
+        if (cellPos.range) for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) this.table.scenegraph.updateCellContent(col, row);else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
         this.table.scenegraph.updateNextFrame();
       }
       updateCustomCell(customCellStyle, customCellStyleArrangement) {
@@ -38621,7 +38637,7 @@
       constructor(container) {
         let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.7.2", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
+        if (super(), this.showFrozenIcon = !0, this.version = "1.7.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), !container && "node" !== options.mode && !options.canvas) throw new Error("vtable's container is undefined");
         const {
           frozenColCount = 0,
           frozenRowCount: frozenRowCount,
@@ -44927,7 +44943,7 @@
         getWeekday: getWeekday
     });
 
-    const version = "1.7.2";
+    const version = "1.7.3";
 
     exports.Gantt = Gantt;
     exports.TYPES = index$1;