feat: update

packages/sheets-data-validation/src/controllers/dv-render.controller.ts

@@ -16,8 +16,9 @@
 
 
 import type { ICellDataForSheetInterceptor, ICellRenderContext, Workbook } from '@univerjs/core';
-import { DataValidationRenderMode, DataValidationStatus, DataValidationType, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, UniverInstanceType, WrapStrategy } from '@univerjs/core';
-import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
+import { DataValidationRenderMode, DataValidationStatus, DataValidationType, ICommandService, IUniverInstanceService, LifecycleStages, OnLifecycle, RxDisposable, sequenceExecute, UniverInstanceType, WrapStrategy } from '@univerjs/core';
+import type { IUpdateDataValidationSettingCommandParams } from '@univerjs/data-validation';
+import { DataValidationModel, DataValidatorRegistryService, UpdateDataValidationSettingCommand } from '@univerjs/data-validation';
 import { ComponentManager, IMenuService } from '@univerjs/ui';
 import { Inject, Injector } from '@wendellhu/redi';
 import { AutoHeightController, IEditorBridgeService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
@@ -59,7 +60,8 @@ export class DataValidationRenderController extends RxDisposable {
  @Inject(DataValidationDropdownManagerService) private readonly _dropdownManagerService: DataValidationDropdownManagerService,
  @Inject(SheetInterceptorService) private readonly _sheetInterceptorService: SheetInterceptorService,
  @Inject(Injector) private readonly _injector: Injector,
- @Inject(AutoHeightController) private readonly _autoHeightController: AutoHeightController
+ @Inject(AutoHeightController) private readonly _autoHeightController: AutoHeightController,
+ @ICommandService private readonly _commandService: ICommandService
  ) {
  super();
  this._init();
@@ -332,12 +334,11 @@ export class DataValidationRenderController extends RxDisposable {
  }
 
  private _initAutoHeight() {
- this.disposeWithMe(
- this._dataValidationModel.ruleChange$.subscribe((payload) => {
- if (payload.rule) {
- this._autoHeightController.markRangeAutoHeightDirty(payload.rule.ranges);
- }
- })
- );
+ this._dataValidationModel.ruleChange$.subscribe((info) => {
+ if (info.rule?.ranges) {
+ const mutations = this._autoHeightController.getUndoRedoParamsOfAutoHeight(info.rule.ranges);
+ sequenceExecute(mutations.redos, this._commandService);
+ }
+ });
  }
 }

packages/sheets-ui/src/controllers/auto-height.controller.ts

@@ -33,14 +33,10 @@ import {
 } from '@univerjs/sheets';
 import { Inject, Injector } from '@wendellhu/redi';
 
-import { Subject } from 'rxjs';
 import { SheetSkeletonManagerService } from '../services/sheet-skeleton-manager.service';
 
 @OnLifecycle(LifecycleStages.Ready, AutoHeightController)
 export class AutoHeightController extends Disposable {
- private _autoHeightDirtyRanges$ = new Subject<IRange[]>();
- autoHeightDirtyRanges$ = this._autoHeightDirtyRanges$.asObservable();
-
  constructor(
  @Inject(Injector) private _injector: Injector,
  @Inject(SheetInterceptorService) private _sheetInterceptorService: SheetInterceptorService,
@@ -52,7 +48,7 @@ export class AutoHeightController extends Disposable {
  this._initialize();
  }
 
- private _getUndoRedoParamsOfAutoHeight(ranges: IRange[]) {
+ getUndoRedoParamsOfAutoHeight(ranges: IRange[]) {
  const {
  _univerInstanceService: univerInstanceService,
  _sheetSkeletonManagerService: sheetSkeletonService,
@@ -71,12 +67,10 @@ export class AutoHeightController extends Disposable {
  unitId,
  rowsAutoHeightInfo,
  };
-
  const undoParams: ISetWorksheetRowAutoHeightMutationParams = SetWorksheetRowAutoHeightMutationFactory(
  injector,
  redoParams
  );
-
  return {
  undos: [
  {
@@ -106,7 +100,7 @@ export class AutoHeightController extends Disposable {
  };
  }
 
- return this._getUndoRedoParamsOfAutoHeight(command.params.range);
+ return this.getUndoRedoParamsOfAutoHeight(command.params.range);
  },
  }));
  // for intercept 'sheet.command.set-row-is-auto-height' command.
@@ -119,7 +113,7 @@ export class AutoHeightController extends Disposable {
  };
  }
 
- return this._getUndoRedoParamsOfAutoHeight(command.params.ranges);
+ return this.getUndoRedoParamsOfAutoHeight(command.params.ranges);
  },
  }));
 
@@ -153,16 +147,8 @@ export class AutoHeightController extends Disposable {
  };
  }
 
- return this._getUndoRedoParamsOfAutoHeight(selections);
+ return this.getUndoRedoParamsOfAutoHeight(selections);
  },
  }));
-
- this.disposeWithMe(this.autoHeightDirtyRanges$.subscribe((ranges) => {
- this._getUndoRedoParamsOfAutoHeight(ranges);
- }));
- }
-
- markRangeAutoHeightDirty(ranges: IRange[]) {
- this._autoHeightDirtyRanges$.next(ranges);
  }
 }

packages/sheets/src/commands/mutations/set-worksheet-row-height.mutation.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import type { BooleanNumber, IMutation, IObjectArrayPrimitiveType, IRange, Nullable } from '@univerjs/core';
+import type { BooleanNumber, IMutation, IObjectArrayPrimitiveType, IRange, Nullable, Workbook } from '@univerjs/core';
 import { CommandType, IUniverInstanceService } from '@univerjs/core';
 import type { IRowAutoHeightInfo } from '@univerjs/engine-render';
 import type { IAccessor } from '@wendellhu/redi';
@@ -202,7 +202,7 @@ export const SetWorksheetRowAutoHeightMutation: IMutation<ISetWorksheetRowAutoHe
  handler: (accessor, params) => {
  const { unitId, subUnitId, rowsAutoHeightInfo } = params;
  const univerInstanceService = accessor.get(IUniverInstanceService);
- const workbook = univerInstanceService.getUniverSheetInstance(unitId);
+ const workbook = univerInstanceService.getUnit<Workbook>(unitId);
  const worksheet = workbook?.getSheetBySheetId(subUnitId);
 
  if (!worksheet || !workbook) {