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(sheets): fix some bugs (#2545)
ybzkyb065f028b66e
diff --git a/packages/sheets-filter-ui/src/models/__tests__/conditions.spec.ts b/packages/sheets-filter-ui/src/models/__tests__/conditions.spec.tsindex 94d8d022a9..219ace4bed 100644--- a/packages/sheets-filter-ui/src/models/__tests__/conditions.spec.ts+++ b/packages/sheets-filter-ui/src/models/__tests__/conditions.spec.ts@@ -87,7 +87,7 @@ describe('test "FilterConditionItems"', () => {it('should map to filter column with space string', () => {expect(FilterConditionItems.NOT_EMPTY.mapToFilterColumn({ operator1: ExtendCustomFilterOperator.NOT_EMPTY }))- .toEqual({ customFilters: { customFilters: [{ operator: CustomFilterOperator.NOT_EQUALS, val: ' ' }] } });+ .toEqual({ customFilters: { customFilters: [{ operator: CustomFilterOperator.NOT_EQUALS, val: '' }] } });});});diff --git a/packages/sheets-filter-ui/src/models/conditions.ts b/packages/sheets-filter-ui/src/models/conditions.tsindex b537a15822..4f80080f03 100644--- a/packages/sheets-filter-ui/src/models/conditions.ts+++ b/packages/sheets-filter-ui/src/models/conditions.ts@@ -133,7 +133,7 @@ export namespace FilterConditionItems {getDefaultFormParams: () => { throw new Error('[FilterConditionItems.NOT_EMPTY]: should not have initial form params!'); },testMappingParams: ({ operator1 }) => operator1 === ExtendCustomFilterOperator.NOT_EMPTY,- mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: ' ', operator: CustomFilterOperator.NOT_EQUALS }] } }),+ mapToFilterColumn: () => ({ customFilters: { customFilters: [{ val: '', operator: CustomFilterOperator.NOT_EQUALS }] } }),testMappingFilterColumn: (filterColumn) => {if (filterColumn.customFilters?.customFilters.length !== 1) {return false;diff --git a/packages/sheets-filter/src/controllers/sheets-filter.controller.ts b/packages/sheets-filter/src/controllers/sheets-filter.controller.tsindex 6adcf064b7..6a9e151dac 100644--- a/packages/sheets-filter/src/controllers/sheets-filter.controller.ts+++ b/packages/sheets-filter/src/controllers/sheets-filter.controller.ts@@ -801,7 +801,7 @@ export class SheetsFilterController extends Disposable {const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);if (!filterModel) return;const filterRange = filterModel.getRange();- if (command.id === MoveRowsCommand.id && params.fromRange.startRow <= filterRange.startRow && params.fromRange.endRow >= filterRange.startRow) {+ if (command.id === MoveRowsCommand.id && params.fromRange.startRow <= filterRange.startRow && params.fromRange.endRow < filterRange.endRow) {this._sheetsFilterService.setFilterErrorMsg('sheets-filter.msg.filter-header-forbidden');throw new Error('[SheetsFilterController]: Cannot move header row of filter');}diff --git a/packages/sheets-ui/src/controllers/auto-fill.controller.ts b/packages/sheets-ui/src/controllers/auto-fill.controller.tsindex e76bfc6ab7..be5828cd7d 100644--- a/packages/sheets-ui/src/controllers/auto-fill.controller.ts+++ b/packages/sheets-ui/src/controllers/auto-fill.controller.ts@@ -53,6 +53,7 @@ import {RemoveSheetMutation,RemoveWorksheetMergeMutation,SelectionManagerService,+ SetRangeValuesCommand,SetRangeValuesMutation,SetRangeValuesUndoMutationFactory,SetSelectionsOperation,@@ -130,9 +131,9 @@ export class AutoFillController extends Disposable {const quitCommands = [SetCellEditVisibleOperation.id,AutoClearContentCommand.id,+ SetRangeValuesCommand.id,SetZoomRatioOperation.id,SetWorksheetActiveOperation.id,- SetRangeValuesMutation.id,MoveRangeMutation.id,RemoveRowMutation.id,RemoveColMutation.id,diff --git a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.tsindex 5d20bccbe8..92cc3552a6 100644--- a/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts+++ b/packages/sheets-ui/src/services/clipboard/html-to-usm/converter.ts@@ -156,6 +156,9 @@ export class HtmlToUSMService {let cellDataStream;if (i === starts.length - 1) {cellDataStream = `${dataStream.substring(starts[i])}\r\n`;+ if (cellDataStream === '\r\n') {+ continue;+ }} else {cellDataStream = `${dataStream.substring(starts[i], starts[i + 1] - 1)}\r\n`;}@@ -177,7 +180,8 @@ export class HtmlToUSMService {paragraphs: generateParagraphs(cellDataStream),},});- valueMatrix.setValue(valueMatrix.getLength(), 0, {+ const isEmptyMatrix = Object.keys(valueMatrix.getMatrix()).length === 0;+ valueMatrix.setValue(isEmptyMatrix ? 0 : valueMatrix.getLength(), 0, {v: cellDataStream,p,});diff --git a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts b/packages/sheets-ui/src/services/selection/selection-shape-extension.tsindex b0ae468f37..38cacfa63e 100644--- a/packages/sheets-ui/src/services/selection/selection-shape-extension.ts+++ b/packages/sheets-ui/src/services/selection/selection-shape-extension.ts@@ -16,9 +16,9 @@/* eslint-disable max-lines-per-function */import type { IFreeze, IRangeWithCoord, Nullable, Observer, ThemeService } from '@univerjs/core';-import { ColorKit } from '@univerjs/core';+import { ColorKit, UniverInstanceType } from '@univerjs/core';import type { IMouseEvent, IPointerEvent, Scene, SpreadsheetSkeleton, Viewport } from '@univerjs/engine-render';-import { CURSOR_TYPE, isRectIntersect, Rect, ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';+import { CURSOR_TYPE, IRenderManagerService, isRectIntersect, Rect, ScrollTimer, ScrollTimerType, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';import { getNormalSelectionStyle, SELECTION_CONTROL_BORDER_BUFFER_WIDTH } from '@univerjs/sheets';import type { Injector } from '@wendellhu/redi';@@ -103,8 +103,10 @@ export class SelectionShapeExtension {}private _getFreeze() {- const sheetSkeletonManagerService = this._injector.get(SheetSkeletonManagerService);- return sheetSkeletonManagerService.getCurrent()?.skeleton.getWorksheetConfig().freeze;+ const renderManagerService = this._injector.get(IRenderManagerService);+ const freeze = renderManagerService.withCurrentTypeOfUnit(UniverInstanceType.UNIVER_SHEET, SheetSkeletonManagerService)+ ?.getCurrent()?.skeleton.getWorksheetConfig().freeze;+ return freeze;}private _isSelectionInViewport(selection: IRangeWithCoord, viewport: Viewport) {