@univerjs/sheets-table 1.1.0 → 1.3.0

package/lib/index.js

@@ -1,4 +1,4 @@
-import { BooleanNumber, BorderStyleTypes, CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DateSystem, DependentOn, Disposable, ErrorService, FilterSelectionMode, FormulaType, ICommandService, IConfigService, ILogService, IPermissionService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Plugin, RTree, RecordValueType, Rectangle, UniverInstanceType, customNameCharacterCheck, excelSerialToDateTime, generateRandomId, getColorStyle, merge, numfmt, regexp, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
+import { BooleanNumber, BorderStyleTypes, CellValueType, ColorKit, CommandType, DEFAULT_STYLES, DateSystem, DependentOn, Disposable, ErrorService, FilterSelectionMode, FormulaType, ICommandService, IConfigService, ILogService, IPermissionService, IResourceManagerService, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Plugin, RTree, RecordValueType, Rectangle, Tools, UniverInstanceType, customNameCharacterCheck, excelSerialToDateTime, generateRandomId, getColorStyle, getRecordValueKey, merge, numfmt, regexp, registerDependencies, sequenceExecute, toDisposable, touchDependencies } from "@univerjs/core";
 import { IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, RemoveSuperTableMutation, SetSuperTableMutation, extractFormulaError, serializeRange } from "@univerjs/engine-formula";
 import { AddRangeThemeMutation, CopySheetCommand, IExclusiveRangeService, INTERCEPTOR_POINT, InsertColCommand, InsertColMutation, InsertRowCommand, InsertRowMutation, MoveRangeCommand, RangeThemeStyle, RefRangeService, RemoveColCommand, RemoveColMutation, RemoveRangeThemeMutation, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SheetInterceptorService, SheetRangeThemeModel, SheetRangeThemeService, SheetsSelectionsService, UniverSheetsPlugin, WorkbookEditablePermission, ZebraCrossingCacheController, checkRangesEditablePermission, getMoveRangeCommandMutations, getMoveRangeUndoRedoMutations, getSheetCommandTarget } from "@univerjs/sheets";
 import { BehaviorSubject, Subject, filter, switchMap } from "rxjs";
@@ -130,6 +130,113 @@ let SheetsTableSortStateEnum = /* @__PURE__ */ function(SheetsTableSortStateEnum
 	return SheetsTableSortStateEnum;
 }({});
 
+//#endregion
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
+function _typeof(o) {
+	"@babel/helpers - typeof";
+	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
+		return typeof o;
+	} : function(o) {
+		return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+	}, _typeof(o);
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
+function toPrimitive(t, r) {
+	if ("object" != _typeof(t) || !t) return t;
+	var e = t[Symbol.toPrimitive];
+	if (void 0 !== e) {
+		var i = e.call(t, r || "default");
+		if ("object" != _typeof(i)) return i;
+		throw new TypeError("@@toPrimitive must return a primitive value.");
+	}
+	return ("string" === r ? String : Number)(t);
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
+function toPropertyKey(t) {
+	var i = toPrimitive(t, "string");
+	return "symbol" == _typeof(i) ? i : i + "";
+}
+
+//#endregion
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
+function _defineProperty(e, r, t) {
+	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
+		value: t,
+		enumerable: !0,
+		configurable: !0,
+		writable: !0
+	}) : e[r] = t, e;
+}
+
+//#endregion
+//#region src/models/table-column.ts
+var TableColumn = class {
+	constructor(id, name) {
+		_defineProperty(this, "dataType", void 0);
+		_defineProperty(this, "id", void 0);
+		_defineProperty(this, "displayName", void 0);
+		_defineProperty(this, "formula", void 0);
+		_defineProperty(this, "formulaIsArray", void 0);
+		_defineProperty(this, "totalsRowLabel", void 0);
+		_defineProperty(this, "totalsRowFunction", void 0);
+		_defineProperty(this, "totalsRowFormula", void 0);
+		_defineProperty(this, "showFilterButton", void 0);
+		_defineProperty(this, "meta", void 0);
+		_defineProperty(this, "style", void 0);
+		this.id = id;
+		this.displayName = name;
+		this.dataType = "string";
+		this.formula = "";
+		this.showFilterButton = true;
+		this.meta = {};
+		this.style = {};
+	}
+	getMeta() {
+		return this.meta;
+	}
+	setMeta(meta) {
+		this.meta = meta;
+	}
+	getDisplayName() {
+		return this.displayName;
+	}
+	toJSON() {
+		return {
+			id: this.id,
+			displayName: this.displayName,
+			dataType: this.dataType,
+			formula: this.formula,
+			formulaIsArray: this.formulaIsArray,
+			totalsRowLabel: this.totalsRowLabel,
+			totalsRowFunction: this.totalsRowFunction,
+			totalsRowFormula: this.totalsRowFormula,
+			showFilterButton: this.showFilterButton,
+			meta: this.meta,
+			style: this.style
+		};
+	}
+	fromJSON(json) {
+		this.id = json.id;
+		this.displayName = json.displayName;
+		this.dataType = json.dataType;
+		this.formula = json.formula;
+		this.formulaIsArray = json.formulaIsArray;
+		this.totalsRowLabel = json.totalsRowLabel;
+		this.totalsRowFunction = json.totalsRowFunction;
+		this.totalsRowFormula = json.totalsRowFormula;
+		this.showFilterButton = json.showFilterButton ?? true;
+		this.meta = json.meta;
+		this.style = json.style;
+	}
+	isShowFilterButton() {
+		return this.showFilterButton;
+	}
+};
+
 //#endregion
 //#region src/util.ts
 function getColumnName(columnIndex, columnText) {
@@ -315,113 +422,6 @@ const tableThemeConfig = tableDefaultThemeStyleArr.map((item, index) => {
 	};
 });
 
