@visactor/vtable 1.11.6-alpha.1 → 1.11.6-alpha.3

package/cjs/core/tableHelper.js

@@ -272,4 +272,5 @@ exports._getTargetFrozenColAt = _getTargetFrozenColAt, exports._toPxWidth = _toP
 exports._applyColWidthLimits = _applyColWidthLimits, exports.isAutoDefine = isAutoDefine, 
 exports._getScrollableVisibleRect = _getScrollableVisibleRect, exports.getStyleTheme = getStyleTheme, 
 exports.getCellCornerRadius = getCellCornerRadius, exports.parseMarkLineGetExtendRange = parseMarkLineGetExtendRange, 
-exports.generateAggregationForColumn = generateAggregationForColumn, exports.checkHasAggregationOnColumnDefine = checkHasAggregationOnColumnDefine;
+exports.generateAggregationForColumn = generateAggregationForColumn, exports.checkHasAggregationOnColumnDefine = checkHasAggregationOnColumnDefine;
+//# sourceMappingURL=tableHelper.js.map

package/cjs/dataset/dataset-pivot-table.js

@@ -346,5 +346,4 @@ class DatasetForPivotTable {
     }
 }
 
-exports.DatasetForPivotTable = DatasetForPivotTable;
-//# sourceMappingURL=dataset-pivot-table.js.map
+exports.DatasetForPivotTable = DatasetForPivotTable;

package/cjs/edit/edit-manager.js

@@ -45,8 +45,6 @@ class EditManeger {
                     height: rect.height
                 }
             };
