@visactor/vtable-sheet 1.22.4-alpha.2 → 1.22.4-alpha.3

package/cjs/index.d.ts

@@ -2,5 +2,5 @@ import VTableSheet from './components/vtable-sheet';
 import type { ISheetDefine, IVTableSheetOptions } from './ts-types';
 import * as TYPES from './ts-types';
 import * as VTable from './vtable';
-export declare const version = "1.22.4-alpha.2";
+export declare const version = "1.22.4-alpha.3";
 export { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };

package/cjs/index.js

@@ -47,4 +47,4 @@ exports.VTable = VTable;
 
 const style_manager_1 = require("./styles/style-manager");
 
-exports.version = "1.22.4-alpha.2", (0, style_manager_1.importStyles)();
+exports.version = "1.22.4-alpha.3", (0, style_manager_1.importStyles)();

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAAoD;AAW3C,sBAXF,sBAAW,CAWE;AATpB,kDAAoC;AASd,sBAAK;AAR3B,iDAAmC;AAQN,wBAAM;AAPnC,0DAAsD;AACzC,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,4BAAY,GAAE,CAAC","file":"index.js","sourcesContent":["import VTableSheet from './components/vtable-sheet';\nimport type { ISheetDefine, IVTableSheetOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.22.4-alpha.2\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAAoD;AAW3C,sBAXF,sBAAW,CAWE;AATpB,kDAAoC;AASd,sBAAK;AAR3B,iDAAmC;AAQN,wBAAM;AAPnC,0DAAsD;AACzC,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,4BAAY,GAAE,CAAC","file":"index.js","sourcesContent":["import VTableSheet from './components/vtable-sheet';\nimport type { ISheetDefine, IVTableSheetOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.22.4-alpha.3\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions };\n"]}

package/dist/vtable-sheet.js

@@ -59310,7 +59310,7 @@
       }
       constructor(container, options = {}) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
-        if (super(), this.showFrozenIcon = !0, this.version = "1.22.4-alpha.2", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env$1.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.22.4-alpha.3", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "node" === Env$1.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(this, options), this.fireListeners(TABLE_EVENT_TYPE.BEFORE_INIT, {
           options: options,
           container: container
@@ -73108,13 +73108,20 @@
           e.stopPropagation();
         });
       }
