@visactor/vtable 0.9.1-alpha.3 → 0.9.1-alpha.4

package/cjs/core/BaseTable.d.ts

@@ -10,7 +10,7 @@ import { StateManeger } from '../state/state';
 import { EventManeger } from '../event/event';
 import type { CachedDataSource, DataSource } from '../data';
 import type { IWrapTextGraphicAttribute } from '@visactor/vrender';
-import type { ITextSize } from '@visactor/vutils';
+import { type ITextSize } from '@visactor/vutils';
 import type { ColumnData, ColumnDefine, ColumnsDefine, IndicatorData } from '../ts-types/list-table/layout-map/api';
 import type { TooltipOptions } from '../ts-types/tooltip';
 import type { BaseTableAPI, BaseTableConstructorOptions, IBaseTableProtected } from '../ts-types/base-table';

package/cjs/core/BaseTable.js

@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.BaseTable = void 0;
 
-const columnStyleContents = __importStar(require("../body-helper/style")), headerStyleContents = __importStar(require("../header-helper/style")), style_1 = require("./style"), style = __importStar(require("../tools/style")), helper_1 = require("../tools/helper"), TABLE_EVENT_TYPE_1 = require("./TABLE_EVENT_TYPE"), EventHandler_1 = require("../event/EventHandler"), EventTarget_1 = require("../event/EventTarget"), NumberMap_1 = require("../tools/NumberMap"), Rect_1 = require("../tools/Rect"), util_1 = require("../tools/util"), themes_1 = __importDefault(require("../themes")), env_1 = require("../tools/env"), scenegraph_1 = require("../scenegraph/scenegraph"), state_1 = require("../state/state"), event_1 = require("../event/event"), body_helper_1 = require("../body-helper/body-helper"), header_helper_1 = require("../header-helper/header-helper"), TooltipHandler_1 = require("../tooltip/TooltipHandler"), text_1 = require("../scenegraph/graphic/text"), measure_text_1 = require("../scenegraph/utils/measure-text"), get_prop_1 = require("../scenegraph/utils/get-prop"), icons_1 = require("../plugins/icons"), tableHelper_1 = require("./tableHelper"), MenuHandler_1 = require("../menu/dom/MenuHandler"), FouseInput_1 = require("./FouseInput"), pixel_ratio_1 = require("../tools/pixel-ratio"), {toBoxArray: toBoxArray} = helper_1.style, {isTouchEvent: isTouchEvent} = helper_1.event, rangeReg = /^\$(\d+)\$(\d+)$/;
+const columnStyleContents = __importStar(require("../body-helper/style")), headerStyleContents = __importStar(require("../header-helper/style")), style_1 = require("./style"), style = __importStar(require("../tools/style")), helper_1 = require("../tools/helper"), TABLE_EVENT_TYPE_1 = require("./TABLE_EVENT_TYPE"), EventHandler_1 = require("../event/EventHandler"), EventTarget_1 = require("../event/EventTarget"), NumberMap_1 = require("../tools/NumberMap"), Rect_1 = require("../tools/Rect"), util_1 = require("../tools/util"), themes_1 = __importDefault(require("../themes")), env_1 = require("../tools/env"), scenegraph_1 = require("../scenegraph/scenegraph"), state_1 = require("../state/state"), event_1 = require("../event/event"), body_helper_1 = require("../body-helper/body-helper"), header_helper_1 = require("../header-helper/header-helper"), TooltipHandler_1 = require("../tooltip/TooltipHandler"), vutils_1 = require("@visactor/vutils"), text_1 = require("../scenegraph/graphic/text"), measure_text_1 = require("../scenegraph/utils/measure-text"), get_prop_1 = require("../scenegraph/utils/get-prop"), icons_1 = require("../plugins/icons"), tableHelper_1 = require("./tableHelper"), MenuHandler_1 = require("../menu/dom/MenuHandler"), FouseInput_1 = require("./FouseInput"), pixel_ratio_1 = require("../tools/pixel-ratio"), {toBoxArray: toBoxArray} = helper_1.style, {isTouchEvent: isTouchEvent} = helper_1.event, rangeReg = /^\$(\d+)\$(\d+)$/;
 
 (0, style_1.importStyle)();
 
@@ -43,7 +43,7 @@ class BaseTable extends EventTarget_1.EventTarget {
     }
     constructor(options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        super(), this.showPin = !0, this.showSort = !0, this.version = "0.9.1-alpha.3", 
+        super(), this.showPin = !0, this.showSort = !0, this.version = "0.9.1-alpha.4", 
         this.id = `VTable${Date.now()}`, this.throttleInvalidate = (0, util_1.throttle2)(this.invalidate.bind(this), 200);
         const {frozenColCount: frozenColCount = 0, defaultRowHeight: defaultRowHeight = 40, defaultHeaderRowHeight: defaultHeaderRowHeight, defaultColWidth: defaultColWidth = 80, defaultHeaderColWidth: defaultHeaderColWidth, widthMode: widthMode = "standard", keyboardOptions: keyboardOptions, parentElement: parentElement, columnResizeMode: columnResizeMode, dragHeaderMode: dragHeaderMode, showPin: showPin, allowFrozenColCount: allowFrozenColCount, padding: padding, hover: hover, menu: menu, select: click, customRender: customRender, pixelRatio: pixelRatio = pixel_ratio_1.defaultPixelRatio} = options;
         this.options = options, this._widthMode = widthMode, this.customRender = customRender, 
@@ -1092,8 +1092,8 @@ class BaseTable extends EventTarget_1.EventTarget {
         return {
             textAlign: theme.text.textAlign,
             textBaseline: theme.text.textBaseline,
-            bgColor: theme.group.fill,
-            color: theme.text.fill,
+            bgColor: (0, vutils_1.isBoolean)(theme.group.fill) ? (0, get_prop_1.getProp)("bgColor", actStyle, col, row, this) : theme.group.fill,
+            color: (0, vutils_1.isBoolean)(theme.text.fill) ? (0, get_prop_1.getProp)("color", actStyle, col, row, this) : theme.text.fill,
             fontFamily: theme.text.fontFamily,
             fontSize: theme.text.fontSize,
             fontWeight: theme.text.fontWeight,
@@ -1103,13 +1103,14 @@ class BaseTable extends EventTarget_1.EventTarget {
             autoWrapText: null != autoWrapText && autoWrapText,
             lineClamp: null != lineClamp ? lineClamp : "auto",
             textOverflow: textOverflow,
-            borderColor: theme.group.stroke,
+            borderColor: (0, vutils_1.isBoolean)(theme.group.stroke) ? (0, get_prop_1.getProp)("borderColor", actStyle, col, row, this) : theme.group.stroke,
             borderLineWidth: theme.group.lineWidth,
             borderLineDash: theme.group.lineDash,
-            underline: theme.text.underline,
-            underlineDash: theme.text.underlineDash,
-            lineThrough: theme.text.lineThrough,
-            lineThroughDash: theme.text.lineThroughDash
+            underline: !!theme.text.underline,
+            lineThrough: !!theme.text.lineThrough,
+            padding: theme._vtable.padding,
+            underlineWidth: theme.text.underline,
+            lineThroughLineWidth: theme.text.lineThrough
         };
     }
     getAllBodyCells(colMaxCount, rowMaxCount) {