@visactor/vtable 0.13.4-alpha.5 → 0.13.5

package/cjs/body-helper/style/CheckboxStyle.d.ts

@@ -1,7 +1,13 @@
-import type { CheckboxStyleOption, IStyleOption } from '../../ts-types';
+import type { CheckboxStyleOption } from '../../ts-types';
 import { Style } from './Style';
 export declare class CheckboxStyle extends Style {
+    private _size;
+    private _spaceBetweenTextAndIcon;
     static get DEFAULT(): CheckboxStyle;
-    constructor(style?: CheckboxStyleOption, bodyStyle?: IStyleOption);
+    constructor(style?: CheckboxStyleOption, headerStyle?: CheckboxStyleOption);
+    get size(): number;
+    set size(size: number);
+    get spaceBetweenTextAndIcon(): number;
+    set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon: number);
     clone(): CheckboxStyle;
 }

package/cjs/body-helper/style/CheckboxStyle.js

@@ -12,11 +12,25 @@ class CheckboxStyle extends Style_1.Style {
     static get DEFAULT() {
         return defaultStyle || (defaultStyle = new CheckboxStyle);
     }
-    constructor(style = {}, bodyStyle = {}) {
-        super(style, bodyStyle);
+    constructor(style = {}, headerStyle = {}) {
+        var _a, _b;
+        super(style, headerStyle), this._size = (null !== (_a = style.size) && void 0 !== _a ? _a : null == headerStyle ? void 0 : headerStyle.size) || 14, 
+        this._spaceBetweenTextAndIcon = (null !== (_b = style.spaceBetweenTextAndIcon) && void 0 !== _b ? _b : null == headerStyle ? void 0 : headerStyle.spaceBetweenTextAndIcon) || 8;
+    }
+    get size() {
+        return this._size;
+    }
+    set size(size) {
+        this._size = size;
+    }
+    get spaceBetweenTextAndIcon() {
+        return this._spaceBetweenTextAndIcon;
+    }
+    set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon) {
+        this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;
     }
     clone() {
-        return new CheckboxStyle(this, null);
+        return new CheckboxStyle(this);
     }
 }
 

package/cjs/body-helper/style/CheckboxStyle.js.map

