Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix: add row/column manager insert method and optimze insertMatrixArray (#6555)
wpxp123456be00938dd8a8
diff --git a/packages/core/src/shared/object-matrix.ts b/packages/core/src/shared/object-matrix.tsindex 08b16a706a..31caec487a 100644--- a/packages/core/src/shared/object-matrix.ts+++ b/packages/core/src/shared/object-matrix.ts@@ -62,6 +62,8 @@ export function getArrayLength<T>(o: IObjectArrayPrimitiveType<T> | IObjectMatrireturn maxIndex + 1;}+const isEmptyValue = (value: any): boolean => value === undefined || value === null || (typeof value === 'object' && Object.keys(value).length === 0);+export function insertMatrixArray<T>(index: number,value: T,@@ -72,14 +74,16 @@ export function insertMatrixArray<T>(// move all items after index in backward orderfor (let i = length - 1; i >= index; i--) {- if (array[i] === undefined) {+ if (isEmptyValue(array[i])) {delete array[i + 1];} else {array[i + 1] = array[i];}}- array[index] = value;+ if (!isEmptyValue(value)) {+ array[index] = value;+ }}export function spliceArray<T>(diff --git a/packages/core/src/sheets/column-manager.ts b/packages/core/src/sheets/column-manager.tsindex 14e9aa9a12..d3425c9640 100644--- a/packages/core/src/sheets/column-manager.ts+++ b/packages/core/src/sheets/column-manager.ts@@ -216,6 +216,35 @@ export class ColumnManager {return this._columnData[columnPos];}+ /**+ * Insert columns data at given position+ * @param {number} startColumn - start column index+ * @param {number} endColumn - end column index+ * @param {IObjectArrayPrimitiveType<IColumnData>} [columnDataInfo] - column data info+ */+ insertColumnsWithData(startColumn: number, endColumn: number, columnDataInfo?: IObjectArrayPrimitiveType<IColumnData>) {+ const count = endColumn - startColumn + 1;+ // ColumnData key is column index, default is ascending order+ const columns = Object.keys(this._columnData);++ // Move existing columns data after startColumn to the right, use reverse order to avoid overwrite+ for (let i = columns.length - 1; i >= 0; i--) {+ const columnIndex = Number(columns[i]);+ if (columnIndex >= startColumn) {+ this._columnData[columnIndex + count] = this._columnData[columnIndex];+ delete this._columnData[columnIndex];+ }+ }++ // Insert new column data+ for (let c = startColumn; c <= endColumn; c++) {+ const columnData = columnDataInfo?.[c - startColumn];+ if (columnData !== undefined && columnData !== null && Object.keys(columnData).length > 0) {+ this._columnData[c] = { ...columnData };+ }+ }+ }+/*** Remove column data of given column* @param columnPosdiff --git a/packages/core/src/sheets/row-manager.ts b/packages/core/src/sheets/row-manager.tsindex 2370463afb..42b616ca87 100644--- a/packages/core/src/sheets/row-manager.ts+++ b/packages/core/src/sheets/row-manager.ts@@ -132,6 +132,35 @@ export class RowManager {return this._rowData[rowPos];}+ /**+ * Insert rows data at given position+ * @param {number} startRow - start row index+ * @param {number} endRow - end row index+ * @param {IObjectArrayPrimitiveType<IRowData>} [rowDataInfo] - row data info+ */+ insertRowsWithData(startRow: number, endRow: number, rowDataInfo?: IObjectArrayPrimitiveType<IRowData>) {+ const count = endRow - startRow + 1;+ // RowData key is row index, default is ascending order+ const rows = Object.keys(this._rowData);++ // Move existing row data after startRow downwards, use reverse order to avoid overwrite+ for (let i = rows.length - 1; i >= 0; i--) {+ const rowIndex = Number(rows[i]);+ if (rowIndex >= startRow) {+ this._rowData[rowIndex + count] = this._rowData[rowIndex];+ delete this._rowData[rowIndex];+ }+ }++ // Insert new row data+ for (let r = startRow; r <= endRow; r++) {+ const rowData = rowDataInfo?.[r - startRow];+ if (rowData !== undefined && rowData !== null && Object.keys(rowData).length > 0) {+ this._rowData[r] = { ...rowData };+ }+ }+ }+/*** Remove row data of given row* @param rowPosdiff --git a/packages/sheets/src/commands/mutations/insert-row-col.mutation.ts b/packages/sheets/src/commands/mutations/insert-row-col.mutation.tsindex 760d1ffae6..5831c5ebd5 100644--- a/packages/sheets/src/commands/mutations/insert-row-col.mutation.ts+++ b/packages/sheets/src/commands/mutations/insert-row-col.mutation.ts@@ -21,7 +21,7 @@ import type {IRemoveColMutationParams,IRemoveRowsMutationParams,} from '../../basics/interfaces/mutation-interface';-import { CommandType, insertMatrixArray, IUniverInstanceService } from '@univerjs/core';+import { CommandType, IUniverInstanceService } from '@univerjs/core';import { getSheetMutationTarget } from '../commands/utils/target-util';export const InsertRowMutationUndoFactory = (@@ -50,24 +50,20 @@ export const InsertRowMutation: IMutation<IInsertRowMutationParams> = {}const { worksheet } = target;- // TODO@wzhudev: should not expose row data and let outside modules to modify it directly- // the correct way to do this is to provide a method from RowManager to modify row data- const rowWrapper = worksheet.getRowManager().getRowData();+ const rowManager = worksheet.getRowManager();const { range, rowInfo } = params;const { startRow, endRow } = range;- for (let r = startRow; r <= endRow; r++) {- if (rowInfo && rowInfo[r - startRow]) {- insertMatrixArray(r, rowInfo[r - startRow], rowWrapper);- }- }+ // insert row data+ rowManager.insertRowsWithData(startRow, endRow, rowInfo);+ // update worksheet row countconst insertedRowCount = endRow - startRow + 1;worksheet.setRowCount(worksheet.getRowCount() + insertedRowCount);// remove cells contents by directly mutating worksheetCellMatrixconst cellMatrix = worksheet.getCellMatrix();- cellMatrix.insertRows(range.startRow, insertedRowCount);+ cellMatrix.insertRows(startRow, insertedRowCount);return true;},@@ -99,16 +95,14 @@ export const InsertColMutation: IMutation<IInsertColMutationParams> = {};const { worksheet } = target;- const columnWrapper = worksheet.getColumnManager().getColumnData();+ const columnManager = worksheet.getColumnManager();const { range, colInfo } = params;const { startColumn, endColumn } = range;- for (let c = startColumn; c <= endColumn; c++) {- if (colInfo && colInfo[c - startColumn]) {- insertMatrixArray(c, colInfo[c - startColumn], columnWrapper);- }- }+ // insert column data+ columnManager.insertColumnsWithData(startColumn, endColumn, colInfo);+ // update worksheet column countconst insertedColumnCount = endColumn - startColumn + 1;worksheet.setColumnCount(worksheet.getColumnCount() + insertedColumnCount);