@univerjs/sheets-filter-ui 0.2.9 → 0.2.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/es/index.js CHANGED
@@ -7,10 +7,10 @@ import { SheetsFilterService, SetSheetsFilterRangeMutation, RemoveSheetsFilterMu
7
7
  import { toModule, IRPCChannelService, fromModule } from "@univerjs/rpc";
8
8
  import { IMessageService, ILayoutService, useObservable, useComponentsOfPart, ComponentContainer, KeyCode, MetaKeys, MenuGroup, MenuItemType, MenuPosition, getMenuHiddenObservable, ComponentManager, IShortcutService, IMenuService } from "@univerjs/ui";
9
9
  import { BehaviorSubject, ReplaySubject, of, Subject, merge, combineLatest, throttleTime, startWith, map, shareReplay, switchMap, filter, takeUntil, distinctUntilChanged } from "rxjs";
10
- import { SetCellEditVisibleOperation, SheetsUIPart, whenSheetEditorFocused, getCurrentRangeDisable$, SelectionShape, getCoordByCell, SheetSkeletonManagerService, SheetsRenderService, ISheetSelectionRenderService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController } from "@univerjs/sheets-ui";
10
+ import { SetCellEditVisibleOperation, SheetsUIPart, whenSheetEditorFocused, getCurrentRangeDisable$, SelectionShape, getCoordByCell, SheetSkeletonManagerService, ISheetSelectionRenderService, SheetsRenderService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController } from "@univerjs/sheets-ui";
11
11
  import { Rect, Shape, IRenderManagerService } from "@univerjs/engine-render";
12
12
  import { MessageType, Select, RadioGroup, Radio, Input, Checkbox, Tooltip, Button, Segmented } from "@univerjs/design";
13
- import { getSheetCommandTarget, SheetsSelectionsService, isSingleCellSelection, expandToContinuousRange, RefRangeService, WorkbookEditablePermission, WorksheetFilterPermission, WorksheetEditPermission, RangeProtectionPermissionEditPoint, INTERCEPTOR_POINT, SheetInterceptorService, RangeProtectionPermissionViewPoint } from "@univerjs/sheets";
13
+ import { getSheetCommandTarget, SheetsSelectionsService, isSingleCellSelection, expandToContinuousRange, RefRangeService, WorksheetFilterPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, INTERCEPTOR_POINT, SheetInterceptorService } from "@univerjs/sheets";
14
14
  import * as React from "react";
15
15
  import React__default, { forwardRef, useRef, createElement, useCallback, useMemo as useMemo$1, version, isValidElement, useEffect, useState } from "react";
16
16
  import ReactDOM, { flushSync } from "react-dom";
@@ -2919,7 +2919,7 @@ function SmartToggleFilterMenuItemFactory(accessor) {
2919
2919
  positions: [MenuPosition.TOOLBAR_START],
2920
2920
  hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
2921
2921
  activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
2922
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
2922
+ disabled$: getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] })
2923
2923
  };
2924
2924
  }
2925
2925
  __name(SmartToggleFilterMenuItemFactory, "SmartToggleFilterMenuItemFactory");
@@ -3037,17 +3037,12 @@ var __defProp$6 = Object.defineProperty, __getOwnPropDesc$6 = Object.getOwnPrope
3037
3037
  const DEFAULT_Z_INDEX = 1e3, SHEETS_FILTER_BUTTON_Z_INDEX = 5e3;
3038
3038
  var _a6;
3039
3039
  let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