@@ -1 +1 @@
-{"version":3,"sources":["body-helper/style/CheckboxStyle.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAChC,IAAI,YAA2B,CAAC;AAEhC,MAAa,aAAc,SAAQ,aAAK;IAItC,MAAM,KAAK,OAAO;QAChB,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,aAAa,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,YAAY,QAA6B,EAAE,EAAE,YAA0B,EAAE;QACvE,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAG1B,CAAC;IAeD,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;CACF;AA7BD,sCA6BC","file":"CheckboxStyle.js","sourcesContent":["import type { CheckboxStyleOption, IStyleOption, StylePropertyFunctionArg } from '../../ts-types';\nimport { Style } from './Style';\nlet defaultStyle: CheckboxStyle;\n\nexport class CheckboxStyle extends Style {\n  // private _checked: boolean | ((args: StylePropertyFunctionArg) => boolean);\n  // private _disable: boolean | ((args: StylePropertyFunctionArg) => boolean);\n\n  static get DEFAULT(): CheckboxStyle {\n    return defaultStyle ? defaultStyle : (defaultStyle = new CheckboxStyle());\n  }\n  constructor(style: CheckboxStyleOption = {}, bodyStyle: IStyleOption = {}) {\n    super(style, bodyStyle);\n    // this._checked = style.checked;\n    // this._disable = style.disable;\n  }\n  // get checked(): boolean | ((args: StylePropertyFunctionArg) => boolean) {\n  //   return this._checked;\n  // }\n  // set checked(value: boolean | ((args: StylePropertyFunctionArg) => boolean)) {\n  //   this._checked = value;\n  //   //this.doChangeStyle();\n  // }\n  // get disable(): boolean | ((args: StylePropertyFunctionArg) => boolean) {\n  //   return this._disable;\n  // }\n  // set disable(value: boolean | ((args: StylePropertyFunctionArg) => boolean)) {\n  //   this._disable = value;\n  //   //this.doChangeStyle();\n  // }\n  clone(): CheckboxStyle {\n    return new CheckboxStyle(this, null);\n  }\n}\n"]}
+{"version":3,"sources":["body-helper/style/CheckboxStyle.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAEhC,IAAI,YAA2B,CAAC;AAEhC,MAAa,aAAc,SAAQ,aAAK;IAGtC,MAAM,KAAK,OAAO;QAChB,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,aAAa,EAAE,CAAC,CAAC;IAC5E,CAAC;IACD,YAAY,QAA6B,EAAE,EAAE,cAAmC,EAAE;;QAChF,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACrD,IAAI,CAAC,wBAAwB,GAAG,CAAC,MAAA,KAAK,CAAC,uBAAuB,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC/G,CAAC;IACD,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,IAAI,IAAI,CAAC,IAAY;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IACD,IAAI,uBAAuB;QACzB,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACvC,CAAC;IACD,IAAI,uBAAuB,CAAC,uBAA+B;QACzD,IAAI,CAAC,wBAAwB,GAAG,uBAAuB,CAAC;IAC1D,CAAC;IACD,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACF;AA1BD,sCA0BC","file":"CheckboxStyle.js","sourcesContent":["import type { CheckboxStyleOption, IStyleOption } from '../../ts-types';\nimport { Style } from './Style';\n\nlet defaultStyle: CheckboxStyle;\n\nexport class CheckboxStyle extends Style {\n  private _size: number;\n  private _spaceBetweenTextAndIcon: number;\n  static get DEFAULT(): CheckboxStyle {\n    return defaultStyle ? defaultStyle : (defaultStyle = new CheckboxStyle());\n  }\n  constructor(style: CheckboxStyleOption = {}, headerStyle: CheckboxStyleOption = {}) {\n    super(style, headerStyle);\n    this._size = (style.size ?? headerStyle?.size) || 14;\n    this._spaceBetweenTextAndIcon = (style.spaceBetweenTextAndIcon ?? headerStyle?.spaceBetweenTextAndIcon) || 8;\n  }\n  get size(): number {\n    return this._size;\n  }\n  set size(size: number) {\n    this._size = size;\n  }\n  get spaceBetweenTextAndIcon(): number {\n    return this._spaceBetweenTextAndIcon;\n  }\n  set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon: number) {\n    this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;\n  }\n  clone(): CheckboxStyle {\n    return new CheckboxStyle(this);\n  }\n}\n"]}

package/cjs/core/BaseTable.d.ts

@@ -280,6 +280,7 @@ export declare abstract class BaseTable extends EventTarget implements BaseTable
     getRecordStartRowByRecordIndex(index: number): number;
     _getHeaderCellBySortState(sortState: SortState): CellAddress | undefined;
     getCellRange(col: number, row: number): CellRange;
+    getCustomMerge(col: number, row: number): import("../ts-types").CustomMerge;
     isCellRangeEqual(col: number, row: number, targetCol: number, targetRow: number): boolean;
     _getLayoutCellId(col: number, row: number): LayoutObjectId;
     getHeaderDescription(col: number, row: number): string | undefined;

package/cjs/core/BaseTable.js

@@ -45,7 +45,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g;
-        if (super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.13.4-alpha.5", 
+        if (super(), this.showFrozenIcon = !0, this.showSort = !0, this.version = "0.13.5", 
         this.id = `VTable${Date.now()}`, this.isReleased = !1, this.throttleInvalidate = (0, 
         util_1.throttle2)(this.render.bind(this), 200), !container && "node" !== options.mode) throw new Error("vtable's container is undefined");
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", heightMode: heightMode = "standard", autoFillWidth: autoFillWidth = !1, autoFillHeight: autoFillHeight = !1, keyboardOptions: keyboardOptions, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showFrozenIcon: showFrozenIcon, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio, renderChartAsync: renderChartAsync, renderChartAsyncBatchCount: renderChartAsyncBatchCount, mode: mode, modeParams: modeParams, canvasWidth: canvasWidth, canvasHeight: canvasHeight, overscrollBehavior: overscrollBehavior} = options;
@@ -105,7 +105,9 @@ class BaseTable extends EventTarget_1.EventTarget {
         }, options.menu), Array.isArray(null === (_e = options.menu) || void 0 === _e ? void 0 : _e.dropDownMenuHighlight) && this.setDropDownMenuHighlight(null === (_f = options.menu) || void 0 === _f ? void 0 : _f.dropDownMenuHighlight), 
         Array.isArray(null === (_g = options.menu) || void 0 === _g ? void 0 : _g.defaultHeaderMenuItems) && (this.globalDropDownMenu = options.menu.defaultHeaderMenuItems), 
         "html" === internalProps.menu.renderMode && (internalProps.menuHandler = new MenuHandler_1.MenuHandler(this)), 
-        this.headerStyleCache = new Map, this.bodyStyleCache = new Map;
+        this.headerStyleCache = new Map, this.bodyStyleCache = new Map, internalProps.stick = {
+            changedCells: []
+        }, internalProps.customMergeCell = options.customMergeCell;
     }
     getContainer() {
         return this.container;
@@ -996,8 +998,31 @@ class BaseTable extends EventTarget_1.EventTarget {
         }
     }
     getCellRange(col, row) {
+        if (this.internalProps.customMergeCell) {
+            const customMerge = this.internalProps.customMergeCell(col, row, this);
+            if (customMerge && customMerge.range && customMerge.text) return customMerge.range;
+        }
         return this.internalProps.layoutMap.getCellRange(col, row);
     }
+    getCustomMerge(col, row) {
+        if (this.internalProps.customMergeCell) {
+            const customMerge = this.internalProps.customMergeCell(col, row, this);
+            if (customMerge && customMerge.range && customMerge.text) {
+                if (customMerge.style) {
+                    const styleClass = this.internalProps.bodyHelper.getStyleClass("text"), style = customMerge.style, fullStyle = columnStyleContents.of(style, this.theme.bodyStyle, {
+                        col: col,
+                        row: row,
+                        table: this,
+                        value: this.getCellValue(col, row),
+                        dataValue: this.getCellOriginValue(col, row),
+                        cellHeaderPaths: this.getCellHeaderPaths(col, row)
+                    }, styleClass, this.options.autoWrapText);
+                    customMerge.style = fullStyle;
+                }
+                return customMerge;
+            }
+        }
+    }
     isCellRangeEqual(col, row, targetCol, targetRow) {
         return this.internalProps.layoutMap.isCellRangeEqual(col, row, targetCol, targetRow);
     }