@visactor/vtable 1.26.7 → 1.26.8

package/es/ListTable.d.ts

@@ -99,7 +99,7 @@ export declare class ListTable extends BaseTable implements ListTableAPI {
     getEditor(col: number, row: number): IEditor<any, any>;
     isHasEditorDefine(col: number, row: number): boolean;
     changeCellValue(col: number, row: number, value: string | number | null, workOnEditableCell?: boolean, triggerEvent?: boolean, noTriggerChangeCellValuesEvent?: boolean): void;
-    changeCellValues(startCol: number, startRow: number, values: (string | number)[][], workOnEditableCell?: boolean, triggerEvent?: boolean, noTriggerChangeCellValuesEvent?: boolean): Promise<boolean[][]>;
+    changeCellValues(startCol: number, startRow: number, values: (string | number)[][], workOnEditableCell?: boolean, triggerEvent?: boolean, noTriggerChangeCellValuesEvent?: boolean, shouldCancel?: () => boolean): Promise<boolean[][]>;
     changeCellValuesByRanges(ranges: CellRange[], value: string | number | null, workOnEditableCell?: boolean, triggerEvent?: boolean, noTriggerChangeCellValuesEvent?: boolean): Promise<void>;
     changeSourceCellValue(recordIndex: number | number[], field: FieldDef, value: string | number | null): void;
     changeCellValueByRecord(recordIndex: number | number[], field: FieldDef, value: string | number | null, options?: {

package/es/ListTable.js

@@ -2,7 +2,7 @@ import { HierarchyState } from "./ts-types";
 
 import { SimpleHeaderLayoutMap } from "./layout";
 
-import { isArray, isValid } from "@visactor/vutils";
+import { arrayEqual, isArray, isValid } from "@visactor/vutils";
 
 import { _setRecords, checkHasAggregationOnColumnDefine, generateAggregationForColumn } from "./core/tableHelper";
 
@@ -32,7 +32,7 @@ import { getGroupByDataConfig } from "./core/group-helper";
 
 import { DataSource } from "./data";
 
-import { getValueFromDeepArray } from "./data/DataSource";
+import { getRecordFieldValue, getValueFromDeepArray } from "./data/DataSource";
 
 import { listTableAddRecord, listTableAddRecords, listTableChangeCellValue, listTableChangeCellValues, listTableChangeCellValuesByRanges, listTableDeleteRecords, listTableUpdateRecords, sortRecords } from "./core/record-helper";
 
@@ -55,6 +55,10 @@ function clearLayoutColumnState(columns) {
     }));
 }
 