-            col === this.table.colCount - 1 && (referencePosition.rect.width = rect.width - 1), 
-            row === this.table.rowCount - 1 && (referencePosition.rect.height = rect.height - 1), 
             editor.beginEditing, null === (_c = editor.beginEditing) || void 0 === _c || _c.call(editor, this.table.getElement(), referencePosition, dataValue), 
             editor.bindSuccessCallback, null === (_d = editor.bindSuccessCallback) || void 0 === _d || _d.call(editor, (() => {
                 this.completeEdit();

package/cjs/edit/edit-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/edit/edit-manager.ts"],"names":[],"mappings":"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","file":"edit-manager.js","sourcesContent":["import type { IEditor } from '@visactor/vtable-editors';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ListTableAPI, ListTableConstructorOptions } from '../ts-types';\nimport { getCellEventArgsSet } from '../event/util';\nimport type { SimpleHeaderLayoutMap } from '../layout';\nimport { isPromise } from '../tools/helper';\nimport { isValid } from '@visactor/vutils';\n\nexport class EditManeger {\n  table: BaseTableAPI;\n  editingEditor: IEditor;\n  isValidatingValue: boolean = false;\n  editCell: { col: number; row: number };\n\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.bindEvent();\n  }\n\n  bindEvent() {\n    const handler = this.table.internalProps.handler;\n    const editCellTrigger = (this.table.options as ListTableConstructorOptions).editCellTrigger;\n    this.table.on(TABLE_EVENT_TYPE.DBLCLICK_CELL, e => {\n      if (\n        !editCellTrigger || //默认为双击\n        editCellTrigger === 'doubleclick' ||\n        (Array.isArray(editCellTrigger) && editCellTrigger.includes('doubleclick'))\n      ) {\n        const { col, row } = e;\n\n        //取双击自动列宽逻辑\n        const eventArgsSet = getCellEventArgsSet(e.federatedEvent);\n        const resizeCol = this.table.scenegraph.getResizeColAt(\n          eventArgsSet.abstractPos.x,\n          eventArgsSet.abstractPos.y,\n          eventArgsSet.eventArgs?.targetCell\n        );\n        if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {\n          // 判断同双击自动列宽的时间监听的DBLCLICK_CELL\n          // 如果是双击自动列宽 则编辑不开启\n          return;\n        }\n        this.startEditCell(col, row);\n      }\n    });\n\n    this.table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {\n      if (editCellTrigger === 'click' || (Array.isArray(editCellTrigger) && editCellTrigger.includes('click'))) {\n        const { col, row } = e;\n        this.startEditCell(col, row);\n      }\n    });\n\n    // handler.on(this.table.getElement(), 'wheel', (e: WheelEvent) => {\n    //   this.completeEdit();\n    // });\n    // handler.on(this.table.getElement(), 'resize', (e: Event) => {\n    //   if (this.table.autoFillWidth || this.table.autoFillHeight) {\n    //     this.completeEdit();\n    //   }\n    // });\n  }\n\n  startEditCell(col: number, row: number, value?: string | number) {\n    if (this.editingEditor) {\n      return;\n    }\n    const editor = (this.table as ListTableAPI).getEditor(col, row);\n    if (editor) {\n      // //自定义内容单元格不允许编辑\n      // if (this.table.getCustomRender(col, row) || this.table.getCustomLayout(col, row)) {\n      //   console.warn(\"VTable Warn: cell has config custom render or layout, can't be edited\");\n      //   return;\n      // }\n      // if (!this.table.isHeader(col, row)) {\n      //   const range = this.table.getCellRange(col, row);\n      //   const isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      //   if (isMerge) {\n      //     console.warn(\"VTable Warn: this is merge cell, can't be edited\");\n      //     return;\n      //   }\n      // }\n      if ((this.table.internalProps.layoutMap as SimpleHeaderLayoutMap)?.isAggregation?.(col, row)) {\n        console.warn(\"VTable Warn: this is aggregation value, can't be edited\");\n        return;\n      }\n\n      if (!this.editingEditor) {\n        this.editCell = { col, row };\n      }\n      this.editingEditor = editor;\n      const dataValue = isValid(value) ? value : this.table.getCellOriginValue(col, row);\n      const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));\n      const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };\n\n      // adjust last col&row, same as packages/vtable/src/scenegraph/graphic/contributions/group-contribution-render.ts getCellSizeForDraw\n      if (col === this.table.colCount - 1) {\n        referencePosition.rect.width = rect.width - 1;\n      }\n      if (row === this.table.rowCount - 1) {\n        referencePosition.rect.height = rect.height - 1;\n      }\n\n      editor.beginEditing && console.warn('VTable Warn: `beginEditing` is deprecated, please use `onStart` instead.');\n      editor.beginEditing?.(this.table.getElement(), referencePosition, dataValue);\n\n      if (editor.bindSuccessCallback) {\n        console.warn('VTable Warn: `bindSuccessCallback` is deprecated, please use `onStart` instead.');\n      }\n      editor.bindSuccessCallback?.(() => {\n        this.completeEdit();\n      });\n      editor.onStart?.({\n        value: dataValue,\n        endEdit: () => {\n          this.completeEdit();\n        },\n        referencePosition,\n        container: this.table.getElement(),\n        col,\n        row\n      });\n    }\n  }\n\n  /** 如果是鼠标事件触发调用该接口 请传入原始事件对象 将判断事件对象是否在编辑器本身上面  来处理是否结束编辑\n   * 返回值如果为false说明没有退出编辑状态  validateValue接口返回false 说明校验失败不退出编辑 */\n  completeEdit(e?: Event): boolean | Promise<boolean> {\n    if (!this.editingEditor) {\n      return true;\n    }\n    if (this.isValidatingValue) {\n      return false;\n    }\n    const target = e?.target as HTMLElement | undefined;\n    const { editingEditor: editor } = this;\n\n    if (target) {\n      if (editor.targetIsOnEditor) {\n        console.warn('VTable Warn: `targetIsOnEditor` is deprecated, please use `isEditorElement` instead.');\n\n        if (editor.targetIsOnEditor(target)) {\n          return false;\n        }\n      } else if (!editor.isEditorElement || editor.isEditorElement(target)) {\n        return false;\n      }\n    }\n\n    if (!this.editingEditor.getValue) {\n      console.warn('VTable Warn: `getValue` is not provided, did you forget to implement it?');\n    }\n    if (this.editingEditor.validateValue) {\n      this.isValidatingValue = true;\n      const maybePromiseOrValue = this.editingEditor.validateValue?.();\n      if (isPromise(maybePromiseOrValue)) {\n        return new Promise((resolve, reject) => {\n          maybePromiseOrValue\n            .then(result => {\n              if (result) {\n                this.doExit();\n                resolve(true);\n              } else {\n                this.isValidatingValue = false;\n                resolve(false);\n              }\n            })\n            .catch((err: Error) => {\n              this.isValidatingValue = false;\n              console.error('VTable Error:', err);\n              reject(err);\n            });\n        });\n      } else if (maybePromiseOrValue) {\n        this.doExit();\n        return true;\n      }\n      return false;\n    }\n    this.doExit();\n    return true;\n  }\n\n  private doExit() {\n    const changedValue = this.editingEditor.getValue?.();\n    const range = this.table.getCellRange(this.editCell.col, this.editCell.row);\n    const changedValues: any[] = [];\n    for (let row = range.start.row; row <= range.end.row; row++) {\n      const rowChangedValues = [];\n      for (let col = range.start.col; col <= range.end.col; col++) {\n        rowChangedValues.push(changedValue);\n      }\n      changedValues.push(rowChangedValues);\n    }\n    (this.table as ListTableAPI).changeCellValues(range.start.col, range.start.row, changedValues);\n    this.editingEditor.exit && console.warn('VTable Warn: `exit` is deprecated, please use `onEnd` instead.');\n    this.editingEditor.exit?.();\n    this.editingEditor.onEnd?.();\n    this.editingEditor = null;\n    this.isValidatingValue = false;\n  }\n\n  cancelEdit() {\n    if (this.editingEditor) {\n      // TODO: 添加开发时弃用警告\n      this.editingEditor.exit?.();\n      this.editingEditor.onEnd?.();\n      this.editingEditor = null;\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/edit/edit-manager.ts"],"names":[],"mappings":"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","file":"edit-manager.js","sourcesContent":["import type { IEditor } from '@visactor/vtable-editors';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { ListTableAPI, ListTableConstructorOptions } from '../ts-types';\nimport { getCellEventArgsSet } from '../event/util';\nimport type { SimpleHeaderLayoutMap } from '../layout';\nimport { isPromise } from '../tools/helper';\nimport { isValid } from '@visactor/vutils';\n\nexport class EditManeger {\n  table: BaseTableAPI;\n  editingEditor: IEditor;\n  isValidatingValue: boolean = false;\n  editCell: { col: number; row: number };\n\n  constructor(table: BaseTableAPI) {\n    this.table = table;\n    this.bindEvent();\n  }\n\n  bindEvent() {\n    const handler = this.table.internalProps.handler;\n    const editCellTrigger = (this.table.options as ListTableConstructorOptions).editCellTrigger;\n    this.table.on(TABLE_EVENT_TYPE.DBLCLICK_CELL, e => {\n      if (\n        !editCellTrigger || //默认为双击\n        editCellTrigger === 'doubleclick' ||\n        (Array.isArray(editCellTrigger) && editCellTrigger.includes('doubleclick'))\n      ) {\n        const { col, row } = e;\n\n        //取双击自动列宽逻辑\n        const eventArgsSet = getCellEventArgsSet(e.federatedEvent);\n        const resizeCol = this.table.scenegraph.getResizeColAt(\n          eventArgsSet.abstractPos.x,\n          eventArgsSet.abstractPos.y,\n          eventArgsSet.eventArgs?.targetCell\n        );\n        if (this.table._canResizeColumn(resizeCol.col, resizeCol.row) && resizeCol.col >= 0) {\n          // 判断同双击自动列宽的时间监听的DBLCLICK_CELL\n          // 如果是双击自动列宽 则编辑不开启\n          return;\n        }\n        this.startEditCell(col, row);\n      }\n    });\n\n    this.table.on(TABLE_EVENT_TYPE.CLICK_CELL, e => {\n      if (editCellTrigger === 'click' || (Array.isArray(editCellTrigger) && editCellTrigger.includes('click'))) {\n        const { col, row } = e;\n        this.startEditCell(col, row);\n      }\n    });\n\n    // handler.on(this.table.getElement(), 'wheel', (e: WheelEvent) => {\n    //   this.completeEdit();\n    // });\n    // handler.on(this.table.getElement(), 'resize', (e: Event) => {\n    //   if (this.table.autoFillWidth || this.table.autoFillHeight) {\n    //     this.completeEdit();\n    //   }\n    // });\n  }\n\n  startEditCell(col: number, row: number, value?: string | number) {\n    if (this.editingEditor) {\n      return;\n    }\n    const editor = (this.table as ListTableAPI).getEditor(col, row);\n    if (editor) {\n      // //自定义内容单元格不允许编辑\n      // if (this.table.getCustomRender(col, row) || this.table.getCustomLayout(col, row)) {\n      //   console.warn(\"VTable Warn: cell has config custom render or layout, can't be edited\");\n      //   return;\n      // }\n      // if (!this.table.isHeader(col, row)) {\n      //   const range = this.table.getCellRange(col, row);\n      //   const isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;\n      //   if (isMerge) {\n      //     console.warn(\"VTable Warn: this is merge cell, can't be edited\");\n      //     return;\n      //   }\n      // }\n      if ((this.table.internalProps.layoutMap as SimpleHeaderLayoutMap)?.isAggregation?.(col, row)) {\n        console.warn(\"VTable Warn: this is aggregation value, can't be edited\");\n        return;\n      }\n\n      if (!this.editingEditor) {\n        this.editCell = { col, row };\n      }\n      this.editingEditor = editor;\n      const dataValue = isValid(value) ? value : this.table.getCellOriginValue(col, row);\n      const rect = this.table.getCellRangeRelativeRect(this.table.getCellRange(col, row));\n      const referencePosition = { rect: { left: rect.left, top: rect.top, width: rect.width, height: rect.height } };\n\n      editor.beginEditing && console.warn('VTable Warn: `beginEditing` is deprecated, please use `onStart` instead.');\n      editor.beginEditing?.(this.table.getElement(), referencePosition, dataValue);\n\n      if (editor.bindSuccessCallback) {\n        console.warn('VTable Warn: `bindSuccessCallback` is deprecated, please use `onStart` instead.');\n      }\n      editor.bindSuccessCallback?.(() => {\n        this.completeEdit();\n      });\n      editor.onStart?.({\n        value: dataValue,\n        endEdit: () => {\n          this.completeEdit();\n        },\n        referencePosition,\n        container: this.table.getElement(),\n        col,\n        row\n      });\n    }\n  }\n\n  /** 如果是鼠标事件触发调用该接口 请传入原始事件对象 将判断事件对象是否在编辑器本身上面  来处理是否结束编辑\n   * 返回值如果为false说明没有退出编辑状态  validateValue接口返回false 说明校验失败不退出编辑 */\n  completeEdit(e?: Event): boolean | Promise<boolean> {\n    if (!this.editingEditor) {\n      return true;\n    }\n    if (this.isValidatingValue) {\n      return false;\n    }\n    const target = e?.target as HTMLElement | undefined;\n    const { editingEditor: editor } = this;\n\n    if (target) {\n      if (editor.targetIsOnEditor) {\n        console.warn('VTable Warn: `targetIsOnEditor` is deprecated, please use `isEditorElement` instead.');\n\n        if (editor.targetIsOnEditor(target)) {\n          return false;\n        }\n      } else if (!editor.isEditorElement || editor.isEditorElement(target)) {\n        return false;\n      }\n    }\n\n    if (!this.editingEditor.getValue) {\n      console.warn('VTable Warn: `getValue` is not provided, did you forget to implement it?');\n    }\n    if (this.editingEditor.validateValue) {\n      this.isValidatingValue = true;\n      const maybePromiseOrValue = this.editingEditor.validateValue?.();\n      if (isPromise(maybePromiseOrValue)) {\n        return new Promise((resolve, reject) => {\n          maybePromiseOrValue\n            .then(result => {\n              if (result) {\n                this.doExit();\n                resolve(true);\n              } else {\n                this.isValidatingValue = false;\n                resolve(false);\n              }\n            })\n            .catch((err: Error) => {\n              this.isValidatingValue = false;\n              console.error('VTable Error:', err);\n              reject(err);\n            });\n        });\n      } else if (maybePromiseOrValue) {\n        this.doExit();\n        return true;\n      }\n      return false;\n    }\n    this.doExit();\n    return true;\n  }\n\n  private doExit() {\n    const changedValue = this.editingEditor.getValue?.();\n    const range = this.table.getCellRange(this.editCell.col, this.editCell.row);\n    const changedValues: any[] = [];\n    for (let row = range.start.row; row <= range.end.row; row++) {\n      const rowChangedValues = [];\n      for (let col = range.start.col; col <= range.end.col; col++) {\n        rowChangedValues.push(changedValue);\n      }\n      changedValues.push(rowChangedValues);\n    }\n    (this.table as ListTableAPI).changeCellValues(range.start.col, range.start.row, changedValues);\n    this.editingEditor.exit && console.warn('VTable Warn: `exit` is deprecated, please use `onEnd` instead.');\n    this.editingEditor.exit?.();\n    this.editingEditor.onEnd?.();\n    this.editingEditor = null;\n    this.isValidatingValue = false;\n  }\n\n  cancelEdit() {\n    if (this.editingEditor) {\n      // TODO: 添加开发时弃用警告\n      this.editingEditor.exit?.();\n      this.editingEditor.onEnd?.();\n      this.editingEditor = null;\n    }\n  }\n}\n"]}

package/cjs/index.d.ts

@@ -19,7 +19,7 @@ import { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils
 export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
 export { getTargetCell } from './event/util';
-export declare const version = "1.11.6-alpha.1";
+export declare const version = "1.11.6-alpha.3";
 export { TYPES, core, ListTable, ListTableSimple, ListTableConstructorOptions, PivotTable, PivotTableSimple, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, GanttConstructorOptions, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout, updateCell, renderChart, graphicUtil, setCustomAlphabetCharSet, restoreMeasureText };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/cjs/index.js

@@ -169,7 +169,7 @@ Object.defineProperty(exports, "getTargetCell", {
     get: function() {
         return util_1.getTargetCell;
     }
-}), exports.version = "1.11.6-alpha.1", exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, 
+}), exports.version = "1.11.6-alpha.3", exports.getIcons = getIcons, exports.clearGlobal = clearGlobal, 
 TYPES.AggregationType, __exportStar(require("./components"), exports), __exportStar(require("./scenegraph/group-creater/cell-type"), exports);
 
 var TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE");

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4D;AAyG1D,4FAzGO,qBAAW,OAyGP;AAxGb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AA6DlC,sBAAK;AA5DP,6CAA+B;AA6D7B,oBAAI;AA5DN,6CAA+B;AAuF7B,oBAAI;AAtFN,+CAAiC;AACjC,qDAAuC;AA0FrC,4BAAQ;AAzFV,iDAAmC;AAmFjC,wBAAM;AAlFR,yEAA2D;AA4FzD,wCAAc;AArEhB,mDAA4D;AAkC1D,0FAlCuB,4BAAS,OAkCvB;AAjCX,yDAAqD;AAkCnD,gGAlCO,kCAAe,OAkCP;AAhCjB,qDAA+D;AAkC7D,2FAlCwB,8BAAU,OAkCxB;AAjCZ,2DAAuD;AAkCrD,iGAlCO,oCAAgB,OAkCP;AAjClB,6CAA0C;AAoCxC,2FApCO,uBAAU,OAoCP;AAlCZ,8DAAgD;AA+D9C,oCAAY;AA7Dd,wEAAoE;AA8DlE,2FA9DO,wBAAU,OA8DP;AA7DZ,gGAAqF;AA8DnF,4FA9DO,iCAAW,OA8DP;AA7Db,kEAA+F;AAgE7F,mGAhEO,iCAAkB,OAgEP;AADlB,yGA/D2B,uCAAwB,OA+D3B;AA1D1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAC7B,qCAA6C;AAApC,qGAAA,aAAa,OAAA;AAKT,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAyDxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAtBC,4BAAQ;AAwBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA3BC,kCAAW;AA4Bb,KAAK,CAAC,eAAe,CAAC;AAEtB,+CAA6B;AAC7B,uEAAqD;AAErD,4DAA2D;AAAlD,oHAAA,gBAAgB,OAAA;AACzB,wFAA+G;AAAtG,gIAAA,sBAAsB,OAAA;AAAE,gIAAA,sBAAsB,OAAA;AAEvD,mDAAkD;AAAzC,0GAAA,WAAW,OAAA","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  GanttConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.11.6-alpha.1\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableSimple,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableSimple,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  GanttConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout,\n  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\n  // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n\nexport { EventTarget } from './event/EventTarget';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4D;AAyG1D,4FAzGO,qBAAW,OAyGP;AAxGb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AA6DlC,sBAAK;AA5DP,6CAA+B;AA6D7B,oBAAI;AA5DN,6CAA+B;AAuF7B,oBAAI;AAtFN,+CAAiC;AACjC,qDAAuC;AA0FrC,4BAAQ;AAzFV,iDAAmC;AAmFjC,wBAAM;AAlFR,yEAA2D;AA4FzD,wCAAc;AArEhB,mDAA4D;AAkC1D,0FAlCuB,4BAAS,OAkCvB;AAjCX,yDAAqD;AAkCnD,gGAlCO,kCAAe,OAkCP;AAhCjB,qDAA+D;AAkC7D,2FAlCwB,8BAAU,OAkCxB;AAjCZ,2DAAuD;AAkCrD,iGAlCO,oCAAgB,OAkCP;AAjClB,6CAA0C;AAoCxC,2FApCO,uBAAU,OAoCP;AAlCZ,8DAAgD;AA+D9C,oCAAY;AA7Dd,wEAAoE;AA8DlE,2FA9DO,wBAAU,OA8DP;AA7DZ,gGAAqF;AA8DnF,4FA9DO,iCAAW,OA8DP;AA7Db,kEAA+F;AAgE7F,mGAhEO,iCAAkB,OAgEP;AADlB,yGA/D2B,uCAAwB,OA+D3B;AA1D1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAC7B,qCAA6C;AAApC,qGAAA,aAAa,OAAA;AAKT,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAyDxC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAtBC,4BAAQ;AAwBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA3BC,kCAAW;AA4Bb,KAAK,CAAC,eAAe,CAAC;AAEtB,+CAA6B;AAC7B,uEAAqD;AAErD,4DAA2D;AAAlD,oHAAA,gBAAgB,OAAA;AACzB,wFAA+G;AAAtG,gIAAA,sBAAsB,OAAA;AAAE,gIAAA,sBAAsB,OAAA;AAEvD,mDAAkD;AAAzC,0GAAA,WAAW,OAAA","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  GanttConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.11.6-alpha.3\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableSimple,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableSimple,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  GanttConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout,\n  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\n  // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n\nexport { EventTarget } from './event/EventTarget';\n"]}

package/cjs/plugins/custom-cell-style.d.ts

@@ -1,5 +1,5 @@
 import type { BaseTableAPI } from '../ts-types/base-table';
-import { type CellRange, type ColumnStyleOption, type CustomCellStyle, type CustomCellStyleArrangement } from '../ts-types';
+import type { CellRange, ColumnStyleOption, CustomCellStyle, CustomCellStyleArrangement } from '../ts-types';
 import type { Style } from '../body-helper/style';
 export interface ICustomCellStylePlugin {
     new (table: BaseTableAPI, customCellStyle: CustomCellStyle[], customCellStyleArrangement: CustomCellStyleArrangement[]): CustomCellStylePlugin;

package/cjs/plugins/custom-cell-style.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerCustomCellStylePlugin = exports.mergeStyle = exports.CustomCellStylePlugin = void 0;
 
-const vutils_1 = require("@visactor/vutils"), ts_types_1 = require("../ts-types"), factory_1 = require("../core/factory");
+const vutils_1 = require("@visactor/vutils"), factory_1 = require("../core/factory");
 
 class CustomCellStylePlugin {
     constructor(table, customCellStyle, customCellStyleArrangement) {
@@ -44,34 +44,25 @@ class CustomCellStylePlugin {
         })), this.table.scenegraph.updateNextFrame();
     }
     arrangeCustomCellStyle(cellPos, customStyleId) {
-        var _a;
         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 && !customStyleId) return;
-        if (-1 === index && customStyleId) this.customCellStyleArrangement.push({
-            cellPosition: {
-                col: cellPos.col,
-                row: cellPos.row,
-                range: cellPos.range
-            },
-            customStyleId: customStyleId
-        }); else {
-            if (this.customCellStyleArrangement[index].customStyleId === customStyleId) return;
-            customStyleId ? this.customCellStyleArrangement[index].customStyleId = customStyleId : this.customCellStyleArrangement.splice(index, 1);
-        }
-        const style = null === (_a = this.getCustomCellStyleOption(customStyleId)) || void 0 === _a ? void 0 : _a.style;
-        let forceFastUpdate;
-        if (style) {
-            forceFastUpdate = !0;
-            for (const key in style) if (-1 === ts_types_1.cellStyleKeys.indexOf(key)) {
-                forceFastUpdate = !1;
-                break;
+        if (-1 !== index || customStyleId) {
+            if (-1 === index && customStyleId) this.customCellStyleArrangement.push({
+                cellPosition: {
+                    col: cellPos.col,
+                    row: cellPos.row,
+                    range: cellPos.range
+                },
+                customStyleId: customStyleId
+            }); else {
+                if (this.customCellStyleArrangement[index].customStyleId === customStyleId) return;
+                customStyleId ? this.customCellStyleArrangement[index].customStyleId = customStyleId : this.customCellStyleArrangement.splice(index, 1);
             }
+            if (cellPos.range) for (let col = Math.max(0, cellPos.range.start.col); col <= Math.min(this.table.colCount - 1, cellPos.range.end.col); col++) for (let row = Math.max(0, cellPos.range.start.row); row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row); row++) {
+                const range = this.table.getCellRange(col, row);
+                for (let c = range.start.col; c <= range.end.col; c++) for (let r = range.start.row; r <= range.end.row; r++) this.table.scenegraph.updateCellContent(c, r);
+            } else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
+            this.table.scenegraph.updateNextFrame();
         }
-        if (cellPos.range) for (let col = Math.max(0, cellPos.range.start.col); col <= Math.min(this.table.colCount - 1, cellPos.range.end.col); col++) for (let row = Math.max(0, cellPos.range.start.row); row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row); row++) {
-            const range = this.table.getCellRange(col, row);
-            for (let c = range.start.col; c <= range.end.col; c++) for (let r = range.start.row; r <= range.end.row; r++) this.table.scenegraph.updateCellContent(c, r, forceFastUpdate);
-        } else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row, forceFastUpdate);
-        this.table.scenegraph.updateNextFrame();
     }
     updateCustomCell(customCellStyle, customCellStyleArrangement) {
         this.customCellStyle.length = 0, this.customCellStyleArrangement.length = 0, customCellStyle.forEach((cellStyle => {

package/cjs/plugins/custom-cell-style.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/plugins/custom-cell-style.ts"],"names":[],"mappings":"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","file":"custom-cell-style.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport {\n  cellStyleKeys,\n  type CellRange,\n  type ColumnStyleOption,\n  type CustomCellStyle,\n  type CustomCellStyleArrangement\n} from '../ts-types';\nimport type { Style } from '../body-helper/style';\nimport { Factory } from '../core/factory';\n\nexport interface ICustomCellStylePlugin {\n  new (\n    table: BaseTableAPI,\n    customCellStyle: CustomCellStyle[],\n    customCellStyleArrangement: CustomCellStyleArrangement[]\n  ): CustomCellStylePlugin;\n}\n\nexport class CustomCellStylePlugin {\n  table: BaseTableAPI;\n  customCellStyle: CustomCellStyle[];\n  customCellStyleArrangement: CustomCellStyleArrangement[];\n\n  constructor(\n    table: BaseTableAPI,\n    customCellStyle: CustomCellStyle[],\n    customCellStyleArrangement: CustomCellStyleArrangement[]\n  ) {\n    this.table = table;\n    this.customCellStyle = customCellStyle;\n    this.customCellStyleArrangement = customCellStyleArrangement;\n  }\n\n  getCustomCellStyle(col: number, row: number) {\n    const customStyleIds = this.getCustomCellStyleIds(col, row);\n    if (customStyleIds.length) {\n      const styles: ColumnStyleOption[] = [];\n\n      customStyleIds.forEach(customStyleId => {\n        const styleOption = this.getCustomCellStyleOption(customStyleId);\n        if (styleOption?.style) {\n          styles.push(styleOption.style);\n        }\n      });\n\n      return merge({}, ...styles);\n      // const styleOption = this.getCustomCellStyleOption(customStyleId);\n      // return styleOption?.style;\n    }\n    return undefined;\n  }\n\n  getCustomCellStyleIds(col: number, row: number) {\n    // let customStyleId;\n    const customStyleIds: string[] = [];\n\n    const range = this.table.getCellRange(col, row);\n    for (let c = range.start.col; c <= range.end.col; c++) {\n      for (let r = range.start.row; r <= range.end.row; r++) {\n        // eslint-disable-next-line no-loop-func\n        this.customCellStyleArrangement.forEach(style => {\n          if (style.cellPosition.range) {\n            if (\n              style.cellPosition.range.start.col <= c &&\n              style.cellPosition.range.end.col >= c &&\n              style.cellPosition.range.start.row <= r &&\n              style.cellPosition.range.end.row >= r\n            ) {\n              // customStyleId = style.customStyleId;\n              customStyleIds.push(style.customStyleId);\n            }\n          } else if (style.cellPosition.col === c && style.cellPosition.row === r) {\n            // customStyleId = style.customStyleId;\n            customStyleIds.push(style.customStyleId);\n          }\n        });\n      }\n    }\n\n    return customStyleIds;\n  }\n\n  getCustomCellStyleOption(customStyleId: string) {\n    return this.customCellStyle.find(style => style.id === customStyleId);\n  }\n\n  registerCustomCellStyle(customStyleId: string, customStyle: ColumnStyleOption | undefined | null) {\n    const index = this.customCellStyle.findIndex(style => style.id === customStyleId);\n    if (index === -1) {\n      this.customCellStyle.push({\n        id: customStyleId,\n        style: customStyle\n      });\n    } else {\n      this.customCellStyle[index] = {\n        id: customStyleId,\n        style: customStyle\n      };\n    }\n\n    this.customCellStyleArrangement.forEach(cellStyle => {\n      const cellPos = cellStyle.cellPosition;\n      if (cellStyle.customStyleId === customStyleId) {\n        if (cellPos.range) {\n          for (\n            let col = Math.max(0, cellPos.range.start.col);\n            col <= Math.min(this.table.colCount - 1, cellPos.range.end.col);\n            col++\n          ) {\n            for (\n              let row = Math.max(0, cellPos.range.start.row);\n              row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row);\n              row++\n            ) {\n              this.table.scenegraph.updateCellContent(col, row);\n            }\n          }\n        } else {\n          this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);\n        }\n      }\n    });\n    this.table.scenegraph.updateNextFrame();\n  }\n\n  arrangeCustomCellStyle(\n    cellPos: {\n      col?: number;\n      row?: number;\n      range?: CellRange;\n    },\n    customStyleId: string | undefined | null\n  ) {\n    const index = this.customCellStyleArrangement.findIndex(style => {\n      if (style.cellPosition.range && cellPos.range) {\n        return (\n          style.cellPosition.range.start.col === cellPos.range.start.col &&\n          style.cellPosition.range.start.row === cellPos.range.start.row &&\n          style.cellPosition.range.end.col === cellPos.range.end.col &&\n          style.cellPosition.range.end.row === cellPos.range.end.row\n        );\n      }\n      return style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row;\n    });\n\n    if (index === -1 && !customStyleId) {\n      // do nothing\n      return;\n    } else if (index === -1 && customStyleId) {\n      // add new style\n      this.customCellStyleArrangement.push({\n        cellPosition: {\n          col: cellPos.col,\n          row: cellPos.row,\n          range: cellPos.range\n        },\n        customStyleId: customStyleId\n      });\n    } else if (this.customCellStyleArrangement[index].customStyleId === customStyleId) {\n      // same style\n      return;\n    } else if (customStyleId) {\n      // update style\n      this.customCellStyleArrangement[index].customStyleId = customStyleId;\n    } else {\n      // delete useless style\n      this.customCellStyleArrangement.splice(index, 1);\n    }\n\n    const style = this.getCustomCellStyleOption(customStyleId)?.style;\n    let forceFastUpdate;\n    if (style) {\n      forceFastUpdate = true;\n      for (const key in style) {\n        if (cellStyleKeys.indexOf(key) === -1) {\n          forceFastUpdate = false;\n          break;\n        }\n      }\n    }\n\n    // update cell group\n    if (cellPos.range) {\n      for (\n        let col = Math.max(0, cellPos.range.start.col);\n        col <= Math.min(this.table.colCount - 1, cellPos.range.end.col);\n        col++\n      ) {\n        for (\n          let row = Math.max(0, cellPos.range.start.row);\n          row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row);\n          row++\n        ) {\n          const range = this.table.getCellRange(col, row);\n          for (let c = range.start.col; c <= range.end.col; c++) {\n            for (let r = range.start.row; r <= range.end.row; r++) {\n              this.table.scenegraph.updateCellContent(c, r, forceFastUpdate);\n            }\n          }\n          // this.table.scenegraph.updateCellContent(col, row);\n        }\n      }\n    } else {\n      this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row, forceFastUpdate);\n    }\n\n    this.table.scenegraph.updateNextFrame();\n  }\n\n  updateCustomCell(customCellStyle: CustomCellStyle[], customCellStyleArrangement: CustomCellStyleArrangement[]) {\n    this.customCellStyle.length = 0;\n    this.customCellStyleArrangement.length = 0;\n    customCellStyle.forEach((cellStyle: CustomCellStyle) => {\n      this.registerCustomCellStyle(cellStyle.id, cellStyle.style);\n    });\n    customCellStyleArrangement.forEach((cellStyle: CustomCellStyleArrangement) => {\n      this.arrangeCustomCellStyle(cellStyle.cellPosition, cellStyle.customStyleId);\n    });\n  }\n\n  hasCustomCellStyle(customStyleId: string) {\n    return this.customCellStyle.some(style => style.id === customStyleId);\n  }\n}\n\nexport function mergeStyle(cacheStyle: Style, customCellStyle: ColumnStyleOption): Style {\n  cacheStyle = cacheStyle.clone();\n\n  for (const key in customCellStyle) {\n    const value = (customCellStyle as any)[key];\n    if (value) {\n      (cacheStyle as any)[`_${key}`] = value;\n    }\n  }\n\n  return cacheStyle;\n}\n\nexport const registerCustomCellStylePlugin = () => {\n  Factory.registerComponent('customCellStylePlugin', CustomCellStylePlugin);\n};\n\n// export type ICustomCellStylePlugin = typeof CustomCellStylePlugin;\n"]}
+{"version":3,"sources":["../src/plugins/custom-cell-style.ts"],"names":[],"mappings":"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","file":"custom-cell-style.js","sourcesContent":["import { merge } from '@visactor/vutils';\nimport type { BaseTableAPI } from '../ts-types/base-table';\nimport type { CellRange, ColumnStyleOption, CustomCellStyle, CustomCellStyleArrangement } from '../ts-types';\nimport type { Style } from '../body-helper/style';\nimport { Factory } from '../core/factory';\n\nexport interface ICustomCellStylePlugin {\n  new (\n    table: BaseTableAPI,\n    customCellStyle: CustomCellStyle[],\n    customCellStyleArrangement: CustomCellStyleArrangement[]\n  ): CustomCellStylePlugin;\n}\n\nexport class CustomCellStylePlugin {\n  table: BaseTableAPI;\n  customCellStyle: CustomCellStyle[];\n  customCellStyleArrangement: CustomCellStyleArrangement[];\n\n  constructor(\n    table: BaseTableAPI,\n    customCellStyle: CustomCellStyle[],\n    customCellStyleArrangement: CustomCellStyleArrangement[]\n  ) {\n    this.table = table;\n    this.customCellStyle = customCellStyle;\n    this.customCellStyleArrangement = customCellStyleArrangement;\n  }\n\n  getCustomCellStyle(col: number, row: number) {\n    const customStyleIds = this.getCustomCellStyleIds(col, row);\n    if (customStyleIds.length) {\n      const styles: ColumnStyleOption[] = [];\n\n      customStyleIds.forEach(customStyleId => {\n        const styleOption = this.getCustomCellStyleOption(customStyleId);\n        if (styleOption?.style) {\n          styles.push(styleOption.style);\n        }\n      });\n\n      return merge({}, ...styles);\n      // const styleOption = this.getCustomCellStyleOption(customStyleId);\n      // return styleOption?.style;\n    }\n    return undefined;\n  }\n\n  getCustomCellStyleIds(col: number, row: number) {\n    // let customStyleId;\n    const customStyleIds: string[] = [];\n\n    const range = this.table.getCellRange(col, row);\n    for (let c = range.start.col; c <= range.end.col; c++) {\n      for (let r = range.start.row; r <= range.end.row; r++) {\n        // eslint-disable-next-line no-loop-func\n        this.customCellStyleArrangement.forEach(style => {\n          if (style.cellPosition.range) {\n            if (\n              style.cellPosition.range.start.col <= c &&\n              style.cellPosition.range.end.col >= c &&\n              style.cellPosition.range.start.row <= r &&\n              style.cellPosition.range.end.row >= r\n            ) {\n              // customStyleId = style.customStyleId;\n              customStyleIds.push(style.customStyleId);\n            }\n          } else if (style.cellPosition.col === c && style.cellPosition.row === r) {\n            // customStyleId = style.customStyleId;\n            customStyleIds.push(style.customStyleId);\n          }\n        });\n      }\n    }\n\n    return customStyleIds;\n  }\n\n  getCustomCellStyleOption(customStyleId: string) {\n    return this.customCellStyle.find(style => style.id === customStyleId);\n  }\n\n  registerCustomCellStyle(customStyleId: string, customStyle: ColumnStyleOption | undefined | null) {\n    const index = this.customCellStyle.findIndex(style => style.id === customStyleId);\n    if (index === -1) {\n      this.customCellStyle.push({\n        id: customStyleId,\n        style: customStyle\n      });\n    } else {\n      this.customCellStyle[index] = {\n        id: customStyleId,\n        style: customStyle\n      };\n    }\n\n    this.customCellStyleArrangement.forEach(cellStyle => {\n      const cellPos = cellStyle.cellPosition;\n      if (cellStyle.customStyleId === customStyleId) {\n        if (cellPos.range) {\n          for (\n            let col = Math.max(0, cellPos.range.start.col);\n            col <= Math.min(this.table.colCount - 1, cellPos.range.end.col);\n            col++\n          ) {\n            for (\n              let row = Math.max(0, cellPos.range.start.row);\n              row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row);\n              row++\n            ) {\n              this.table.scenegraph.updateCellContent(col, row);\n            }\n          }\n        } else {\n          this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);\n        }\n      }\n    });\n    this.table.scenegraph.updateNextFrame();\n  }\n\n  arrangeCustomCellStyle(\n    cellPos: {\n      col?: number;\n      row?: number;\n      range?: CellRange;\n    },\n    customStyleId: string | undefined | null\n  ) {\n    const index = this.customCellStyleArrangement.findIndex(style => {\n      if (style.cellPosition.range && cellPos.range) {\n        return (\n          style.cellPosition.range.start.col === cellPos.range.start.col &&\n          style.cellPosition.range.start.row === cellPos.range.start.row &&\n          style.cellPosition.range.end.col === cellPos.range.end.col &&\n          style.cellPosition.range.end.row === cellPos.range.end.row\n        );\n      }\n      return style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row;\n    });\n\n    if (index === -1 && !customStyleId) {\n      // do nothing\n      return;\n    } else if (index === -1 && customStyleId) {\n      // add new style\n      this.customCellStyleArrangement.push({\n        cellPosition: {\n          col: cellPos.col,\n          row: cellPos.row,\n          range: cellPos.range\n        },\n        customStyleId: customStyleId\n      });\n    } else if (this.customCellStyleArrangement[index].customStyleId === customStyleId) {\n      // same style\n      return;\n    } else if (customStyleId) {\n      // update style\n      this.customCellStyleArrangement[index].customStyleId = customStyleId;\n    } else {\n      // delete useless style\n      this.customCellStyleArrangement.splice(index, 1);\n    }\n\n    // update cell group\n    if (cellPos.range) {\n      for (\n        let col = Math.max(0, cellPos.range.start.col);\n        col <= Math.min(this.table.colCount - 1, cellPos.range.end.col);\n        col++\n      ) {\n        for (\n          let row = Math.max(0, cellPos.range.start.row);\n          row <= Math.min(this.table.rowCount - 1, cellPos.range.end.row);\n          row++\n        ) {\n          const range = this.table.getCellRange(col, row);\n          for (let c = range.start.col; c <= range.end.col; c++) {\n            for (let r = range.start.row; r <= range.end.row; r++) {\n              this.table.scenegraph.updateCellContent(c, r);\n            }\n          }\n          // this.table.scenegraph.updateCellContent(col, row);\n        }\n      }\n    } else {\n      this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);\n    }\n\n    this.table.scenegraph.updateNextFrame();\n  }\n\n  updateCustomCell(customCellStyle: CustomCellStyle[], customCellStyleArrangement: CustomCellStyleArrangement[]) {\n    this.customCellStyle.length = 0;\n    this.customCellStyleArrangement.length = 0;\n    customCellStyle.forEach((cellStyle: CustomCellStyle) => {\n      this.registerCustomCellStyle(cellStyle.id, cellStyle.style);\n    });\n    customCellStyleArrangement.forEach((cellStyle: CustomCellStyleArrangement) => {\n      this.arrangeCustomCellStyle(cellStyle.cellPosition, cellStyle.customStyleId);\n    });\n  }\n\n  hasCustomCellStyle(customStyleId: string) {\n    return this.customCellStyle.some(style => style.id === customStyleId);\n  }\n}\n\nexport function mergeStyle(cacheStyle: Style, customCellStyle: ColumnStyleOption): Style {\n  cacheStyle = cacheStyle.clone();\n\n  for (const key in customCellStyle) {\n    const value = (customCellStyle as any)[key];\n    if (value) {\n      (cacheStyle as any)[`_${key}`] = value;\n    }\n  }\n\n  return cacheStyle;\n}\n\nexport const registerCustomCellStylePlugin = () => {\n  Factory.registerComponent('customCellStylePlugin', CustomCellStylePlugin);\n};\n\n// export type ICustomCellStylePlugin = typeof CustomCellStylePlugin;\n"]}

package/cjs/scenegraph/group-creater/cell-helper.d.ts

@@ -6,7 +6,7 @@ export declare function createCell(type: ColumnTypeOption, value: string, define
     elementsGroup?: VGroup;
     renderDefault: boolean;
 }): Group;
-export declare function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean, isShadow?: boolean, forceFastUpdate?: boolean): Group;
+export declare function updateCell(col: number, row: number, table: BaseTableAPI, addNew?: boolean, isShadow?: boolean): Group;
 export declare function dealWithMergeCellSize(range: CellRange, cellWidth: number, cellHeight: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, table: BaseTableAPI): void;
 export declare function dealWithMergeCellSizeForShadow(range: CellRange, cellWidth: number, cellHeight: number, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, table: BaseTableAPI, cellGroup: Group): void;
 export declare function resizeCellGroup(cellGroup: Group, rangeWidth: number, rangeHeight: number, range: CellRange, table: BaseTableAPI): {

package/cjs/scenegraph/group-creater/cell-helper.js

@@ -68,7 +68,7 @@ function createCell(type, value, define, table, col, row, colWidth, cellWidth, c
     cellGroup;
 }
 
-function updateCell(col, row, table, addNew, isShadow, forceFastUpdate) {
+function updateCell(col, row, table, addNew, isShadow) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, !0), cellLocation = table.getCellLocation(col, row);
     let isMerge, range, customStyle, customResult, value = table.getCellValue(col, row), isCustomMerge = !1;
@@ -98,7 +98,7 @@ function updateCell(col, row, table, addNew, isShadow, forceFastUpdate) {
     const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row), autoWrapText = null !== (_a = cellStyle.autoWrapText) && void 0 !== _a ? _a : table.internalProps.autoWrapText, cellTheme = (0, 
     tableHelper_1.getStyleTheme)(cellStyle, table, isMerge ? range.start.col : col, isMerge ? range.start.row : row, get_prop_1.getProp).theme;
     if (cellTheme.group.cornerRadius = (0, tableHelper_1.getCellCornerRadius)(col, row, table), 
-    !addNew && !isMerge && !((null == define ? void 0 : define.customLayout) || (null == define ? void 0 : define.customRender) || (null == define ? void 0 : define.headerCustomLayout) || (null == define ? void 0 : define.headerCustomRender)) && (forceFastUpdate || canUseFastUpdate(col, row, oldCellGroup, autoWrapText, mayHaveIcon, table))) {
+    !addNew && !isMerge && !((null == define ? void 0 : define.customLayout) || (null == define ? void 0 : define.customRender) || (null == define ? void 0 : define.headerCustomLayout) || (null == define ? void 0 : define.headerCustomRender)) && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, mayHaveIcon, table)) {
         const cellWidth = table.getColWidth(col), cellHeight = table.getRowHeight(row);
         oldCellGroup.setAttributes({
             width: cellWidth,