-//#endregion
-//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
-function _typeof(o) {
-	"@babel/helpers - typeof";
-	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
-		return typeof o;
-	} : function(o) {
-		return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-	}, _typeof(o);
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
-function toPrimitive(t, r) {
-	if ("object" != _typeof(t) || !t) return t;
-	var e = t[Symbol.toPrimitive];
-	if (void 0 !== e) {
-		var i = e.call(t, r || "default");
-		if ("object" != _typeof(i)) return i;
-		throw new TypeError("@@toPrimitive must return a primitive value.");
-	}
-	return ("string" === r ? String : Number)(t);
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
-function toPropertyKey(t) {
-	var i = toPrimitive(t, "string");
-	return "symbol" == _typeof(i) ? i : i + "";
-}
-
-//#endregion
-//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
-function _defineProperty(e, r, t) {
-	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
-		value: t,
-		enumerable: !0,
-		configurable: !0,
-		writable: !0
-	}) : e[r] = t, e;
-}
-
-//#endregion
-//#region src/models/table-column.ts
-var TableColumn = class {
-	constructor(id, name) {
-		_defineProperty(this, "dataType", void 0);
-		_defineProperty(this, "id", void 0);
-		_defineProperty(this, "displayName", void 0);
-		_defineProperty(this, "formula", void 0);
-		_defineProperty(this, "formulaIsArray", void 0);
-		_defineProperty(this, "totalsRowLabel", void 0);
-		_defineProperty(this, "totalsRowFunction", void 0);
-		_defineProperty(this, "totalsRowFormula", void 0);
-		_defineProperty(this, "showFilterButton", void 0);
-		_defineProperty(this, "meta", void 0);
-		_defineProperty(this, "style", void 0);
-		this.id = id;
-		this.displayName = name;
-		this.dataType = "string";
-		this.formula = "";
-		this.showFilterButton = true;
-		this.meta = {};
-		this.style = {};
-	}
-	getMeta() {
-		return this.meta;
-	}
-	setMeta(meta) {
-		this.meta = meta;
-	}
-	getDisplayName() {
-		return this.displayName;
-	}
-	toJSON() {
-		return {
-			id: this.id,
-			displayName: this.displayName,
-			dataType: this.dataType,
-			formula: this.formula,
-			formulaIsArray: this.formulaIsArray,
-			totalsRowLabel: this.totalsRowLabel,
-			totalsRowFunction: this.totalsRowFunction,
-			totalsRowFormula: this.totalsRowFormula,
-			showFilterButton: this.showFilterButton,
-			meta: this.meta,
-			style: this.style
-		};
-	}
-	fromJSON(json) {
-		this.id = json.id;
-		this.displayName = json.displayName;
-		this.dataType = json.dataType;
-		this.formula = json.formula;
-		this.formulaIsArray = json.formulaIsArray;
-		this.totalsRowLabel = json.totalsRowLabel;
-		this.totalsRowFunction = json.totalsRowFunction;
-		this.totalsRowFormula = json.totalsRowFormula;
-		this.showFilterButton = json.showFilterButton ?? true;
-		this.meta = json.meta;
-		this.style = json.style;
-	}
-	isShowFilterButton() {
-		return this.showFilterButton;
-	}
-};
-
 //#endregion
 //#region src/const.ts
 /**
@@ -1338,35 +1338,13 @@ function getTableRecordValue(sheet, row, column) {
 	};
 	throw new TypeError("Invalid table record cell value.");
 }
-function getTableRecordValueKey(_value) {
-	const value = _value;
-	if (!isRecord(value) || typeof value.type !== "string") throw new TypeError("Invalid table record value.");
-	switch (value.type) {
-		case RecordValueType.Blank:
-			if ("value" in value) throw new TypeError("Blank table record values cannot have a value.");
-			return "[\"blank\"]";
-		case RecordValueType.String:
-		case RecordValueType.Error:
-			if (typeof value.value !== "string") throw new TypeError("Invalid table record value.");
-			return JSON.stringify([value.type, value.value]);
-		case RecordValueType.Boolean:
-			if (typeof value.value !== "boolean") throw new TypeError("Invalid table record value.");
-			return JSON.stringify([value.type, value.value]);
-		case RecordValueType.Number:
-		case RecordValueType.Date:
-			if (typeof value.value !== "number") throw new TypeError("Invalid table record value.");
-			if (!Number.isFinite(value.value)) throw new RangeError("Table record numeric values must be finite.");
-			return JSON.stringify([value.type, value.value === 0 ? 0 : value.value]);
-		default: throw new TypeError("Unknown table record value type.");
-	}
-}
 function compileTableRecordFilter(_filter) {
 	const filter = _filter;
 	if (!isRecord(filter) || filter.filterType !== "record") throw new TypeError("Invalid table record filter.");
 	if (filter.mode !== FilterSelectionMode.Include && filter.mode !== FilterSelectionMode.Exclude || !Array.isArray(filter.values)) throw new TypeError("Invalid table record filter.");
-	const keys = new Set(filter.values.map((value) => getTableRecordValueKey(value)));
-	if (filter.mode === FilterSelectionMode.Include) return (value) => keys.has(getTableRecordValueKey(value));
-	return (value) => !keys.has(getTableRecordValueKey(value));
+	const keys = new Set(filter.values.map((value) => getRecordValueKey(value)));
+	if (filter.mode === FilterSelectionMode.Include) return (value) => keys.has(getRecordValueKey(value));
+	return (value) => !keys.has(getRecordValueKey(value));
 }
 function cloneTableRecordFilter(filter) {
 	compileTableRecordFilter(filter);
@@ -2309,13 +2287,19 @@ const AddSheetTableCommand = {
 		const undos = [];
 		const { unitId, subUnitId, range } = params;
 		const header = tableManager.getColumnHeader(unitId, subUnitId, range, localeService.t("sheets-table.columnPrefix"));
+		const options = Tools.deepClone(params.options ?? {});
+		options.columns = header.map((name, index) => {
+			var _options$columns;
+			return ((_options$columns = options.columns) === null || _options$columns === void 0 ? void 0 : _options$columns[index]) ?? new TableColumn(generateRandomId(), name).toJSON();
+		});
 		redos.push({
 			id: AddSheetTableMutation.id,
 			params: {
 				...params,
 				tableId,
 				name: tableName,
-				header
+				header,
+				options
 			}
 		});
 		undos.push({
@@ -3954,7 +3938,7 @@ SheetsTableThemeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-table";
-var version = "1.1.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/commands/mutations/move-sheet-table.mutation.ts
@@ -4931,4 +4915,4 @@ UniverSheetsTablePlugin = __decorate([
 ], UniverSheetsTablePlugin);
 
 //#endregion
-export { AddSheetTableCommand, AddSheetTableMutation, AddTableThemeCommand, DeleteSheetTableCommand, DeleteSheetTableMutation, RemoveTableThemeCommand, SHEET_TABLE_CUSTOM_THEME_PREFIX, SetSheetTableCommand, SetSheetTableFilterCommand, SetSheetTableFilterMutation, SetSheetTableMutation, SetSheetTableSortStateCommand, SheetTableInsertColCommand, SheetTableInsertColumnAtCommand, SheetTableInsertRowAtCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveColumnAtCommand, SheetTableRemoveRowCommand, SheetTableService, SheetsTableButtonStateEnum, SheetsTableController, SheetsTableSortStateEnum, SheetsTableThemeController, TABLE_FILTER_EMPTY_VALUE, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableManager, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, UniverSheetsTablePlugin, compileTableRecordFilter, customEmptyThemeWithBorderStyle, getExistingNamesSet, getTableRecordValue, getTableRecordValueKey, isColorTableFilter, isConditionFilter, isManualTableFilter, isRecordTableFilter, processStyleWithBorderStyle, validateSheetTableName };
+export { AddSheetTableCommand, AddSheetTableMutation, AddTableThemeCommand, DeleteSheetTableCommand, DeleteSheetTableMutation, RemoveTableThemeCommand, SHEET_TABLE_CUSTOM_THEME_PREFIX, SetSheetTableCommand, SetSheetTableFilterCommand, SetSheetTableFilterMutation, SetSheetTableMutation, SetSheetTableSortStateCommand, SheetTableInsertColCommand, SheetTableInsertColumnAtCommand, SheetTableInsertRowAtCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveColumnAtCommand, SheetTableRemoveRowCommand, SheetTableService, SheetsTableButtonStateEnum, SheetsTableController, SheetsTableSortStateEnum, SheetsTableThemeController, TABLE_FILTER_EMPTY_VALUE, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableManager, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, UniverSheetsTablePlugin, compileTableRecordFilter, customEmptyThemeWithBorderStyle, getExistingNamesSet, getTableRecordValue, isColorTableFilter, isConditionFilter, isManualTableFilter, isRecordTableFilter, processStyleWithBorderStyle, validateSheetTableName };

package/lib/types/index.d.ts

@@ -37,13 +37,13 @@ export { SHEET_TABLE_CUSTOM_THEME_PREFIX, TABLE_FILTER_EMPTY_VALUE } from './con
 export { SheetsTableThemeController } from './controllers/sheet-table-theme.controller';
 export { SheetsTableController } from './controllers/sheets-table.controller';
 export { customEmptyThemeWithBorderStyle, processStyleWithBorderStyle } from './controllers/table-theme.factory';
-export { compileTableRecordFilter, getTableRecordValue, getTableRecordValueKey } from './models/filter-util/record-filter';
+export { compileTableRecordFilter, getTableRecordValue } from './models/filter-util/record-filter';
 export { TableManager } from './models/table-manager';
 export { UniverSheetsTablePlugin } from './plugin';
 export { SheetTableService } from './services/table.service';
 export { SheetsTableButtonStateEnum, SheetsTableSortStateEnum, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, } from './types/enum';
-export type { ITableCalculatedColumnConfig, ITableColorFilterItem, ITableColumnJson, ITableConditionFilterItem, ITableData, ITableFilterButtonConfig, ITableFilterItem, ITableInfo, ITableInfoWithUnitId, ITableManualFilterItem, ITableOptions, ITableRange, ITableRangeWithState, ITableRecordFilterItem, TableMetaType, TableRecordValue, TableRelationTupleType, } from './types/type';
+export type { ITableCalculatedColumnConfig, ITableColorFilterItem, ITableColumnJson, ITableConditionFilterItem, ITableData, ITableFilterButtonConfig, ITableFilterItem, ITableInfo, ITableInfoWithUnitId, ITableManualFilterItem, ITableOptions, ITableRange, ITableRangeWithState, ITableRecordFilterItem, TableMetaType, TableRelationTupleType, } from './types/type';
 export type { ITableJson, ITableSetConfig } from './types/type';
-export { getExistingNamesSet, isColorTableFilter, isConditionFilter, isManualTableFilter, isRecordTableFilter } from './util';
+export { getExistingNamesSet, isColorTableFilter, isConditionFilter, isManualTableFilter, isRecordTableFilter, } from './util';
 export { validateSheetTableName } from './util/table-name';
 export type { ISheetTableNameValidationResult, SheetTableNameValidationReason } from './util/table-name';

package/lib/types/models/filter-util/record-filter.d.ts

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Worksheet } from '@univerjs/core';
-import type { ITableRecordFilterItem, TableRecordValue } from '../../types/type';
+import type { RecordValue, Worksheet } from '@univerjs/core';
+import type { ITableRecordFilterItem } from '../../types/type';
 /**
  * Formula errors are recognized when the cell retains formula, shared-formula, or intercepted array-formula context.
  */