+function isSameField(left, right) {
+    return left === right || Array.isArray(left) && Array.isArray(right) && arrayEqual(left, right);
+}
+
 export class ListTable extends BaseTable {
     constructor(container, options) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -353,7 +357,7 @@ export class ListTable extends BaseTable {
         return this.transpose ? this.dataSource.getTableIndex(recordIndex) + this.rowHeaderLevelCount : this.dataSource.getTableIndex(recordIndex) + this.columnHeaderLevelCount;
     }
     getTableIndexByField(field) {
-        const colObj = this.internalProps.layoutMap.columnObjects.find((col => col.field === field));
+        const colObj = this.internalProps.layoutMap.columnObjects.find((col => isSameField(col.field, field)));
         if (!colObj) return -1;
         const layoutRange = this.internalProps.layoutMap.getBodyLayoutRangeById(colObj.id);
         return this.transpose ? layoutRange.start.row : layoutRange.start.col;
@@ -515,7 +519,7 @@ export class ListTable extends BaseTable {
         };
     }
     getCellRangeByField(field, index) {
-        const {layoutMap: layoutMap} = this.internalProps, colObj = layoutMap.columnObjects.find((col => col.field === field));
+        const {layoutMap: layoutMap} = this.internalProps, colObj = layoutMap.columnObjects.find((col => isSameField(col.field, field)));
         if (colObj) {
             const layoutRange = layoutMap.getBodyLayoutRangeById(colObj.id);
             let startRow;
@@ -629,7 +633,7 @@ export class ListTable extends BaseTable {
     _getSortFuncFromHeaderOption(columns, field, fieldKey) {
         if (columns || (columns = this.internalProps.columns), field && columns && columns.length > 0) for (let i = 0; i < columns.length; i++) {
             const header = columns[i];
-            if ((fieldKey && fieldKey === header.fieldKey || !fieldKey && header.field === field) && header.sort && "function" == typeof header.sort) return header.sort;
+            if ((fieldKey && fieldKey === header.fieldKey || !fieldKey && isSameField(header.field, field)) && header.sort && "function" == typeof header.sort) return header.sort;
             if (header.columns) {
                 const sort = this._getSortFuncFromHeaderOption(header.columns, field, fieldKey);
                 if (sort) return sort;
@@ -642,7 +646,7 @@ export class ListTable extends BaseTable {
         if (normalizedSortState.length ? this.internalProps.sortState = sortState : this.internalProps.sortState = null, 
         executeSort) if (normalizedSortState.length) this.internalProps.layoutMap.headerObjects.some((item => !1 !== item.define.sort)) && (this.dataSource.sort(normalizedSortState.map((item => {
             const sortFunc = this._getSortFuncFromHeaderOption(this.internalProps.columns, item.field);
-            this.internalProps.layoutMap.headerObjects.find((col => col && col.field === item.field));
+            this.internalProps.layoutMap.headerObjects.find((col => col && isSameField(col.field, item.field)));
             return {
                 field: item.field,
                 order: item.order,
@@ -744,7 +748,7 @@ export class ListTable extends BaseTable {
                 const sortState = Array.isArray(this.sortState) ? this.sortState : [ this.sortState ];
                 sortState.some((item => item.order && item.field && "normal" !== item.order)) && this.internalProps.layoutMap.headerObjectsIncludeHided.some((item => !1 !== item.define.sort)) && this.dataSource.sort(sortState.map((item => {
                     const sortFunc = this._getSortFuncFromHeaderOption(void 0, item.field);
-                    this.internalProps.layoutMap.headerObjectsIncludeHided.find((col => col && col.field === item.field));
+                    this.internalProps.layoutMap.headerObjectsIncludeHided.find((col => col && isSameField(col.field, item.field)));
                     return {
                         field: item.field,
                         order: item.order || "asc",
@@ -832,8 +836,8 @@ export class ListTable extends BaseTable {
     changeCellValue(col, row, value, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
         return listTableChangeCellValue(col, row, value, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
     }
-    changeCellValues(startCol, startRow, values, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
-        return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
+    changeCellValues(startCol, startRow, values, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent, shouldCancel) {
+        return listTableChangeCellValues(startCol, startRow, values, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent, shouldCancel);
     }
     changeCellValuesByRanges(ranges, value, workOnEditableCell = !1, triggerEvent = !0, noTriggerChangeCellValuesEvent) {
         return listTableChangeCellValuesByRanges(ranges, value, workOnEditableCell, triggerEvent, this, noTriggerChangeCellValuesEvent);
@@ -862,10 +866,11 @@ export class ListTable extends BaseTable {
         var _a, _b, _c, _d, _e;
         const triggerEvent = null === (_a = null == options ? void 0 : options.triggerEvent) || void 0 === _a || _a, noTriggerChangeCellValuesEvent = null == options ? void 0 : options.noTriggerChangeCellValuesEvent, autoRefresh = null === (_b = null == options ? void 0 : options.autoRefresh) || void 0 === _b || _b, records = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records;
         let record, oldValue;
-        if (!Array.isArray(records) || "string" != typeof field && "number" != typeof field || (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], 
-        oldValue = null == record ? void 0 : record[field]), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), 
+        if (Array.isArray(records) && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], 
+        oldValue = getRecordFieldValue(record, field)), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), 
+        Array.isArray(records) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex]), 
         !triggerEvent) return;
-        const changedValue = !record || "string" != typeof field && "number" != typeof field ? value : null == record ? void 0 : record[field];
+        const changedValue = record && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) ? getRecordFieldValue(record, field) : value;
         if (oldValue !== changedValue) {
             const cellAddr = this.getCellAddrByFieldRecord(field, recordIndex), changeValue = {
                 col: null !== (_d = null == cellAddr ? void 0 : cellAddr.col) && void 0 !== _d ? _d : -1,
@@ -895,10 +900,11 @@ export class ListTable extends BaseTable {
         for (let i = 0; i < changeValues.length; i++) {
             const {recordIndex: recordIndex, field: field, value: value} = changeValues[i], records = null === (_c = this.dataSource.dataSourceObj) || void 0 === _c ? void 0 : _c.records;
             let record, oldValue;
-            if (!Array.isArray(records) || "string" != typeof field && "number" != typeof field || (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], 
-            oldValue = null == record ? void 0 : record[field]), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), 
+            if (Array.isArray(records) && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex], 
+            oldValue = getRecordFieldValue(record, field)), this.dataSource.changeFieldValueByRecordIndex(value, recordIndex, field, this), 
+            Array.isArray(records) && (record = Array.isArray(recordIndex) ? getValueFromDeepArray(records, recordIndex) : records[recordIndex]), 
             triggerEvent) {
-                const changedValue = !record || "string" != typeof field && "number" != typeof field ? value : null == record ? void 0 : record[field];
+                const changedValue = record && ("string" == typeof field || "number" == typeof field || Array.isArray(field)) ? getRecordFieldValue(record, field) : value;
                 if (oldValue !== changedValue) {
                     const changeValue = {
                         col: null !== (_e = null === (_d = this.getCellAddrByFieldRecord(field, recordIndex)) || void 0 === _d ? void 0 : _d.col) && void 0 !== _e ? _e : -1,