@visactor/vtable-sheet 1.26.0 → 1.26.1-alpha.0

package/cjs/core/WorkSheet.js

@@ -444,4 +444,5 @@ class WorkSheet {
     }
 }
 
-exports.WorkSheet = WorkSheet;
+exports.WorkSheet = WorkSheet;
+//# sourceMappingURL=WorkSheet.js.map

package/cjs/event/vtable-sheet-event-bus.js

@@ -72,5 +72,4 @@ class VTableSheetEventBus {
     }
 }
 
-exports.VTableSheetEventBus = VTableSheetEventBus;
-//# sourceMappingURL=vtable-sheet-event-bus.js.map
+exports.VTableSheetEventBus = VTableSheetEventBus;

package/cjs/index.d.ts

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

package/cjs/index.js

@@ -47,4 +47,4 @@ exports.VTable = VTable;
 
 const style_manager_1 = require("./styles/style-manager");
 
-exports.version = "1.26.0", (0, style_manager_1.importStyles)();
+exports.version = "1.26.1-alpha.0", (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,QAAQ,CAAC;AAEhC,IAAA,4BAAY,GAAE,CAAC","file":"index.js","sourcesContent":["import VTableSheet from './components/vtable-sheet';\nimport type { ISheetDefine, IVTableSheetOptions, IVTableSheetUpdateOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.26.0\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions, IVTableSheetUpdateOptions };\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, IVTableSheetUpdateOptions } from './ts-types';\nimport * as TYPES from './ts-types';\nimport * as VTable from './vtable';\nimport { importStyles } from './styles/style-manager';\nexport const version = \"1.26.1-alpha.0\";\n// 导入样式\nimportStyles();\n/**\n * @namespace VTableSheet\n */\nexport { VTableSheet, TYPES, VTable, ISheetDefine, IVTableSheetOptions, IVTableSheetUpdateOptions };\n"]}

package/dist/vtable-sheet.js

@@ -4940,6 +4940,20 @@
     function crossProduct(dir1, dir2) {
       return dir1[0] * dir2[1] - dir1[1] * dir2[0];
     }
+    function fixPrecision$1(num, precision = 10) {
+      return Math.round(num * precision) / precision;
+    }
+    function getDecimalPlaces(n) {
+      const dStr = n.toString().split(/[eE]/),
+        s = (dStr[0].split(".")[1] || "").length - (+dStr[1] || 0);
+      return s > 0 ? s : 0;
+    }
+    function precisionAdd(a, b) {
+      return fixPrecision$1(a + b, 10 ** Math.max(getDecimalPlaces(a), getDecimalPlaces(b)));
+    }
+    function precisionSub(a, b) {
+      return fixPrecision$1(a - b, 10 ** Math.max(getDecimalPlaces(a), getDecimalPlaces(b)));
+    }
 
     class Point {
       constructor(x = 0, y = 0, x1, y1) {
@@ -37697,42 +37711,54 @@
         if (record) if (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), record.isAggregator && this.children) {
           this.children.push(record);
           const value = record.value();
-          this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+          this.sum = precisionAdd(this.sum, null != value ? value : 0), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionAdd(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, value)));
         } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
           const value = parseFloat(record[this.field]);