-export declare function getTableRecordValue(sheet: Worksheet, row: number, column: number): TableRecordValue;
-export declare function getTableRecordValueKey(_value: TableRecordValue): string;
-export declare function compileTableRecordFilter(_filter: ITableRecordFilterItem): (value: TableRecordValue) => boolean;
+export declare function getTableRecordValue(sheet: Worksheet, row: number, column: number): RecordValue;
+export declare function compileTableRecordFilter(_filter: ITableRecordFilterItem): (value: RecordValue) => boolean;
 export declare function cloneTableRecordFilter(filter: ITableRecordFilterItem): ITableRecordFilterItem;

package/lib/types/types/type.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { FilterSelectionMode, IRange, IStyleData, Nullable, RecordValueType } from '@univerjs/core';
+import type { FilterSelectionMode, IRange, IStyleData, Nullable, RecordValue } from '@univerjs/core';
 import type { SheetsTableButtonStateEnum, SheetsTableSortStateEnum, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableNumberCompareTypeEnum, TableStringCompareTypeEnum } from './enum';
 export interface ITableRange {
     startRow: number;
@@ -63,21 +63,6 @@ export interface ITableFilterJSON {
         sortState: SheetsTableSortStateEnum;
     };
 }
-export type TableRecordValue = {
-    type: RecordValueType.Blank;
-} | {
-    type: RecordValueType.String;
-    value: string;
-} | {
-    type: RecordValueType.Number | RecordValueType.Date;
-    value: number;
-} | {
-    type: RecordValueType.Boolean;
-    value: boolean;
-} | {
-    type: RecordValueType.Error;
-    value: string;
-};
 export type ITableFilterItem = ITableManualFilterItem | ITableConditionFilterItem | ITableColorFilterItem | ITableRecordFilterItem;
 export type TableMetaType = Record<string, any>;
 /**
@@ -109,7 +94,7 @@ export interface ITableColorFilterItem {
 export interface ITableRecordFilterItem {
     filterType: TableColumnFilterTypeEnum.record;
     mode: FilterSelectionMode.Include | FilterSelectionMode.Exclude;
-    values: TableRecordValue[];
+    values: RecordValue[];
 }
 export interface ITableDateFilterInfo {
     conditionType: TableConditionTypeEnum.Date;