@univerjs/sheets-table 1.0.3 → 1.1.0

package/lib/locale/ca-ES.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Columna",
 	tablePrefix: "Taula",
+	moveTableOverlapError: "La destinació se superposa amb una altra taula.",
 	tableNameError: "El nom de la taula no pot contenir espais, no pot començar amb un número i no pot ser idèntic a un nom de taula existent"
 } };
 

package/lib/locale/de-DE.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Spalte",
 	tablePrefix: "Tabelle",
+	moveTableOverlapError: "Der Zielbereich überschneidet sich mit einer anderen Tabelle.",
 	tableNameError: "Tabellenname darf keine Leerzeichen enthalten, darf nicht mit einer Zahl beginnen und darf nicht mit einem vorhandenen Tabellennamen identisch sein"
 } };
 

package/lib/locale/en-US.js

@@ -17,6 +17,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Column",
 	tablePrefix: "Table",
+	moveTableOverlapError: "The destination overlaps another table.",
 	tableNameError: "Table name cannot contain spaces, cannot start with a number, and cannot be identical to an existing table name"
 } };
 

package/lib/locale/es-ES.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Columna",
 	tablePrefix: "Tabla",
+	moveTableOverlapError: "El destino se superpone con otra tabla.",
 	tableNameError: "El nombre de la tabla no puede contener espacios, no puede comenzar con un número y no puede ser idéntico a un nombre de tabla existente"
 } };
 

package/lib/locale/fa-IR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "ستون",
 	tablePrefix: "جدول",
+	moveTableOverlapError: "محدودهٔ مقصد با جدول دیگری هم‌پوشانی دارد.",
 	tableNameError: "نام جدول نمی‌تواند شامل فاصله باشد، نمی‌تواند با عدد شروع شود و نمی‌تواند با نام جدول‌های موجود تکراری باشد"
 } };
 

package/lib/locale/fr-FR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Colonne",
 	tablePrefix: "Tableau",
+	moveTableOverlapError: "La destination chevauche un autre tableau.",
 	tableNameError: "Le nom du tableau ne peut pas contenir d'espaces, ne peut pas commencer par un chiffre et ne peut pas être identique à un nom de tableau existant"
 } };
 

package/lib/locale/id-ID.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Kolom",
 	tablePrefix: "Tabel",
+	moveTableOverlapError: "Rentang tujuan tumpang tindih dengan tabel lain.",
 	tableNameError: "Nama tabel tidak boleh mengandung spasi, tidak boleh diawali dengan angka, dan tidak boleh sama dengan nama tabel yang sudah ada"
 } };
 

package/lib/locale/it-IT.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Colonna",
 	tablePrefix: "Tabella",
+	moveTableOverlapError: "La destinazione si sovrappone a un’altra tabella.",
 	tableNameError: "Il nome della tabella non può contenere spazi, non può iniziare con un numero e non può essere identico a un nome di tabella esistente"
 } };
 

package/lib/locale/ja-JP.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表",
+	moveTableOverlapError: "移動先が他のテーブルと重なっています。",
 	tableNameError: "表の名前は空白を含めることはできず、数字で始めることはできず、既存の表名と重複できません"
 } };
 

package/lib/locale/ko-KR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "열",
 	tablePrefix: "표",
+	moveTableOverlapError: "대상 범위가 다른 표와 겹칩니다.",
 	tableNameError: "표 이름은 공백을 포함할 수 없으며 숫자로 시작할 수 없고 기존 표 이름과 중복될 수 없습니다"
 } };
 

package/lib/locale/pl-PL.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Kolumna",
 	tablePrefix: "Tabela",
+	moveTableOverlapError: "Zakres docelowy nakłada się na inną tabelę.",
 	tableNameError: "Nazwa tabeli nie może zawierać spacji, nie może zaczynać się od cyfry i nie może być identyczna z istniejącą nazwą tabeli"
 } };
 

package/lib/locale/pt-BR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Coluna",
 	tablePrefix: "Tabela",
+	moveTableOverlapError: "O destino se sobrepõe a outra tabela.",
 	tableNameError: "O nome da tabela não pode conter espaços, não pode começar com um número e não pode ser idêntico a um nome de tabela existente"
 } };
 