-          this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+          this.sum = precisionAdd(this.sum, value), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionAdd(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, value)));
         }
         this.clearCacheValue();
       }
       deleteRecord(record) {
-        if (record) if (this.isRecord && this.records && (this.records = this.records.filter(item => item !== record)), record.isAggregator && this.children) {
-          this.children = this.children.filter(item => item !== record);
-          const value = record.value();
-          this.sum -= null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum -= value : value < 0 && (this.nagetiveSum -= value));
-        } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
-          const value = parseFloat(record[this.field]);
-          this.sum -= value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum -= value : value < 0 && (this.nagetiveSum -= value));
+        if (record) {
+          if (this.isRecord && this.records) {
+            const index = this.records.indexOf(record);
+            -1 !== index && this.records.splice(index, 1);
+          }
+          if (record.isAggregator && this.children) {
+            const index = this.children.indexOf(record);
+            -1 !== index && this.children.splice(index, 1);
+            const value = record.value();
+            this.sum = precisionSub(this.sum, null != value ? value : 0), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionSub(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionSub(this.nagetiveSum, value)));
+          } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
+            const value = parseFloat(record[this.field]);
+            this.sum = precisionSub(this.sum, value), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionSub(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionSub(this.nagetiveSum, value)));
+          }
         }
         this.clearCacheValue();
       }
       updateRecord(oldRecord, newRecord) {
         if (oldRecord && newRecord) {
-          if (this.isRecord && this.records && (this.records = this.records.map(item => item === oldRecord ? newRecord : item)), oldRecord.isAggregator && this.children) {
-            const oldValue = oldRecord.value();
-            this.children = this.children.filter(item => item !== oldRecord);
+          if (this.isRecord && this.records) {
+            const index = this.records.indexOf(oldRecord);
+            -1 !== index && (this.records[index] = newRecord);
+          }
+          if (oldRecord.isAggregator && this.children) {
+            const oldValue = oldRecord.value(),
+              index = this.children.indexOf(oldRecord);
+            -1 !== index && (this.children[index] = newRecord);
             const newValue = newRecord.value();
-            this.children.push(newRecord), this.sum += newValue - oldValue, this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum -= oldValue : oldValue < 0 && (this.nagetiveSum -= oldValue), newValue > 0 ? this.positiveSum += newValue : newValue < 0 && (this.nagetiveSum += newValue));
+            this.sum = precisionAdd(this.sum, precisionSub(newValue, oldValue)), this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum = precisionSub(this.positiveSum, oldValue) : oldValue < 0 && (this.nagetiveSum = precisionSub(this.nagetiveSum, oldValue)), newValue > 0 ? this.positiveSum = precisionAdd(this.positiveSum, newValue) : newValue < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, newValue)));
           } else if (this.field && !isNaN(parseFloat(oldRecord[this.field]))) {
             const oldValue = parseFloat(oldRecord[this.field]),
               newValue = parseFloat(newRecord[this.field]);
-            this.sum += newValue - oldValue, this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum -= oldValue : oldValue < 0 && (this.nagetiveSum -= oldValue), newValue > 0 ? this.positiveSum += newValue : newValue < 0 && (this.nagetiveSum += newValue));
+            this.sum = precisionAdd(this.sum, precisionSub(newValue, oldValue)), this.needSplitPositiveAndNegativeForSum && (oldValue > 0 ? this.positiveSum = precisionSub(this.positiveSum, oldValue) : oldValue < 0 && (this.nagetiveSum = precisionSub(this.nagetiveSum, oldValue)), newValue > 0 ? this.positiveSum = precisionAdd(this.positiveSum, newValue) : newValue < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, newValue)));
           }
           this.clearCacheValue();
         }
       }
       value() {
-        var _a, _b;
-        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.sum : void 0;
+        var _a;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : this.records && this.records.length >= 1 || !1 === this.isRecord ? this.sum : void 0;
       }
       positiveValue() {
         return this.positiveSum;
@@ -37748,16 +37774,16 @@
           const child = this.children[i];
           if (child.isAggregator) {
             const value = child.value();
-            this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+            this.sum = precisionAdd(this.sum, null != value ? value : 0), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionAdd(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, value)));
           }
         } else if (this.records) for (let i = 0; i < this.records.length; i++) {
           const record = this.records[i];
           if (record.isAggregator) {
             const value = record.value();
-            this.sum += null != value ? value : 0, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+            this.sum = precisionAdd(this.sum, null != value ? value : 0), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionAdd(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, value)));
           } else if (this.field && !isNaN(parseFloat(record[this.field]))) {
             const value = parseFloat(record[this.field]);
-            this.sum += value, this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum += value : value < 0 && (this.nagetiveSum += value));
+            this.sum = precisionAdd(this.sum, value), this.needSplitPositiveAndNegativeForSum && (value > 0 ? this.positiveSum = precisionAdd(this.positiveSum, value) : value < 0 && (this.nagetiveSum = precisionAdd(this.nagetiveSum, value)));
           }
         }
       }