3040
- constructor(_context, _injector, _sheetSkeletonManagerService, _sheetsFilterService, _themeService, _sheetInterceptorService, _sheetsRenderService, _commandService, _renderManagerService, _selectionRenderService) {
3040
+ constructor(_context, _injector, _sheetSkeletonManagerService, _sheetsFilterService, _themeService, _sheetInterceptorService, _commandService, _selectionRenderService) {
3041
3041
  super();
3042
3042
  __publicField(this, "_filterRangeShape", null);
3043
3043
  __publicField(this, "_buttonRenderDisposable", null);
3044
3044
  __publicField(this, "_filterButtonShapes", []);
3045
- this._context = _context, this._injector = _injector, this._sheetSkeletonManagerService = _sheetSkeletonManagerService, this._sheetsFilterService = _sheetsFilterService, this._themeService = _themeService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetsRenderService = _sheetsRenderService, this._commandService = _commandService, this._renderManagerService = _renderManagerService, this._selectionRenderService = _selectionRenderService, [
3046
- SetSheetsFilterRangeMutation,
3047
- SetSheetsFilterCriteriaMutation,
3048
- RemoveSheetsFilterMutation,
3049
- ReCalcSheetsFilterMutation
3050
- ].forEach((m2) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(m2.id))), this._initRenderer();
3045
+ this._context = _context, this._injector = _injector, this._sheetSkeletonManagerService = _sheetSkeletonManagerService, this._sheetsFilterService = _sheetsFilterService, this._themeService = _themeService, this._sheetInterceptorService = _sheetInterceptorService, this._commandService = _commandService, this._selectionRenderService = _selectionRenderService, this._initRenderer();
3051
3046
  }
3052
3047
  _initRenderer() {
3053
3048
  this._sheetSkeletonManagerService.currentSkeleton$.pipe(
@@ -3073,18 +3068,15 @@ let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
3073
3068
  }),
3074
3069
  takeUntil(this.dispose$)
3075
3070
  ).subscribe((renderParams) => {
3076
- this._disposeRendering(), !(!renderParams || !renderParams.range) && (this._renderRange(renderParams.unitId, renderParams.range, renderParams.skeleton), this._renderButtons(renderParams));
3071
+ this._disposeRendering(), !(!renderParams || !renderParams.range) && (this._renderRange(renderParams.range, renderParams.skeleton), this._renderButtons(renderParams));
3077
3072
  });
3078
3073
  }