package/lib/locale/ru-RU.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Столбец",
 	tablePrefix: "Таблица",
+	moveTableOverlapError: "Диапазон назначения пересекается с другой таблицей.",
 	tableNameError: "Имя таблицы не может содержать пробелы, не может начинаться с цифры и не может совпадать с именем существующей таблицы"
 } };
 

package/lib/locale/sk-SK.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Stĺpec",
 	tablePrefix: "Tabuľka",
+	moveTableOverlapError: "Cieľový rozsah sa prekrýva s inou tabuľkou.",
 	tableNameError: "Názov tabuľky nesmie obsahovať medzery, nesmie začínať číslom a nesmie byť zhodný s existujúcim názvom tabuľky"
 } };
 

package/lib/locale/vi-VN.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Cột",
 	tablePrefix: "Bảng",
+	moveTableOverlapError: "Vùng đích chồng lấp với một bảng khác.",
 	tableNameError: "Tên bảng không thể chứa khoảng trắng, không được bắt đầu bằng số và không được trùng với tên bảng đã có"
 } };
 

package/lib/locale/zh-CN.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目标区域与其他表格重叠。",
 	tableNameError: "表格名称不能包含空格， 不能以数字开头，不能和已有表格名称重复"
 } };
 

package/lib/locale/zh-HK.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目標區域與其他表格重疊。",
 	tableNameError: "表格名稱不能包含空格， 不能以數字開頭，不能和已有表格名稱重複"
 } };
 

package/lib/locale/zh-TW.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目標區域與其他表格重疊。",
 	tableNameError: "表格名稱不能包含空格， 不能以數字開頭，不能和已有表格名稱重複"
 } };
 

package/lib/types/commands/mutations/move-sheet-table.mutation.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IMutation } from '@univerjs/core';
+import type { ITableCalculatedColumnConfig, ITableRange } from '../../types/type';
+export interface IMoveSheetTableMutationParams {
+    unitId: string;
+    tableId: string;
+    subUnitId: string;
+    range: ITableRange;
+    calculatedColumns?: ITableCalculatedColumnConfig[];
+}
+export declare const MoveSheetTableMutation: IMutation<IMoveSheetTableMutationParams>;

package/lib/types/controllers/sheet-table-move.controller.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Disposable, ErrorService, Injector, IUniverInstanceService, LocaleService } from '@univerjs/core';
+import { SheetInterceptorService } from '@univerjs/sheets';
+import { TableManager } from '../models/table-manager';
+export declare class SheetTableMoveController extends Disposable {
+    private readonly _tableManager;
+    private readonly _sheetInterceptorService;
+    private readonly _univerInstanceService;
+    private readonly _injector;
+    private readonly _localeService;
+    private readonly _errorService;
+    constructor(_tableManager: TableManager, _sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _injector: Injector, _localeService: LocaleService, _errorService: ErrorService);
+    private _getTargets;
+    private _checkMove;
+    private _isValidMoveRange;
+    private _getMoveMutations;
+}

package/lib/types/controllers/table-filter.controller.d.ts