@@ -37800,17 +37826,43 @@
         super(...arguments), this.type = AggregationType.AVG, this.sum = 0, this.count = 0;
       }
       push(record) {
-        record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), record.isAggregator && record.type === AggregationType.AVG ? (this.children && this.children.push(record), this.sum += record.sum, this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), this.count++)), this.clearCacheValue();
+        record && (this.isRecord && this.records && (record.isAggregator ? this.records.push(...record.records) : this.records.push(record)), record.isAggregator && record.type === AggregationType.AVG ? (this.children && this.children.push(record), this.sum = precisionAdd(this.sum, record.sum), this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum = precisionAdd(this.sum, parseFloat(record[this.field])), this.count++)), this.clearCacheValue();
       }
       deleteRecord(record) {
-        record && (this.isRecord && this.records && (this.records = this.records.filter(item => item !== record)), record.isAggregator && record.type === AggregationType.AVG ? (this.children && (this.children = this.children.filter(item => item !== record)), this.sum -= record.sum, this.count -= record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum -= parseFloat(record[this.field]), this.count--)), this.clearCacheValue();
+        if (record) {
+          if (this.isRecord && this.records) {
+            const index = this.records.indexOf(record);
+            -1 !== index && this.records.splice(index, 1);
+          }
+          if (record.isAggregator && record.type === AggregationType.AVG) {
+            if (this.children) {
+              const index = this.children.indexOf(record);
+              -1 !== index && this.children.splice(index, 1);
+            }
+            this.sum = precisionSub(this.sum, record.sum), this.count -= record.count;
+          } else this.field && !isNaN(parseFloat(record[this.field])) && (this.sum = precisionSub(this.sum, parseFloat(record[this.field])), this.count--);
+        }
+        this.clearCacheValue();
       }
       updateRecord(oldRecord, newRecord) {
-        oldRecord && newRecord && (this.isRecord && this.records && (this.records = this.records.map(item => item === oldRecord ? newRecord : item)), oldRecord.isAggregator && oldRecord.type === AggregationType.AVG ? (this.children && newRecord.isAggregator && (this.children = this.children.map(item => item === oldRecord ? newRecord : item)), this.sum += newRecord.sum - oldRecord.sum, this.count += newRecord.count - oldRecord.count) : this.field && !isNaN(parseFloat(oldRecord[this.field])) && (this.sum += parseFloat(newRecord[this.field]) - parseFloat(oldRecord[this.field])), this.clearCacheValue());
+        if (oldRecord && newRecord) {
+          if (this.isRecord && this.records) {
+            const index = this.records.indexOf(oldRecord);
+            -1 !== index && (this.records[index] = newRecord);
+          }
+          if (oldRecord.isAggregator && oldRecord.type === AggregationType.AVG) {
+            if (this.children && newRecord.isAggregator) {
+              const index = this.children.indexOf(oldRecord);
+              -1 !== index && (this.children[index] = newRecord);
+            }
+            this.sum = precisionAdd(this.sum, precisionSub(newRecord.sum, oldRecord.sum)), this.count += newRecord.count - oldRecord.count;
+          } else this.field && !isNaN(parseFloat(oldRecord[this.field])) && (this.sum = precisionAdd(this.sum, precisionSub(parseFloat(newRecord[this.field]), parseFloat(oldRecord[this.field]))));
+          this.clearCacheValue();
+        }
       }
       value() {
-        var _a, _b;
-        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : (null === (_b = this.records) || void 0 === _b ? void 0 : _b.length) >= 1 ? this.sum / this.count : void 0;
+        var _a;
+        return null !== (_a = this.changedValue) && void 0 !== _a ? _a : this.records && this.records.length >= 1 || !1 === this.isRecord && this.count > 0 ? this.sum / this.count : void 0;
       }
       reset() {
         this.changedValue = void 0, this.children = [], this.records = [], this.sum = 0, this.count = 0;
@@ -37820,11 +37872,11 @@
           const child = this.children[i];
           if (child.isAggregator && child.type === AggregationType.AVG) {
             const childValue = child.value();
-            this.sum += childValue * child.count, this.count += child.count;
+            this.sum = precisionAdd(this.sum, childValue * child.count), this.count += child.count;
           }
         } else if (this.records) for (let i = 0; i < this.records.length; i++) {
           const record = this.records[i];
-          record.isAggregator && record.type === AggregationType.AVG ? (this.sum += record.sum, this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum += parseFloat(record[this.field]), this.count++);
+          record.isAggregator && record.type === AggregationType.AVG ? (this.sum = precisionAdd(this.sum, record.sum), this.count += record.count) : this.field && !isNaN(parseFloat(record[this.field])) && (this.sum = precisionAdd(this.sum, parseFloat(record[this.field])), this.count++);
         }
       }
     }
@@ -61178,7 +61230,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._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
+        if (super(), this.showFrozenIcon = !0, this._scrollToRowCorrectTimer = null, this._tableBorderWidth_left = 0, this._tableBorderWidth_right = 0, this._tableBorderWidth_top = 0, this._tableBorderWidth_bottom = 0, this.version = "1.26.1-alpha.0", this.id = `VTable${Date.now()}`, this.isReleased = !1, this._chartEventMap = {}, this.throttleInvalidate = throttle2(this.render.bind(this), 200), "undefined" != typeof window) {
           const g = window;
           g[this.id] = this;
           const registry = g.__vtable__ || (g.__vtable__ = {
@@ -83720,7 +83772,7 @@
     function getCellMatrix(table) {
       return {
         getValue: (row, col) => {
-          const value = table.getCellValue(col, row);
+          const value = table.getCellOriginValue(col, row);
           return "number" != typeof value && isNaN(Number(value)) ? {
             v: value || "",
             t: CellValueType.STRING
@@ -95772,7 +95824,7 @@
         importStyle();
     }
 
-    const version = "1.26.0";
+    const version = "1.26.1-alpha.0";
     importStyles();
 
     exports.TYPES = index;