3079
- _renderRange(unitId, range, skeleton) {
3080
- const renderer = this._renderManagerService.getRenderById(unitId);
3081
- if (!renderer)
3082
- return;
3083
- const { scene } = renderer, { rangeWithCoord, style } = this._selectionRenderService.attachSelectionWithCoord({
3074
+ _renderRange(range, skeleton) {
3075
+ const { scene } = this._context, { rangeWithCoord, style } = this._selectionRenderService.attachSelectionWithCoord({
3084
3076
  range,
3085
3077
  primary: null,
3086
3078
  style: null
3087
- }), { rowHeaderWidth, columnHeaderHeight } = skeleton, filterRangeShape = this._filterRangeShape = new SelectionShape(scene, DEFAULT_Z_INDEX, !0, this._themeService);
3079
+ }), { rowHeaderWidth, columnHeaderHeight } = skeleton, filterRangeShape = this._filterRangeShape = new SelectionShape(scene, DEFAULT_Z_INDEX, this._themeService, !0);
3088
3080
  filterRangeShape.update(rangeWithCoord, rowHeaderWidth, columnHeaderHeight, {
3089
3081
  hasAutoFill: !1,
3090
3082
  fill: "rgba(0, 0, 0, 0.0)",
@@ -3092,11 +3084,8 @@ let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
3092
3084
  }), filterRangeShape.setEvent(!1), scene.makeDirty(!0);
3093
3085
  }
3094
3086
  _renderButtons(params) {
3095
- const { range, filterModel, unitId, skeleton, worksheetId } = params, currentRenderer = this._renderManagerService.getRenderById(unitId);
3096
- if (!currentRenderer)
3097
- return;
3098
- const { scene } = currentRenderer;
3099
- this._interceptCellContent(params.range);
3087
+ const { range, filterModel, unitId, skeleton, worksheetId } = params, { scene } = this._context;
3088
+ this._interceptCellContent(unitId, worksheetId, params.range);
3100
3089
  const { startColumn, endColumn, startRow } = range;
3101
3090
  for (let col = startColumn; col <= endColumn; col++) {
3102
3091
  const key = `sheets-filter-button-${col}`, startPosition = getCoordByCell(startRow, col, scene, skeleton), { startX, startY, endX, endY } = startPosition, cellWidth = endX - startX, cellHeight = endY - startY;
@@ -3116,12 +3105,12 @@ let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
3116
3105
  }
3117
3106
  scene.addObjects(this._filterButtonShapes), scene.makeDirty();
3118
3107
  }
3119
- _interceptCellContent(range) {
3108
+ _interceptCellContent(workbookId, worksheetId, range) {
3120
3109
  const { startRow, startColumn, endColumn } = range;
3121
3110
  this._buttonRenderDisposable = this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.CELL_CONTENT, {
3122
3111
  handler: /* @__PURE__ */ __name((cell, pos, next) => {
3123
- const { row, col } = pos;
3124
- return row !== startRow || col < startColumn || col > endColumn ? next(cell) : next({
3112
+ const { row, col, unitId, subUnitId } = pos;
3113
+ return unitId !== workbookId || subUnitId !== worksheetId || row !== startRow || col < startColumn || col > endColumn ? next(cell) : next({
3125
3114
  ...cell,
3126
3115
  // @ts-ignore
3127
3116
  fontRenderExtension: {
@@ -3145,10 +3134,8 @@ SheetsFilterRenderController = __decorateClass$6([
3145
3134
  __decorateParam$6(3, Inject(SheetsFilterService)),
3146
3135
  __decorateParam$6(4, Inject(ThemeService)),
3147
3136
  __decorateParam$6(5, Inject(SheetInterceptorService)),
3148
- __decorateParam$6(6, Inject(SheetsRenderService)),
3149
- __decorateParam$6(7, ICommandService),
3150
- __decorateParam$6(8, IRenderManagerService),
3151
- __decorateParam$6(9, ISheetSelectionRenderService)
3137
+ __decorateParam$6(6, ICommandService),
3138
+ __decorateParam$6(7, ISheetSelectionRenderService)
3152
3139
  ], SheetsFilterRenderController);
3153
3140
  var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor, __decorateClass$5 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
3154
3141
  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -3156,15 +3143,21 @@ var __defProp$5 = Object.defineProperty, __getOwnPropDesc$5 = Object.getOwnPrope
3156
3143
  return kind && result && __defProp$5(target, key, result), result;
3157
3144
  }, "__decorateClass$5"), __decorateParam$5 = /* @__PURE__ */ __name((index2, decorator) => (target, key) => decorator(target, key, index2), "__decorateParam$5"), _a7;
3158
3145
  let SheetsFilterUIMobileController = (_a7 = class extends RxDisposable {
3159
- constructor(_renderManagerService) {
3160
- super(), this._renderManagerService = _renderManagerService, this._initRenderControllers();
3161
- }
3162
- _initRenderControllers() {
3163
- this.disposeWithMe(this._renderManagerService.registerRenderModule(UniverInstanceType.UNIVER_SHEET, [SheetsFilterRenderController]));
3146
+ constructor(_renderManagerService, _sheetsRenderService) {
3147
+ super(), this._renderManagerService = _renderManagerService, this._sheetsRenderService = _sheetsRenderService, [
3148
+ SetSheetsFilterRangeMutation,
3149
+ SetSheetsFilterCriteriaMutation,
3150
+ RemoveSheetsFilterMutation,
3151
+ ReCalcSheetsFilterMutation
3152
+ ].forEach((m2) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(m2.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
3153
+ UniverInstanceType.UNIVER_SHEET,
3154
+ [SheetsFilterRenderController]
3155
+ ));
3164
3156
  }
3165
3157
  }, __name(_a7, "SheetsFilterUIMobileController"), _a7);
3166
3158
  SheetsFilterUIMobileController = __decorateClass$5([
3167
- __decorateParam$5(0, IRenderManagerService)
3159
+ __decorateParam$5(0, IRenderManagerService),
3160
+ __decorateParam$5(1, Inject(SheetsRenderService))
3168
3161
  ], SheetsFilterUIMobileController);
3169
3162
  var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
3170
3163
  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -3174,8 +3167,8 @@ var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPrope
3174
3167
  const DefaultSheetFilterUiConfig = {}, FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
3175
3168
  var _a8;
3176
3169
  let SheetsFilterUIDesktopController = (_a8 = class extends SheetsFilterUIMobileController {
3177
- constructor(_config, _injector, _componentManager, _sheetsFilterPanelService, _sheetCanvasPopupService, _sheetsFilterService, _localeService, _shortcutService, _commandService, _menuService, _contextService, _messageService, _renderManagerService) {
3178
- super(_renderManagerService);
3170
+ constructor(_config, _injector, _componentManager, _sheetsFilterPanelService, _sheetCanvasPopupService, _sheetsFilterService, _localeService, _shortcutService, _commandService, _menuService, _contextService, _messageService, sheetsRenderService, renderManagerService) {
3171
+ super(renderManagerService, sheetsRenderService);
3179
3172
  __publicField(this, "_popupDisposable");
3180
3173
  this._config = _config, this._injector = _injector, this._componentManager = _componentManager, this._sheetsFilterPanelService = _sheetsFilterPanelService, this._sheetCanvasPopupService = _sheetCanvasPopupService, this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._shortcutService = _shortcutService, this._commandService = _commandService, this._menuService = _menuService, this._contextService = _contextService, this._messageService = _messageService, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
3181
3174
  }
@@ -3254,7 +3247,8 @@ SheetsFilterUIDesktopController = __decorateClass$4([
3254
3247
  __decorateParam$4(9, IMenuService),
3255
3248
  __decorateParam$4(10, IContextService),
3256
3249
  __decorateParam$4(11, IMessageService),
3257
- __decorateParam$4(12, IRenderManagerService)
3250
+ __decorateParam$4(12, Inject(SheetsRenderService)),
3251
+ __decorateParam$4(13, IRenderManagerService)
3258
3252
  ], SheetsFilterUIDesktopController);
3259
3253
  var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
3260
3254
  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -3262,23 +3256,31 @@ var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPrope
3262
3256
  return kind && result && __defProp$3(target, key, result), result;
3263
3257
  }, "__decorateClass$3"), __decorateParam$3 = /* @__PURE__ */ __name((index2, decorator) => (target, key) => decorator(target, key, index2), "__decorateParam$3"), _a9;
3264
3258
  let SheetsFilterPermissionController = (_a9 = class extends Disposable {
3265
- constructor(_sheetsFilterService, _localeService, _commandService, _sheetPermissionInterceptorBaseController) {
3266
- super(), this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._commandService = _commandService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._commandExecutedListener();
3259
+ constructor(_sheetsFilterService, _localeService, _commandService, _sheetPermissionInterceptorBaseController, _injector) {
3260
+ super(), this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._commandService = _commandService, this._sheetPermissionInterceptorBaseController = _sheetPermissionInterceptorBaseController, this._injector = _injector, this._commandExecutedListener();
3267
3261
  }
3268
3262
  _commandExecutedListener() {
3269
3263
  this.disposeWithMe(
3270
3264
  this._commandService.beforeCommandExecuted((command) => {
3271
- var _a13;
3272
- if (command.id === SmartToggleSheetsFilterCommand.id && (this._sheetPermissionInterceptorBaseController.permissionCheckWithoutRange({
3273
- workbookTypes: [WorkbookEditablePermission],
3274
- rangeTypes: [RangeProtectionPermissionViewPoint],
3275
- worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission]
3276
- }) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.filterErr"))), command.id === OpenFilterPanelOperation.id) {
3277
- const params = command.params, { unitId, subUnitId } = params, filterRange = (_a13 = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _a13.getRange(), colRange = Tools.deepClone(filterRange);
3265
+ var _a13, _b;
3266
+ if (command.id === SmartToggleSheetsFilterCommand.id) {
3267
+ const univerInstanceService = this._injector.get(IUniverInstanceService), target = getSheetCommandTarget(univerInstanceService);
3268
+ if (!target) return;
3269
+ const { unitId, subUnitId } = target, filterRange = (_a13 = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _a13.getRange();
3270
+ let permission;
3271
+ filterRange ? permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
3272
+ rangeTypes: [RangeProtectionPermissionViewPoint],
3273
+ worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission]
3274
+ }, [filterRange]) : permission = this._sheetPermissionInterceptorBaseController.permissionCheckWithoutRange({
3275
+ rangeTypes: [RangeProtectionPermissionViewPoint],
3276
+ worksheetTypes: [WorksheetViewPermission, WorksheetFilterPermission]
3277
+ }), permission || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.filterErr"));
3278
+ }
3279
+ if (command.id === OpenFilterPanelOperation.id) {
3280
+ const params = command.params, { unitId, subUnitId } = params, filterRange = (_b = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _b.getRange(), colRange = Tools.deepClone(filterRange);
3278
3281
  colRange && (colRange.startColumn = params.col, colRange.endColumn = params.col, this._sheetPermissionInterceptorBaseController.permissionCheckWithRanges({
3279
- workbookTypes: [WorkbookEditablePermission],
3280
3282
  rangeTypes: [RangeProtectionPermissionViewPoint],
3281
- worksheetTypes: [WorksheetFilterPermission, WorksheetEditPermission]
3283
+ worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission]
3282
3284
  }, [colRange]) || this._sheetPermissionInterceptorBaseController.haveNotPermissionHandle(this._localeService.t("permission.dialog.filterErr")));
3283
3285
  }
3284
3286
  })
@@ -3289,7 +3291,8 @@ SheetsFilterPermissionController = __decorateClass$3([
3289
3291
  __decorateParam$3(0, Inject(SheetsFilterService)),
3290
3292
  __decorateParam$3(1, Inject(LocaleService)),
3291
3293
  __decorateParam$3(2, ICommandService),
3292
- __decorateParam$3(3, Inject(SheetPermissionInterceptorBaseController))
3294
+ __decorateParam$3(3, Inject(SheetPermissionInterceptorBaseController)),
3295
+ __decorateParam$3(4, Inject(Injector))
3293
3296
  ], SheetsFilterPermissionController);
3294
3297
  var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __defNormalProp$1 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp$1"), __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
3295
3298
  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -1,4 +1,4 @@
1
- import { Disposable, ICommandService, LocaleService } from '@univerjs/core';
1
+ import { Disposable, ICommandService, Injector, LocaleService } from '@univerjs/core';
2
2
  import { MenuConfig } from '@univerjs/ui';
3
3
  import { SheetPermissionInterceptorBaseController } from '@univerjs/sheets-ui';
4
4
  import { SheetsFilterService } from '@univerjs/sheets-filter';
@@ -15,6 +15,7 @@ export declare class SheetsFilterPermissionController extends Disposable {
15
15
  private _localeService;
16
16
  private readonly _commandService;
17
17
  private readonly _sheetPermissionInterceptorBaseController;
18
- constructor(_sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _commandService: ICommandService, _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController);
18
+ private _injector;
19
+ constructor(_sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _commandService: ICommandService, _sheetPermissionInterceptorBaseController: SheetPermissionInterceptorBaseController, _injector: Injector);
19
20
  private _commandExecutedListener;
20
21
  }
@@ -1,6 +1,6 @@
1
1
  import { ICommandService, IContextService, Injector, LocaleService } from '@univerjs/core';
2
2
  import { ComponentManager, IMenuService, IMessageService, IShortcutService, MenuConfig } from '@univerjs/ui';
3
- import { SheetCanvasPopManagerService } from '@univerjs/sheets-ui';
3
+ import { SheetCanvasPopManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
4
4
  import { IRenderManagerService } from '@univerjs/engine-render';
5
5
  import { SheetsFilterService } from '@univerjs/sheets-filter';
6
6
  import { SheetsFilterPanelService } from '../services/sheets-filter-panel.service';
@@ -27,7 +27,7 @@ export declare class SheetsFilterUIDesktopController extends SheetsFilterUIMobil
27
27
  private readonly _menuService;
28
28
  private readonly _contextService;
29
29
  private readonly _messageService;
30
- constructor(_config: Partial<IUniverSheetsFilterUIConfig>, _injector: Injector, _componentManager: ComponentManager, _sheetsFilterPanelService: SheetsFilterPanelService, _sheetCanvasPopupService: SheetCanvasPopManagerService, _sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _shortcutService: IShortcutService, _commandService: ICommandService, _menuService: IMenuService, _contextService: IContextService, _messageService: IMessageService, _renderManagerService: IRenderManagerService);
30
+ constructor(_config: Partial<IUniverSheetsFilterUIConfig>, _injector: Injector, _componentManager: ComponentManager, _sheetsFilterPanelService: SheetsFilterPanelService, _sheetCanvasPopupService: SheetCanvasPopManagerService, _sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _shortcutService: IShortcutService, _commandService: ICommandService, _menuService: IMenuService, _contextService: IContextService, _messageService: IMessageService, sheetsRenderService: SheetsRenderService, renderManagerService: IRenderManagerService);
31
31
  dispose(): void;
32
32
  private _initShortcuts;
33
33
  private _initCommands;
@@ -1,7 +1,8 @@
1
1
  import { RxDisposable } from '@univerjs/core';
2
2
  import { IRenderManagerService } from '@univerjs/engine-render';
3
+ import { SheetsRenderService } from '@univerjs/sheets-ui';
3
4
  export declare class SheetsFilterUIMobileController extends RxDisposable {
4
5
  private readonly _renderManagerService;
5
- constructor(_renderManagerService: IRenderManagerService);
6
- private _initRenderControllers;
6
+ private _sheetsRenderService;
7
+ constructor(_renderManagerService: IRenderManagerService, _sheetsRenderService: SheetsRenderService);
7
8
  }
@@ -1,8 +1,8 @@
1
1
  import { Workbook, ICommandService, Injector, RxDisposable, ThemeService } from '@univerjs/core';
2
- import { IRenderContext, IRenderModule, IRenderManagerService } from '@univerjs/engine-render';
2
+ import { IRenderContext, IRenderModule } from '@univerjs/engine-render';
3
3
  import { SheetInterceptorService } from '@univerjs/sheets';
4
4
  import { SheetsFilterService } from '@univerjs/sheets-filter';
5
- import { ISheetSelectionRenderService, SheetSkeletonManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
5
+ import { ISheetSelectionRenderService, SheetSkeletonManagerService } from '@univerjs/sheets-ui';
6
6
  export declare class SheetsFilterRenderController extends RxDisposable implements IRenderModule {
7
7
  private readonly _context;
8
8
  private readonly _injector;
@@ -10,14 +10,12 @@ export declare class SheetsFilterRenderController extends RxDisposable implement
10
10
  private readonly _sheetsFilterService;
11
11
  private readonly _themeService;
12
12
  private readonly _sheetInterceptorService;
13
- private _sheetsRenderService;
14
13
  private readonly _commandService;
15
- private readonly _renderManagerService;
16
14
  private readonly _selectionRenderService;
17
15
  private _filterRangeShape;
18
16
  private _buttonRenderDisposable;
19
17
  private _filterButtonShapes;
20
- constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _sheetsFilterService: SheetsFilterService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _sheetsRenderService: SheetsRenderService, _commandService: ICommandService, _renderManagerService: IRenderManagerService, _selectionRenderService: ISheetSelectionRenderService);
18
+ constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _sheetsFilterService: SheetsFilterService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _commandService: ICommandService, _selectionRenderService: ISheetSelectionRenderService);
21
19
  private _initRenderer;
22
20
  private _renderRange;
23
21
  private _renderButtons;