@@ -24,7 +24,6 @@ export declare class TableFilterController extends Disposable {
     private readonly _sheetRowFilteredService;
     private readonly _zebraCrossingCacheController;
     private readonly _tableFilteredOutRows;
-    private _subscription;
     constructor(_tableManager: TableManager, _sheetInterceptorService: SheetInterceptorService, _univerInstanceService: IUniverInstanceService, _sheetRowFilteredService: ISheetRowFilteredService, _zebraCrossingCacheController: ZebraCrossingCacheController);
     private _registerFormulaRowFiltered;
     initTableHiddenRowIntercept(): void;

package/lib/types/locale/en-US.d.ts

@@ -17,6 +17,7 @@ declare const locale: {
     'sheets-table': {
         columnPrefix: string;
         tablePrefix: string;
+        moveTableOverlapError: string;
         tableNameError: string;
     };
 };

package/lib/types/models/table-manager.d.ts

@@ -89,6 +89,7 @@ export declare class TableManager extends Disposable {
     deleteTable(unitId: string, tableId: string): void;
     operationTableRowCol(unitId: string, tableId: string, config: ITableRangeRowColOperation): void;
     updateTableRange(unitId: string, tableId: string, config: ITableRangeUpdate): void;
+    moveTable(unitId: string, tableId: string, subUnitId: string, range: ITableRange): void;
     setTableByConfig(unitId: string, tableId: string, config: ITableSetConfig): void;
     toJSON(unitId: string): ITableResource;
     fromJSON(unitId: string, data: ITableResource): void;

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

@@ -195,6 +195,7 @@ export interface ITableNameChangedEvent extends ITableBaseEvent {
 export interface ITableRangeChangedEvent extends ITableBaseEvent {
     range: ITableRange;
     oldRange: ITableRange;
+    oldSubUnitId?: string;
 }
 export interface ITableThemeChangedEvent extends ITableBaseEvent {
     theme: string;
@@ -203,17 +204,11 @@ export interface ITableThemeChangedEvent extends ITableBaseEvent {
 export type ITableDeletedEvent = ITableAddedEvent & {
     tableStyleId?: string;
 };
-export interface ITableRangeChangedEvent {
-    unitId: string;
-    subUnitId: string;
-    tableId: string;
-    range: ITableRange;
-    oldRange: ITableRange;
-}
 export interface ITableFilterChangedEvent {
     unitId: string;
     subUnitId: string;
     tableId: string;
+    oldSubUnitId?: string;
 }
 export interface ITableColumnJson {
     dataType: TableColumnDataTypeEnum;

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(require("@univerjs/core"),require("@univerjs/sheets-table"),require("@univerjs/sheets/facade"),require("@univerjs/sheets"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`@univerjs/core`,`@univerjs/sheets-table`,`@univerjs/sheets/facade`,`@univerjs/sheets`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverCore,e.UniverSheetsTable,e.UniverSheetsFacade,e.UniverSheets,e.UniverCoreFacade))})(this,function(e,t,n,r,i){var a=class extends n.FWorkbook{getTableInfo(e){let n=this.getId();return this._injector.get(t.SheetTableService).getTableInfo(n,e)}getTableList(){let e=this.getId();return this._injector.get(t.SheetTableService).getTableList(e)}async addTable(n,r,i,a,o){let s=this._injector.get(t.SheetTableService),c=this._injector.get(e.IUniverInstanceService).getCurrentUnitOfType(e.UniverInstanceType.UNIVER_SHEET),l=new Set;if(c&&c.getSheets().forEach(e=>{l.add(e.getName())}),!(0,e.customNameCharacterCheck)(r,l))return;let u={unitId:this.getId(),name:r,subUnitId:n,range:i,options:o,id:a};if(await this._commandService.executeCommand(t.AddSheetTableCommand.id,u)){var d;return(d=s.getTableList(this.getId()).find(e=>e.name===r))==null?void 0:d.id}}async removeTable(e){var n;let r=(n=this.getTableInfo(e))==null?void 0:n.subUnitId;if(!r)return!1;let i={unitId:this.getId(),subUnitId:r,tableId:e};return this._commandService.executeCommand(t.DeleteSheetTableCommand.id,i)}getTableInfoByName(e){return this.getTableList().find(t=>t.name===e)}setTableFilter(e,n,r){let i={unitId:this.getId(),tableId:e,column:n,tableFilter:r};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,i)}};n.FWorkbook.extend(a);var o=class extends n.FWorksheet{setTableColumnFormula(e,n,r){let i=this.getWorkbook().getUnitId(),a=this._injector.get(t.TableManager).getTableById(i,e);return!a||a.getSubunitId()!==this.getSheetId()?!1:this._commandService.syncExecuteCommand(t.SetSheetTableCommand.id,{unitId:i,tableId:e,calculatedColumn:{columnId:n,formula:r}})}setTableFilterButtons(e,n){let r=this.getWorkbook().getUnitId(),i=this._injector.get(t.TableManager).getTableById(r,e);return!i||i.getSubunitId()!==this.getSheetId()?!1:this._commandService.syncExecuteCommand(t.SetSheetTableCommand.id,{unitId:r,tableId:e,filterButtons:n})}addTable(n,r,i,a){let o=this.getSheetId(),s=this.getWorkbook(),c=s.getUnitId(),l=new Set;if(s&&s.getSheets().forEach(e=>{l.add(e.getName())}),!(0,e.customNameCharacterCheck)(n,l))return!1;let u={unitId:c,subUnitId:o,name:n,range:r,id:i,options:a};return this._commandService.executeCommand(t.AddSheetTableCommand.id,u)}setTableFilter(e,n,r){let i={unitId:this.getWorkbook().getUnitId(),tableId:e,column:n,tableFilter:r};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,i)}removeTable(e){let n={unitId:this._fWorkbook.getId(),subUnitId:this.getSheetId(),tableId:e};return this._commandService.executeCommand(t.DeleteSheetTableCommand.id,n)}setTableRange(e,n){let r={unitId:this.getWorkbook().getUnitId(),tableId:e,updateRange:{newRange:n}};return this._commandService.executeCommand(t.SetSheetTableCommand.id,r)}setTableName(n,r){let i=this.getWorkbook(),a=new Set;if(i&&i.getSheets().forEach(e=>{a.add(e.getName())}),!(0,e.customNameCharacterCheck)(r,a))return!1;let o={unitId:this.getWorkbook().getUnitId(),tableId:n,name:r};return this._commandService.executeCommand(t.SetSheetTableCommand.id,o)}getSubTableInfos(){let e=this._fWorkbook.getId();return this._injector.get(t.SheetTableService).getTableList(e).filter(e=>e.subUnitId===this.getSheetId())}resetFilter(e,n){let r={unitId:this._fWorkbook.getId(),tableId:e,column:n,tableFilter:void 0};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,r)}getTableByCell(n,r){let i=this._fWorkbook.getId(),a=this._injector.get(t.SheetTableService).getTableList(i).filter(e=>e.subUnitId===this.getSheetId()),o=(0,e.cellToRange)(n,r);return a.find(t=>{let n=t.range;return e.Rectangle.intersects(n,o)})}addTableTheme(e,n){let i=new r.RangeThemeStyle(`table-style`);return i.fromJson(n),this._commandService.executeCommand(t.AddTableThemeCommand.id,{unitId:this._fWorkbook.getId(),tableId:e,themeStyle:i})}};n.FWorksheet.extend(o);var s=class extends i.FEnum{get TableColumnFilterTypeEnum(){return t.TableColumnFilterTypeEnum}get TableConditionTypeEnum(){return t.TableConditionTypeEnum}get TableNumberCompareTypeEnum(){return t.TableNumberCompareTypeEnum}get TableStringCompareTypeEnum(){return t.TableStringCompareTypeEnum}get TableDateCompareTypeEnum(){return t.TableDateCompareTypeEnum}};i.FEnum.extend(s)});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(require("@univerjs/core"),require("@univerjs/sheets-table"),require("@univerjs/sheets/facade"),require("@univerjs/sheets"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`@univerjs/core`,`@univerjs/sheets-table`,`@univerjs/sheets/facade`,`@univerjs/sheets`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverCore,e.UniverSheetsTable,e.UniverSheetsFacade,e.UniverSheets,e.UniverCoreFacade))})(this,function(e,t,n,r,i){var a=class extends n.FWorkbook{getTableInfo(e){let n=this.getId();return this._injector.get(t.SheetTableService).getTableInfo(n,e)}getTableList(){let e=this.getId();return this._injector.get(t.SheetTableService).getTableList(e)}async addTable(n,r,i,a,o){let s=this._injector.get(t.SheetTableService),c=this._injector.get(e.IUniverInstanceService).getCurrentUnitOfType(e.UniverInstanceType.UNIVER_SHEET),l=/* @__PURE__ */ new Set;if(c&&c.getSheets().forEach(e=>{l.add(e.getName())}),!(0,e.customNameCharacterCheck)(r,l))return;let u={unitId:this.getId(),name:r,subUnitId:n,range:i,options:o,id:a};if(await this._commandService.executeCommand(t.AddSheetTableCommand.id,u)){var d;return(d=s.getTableList(this.getId()).find(e=>e.name===r))==null?void 0:d.id}}async removeTable(e){var n;let r=(n=this.getTableInfo(e))==null?void 0:n.subUnitId;if(!r)return!1;let i={unitId:this.getId(),subUnitId:r,tableId:e};return this._commandService.executeCommand(t.DeleteSheetTableCommand.id,i)}getTableInfoByName(e){return this.getTableList().find(t=>t.name===e)}setTableFilter(e,n,r){let i={unitId:this.getId(),tableId:e,column:n,tableFilter:r};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,i)}};n.FWorkbook.extend(a);var o=class extends n.FWorksheet{setTableColumnFormula(e,n,r){let i=this.getWorkbook().getUnitId(),a=this._injector.get(t.TableManager).getTableById(i,e);return!a||a.getSubunitId()!==this.getSheetId()?!1:this._commandService.syncExecuteCommand(t.SetSheetTableCommand.id,{unitId:i,tableId:e,calculatedColumn:{columnId:n,formula:r}})}setTableFilterButtons(e,n){let r=this.getWorkbook().getUnitId(),i=this._injector.get(t.TableManager).getTableById(r,e);return!i||i.getSubunitId()!==this.getSheetId()?!1:this._commandService.syncExecuteCommand(t.SetSheetTableCommand.id,{unitId:r,tableId:e,filterButtons:n})}addTable(n,r,i,a){let o=this.getSheetId(),s=this.getWorkbook(),c=s.getUnitId(),l=/* @__PURE__ */ new Set;if(s&&s.getSheets().forEach(e=>{l.add(e.getName())}),!(0,e.customNameCharacterCheck)(n,l))return!1;let u={unitId:c,subUnitId:o,name:n,range:r,id:i,options:a};return this._commandService.executeCommand(t.AddSheetTableCommand.id,u)}setTableFilter(e,n,r){let i={unitId:this.getWorkbook().getUnitId(),tableId:e,column:n,tableFilter:r};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,i)}removeTable(e){let n={unitId:this._fWorkbook.getId(),subUnitId:this.getSheetId(),tableId:e};return this._commandService.executeCommand(t.DeleteSheetTableCommand.id,n)}setTableRange(e,n){let r={unitId:this.getWorkbook().getUnitId(),tableId:e,updateRange:{newRange:n}};return this._commandService.executeCommand(t.SetSheetTableCommand.id,r)}setTableName(n,r){let i=this.getWorkbook(),a=/* @__PURE__ */ new Set;if(i&&i.getSheets().forEach(e=>{a.add(e.getName())}),!(0,e.customNameCharacterCheck)(r,a))return!1;let o={unitId:this.getWorkbook().getUnitId(),tableId:n,name:r};return this._commandService.executeCommand(t.SetSheetTableCommand.id,o)}getSubTableInfos(){let e=this._fWorkbook.getId();return this._injector.get(t.SheetTableService).getTableList(e).filter(e=>e.subUnitId===this.getSheetId())}resetFilter(e,n){let r={unitId:this._fWorkbook.getId(),tableId:e,column:n,tableFilter:void 0};return this._commandService.executeCommand(t.SetSheetTableFilterCommand.id,r)}getTableByCell(n,r){let i=this._fWorkbook.getId(),a=this._injector.get(t.SheetTableService).getTableList(i).filter(e=>e.subUnitId===this.getSheetId()),o=(0,e.cellToRange)(n,r);return a.find(t=>{let n=t.range;return e.Rectangle.intersects(n,o)})}addTableTheme(e,n){let i=new r.RangeThemeStyle(`table-style`);return i.fromJson(n),this._commandService.executeCommand(t.AddTableThemeCommand.id,{unitId:this._fWorkbook.getId(),tableId:e,themeStyle:i})}};n.FWorksheet.extend(o);var s=class extends i.FEnum{get TableColumnFilterTypeEnum(){return t.TableColumnFilterTypeEnum}get TableConditionTypeEnum(){return t.TableConditionTypeEnum}get TableNumberCompareTypeEnum(){return t.TableNumberCompareTypeEnum}get TableStringCompareTypeEnum(){return t.TableStringCompareTypeEnum}get TableDateCompareTypeEnum(){return t.TableDateCompareTypeEnum}};i.FEnum.extend(s)});