-      show(col, row, filterModes) {
-        this.filterModes = filterModes, this.filterModes.includes("byValue") ? this.filterModes.includes("byCondition") || (this.filterTabByCondition.style.display = "none", setTimeout(() => this.onTabSwitch("byValue"), 0)) : (this.filterTabByValue.style.display = "none", setTimeout(() => this.onTabSwitch("byCondition"), 0));
+      adjustMenuPosition(col, row, providedLeft, providedTop) {
+        if ("number" == typeof providedLeft && "number" == typeof providedTop) return this.filterMenu.style.display = this.isVisible ? "block" : "none", this.filterMenu.style.left = `${providedLeft}px`, void (this.filterMenu.style.top = `${providedTop}px`);
+        const effectiveCol = "number" == typeof col ? col : this.currentCol,
+          effectiveRow = "number" == typeof row ? row : this.currentRow;
+        if ("number" != typeof effectiveCol || "number" != typeof effectiveRow) return;
+        this.currentCol = effectiveCol, this.currentRow = effectiveRow;
         let left = 0,
           top = 0;
         const canvasBounds = this.table.canvas.getBoundingClientRect(),
-          cell = this.table.getMergeCellRect(col, row);
-        cell.right < this.filterMenuWidth ? (left = cell.left + canvasBounds.left, top = cell.bottom + canvasBounds.top) : (left = cell.right + canvasBounds.left - this.filterMenuWidth, top = cell.bottom + canvasBounds.top), this.filterMenu.style.display = "block", this.filterMenu.style.left = `${left}px`, this.filterMenu.style.top = `${top}px`;
+          cell = this.table.getCellRelativeRect(effectiveCol, effectiveRow);
+        cell.right < this.filterMenuWidth ? (left = cell.left + canvasBounds.left, top = cell.bottom + canvasBounds.top) : (left = cell.right + canvasBounds.left - this.filterMenuWidth, top = cell.bottom + canvasBounds.top), this.filterMenu.style.display = this.isVisible ? "block" : "none", this.filterMenu.style.left = `${left}px`, this.filterMenu.style.top = `${top}px`;
+      }
+      show(col, row, filterModes) {
+        this.filterModes = filterModes, this.filterModes.includes("byValue") ? this.filterModes.includes("byCondition") || (this.filterTabByCondition.style.display = "none", this.onTabSwitch("byValue")) : (this.filterTabByValue.style.display = "none", this.onTabSwitch("byCondition")), this.adjustMenuPosition(col, row), this.filterMenu.style.display = "block";
         const field = this.table.internalProps.layoutMap.getHeaderField(col, row);
         this.updateSelectedField(field);
         const currentFilter = this.filterStateManager.getFilterState(field);
@@ -82596,7 +82603,7 @@
     class FilterPlugin {
       constructor(pluginOptions) {
         var _a, _b, _c;
-        this.id = "filter", this.name = "Filter", this.runTime = [TABLE_EVENT_TYPE.BEFORE_INIT, TABLE_EVENT_TYPE.BEFORE_UPDATE_OPTION, TABLE_EVENT_TYPE.ICON_CLICK], this.id = null !== (_a = null == pluginOptions ? void 0 : pluginOptions.id) && void 0 !== _a ? _a : this.id, this.pluginOptions = pluginOptions, this.pluginOptions.filterIcon = null !== (_b = pluginOptions.filterIcon) && void 0 !== _b ? _b : {
+        this.id = "filter", this.name = "Filter", this.runTime = [TABLE_EVENT_TYPE.BEFORE_INIT, TABLE_EVENT_TYPE.BEFORE_UPDATE_OPTION, TABLE_EVENT_TYPE.ICON_CLICK, TABLE_EVENT_TYPE.SCROLL], this.id = null !== (_a = null == pluginOptions ? void 0 : pluginOptions.id) && void 0 !== _a ? _a : this.id, this.pluginOptions = pluginOptions, this.pluginOptions.filterIcon = null !== (_b = pluginOptions.filterIcon) && void 0 !== _b ? _b : {
           name: "filter-icon",
           type: "svg",
           width: 12,
@@ -82619,23 +82626,23 @@
         const eventArgs = args[0],
           runtime = args[1],
           table = args[2];
-        if (this.table = table, runtime === TABLE_EVENT_TYPE.BEFORE_INIT) this.filterEngine = new FilterEngine(), this.filterStateManager = new FilterStateManager(this.table, this.filterEngine), this.filterToolbar = new FilterToolbar(this.table, this.filterStateManager, this.pluginOptions.styles), this.filterToolbar.render(document.body), this.updateFilterIcons(eventArgs.options), this.filterStateManager.subscribe(() => {
-          this.updateFilterIcons(eventArgs.options), this.table.updateColumns(eventArgs.options.columns, {
+        if (this.table = table, runtime === TABLE_EVENT_TYPE.BEFORE_INIT) this.filterEngine = new FilterEngine(), this.filterStateManager = new FilterStateManager(this.table, this.filterEngine), this.filterToolbar = new FilterToolbar(this.table, this.filterStateManager, this.pluginOptions.styles), this.columns = eventArgs.options.columns, this.filterToolbar.render(document.body), this.updateFilterIcons(this.columns), this.filterStateManager.subscribe(() => {
+          this.updateFilterIcons(this.columns), this.table.updateColumns(this.columns, {
             clearRowHeightCache: !1
           });
-        });else if (runtime === TABLE_EVENT_TYPE.BEFORE_UPDATE_OPTION) this.pluginOptions = Object.assign(Object.assign({}, this.pluginOptions), eventArgs.options.plugins.find(plugin => plugin.id === this.id).pluginOptions), this.handleOptionUpdate(eventArgs.options);else if (runtime === TABLE_EVENT_TYPE.ICON_CLICK && "filter-icon" === eventArgs.name || "filtering-icon" === eventArgs.name) {
+        });else if (runtime === TABLE_EVENT_TYPE.BEFORE_UPDATE_OPTION) this.pluginOptions = Object.assign(Object.assign({}, this.pluginOptions), eventArgs.options.plugins.find(plugin => plugin.id === this.id).pluginOptions), this.columns = eventArgs.options.columns, this.handleOptionUpdate(eventArgs.options);else if (runtime === TABLE_EVENT_TYPE.ICON_CLICK && "filter-icon" === eventArgs.name || "filtering-icon" === eventArgs.name) {
           if (3 === (null === (_a = eventArgs.event) || void 0 === _a ? void 0 : _a.which) || 2 === (null === (_b = eventArgs.event) || void 0 === _b ? void 0 : _b.button) || 2 == (2 & (null === (_c = eventArgs.event) || void 0 === _c ? void 0 : _c.buttons))) return;
           const col = eventArgs.col,
             row = eventArgs.row;
           this.filterToolbar.isVisible ? this.filterToolbar.hide() : this.filterToolbar.show(col, row, this.pluginOptions.filterModes);
-        }
+        } else runtime === TABLE_EVENT_TYPE.SCROLL && "horizontal" === eventArgs.scrollDirection && this.filterToolbar.adjustMenuPosition();
       }
       update() {
         this.filterStateManager && this.reapplyActiveFilters();
       }
       handleOptionUpdate(options) {
         const currentActiveFields = this.filterStateManager ? this.filterStateManager.getActiveFilterFields() : [];
-        this.filterStateManager && currentActiveFields.length > 0 && this.validateFilterStatesAfterUpdate(options, currentActiveFields), this.updateFilterIcons(options);
+        this.filterStateManager && currentActiveFields.length > 0 && this.validateFilterStatesAfterUpdate(options, currentActiveFields), this.updateFilterIcons(options.columns);
       }
       reapplyActiveFilters() {
         this.filterStateManager.reapplyCurrentFilters();
@@ -82655,11 +82662,11 @@
           });
         });
       }
-      updateFilterIcons(options) {
+      updateFilterIcons(columns = []) {
         const filterIcon = this.pluginOptions.filterIcon,
           filteringIcon = this.pluginOptions.filteringIcon,
           isIconEqual = (a, b) => a === b || a && b && "object" == typeof a && "object" == typeof b && a.name === b.name;
-        options.columns.forEach(column => {
+        columns.forEach(column => {
           var _a;
           const shouldShow = this.shouldEnableFilterForColumn(column.field, column),
             isFiltering = !!(null === (_a = this.filterStateManager.getFilterState(column.field)) || void 0 === _a ? void 0 : _a.enable);
@@ -82691,13 +82698,10 @@
         };
       }
       setFilterState(filterState) {
-        if (!this.filterStateManager || !filterState || !filterState.filters) return;
-        this.filterStateManager.dispatch({
+        this.filterStateManager && (this.filterStateManager.dispatch({
           type: FilterActionType.CLEAR_ALL_FILTERS,
           payload: {}
-        });
-        this.table.columns;
-        Object.entries(filterState.filters).forEach(([, config]) => {
+        }), filterState && filterState.filters && Object.entries(filterState.filters).forEach(([, config]) => {
           config.enable && this.filterStateManager.dispatch({
             type: FilterActionType.ADD_FILTER,
             payload: {
@@ -82709,7 +82713,7 @@
               enable: !0
             }
           });
-        });
+        }));
       }
       release() {
         this.table = null, this.filterEngine = null, this.filterStateManager = null, this.filterToolbar = null;
@@ -90023,7 +90027,7 @@
         importStyle();
     }
 
-    const version = "1.22.4-alpha.2";
+    const version = "1.22.4-alpha.3";
     importStyles();
 
     exports.TYPES = index;