@univerjs/sheets-ui 1.0.0-alpha.5 → 1.0.0-alpha.7
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/cjs/index.js +352 -218
- package/lib/es/index.js +352 -218
- package/lib/index.css +4 -0
- package/lib/index.js +352 -218
- package/lib/types/controllers/auto-fill-ui.controller.d.ts +18 -6
- package/lib/types/controllers/permission/sheet-permission-check-ui.controller.d.ts +2 -4
- package/lib/types/controllers/render-controllers/editor-bridge.render-controller.d.ts +1 -0
- package/lib/types/views/sheet-slider/SheetZoomInput.d.ts +1 -1
- package/lib/umd/index.js +11 -11
- package/package.json +14 -14
package/lib/index.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { BreakLineCommand, CoverContentCommand, DOCS_COMPONENT_MAIN_LAYER_INDEX, DOCS_VIEW_KEY, DOC_VERTICAL_PADDING, DeleteLeftCommand, DeleteRightCommand, DocSelectionRenderService, IEditorService, IMEInputCommand, MoveCursorOperation, MoveSelectionOperation, NodePositionConvertToCursor, ReplaceSnapshotCommand, SetInlineFormatBoldCommand, SetInlineFormatCommand, SetInlineFormatFontFamilyCommand, SetInlineFormatFontSizeCommand, SetInlineFormatItalicCommand, SetInlineFormatStrikethroughCommand, SetInlineFormatSubscriptCommand, SetInlineFormatSuperscriptCommand, SetInlineFormatTextColorCommand, SetInlineFormatUnderlineCommand, VIEWPORT_KEY, convertBodyToHtml, getCanvasOffsetByEngine, getLineBounding } from "@univerjs/docs-ui";
|
|
2
2
|
import { AbsoluteRefType, BaselineOffset, BooleanNumber, BorderStyleTypes, CellModeEnum, CellValueType, ColorKit, CommandType, CustomRangeType, DEFAULT_EMPTY_DOCUMENT_VALUE, DEFAULT_STYLES, DEFAULT_WORKSHEET_COLUMN_COUNT, DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT, DEFAULT_WORKSHEET_COLUMN_WIDTH, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_ROW_COUNT, DEFAULT_WORKSHEET_ROW_HEIGHT, DEFAULT_WORKSHEET_ROW_TITLE_WIDTH, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DataStreamTreeTokenType, DependentOn, Direction, Disposable, DisposableCollection, DocumentFlavor, EDITOR_ACTIVATED, ErrorService, FOCUSING_COMMENT_EDITOR, FOCUSING_COMMON_DRAWINGS, FOCUSING_EDITOR_BUT_HIDDEN, FOCUSING_EDITOR_INPUT_FORMULA, FOCUSING_EDITOR_STANDALONE, FOCUSING_FX_BAR_EDITOR, FOCUSING_SHAPE_TEXT_EDITOR, FOCUSING_SHEET, FOCUSING_UNIVER_EDITOR, FontItalic, FontWeight, HorizontalAlign, IAuthzIoService, ICommandService, IConfigService, IConfirmService, IContextService, ILogService, IPermissionService, IUndoRedoService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LRUMap, LocaleService, LocaleType, LookUp, NilCommand, ObjectMatrix, Optional, Plugin, PresetListType, Quantity, RANGE_TYPE, Range, Rectangle, RxDisposable, SHEET_EDITOR_UNITS, ThemeService, Tools, UndoCommandId, UniverInstanceType, UserManagerService, VerticalAlign, Workbook, WrapStrategy, cloneCellDataMatrix, cloneCellDataWithSpanAndDisplay, cloneValue, composeStyles, convertCellToRange, createIdentifier, createInterceptorKey, createParagraphId, createSectionId, dateKit, debounce, extractPureTextFromCell, fromEventSubject, generateRandomId, get, getEmptyCell, getNumfmtParseValueFilter, getReverseDirection, handleStyleToString, isDefaultFormat, isFormulaString, isInternalEditorID, isNotNullOrUndefined, isRealNum, isSafeUrl, isTextFormat, isValidRange, merge, mergeOverrideWithDependencies, nameCharacterCheck, numfmt, registerDependencies, sequenceExecute, set, skipParseTagNames, sortRules, splitIntoGrid, throttle, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
|
|
3
|
+
import { AUTO_FILL_APPLY_TYPE, AUTO_FILL_HOOK_TYPE, AddMergeUndoMutationFactory, AddRangeProtectionCommand, AddRangeProtectionMutation, AddWorksheetMergeAllCommand, AddWorksheetMergeCommand, AddWorksheetMergeHorizontalCommand, AddWorksheetMergeMutation, AddWorksheetMergeVerticalCommand, AddWorksheetProtectionCommand, AutoClearContentCommand, AutoFillCommand, AutoFillController, BEFORE_CELL_EDIT, BorderStyleManagerService, COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE, CancelFrozenCommand, CancelMarkDirtyRowAutoHeightOperation, ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeleteRangeProtectionCommand, DeleteRangeProtectionMutation, DeleteWorksheetProtectionCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, EditStateEnum, IAutoFillService, IExclusiveRangeService, INTERCEPTOR_POINT, INumfmtService, IRefSelectionsService, InsertColBeforeCommand, InsertColCommand, InsertColMutation, InsertDefinedNameCommand, InsertMultiColsLeftCommand, InsertMultiColsRightCommand, InsertMultiRowsAboveCommand, InsertMultiRowsAfterCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowBeforeCommand, InsertRowCommand, InsertRowMutation, InsertSheetCommand, InsertSheetMutation, MAX_CELL_PER_SHEET_KEY, MERGE_CELL_INTERCEPTOR_CHECK, MarkDirtyRowAutoHeightOperation, MergeCellController, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, REF_SELECTIONS_ENABLED, RangeProtectionCache, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, RefRangeService, RefSelectionsService, RefillCommand, RemoveColCommand, RemoveColMutation, RemoveDefinedNameCommand, RemoveMergeUndoMutationFactory, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, RemoveWorksheetMergeCommand, RemoveWorksheetMergeMutation, ResetBackgroundColorCommand, ResetTextColorCommand, SCOPE_WORKBOOK_VALUE_DEFINED_NAME, SELECTIONS_ENABLED, SELECTION_CONTROL_BORDER_BUFFER_COLOR, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, SHEETS_PLUGIN_CONFIG_KEY, ScrollToCellOperation, SelectionMoveType, SetBackgroundColorCommand, SetBoldCommand, SetBorderBasicCommand, SetBorderCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetDefinedNameCommand, SetFontFamilyCommand, SetFontSizeCommand, SetFrozenCommand, SetFrozenMutation, SetFrozenMutationFactory, SetHorizontalTextAlignCommand, SetItalicCommand, SetProtectionCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSelectionsOperation, SetShrinkToFitCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetStrikeThroughCommand, SetStyleCommand, SetTabColorCommand, SetTabColorMutation, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetUnderlineCommand, SetVerticalTextAlignCommand, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetColWidthMutationFactory, SetWorksheetHideCommand, SetWorksheetHideMutation, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetOrderMutation, SetWorksheetPermissionPointsCommand, SetWorksheetRowAutoHeightMutation, SetWorksheetRowAutoHeightMutationFactory, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetWorksheetShowCommand, SheetCopyDownCommand, SheetCopyRightCommand, SheetInterceptorService, SheetPermissionCheckController, SheetPermissionInitController, SheetSkeletonService, SheetsSelectionsService, TextToNumberCommand, ToggleCellCheckboxCommand, ToggleGridlinesCommand, ToggleGridlinesMutation, UniverSheetsPlugin, ViewStateEnum, WorkbookCopyPermission, WorkbookCreateProtectPermission, WorkbookCreateSheetPermission, WorkbookDeleteColumnPermission, WorkbookDeleteRowPermission, WorkbookDeleteSheetPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookInsertColumnPermission, WorkbookInsertRowPermission, WorkbookManageCollaboratorPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetDeleteColumnPermission, WorksheetDeleteProtectionPermission, WorksheetDeleteRowPermission, WorksheetEditPermission, WorksheetInsertColumnPermission, WorksheetInsertRowPermission, WorksheetManageCollaboratorPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission, adjustRangeOnMutation, alignToMergedCellsBorders, attachPrimaryWithCoord, attachRangeWithCoord, attachSelectionWithCoord, baseProtectionActions, convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, countCells, defaultLargeSheetOperationConfig, deserializeListOptions, discreteRangeToRange, expandToContinuousRange, getAddMergeMutationRangeByType, getAllWorksheetPermissionPoint, getCellAtRowCol, getClearContentMutationParamsForRanges, getMoveRangeCommandMutations, getPrimaryForRange, getSelectionsService, getSheetCommandTarget, rangeToDiscreteRange, serializeListOptions, setEndForRange, validateDefinedName } from "@univerjs/sheets";
|
|
3
4
|
import { AnchoredContextMenu, BuiltInUIPart, COLOR_PICKER_COMPONENT, ComponentContainer, ComponentManager, ContextMenuGroup, ContextMenuPosition, CopyCommand, CutCommand, DISABLE_AUTO_FOCUS_KEY, FILE_PNG_CLIPBOARD_MIME_TYPE, FILE__BMP_CLIPBOARD_MIME_TYPE, FILE__JPEG_CLIPBOARD_MIME_TYPE, FILE__WEBP_CLIPBOARD_MIME_TYPE, FONT_FAMILY_COMPONENT, FONT_FAMILY_ITEM_COMPONENT, FONT_SIZE_COMPONENT, FONT_SIZE_LIST, HTML_CLIPBOARD_MIME_TYPE, ICanvasPopupService, IClipboardInterfaceService, IContextMenuService, IDialogService, ILayoutService, IMenuManagerService, IMessageService, INotificationService, IPlatformService, IShortcutService, ISidebarService, IUIPartsService, IconManager, KeyCode, MenuItemType, MetaKeys, PLAIN_TEXT_CLIPBOARD_MIME_TYPE, PasteCommand, RibbonPosition, RibbonStartGroup, RibbonViewGroup, SheetPasteShortKeyCommandName, Slider, ToggleFullscreenOperation, ToolbarItem, UI_PLUGIN_CONFIG_KEY, UniverMobileUIPlugin, ZoomInput, connectInjector, getMenuHiddenObservable, handleStringToStyle, imageMimeTypeSet, sanitizeParsedHtml, textTrim, useComponentsOfPart, useConfigValue, useDependency, useEvent, useObservable, useSidebarClick, useVirtualList } from "@univerjs/ui";
|
|
4
5
|
import { CURSOR_TYPE, DashedRect, DeviceInputEventType, Engine, FIX_ONE_PIXEL_BLUR_OFFSET, Group, IRenderManagerService, Layer, RENDER_CLASS_TYPE, RENDER_RAW_FORMULA_KEY, Rect, RegularPolygon, RenderUnit, SHEET_EXTENSION_PREFIX, SHEET_VIEWPORT_KEY, Scene, ScrollBar, ScrollTimer, ScrollTimerType, Shape, SheetExtension, Spreadsheet, SpreadsheetColumnHeader, SpreadsheetRowHeader, TRANSFORM_CHANGE_OBSERVABLE_TYPE, Vector2, Viewport, cancelRequestFrame, convertTextRotation, convertTransformToOffsetX, convertTransformToOffsetY, fixLineWidthByScale, getCurrentTypeOfRenderer, getNextWheelZoomRatio, ptToPixel, requestNewFrame, withCurrentTypeOfRenderer } from "@univerjs/engine-render";
|
|
5
|
-
import { AUTO_FILL_APPLY_TYPE, AUTO_FILL_HOOK_TYPE, AddMergeUndoMutationFactory, AddRangeProtectionCommand, AddRangeProtectionMutation, AddWorksheetMergeAllCommand, AddWorksheetMergeCommand, AddWorksheetMergeHorizontalCommand, AddWorksheetMergeMutation, AddWorksheetMergeVerticalCommand, AddWorksheetProtectionCommand, AutoClearContentCommand, AutoFillCommand, AutoFillController, BEFORE_CELL_EDIT, BorderStyleManagerService, COMMAND_LISTENER_SKELETON_CHANGE, COMMAND_LISTENER_VALUE_CHANGE, CancelFrozenCommand, CancelMarkDirtyRowAutoHeightOperation, ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, CopySheetCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, DeleteRangeProtectionCommand, DeleteRangeProtectionMutation, DeleteWorksheetProtectionCommand, DeltaColumnWidthCommand, DeltaRowHeightCommand, EditStateEnum, IAutoFillService, IExclusiveRangeService, INTERCEPTOR_POINT, INumfmtService, IRefSelectionsService, InsertColBeforeCommand, InsertColCommand, InsertColMutation, InsertDefinedNameCommand, InsertMultiColsLeftCommand, InsertMultiColsRightCommand, InsertMultiRowsAboveCommand, InsertMultiRowsAfterCommand, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowBeforeCommand, InsertRowCommand, InsertRowMutation, InsertSheetCommand, InsertSheetMutation, MAX_CELL_PER_SHEET_KEY, MERGE_CELL_INTERCEPTOR_CHECK, MarkDirtyRowAutoHeightOperation, MergeCellController, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, REF_SELECTIONS_ENABLED, RangeProtectionCache, RangeProtectionPermissionEditPoint, RangeProtectionPermissionViewPoint, RangeProtectionRuleModel, RefRangeService, RefSelectionsService, RefillCommand, RemoveColCommand, RemoveColMutation, RemoveDefinedNameCommand, RemoveMergeUndoMutationFactory, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, RemoveWorksheetMergeCommand, RemoveWorksheetMergeMutation, ResetBackgroundColorCommand, ResetTextColorCommand, SCOPE_WORKBOOK_VALUE_DEFINED_NAME, SELECTIONS_ENABLED, SELECTION_CONTROL_BORDER_BUFFER_COLOR, SELECTION_CONTROL_BORDER_BUFFER_WIDTH, SHEETS_PLUGIN_CONFIG_KEY, ScrollToCellOperation, SelectionMoveType, SetBackgroundColorCommand, SetBoldCommand, SetBorderBasicCommand, SetBorderCommand, SetColHiddenCommand, SetColHiddenMutation, SetColVisibleMutation, SetColWidthCommand, SetDefinedNameCommand, SetFontFamilyCommand, SetFontSizeCommand, SetFrozenCommand, SetFrozenMutation, SetFrozenMutationFactory, SetHorizontalTextAlignCommand, SetItalicCommand, SetProtectionCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetRangeValuesUndoMutationFactory, SetRowHeightCommand, SetRowHiddenCommand, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectedColsVisibleCommand, SetSelectedRowsVisibleCommand, SetSelectionsOperation, SetShrinkToFitCommand, SetSpecificColsVisibleCommand, SetSpecificRowsVisibleCommand, SetStrikeThroughCommand, SetStyleCommand, SetTabColorCommand, SetTabColorMutation, SetTextColorCommand, SetTextRotationCommand, SetTextWrapCommand, SetUnderlineCommand, SetVerticalTextAlignCommand, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SetWorksheetColWidthMutation, SetWorksheetColWidthMutationFactory, SetWorksheetHideCommand, SetWorksheetHideMutation, SetWorksheetNameCommand, SetWorksheetNameMutation, SetWorksheetOrderCommand, SetWorksheetOrderMutation, SetWorksheetPermissionPointsCommand, SetWorksheetRowAutoHeightMutation, SetWorksheetRowAutoHeightMutationFactory, SetWorksheetRowHeightMutation, SetWorksheetRowIsAutoHeightCommand, SetWorksheetRowIsAutoHeightMutation, SetWorksheetShowCommand, SheetCopyDownCommand, SheetCopyRightCommand, SheetInterceptorService, SheetPermissionCheckController, SheetPermissionInitController, SheetSkeletonService, SheetsSelectionsService, TextToNumberCommand, ToggleCellCheckboxCommand, ToggleGridlinesCommand, ToggleGridlinesMutation, UniverSheetsPlugin, ViewStateEnum, WorkbookCopyPermission, WorkbookCreateProtectPermission, WorkbookCreateSheetPermission, WorkbookDeleteColumnPermission, WorkbookDeleteRowPermission, WorkbookDeleteSheetPermission, WorkbookEditablePermission, WorkbookHideSheetPermission, WorkbookInsertColumnPermission, WorkbookInsertRowPermission, WorkbookManageCollaboratorPermission, WorkbookRenameSheetPermission, WorksheetCopyPermission, WorksheetDeleteColumnPermission, WorksheetDeleteProtectionPermission, WorksheetDeleteRowPermission, WorksheetEditPermission, WorksheetInsertColumnPermission, WorksheetInsertRowPermission, WorksheetManageCollaboratorPermission, WorksheetProtectionPointModel, WorksheetProtectionRuleModel, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetColumnStylePermission, WorksheetSetRowStylePermission, WorksheetViewPermission, adjustRangeOnMutation, alignToMergedCellsBorders, attachPrimaryWithCoord, attachRangeWithCoord, attachSelectionWithCoord, baseProtectionActions, convertPrimaryWithCoordToPrimary, convertSelectionDataToRange, countCells, defaultLargeSheetOperationConfig, deserializeListOptions, discreteRangeToRange, expandToContinuousRange, getAddMergeMutationRangeByType, getAllWorksheetPermissionPoint, getCellAtRowCol, getClearContentMutationParamsForRanges, getMoveRangeCommandMutations, getPrimaryForRange, getSelectionsService, getSheetCommandTarget, rangeToDiscreteRange, serializeListOptions, setEndForRange, validateDefinedName } from "@univerjs/sheets";
|
|
6
6
|
import { BehaviorSubject, EMPTY, Observable, Subject, Subscription, combineLatest, combineLatestWith, distinctUntilChanged, filter, firstValueFrom, from, fromEvent, map, merge as merge$1, of, shareReplay, startWith, switchMap, take, takeUntil, throttleTime, timeout, withLatestFrom } from "rxjs";
|
|
7
7
|
import { DocSelectionManagerService, DocSkeletonManagerService, InsertTextCommand, RichTextEditingMutation, SetTextSelectionsOperation } from "@univerjs/docs";
|
|
8
8
|
import { ObjectScope, UnitAction, UnitObject, UnitRole } from "@univerjs/protocol";
|
|
@@ -686,6 +686,10 @@ var BaseSelectionRenderService = class extends Disposable {
|
|
|
686
686
|
const startViewport = scene.getActiveViewportByCoord(Vector2.FromArray([moveStartPosX, moveStartPosY]));
|
|
687
687
|
this._scenePointerMoveSub = scene.onPointerMove$.subscribeEvent((moveEvt) => {
|
|
688
688
|
var _scene$getActiveViewp;
|
|
689
|
+
if (moveEvt.buttons === 0) {
|
|
690
|
+
this.endSelection();
|
|
691
|
+
return;
|
|
692
|
+
}
|
|
689
693
|
const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
|
|
690
694
|
const { x: newMoveOffsetX, y: newMoveOffsetY } = scene.getCoordRelativeToViewport(Vector2.FromArray([moveOffsetX, moveOffsetY]));
|
|
691
695
|
this._movingHandler(newMoveOffsetX, newMoveOffsetY, activeSelectionControl, rangeType);
|
|
@@ -5063,6 +5067,7 @@ const SheetCopyCommand = {
|
|
|
5063
5067
|
priority: SHEET_CLIPBOARD_PRIORITY,
|
|
5064
5068
|
preconditions: whenSheetFocused,
|
|
5065
5069
|
handler: async (accessor) => {
|
|
5070
|
+
checkSheetClipboardPermission(accessor, CopyCommand.id);
|
|
5066
5071
|
return accessor.get(ISheetClipboardService).copy();
|
|
5067
5072
|
}
|
|
5068
5073
|
};
|
|
@@ -5074,6 +5079,7 @@ const SheetCutCommand = {
|
|
|
5074
5079
|
priority: SHEET_CLIPBOARD_PRIORITY,
|
|
5075
5080
|
preconditions: whenSheetFocused,
|
|
5076
5081
|
handler: async (accessor) => {
|
|
5082
|
+
checkSheetClipboardPermission(accessor, CutCommand.id);
|
|
5077
5083
|
return accessor.get(ISheetClipboardService).cut();
|
|
5078
5084
|
}
|
|
5079
5085
|
};
|
|
@@ -5085,6 +5091,7 @@ const SheetPasteCommand = {
|
|
|
5085
5091
|
priority: SHEET_CLIPBOARD_PRIORITY,
|
|
5086
5092
|
preconditions: whenSheetFocused,
|
|
5087
5093
|
handler: async (accessor, params) => {
|
|
5094
|
+
checkSheetClipboardPermission(accessor, PasteCommand.id, params);
|
|
5088
5095
|
const sheetClipboardService = accessor.get(ISheetClipboardService);
|
|
5089
5096
|
const clipboardInterfaceService = accessor.get(IClipboardInterfaceService);
|
|
5090
5097
|
if (clipboardInterfaceService.supportClipboard) {
|
|
@@ -5103,12 +5110,76 @@ const SheetPasteShortKeyCommand = {
|
|
|
5103
5110
|
id: SheetPasteShortKeyCommandName,
|
|
5104
5111
|
type: CommandType.COMMAND,
|
|
5105
5112
|
handler: async (accessor, params) => {
|
|
5113
|
+
checkSheetClipboardPermission(accessor, PasteCommand.id);
|
|
5106
5114
|
const clipboardService = accessor.get(ISheetClipboardService);
|
|
5107
5115
|
const { htmlContent, textContent, files, formulaClipboardPayload } = params;
|
|
5108
5116
|
clipboardService.legacyPaste(htmlContent, textContent, files, formulaClipboardPayload);
|
|
5109
5117
|
return true;
|
|
5110
5118
|
}
|
|
5111
5119
|
};
|
|
5120
|
+
function checkSheetClipboardPermission(accessor, commandId, params) {
|
|
5121
|
+
const permissionCheckController = accessor.get(SheetPermissionCheckController);
|
|
5122
|
+
let permission = true;
|
|
5123
|
+
let errorKey = "sheets-ui.permission.dialog.commonErr";
|
|
5124
|
+
switch (commandId) {
|
|
5125
|
+
case CopyCommand.id:
|
|
5126
|
+
permission = permissionCheckController.permissionCheckWithRanges({
|
|
5127
|
+
workbookTypes: [WorkbookCopyPermission],
|
|
5128
|
+
worksheetTypes: [WorksheetCopyPermission],
|
|
5129
|
+
rangeTypes: [RangeProtectionPermissionViewPoint]
|
|
5130
|
+
});
|
|
5131
|
+
errorKey = "sheets-ui.permission.dialog.copyErr";
|
|
5132
|
+
break;
|
|
5133
|
+
case CutCommand.id:
|
|
5134
|
+
permission = permissionCheckController.permissionCheckWithRanges({
|
|
5135
|
+
workbookTypes: [WorkbookCopyPermission, WorkbookEditablePermission],
|
|
5136
|
+
worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission],
|
|
5137
|
+
rangeTypes: [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint]
|
|
5138
|
+
});
|
|
5139
|
+
errorKey = "sheets-ui.permission.dialog.copyErr";
|
|
5140
|
+
break;
|
|
5141
|
+
case PasteCommand.id:
|
|
5142
|
+
permission = checkSheetPastePermission(permissionCheckController, params);
|
|
5143
|
+
errorKey = "sheets-ui.permission.dialog.pasteErr";
|
|
5144
|
+
break;
|
|
5145
|
+
}
|
|
5146
|
+
if (permission) return;
|
|
5147
|
+
const localeService = accessor.get(LocaleService);
|
|
5148
|
+
let errorMsg = localeService.t(errorKey);
|
|
5149
|
+
if (commandId === CopyCommand.id || commandId === CutCommand.id) {
|
|
5150
|
+
var _permissionService$ge;
|
|
5151
|
+
const target = getSheetCommandTarget(accessor.get(IUniverInstanceService));
|
|
5152
|
+
const permissionService = accessor.get(IPermissionService);
|
|
5153
|
+
if (target && !((_permissionService$ge = permissionService.getPermissionPoint(new WorkbookCopyPermission(target.unitId).id)) === null || _permissionService$ge === void 0 ? void 0 : _permissionService$ge.value)) errorMsg = localeService.t("sheets-ui.permission.dialog.workbookCopyErr");
|
|
5154
|
+
}
|
|
5155
|
+
permissionCheckController.blockExecuteWithoutPermission(errorMsg);
|
|
5156
|
+
}
|
|
5157
|
+
function checkSheetPastePermission(permissionCheckController, params) {
|
|
5158
|
+
if ((params === null || params === void 0 ? void 0 : params.value) === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_VALUE || (params === null || params === void 0 ? void 0 : params.value) === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMULA || (params === null || params === void 0 ? void 0 : params.value) === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMAT) return permissionCheckController.permissionCheckWithRanges({
|
|
5159
|
+
workbookTypes: [WorkbookEditablePermission],
|
|
5160
|
+
worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
|
|
5161
|
+
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
5162
|
+
});
|
|
5163
|
+
if ((params === null || params === void 0 ? void 0 : params.value) === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_COL_WIDTH) return permissionCheckController.permissionCheckWithRanges({
|
|
5164
|
+
workbookTypes: [WorkbookEditablePermission],
|
|
5165
|
+
worksheetTypes: [
|
|
5166
|
+
WorksheetEditPermission,
|
|
5167
|
+
WorksheetSetCellValuePermission,
|
|
5168
|
+
WorksheetSetCellStylePermission,
|
|
5169
|
+
WorksheetSetColumnStylePermission
|
|
5170
|
+
],
|
|
5171
|
+
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
5172
|
+
});
|
|
5173
|
+
return permissionCheckController.permissionCheckWithRanges({
|
|
5174
|
+
workbookTypes: [WorkbookEditablePermission],
|
|
5175
|
+
worksheetTypes: [
|
|
5176
|
+
WorksheetSetCellValuePermission,
|
|
5177
|
+
WorksheetSetCellStylePermission,
|
|
5178
|
+
WorksheetEditPermission
|
|
5179
|
+
],
|
|
5180
|
+
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
5181
|
+
});
|
|
5182
|
+
}
|
|
5112
5183
|
const SheetPasteValueCommand = {
|
|
5113
5184
|
id: "sheet.command.paste-value",
|
|
5114
5185
|
type: CommandType.COMMAND,
|
|
@@ -8541,11 +8612,7 @@ const SidebarDefinedNameOperation = {
|
|
|
8541
8612
|
header: { title: localeService.t("sheets-ui.definedName.featureTitle") },
|
|
8542
8613
|
children: { label: DEFINED_NAME_CONTAINER },
|
|
8543
8614
|
onClose: () => {},
|
|
8544
|
-
width: 333
|
|
8545
|
-
bodyStyle: {
|
|
8546
|
-
height: "100%",
|
|
8547
|
-
overflow: "hidden"
|
|
8548
|
-
}
|
|
8615
|
+
width: 333
|
|
8549
8616
|
});
|
|
8550
8617
|
break;
|
|
8551
8618
|
default:
|
|
@@ -8827,21 +8894,18 @@ SheetsRenderService = __decorate([
|
|
|
8827
8894
|
//#endregion
|
|
8828
8895
|
//#region src/controllers/auto-fill-ui.controller.ts
|
|
8829
8896
|
let AutoFillUIController = class AutoFillUIController extends Disposable {
|
|
8830
|
-
constructor(_univerInstanceService, _commandService, _autoFillService, _autoFillController,
|
|
8897
|
+
constructor(_univerInstanceService, _commandService, _autoFillService, _autoFillController, _sheetsRenderService) {
|
|
8831
8898
|
super();
|
|
8832
8899
|
this._univerInstanceService = _univerInstanceService;
|
|
8833
8900
|
this._commandService = _commandService;
|
|
8834
8901
|
this._autoFillService = _autoFillService;
|
|
8835
8902
|
this._autoFillController = _autoFillController;
|
|
8836
|
-
this._editorBridgeService = _editorBridgeService;
|
|
8837
|
-
this._renderManagerService = _renderManagerService;
|
|
8838
8903
|
this._sheetsRenderService = _sheetsRenderService;
|
|
8839
8904
|
_defineProperty(this, "_currentLocation", null);
|
|
8840
8905
|
this._init();
|
|
8841
8906
|
}
|
|
8842
8907
|
_init() {
|
|
8843
8908
|
this._initDefaultHook();
|
|
8844
|
-
this._initSelectionControlFillChanged();
|
|
8845
8909
|
this._initQuitListener();
|
|
8846
8910
|
this._initSkeletonChange();
|
|
8847
8911
|
}
|
|
@@ -8896,127 +8960,120 @@ let AutoFillUIController = class AutoFillUIController extends Disposable {
|
|
|
8896
8960
|
this._autoFillController.quit();
|
|
8897
8961
|
this._autoFillService.setShowMenu(false);
|
|
8898
8962
|
}
|
|
8963
|
+
};
|
|
8964
|
+
AutoFillUIController = __decorate([
|
|
8965
|
+
__decorateParam(0, IUniverInstanceService),
|
|
8966
|
+
__decorateParam(1, ICommandService),
|
|
8967
|
+
__decorateParam(2, IAutoFillService),
|
|
8968
|
+
__decorateParam(3, Inject(AutoFillController)),
|
|
8969
|
+
__decorateParam(4, Inject(SheetsRenderService))
|
|
8970
|
+
], AutoFillUIController);
|
|
8971
|
+
let AutoFillRenderController = class AutoFillRenderController extends Disposable {
|
|
8972
|
+
constructor(_context, _selectionRenderService, _selectionManagerService, _commandService, _editorBridgeService) {
|
|
8973
|
+
super();
|
|
8974
|
+
this._context = _context;
|
|
8975
|
+
this._selectionRenderService = _selectionRenderService;
|
|
8976
|
+
this._selectionManagerService = _selectionManagerService;
|
|
8977
|
+
this._commandService = _commandService;
|
|
8978
|
+
this._editorBridgeService = _editorBridgeService;
|
|
8979
|
+
_defineProperty(this, "_selectionControlDisposables", new DisposableCollection());
|
|
8980
|
+
this._initSelectionControlFillChanged();
|
|
8981
|
+
}
|
|
8982
|
+
dispose() {
|
|
8983
|
+
this._selectionControlDisposables.dispose();
|
|
8984
|
+
super.dispose();
|
|
8985
|
+
}
|
|
8899
8986
|
_initSelectionControlFillChanged() {
|
|
8900
|
-
|
|
8901
|
-
|
|
8902
|
-
|
|
8903
|
-
const scheduleUpdateListener = (listener) => {
|
|
8904
|
-
if (pendingRetry) return;
|
|
8905
|
-
pendingRetry = true;
|
|
8906
|
-
setTimeout(() => {
|
|
8907
|
-
pendingRetry = false;
|
|
8908
|
-
listener();
|
|
8909
|
-
}, 0);
|
|
8910
|
-
};
|
|
8911
|
-
const updateListener = () => {
|
|
8912
|
-
disposableCollection.dispose();
|
|
8913
|
-
const currentRenderer = getCurrentTypeOfRenderer(UniverInstanceType.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService);
|
|
8914
|
-
if (!currentRenderer) return;
|
|
8915
|
-
const selectionRenderService = getResolvedSelectionRenderService(currentRenderer);
|
|
8916
|
-
if (!selectionRenderService) {
|
|
8917
|
-
retryCount += 1;
|
|
8918
|
-
if (retryCount <= 3) scheduleUpdateListener(updateListener);
|
|
8919
|
-
return;
|
|
8920
|
-
}
|
|
8921
|
-
retryCount = 0;
|
|
8922
|
-
selectionRenderService.getSelectionControls().forEach((controlSelection) => {
|
|
8923
|
-
disposableCollection.add(controlSelection.selectionFilled$.subscribe((filled) => {
|
|
8924
|
-
if (filled == null || filled.startColumn === -1 || filled.startRow === -1 || filled.endColumn === -1 || filled.endRow === -1) return;
|
|
8925
|
-
const source = {
|
|
8926
|
-
startColumn: controlSelection.model.startColumn,
|
|
8927
|
-
endColumn: controlSelection.model.endColumn,
|
|
8928
|
-
startRow: controlSelection.model.startRow,
|
|
8929
|
-
endRow: controlSelection.model.endRow
|
|
8930
|
-
};
|
|
8931
|
-
const selection = {
|
|
8932
|
-
startColumn: filled.startColumn,
|
|
8933
|
-
endColumn: filled.endColumn,
|
|
8934
|
-
startRow: filled.startRow,
|
|
8935
|
-
endRow: filled.endRow
|
|
8936
|
-
};
|
|
8937
|
-
this._commandService.executeCommand(AutoFillCommand.id, {
|
|
8938
|
-
sourceRange: source,
|
|
8939
|
-
targetRange: selection
|
|
8940
|
-
});
|
|
8941
|
-
}));
|
|
8942
|
-
disposableCollection.add(controlSelection.fillControl.onDblclick$.subscribeEvent(() => {
|
|
8943
|
-
const source = {
|
|
8944
|
-
startColumn: controlSelection.model.startColumn,
|
|
8945
|
-
endColumn: controlSelection.model.endColumn,
|
|
8946
|
-
startRow: controlSelection.model.startRow,
|
|
8947
|
-
endRow: controlSelection.model.endRow
|
|
8948
|
-
};
|
|
8949
|
-
this._handleDbClickFill(source);
|
|
8950
|
-
}));
|
|
8951
|
-
disposableCollection.add(controlSelection.fillControl.onPointerDown$.subscribeEvent(() => {
|
|
8952
|
-
if (this._editorBridgeService.isVisible().visible) this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
|
|
8953
|
-
visible: false,
|
|
8954
|
-
eventType: DeviceInputEventType.PointerDown,
|
|
8955
|
-
unitId: currentRenderer.unitId
|
|
8956
|
-
});
|
|
8957
|
-
}));
|
|
8958
|
-
});
|
|
8959
|
-
};
|
|
8960
|
-
scheduleUpdateListener(updateListener);
|
|
8961
|
-
this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
|
|
8962
|
-
if (command.id === SetSelectionsOperation.id) scheduleUpdateListener(updateListener);
|
|
8987
|
+
this._updateSelectionControlListeners();
|
|
8988
|
+
this.disposeWithMe(this._selectionManagerService.selectionChanged$.subscribe(() => {
|
|
8989
|
+
this._updateSelectionControlListeners();
|
|
8963
8990
|
}));
|
|
8964
|
-
this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).subscribe(() => scheduleUpdateListener(updateListener)));
|
|
8965
8991
|
}
|
|
8966
|
-
|
|
8967
|
-
|
|
8968
|
-
|
|
8992
|
+
_updateSelectionControlListeners() {
|
|
8993
|
+
this._selectionControlDisposables.dispose();
|
|
8994
|
+
this._selectionRenderService.getSelectionControls().forEach((controlSelection) => {
|
|
8995
|
+
this._selectionControlDisposables.add(controlSelection.selectionFilled$.subscribe((filled) => {
|
|
8996
|
+
if (filled == null || filled.startColumn === -1 || filled.startRow === -1 || filled.endColumn === -1 || filled.endRow === -1) return;
|
|
8997
|
+
const sourceRange = {
|
|
8998
|
+
startColumn: controlSelection.model.startColumn,
|
|
8999
|
+
endColumn: controlSelection.model.endColumn,
|
|
9000
|
+
startRow: controlSelection.model.startRow,
|
|
9001
|
+
endRow: controlSelection.model.endRow
|
|
9002
|
+
};
|
|
9003
|
+
const targetRange = {
|
|
9004
|
+
startColumn: filled.startColumn,
|
|
9005
|
+
endColumn: filled.endColumn,
|
|
9006
|
+
startRow: filled.startRow,
|
|
9007
|
+
endRow: filled.endRow
|
|
9008
|
+
};
|
|
9009
|
+
this._executeAutoFill(sourceRange, targetRange);
|
|
9010
|
+
}));
|
|
9011
|
+
this._selectionControlDisposables.add(controlSelection.fillControl.onDblclick$.subscribeEvent(() => {
|
|
9012
|
+
const sourceRange = {
|
|
9013
|
+
startColumn: controlSelection.model.startColumn,
|
|
9014
|
+
endColumn: controlSelection.model.endColumn,
|
|
9015
|
+
startRow: controlSelection.model.startRow,
|
|
9016
|
+
endRow: controlSelection.model.endRow
|
|
9017
|
+
};
|
|
9018
|
+
this._handleDbClickFill(sourceRange);
|
|
9019
|
+
}));
|
|
9020
|
+
this._selectionControlDisposables.add(controlSelection.fillControl.onPointerDown$.subscribeEvent(() => {
|
|
9021
|
+
if (this._editorBridgeService.isVisible().visible) this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
|
|
9022
|
+
visible: false,
|
|
9023
|
+
eventType: DeviceInputEventType.PointerDown,
|
|
9024
|
+
unitId: this._context.unitId
|
|
9025
|
+
});
|
|
9026
|
+
}));
|
|
9027
|
+
});
|
|
9028
|
+
}
|
|
9029
|
+
_executeAutoFill(sourceRange, targetRange) {
|
|
9030
|
+
const subUnitId = this._context.unit.getActiveSheet().getSheetId();
|
|
8969
9031
|
this._commandService.executeCommand(AutoFillCommand.id, {
|
|
8970
|
-
sourceRange
|
|
8971
|
-
targetRange
|
|
9032
|
+
sourceRange,
|
|
9033
|
+
targetRange,
|
|
9034
|
+
unitId: this._context.unitId,
|
|
9035
|
+
subUnitId
|
|
8972
9036
|
});
|
|
8973
9037
|
}
|
|
8974
|
-
|
|
8975
|
-
|
|
8976
|
-
|
|
8977
|
-
|
|
8978
|
-
if (!worksheet) return source;
|
|
8979
|
-
const matrix = worksheet.getCellMatrix();
|
|
8980
|
-
const maxRow = worksheet.getMaxRows();
|
|
8981
|
-
const maxColumn = worksheet.getMaxColumns();
|
|
8982
|
-
let detectEndRow = endRow + 1;
|
|
8983
|
-
if (startColumn > 0 && ((_matrix$getValue = matrix.getValue(detectEndRow, startColumn - 1)) === null || _matrix$getValue === void 0 ? void 0 : _matrix$getValue.v) != null) {
|
|
8984
|
-
var _matrix$getValue2;
|
|
8985
|
-
while (((_matrix$getValue2 = matrix.getValue(detectEndRow + 1, startColumn - 1)) === null || _matrix$getValue2 === void 0 ? void 0 : _matrix$getValue2.v) != null && detectEndRow < maxRow) detectEndRow += 1;
|
|
8986
|
-
} else if (endColumn < maxColumn - 1 && ((_matrix$getValue3 = matrix.getValue(detectEndRow, endColumn + 1)) === null || _matrix$getValue3 === void 0 ? void 0 : _matrix$getValue3.v) != null) {
|
|
8987
|
-
var _matrix$getValue4;
|
|
8988
|
-
while (((_matrix$getValue4 = matrix.getValue(detectEndRow + 1, endColumn + 1)) === null || _matrix$getValue4 === void 0 ? void 0 : _matrix$getValue4.v) != null && detectEndRow < maxRow) detectEndRow += 1;
|
|
8989
|
-
} else detectEndRow = endRow;
|
|
8990
|
-
for (let i = endRow + 1; i <= detectEndRow; i++) for (let j = startColumn; j <= endColumn; j++) {
|
|
8991
|
-
var _matrix$getValue5;
|
|
8992
|
-
if (((_matrix$getValue5 = matrix.getValue(i, j)) === null || _matrix$getValue5 === void 0 ? void 0 : _matrix$getValue5.v) != null) {
|
|
8993
|
-
detectEndRow = i - 1;
|
|
8994
|
-
break;
|
|
8995
|
-
}
|
|
8996
|
-
}
|
|
8997
|
-
return {
|
|
8998
|
-
startColumn,
|
|
8999
|
-
endColumn,
|
|
9000
|
-
startRow,
|
|
9001
|
-
endRow: detectEndRow
|
|
9002
|
-
};
|
|
9038
|
+
_handleDbClickFill(source) {
|
|
9039
|
+
const selection = detectAutoFillRange(source, this._context.unit.getActiveSheet());
|
|
9040
|
+
if (selection.endRow <= source.endRow) return;
|
|
9041
|
+
this._executeAutoFill(source, selection);
|
|
9003
9042
|
}
|
|
9004
9043
|
};
|
|
9005
|
-
|
|
9006
|
-
__decorateParam(
|
|
9007
|
-
__decorateParam(
|
|
9008
|
-
__decorateParam(
|
|
9009
|
-
__decorateParam(
|
|
9010
|
-
|
|
9011
|
-
|
|
9012
|
-
|
|
9013
|
-
|
|
9014
|
-
|
|
9015
|
-
|
|
9016
|
-
const
|
|
9017
|
-
|
|
9018
|
-
if (
|
|
9019
|
-
|
|
9044
|
+
AutoFillRenderController = __decorate([
|
|
9045
|
+
__decorateParam(1, Inject(ISheetSelectionRenderService)),
|
|
9046
|
+
__decorateParam(2, Inject(SheetsSelectionsService)),
|
|
9047
|
+
__decorateParam(3, ICommandService),
|
|
9048
|
+
__decorateParam(4, IEditorBridgeService)
|
|
9049
|
+
], AutoFillRenderController);
|
|
9050
|
+
function detectAutoFillRange(source, worksheet) {
|
|
9051
|
+
var _matrix$getValue, _matrix$getValue3;
|
|
9052
|
+
const { startRow, endRow, startColumn, endColumn } = source;
|
|
9053
|
+
const matrix = worksheet.getCellMatrix();
|
|
9054
|
+
const maxRow = worksheet.getMaxRows();
|
|
9055
|
+
const maxColumn = worksheet.getMaxColumns();
|
|
9056
|
+
let detectEndRow = endRow + 1;
|
|
9057
|
+
if (startColumn > 0 && ((_matrix$getValue = matrix.getValue(detectEndRow, startColumn - 1)) === null || _matrix$getValue === void 0 ? void 0 : _matrix$getValue.v) != null) {
|
|
9058
|
+
var _matrix$getValue2;
|
|
9059
|
+
while (((_matrix$getValue2 = matrix.getValue(detectEndRow + 1, startColumn - 1)) === null || _matrix$getValue2 === void 0 ? void 0 : _matrix$getValue2.v) != null && detectEndRow < maxRow) detectEndRow += 1;
|
|
9060
|
+
} else if (endColumn < maxColumn - 1 && ((_matrix$getValue3 = matrix.getValue(detectEndRow, endColumn + 1)) === null || _matrix$getValue3 === void 0 ? void 0 : _matrix$getValue3.v) != null) {
|
|
9061
|
+
var _matrix$getValue4;
|
|
9062
|
+
while (((_matrix$getValue4 = matrix.getValue(detectEndRow + 1, endColumn + 1)) === null || _matrix$getValue4 === void 0 ? void 0 : _matrix$getValue4.v) != null && detectEndRow < maxRow) detectEndRow += 1;
|
|
9063
|
+
} else detectEndRow = endRow;
|
|
9064
|
+
for (let i = endRow + 1; i <= detectEndRow; i++) for (let j = startColumn; j <= endColumn; j++) {
|
|
9065
|
+
var _matrix$getValue5;
|
|
9066
|
+
if (((_matrix$getValue5 = matrix.getValue(i, j)) === null || _matrix$getValue5 === void 0 ? void 0 : _matrix$getValue5.v) != null) {
|
|
9067
|
+
detectEndRow = i - 1;
|
|
9068
|
+
break;
|
|
9069
|
+
}
|
|
9070
|
+
}
|
|
9071
|
+
return {
|
|
9072
|
+
startColumn,
|
|
9073
|
+
endColumn,
|
|
9074
|
+
startRow,
|
|
9075
|
+
endRow: detectEndRow
|
|
9076
|
+
};
|
|
9020
9077
|
}
|
|
9021
9078
|
|
|
9022
9079
|
//#endregion
|
|
@@ -10310,21 +10367,28 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10310
10367
|
}
|
|
10311
10368
|
_getEditorMaxSize(position, canvasOffset, horizontalAlign) {
|
|
10312
10369
|
if (this._getEditorObject() == null) return;
|
|
10313
|
-
function pxToNum(
|
|
10314
|
-
|
|
10370
|
+
function pxToNum(size) {
|
|
10371
|
+
var _size$replace;
|
|
10372
|
+
return Number.parseFloat((_size$replace = size === null || size === void 0 ? void 0 : size.replace("px", "")) !== null && _size$replace !== void 0 ? _size$replace : "");
|
|
10315
10373
|
}
|
|
10316
10374
|
const engine = this.engine;
|
|
10317
10375
|
if (!engine) return;
|
|
10318
10376
|
const canvasElement = engine.getCanvasElement();
|
|
10319
10377
|
const canvasClientRect = canvasElement.getBoundingClientRect();
|
|
10320
10378
|
const widthOfCanvas = pxToNum(canvasElement.style.width);
|
|
10379
|
+
const heightOfCanvas = pxToNum(canvasElement.style.height);
|
|
10321
10380
|
const { width, height } = canvasClientRect;
|
|
10322
|
-
const
|
|
10381
|
+
const contentElement = this._getEditorContentElement();
|
|
10382
|
+
const contentBoundingRect = contentElement.getBoundingClientRect();
|
|
10383
|
+
const contentScaleX = resolveElementScale(contentBoundingRect.width, contentElement.offsetWidth);
|
|
10384
|
+
const contentScaleY = resolveElementScale(contentBoundingRect.height, contentElement.offsetHeight, contentScaleX);
|
|
10385
|
+
const scaleAdjustX = width / widthOfCanvas / contentScaleX;
|
|
10386
|
+
const scaleAdjustY = Number.isFinite(heightOfCanvas) && heightOfCanvas > 0 ? height / heightOfCanvas / contentScaleY : scaleAdjustX;
|
|
10323
10387
|
const { startX, startY, endX } = position;
|
|
10324
10388
|
const enginWidth = engine.width;
|
|
10325
|
-
const maxHeight = height - startY - EDITOR_BORDER_SIZE * 2;
|
|
10389
|
+
const maxHeight = height / contentScaleY - startY - EDITOR_BORDER_SIZE * 2;
|
|
10326
10390
|
const cellWidth = endX - startX;
|
|
10327
|
-
let maxWidth = width - startX;
|
|
10391
|
+
let maxWidth = width / contentScaleX - startX;
|
|
10328
10392
|
if (horizontalAlign === HorizontalAlign.CENTER) {
|
|
10329
10393
|
const rightGap = enginWidth - endX;
|
|
10330
10394
|
maxWidth = cellWidth + Math.min(startX, rightGap) * 2;
|
|
@@ -10334,7 +10398,10 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10334
10398
|
return {
|
|
10335
10399
|
height: maxHeight,
|
|
10336
10400
|
width: maxWidth,
|
|
10337
|
-
|
|
10401
|
+
contentScaleX,
|
|
10402
|
+
contentScaleY,
|
|
10403
|
+
scaleAdjustX,
|
|
10404
|
+
scaleAdjustY
|
|
10338
10405
|
};
|
|
10339
10406
|
}
|
|
10340
10407
|
/**
|
|
@@ -10351,7 +10418,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10351
10418
|
let { startX, startY } = actualRangeWithCoord;
|
|
10352
10419
|
const { document: documentComponent, scene: editorScene, engine: docEngine } = editorObject;
|
|
10353
10420
|
const viewportMain = editorScene.getViewport(VIEWPORT_KEY.VIEW_MAIN);
|
|
10354
|
-
const { height: clientHeight, width: clientWidth,
|
|
10421
|
+
const { height: clientHeight, width: clientWidth, contentScaleX, contentScaleY, scaleAdjustX, scaleAdjustY } = this._getEditorMaxSize(actualRangeWithCoord, canvasOffset, horizontalAlign);
|
|
10355
10422
|
let physicHeight = editorHeight;
|
|
10356
10423
|
let scrollBar = viewportMain === null || viewportMain === void 0 ? void 0 : viewportMain.getScrollBar();
|
|
10357
10424
|
if (physicHeight > clientHeight) {
|
|
@@ -10372,12 +10439,12 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10372
10439
|
this._addBackground(editorScene, editorWidth / scaleX, editorHeight / scaleY, fill);
|
|
10373
10440
|
const { scaleX: precisionScaleX, scaleY: precisionScaleY } = editorScene.getPrecisionScale();
|
|
10374
10441
|
editorScene.transformByState({
|
|
10375
|
-
width: editorWidth *
|
|
10376
|
-
height: editorHeight *
|
|
10377
|
-
scaleX: scaleX *
|
|
10378
|
-
scaleY: scaleY *
|
|
10442
|
+
width: editorWidth * scaleAdjustX / scaleX,
|
|
10443
|
+
height: editorHeight * scaleAdjustY / scaleY,
|
|
10444
|
+
scaleX: scaleX * scaleAdjustX,
|
|
10445
|
+
scaleY: scaleY * scaleAdjustY
|
|
10379
10446
|
});
|
|
10380
|
-
documentComponent.resize(editorWidth *
|
|
10447
|
+
documentComponent.resize(editorWidth * scaleAdjustX / scaleX, editorHeight * scaleAdjustY / scaleY);
|
|
10381
10448
|
/**
|
|
10382
10449
|
* sometimes requestIdleCallback is invalid, so use setTimeout to ensure the successful execution of the resizeBySize method.
|
|
10383
10450
|
* resize canvas
|
|
@@ -10389,16 +10456,16 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10389
10456
|
}, 0);
|
|
10390
10457
|
const contentBoundingRect = this._getEditorContentElement().getBoundingClientRect();
|
|
10391
10458
|
const canvasBoundingRect = canvasElement.getBoundingClientRect();
|
|
10392
|
-
startX = startX *
|
|
10393
|
-
startY = startY *
|
|
10459
|
+
startX = startX * scaleAdjustX + (canvasBoundingRect.left - contentBoundingRect.left) / contentScaleX;
|
|
10460
|
+
startY = startY * scaleAdjustY + (canvasBoundingRect.top - contentBoundingRect.top) / contentScaleY;
|
|
10394
10461
|
const cellWidth = actualRangeWithCoord.endX - actualRangeWithCoord.startX;
|
|
10395
|
-
if (horizontalAlign === HorizontalAlign.RIGHT) startX += (cellWidth - editorWidth) *
|
|
10396
|
-
else if (horizontalAlign === HorizontalAlign.CENTER) startX += (cellWidth - editorWidth *
|
|
10462
|
+
if (horizontalAlign === HorizontalAlign.RIGHT) startX += (cellWidth - editorWidth) * scaleAdjustX;
|
|
10463
|
+
else if (horizontalAlign === HorizontalAlign.CENTER) startX += (cellWidth - editorWidth * scaleAdjustX) / 2;
|
|
10397
10464
|
this._cellEditorManagerService.setState({
|
|
10398
10465
|
startX,
|
|
10399
10466
|
startY,
|
|
10400
|
-
endX: editorWidth *
|
|
10401
|
-
endY: physicHeight *
|
|
10467
|
+
endX: editorWidth * scaleAdjustX + startX,
|
|
10468
|
+
endY: physicHeight * scaleAdjustY + startY,
|
|
10402
10469
|
show: true
|
|
10403
10470
|
});
|
|
10404
10471
|
}
|
|
@@ -10442,10 +10509,10 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10442
10509
|
const { horizontalAlign } = documentLayoutObject;
|
|
10443
10510
|
const maxSize = this._getEditorMaxSize(position, canvasOffset, horizontalAlign);
|
|
10444
10511
|
if (!maxSize) return;
|
|
10445
|
-
const { height: clientHeight, width: clientWidth,
|
|
10512
|
+
const { height: clientHeight, width: clientWidth, scaleAdjustX, scaleAdjustY } = maxSize;
|
|
10446
10513
|
const cell = skeleton.getCellWithCoordByIndex(row, column);
|
|
10447
|
-
const height = Math.min((cell.mergeInfo.endY - cell.mergeInfo.startY) * scaleY, clientHeight) *
|
|
10448
|
-
const width = Math.min((cell.mergeInfo.endX - cell.mergeInfo.startX) * scaleX, clientWidth) *
|
|
10514
|
+
const height = Math.min((cell.mergeInfo.endY - cell.mergeInfo.startY) * scaleY, clientHeight) * scaleAdjustY;
|
|
10515
|
+
const width = Math.min((cell.mergeInfo.endX - cell.mergeInfo.startX) * scaleX, clientWidth) * scaleAdjustX;
|
|
10449
10516
|
const currentHeight = state.endY - state.startY;
|
|
10450
10517
|
const currentWidth = state.endX - state.startX;
|
|
10451
10518
|
if (currentHeight !== height || currentWidth !== width) {
|
|
@@ -10471,6 +10538,10 @@ SheetCellEditorResizeService = __decorate([
|
|
|
10471
10538
|
__decorateParam(5, IConfigService),
|
|
10472
10539
|
__decorateParam(6, Optional(ISheetEmbedFloatingGeometryService))
|
|
10473
10540
|
], SheetCellEditorResizeService);
|
|
10541
|
+
function resolveElementScale(renderedSize, layoutSize, fallback = 1) {
|
|
10542
|
+
if (!Number.isFinite(renderedSize) || !Number.isFinite(layoutSize) || renderedSize <= 0 || layoutSize <= 0) return fallback;
|
|
10543
|
+
return renderedSize / layoutSize;
|
|
10544
|
+
}
|
|
10474
10545
|
|
|
10475
10546
|
//#endregion
|
|
10476
10547
|
//#region src/controllers/render-controllers/editor-bridge.render-controller.ts
|
|
@@ -10509,12 +10580,17 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends Rx
|
|
|
10509
10580
|
this._d = null;
|
|
10510
10581
|
}
|
|
10511
10582
|
_initSelectionChangeListener(d) {
|
|
10512
|
-
d.add(merge$1(this._selectionManagerService.
|
|
10583
|
+
d.add(merge$1(this._selectionManagerService.selectionSet$, this._selectionManagerService.selectionMoveStart$).subscribe((params) => this._updateEditorPosition(params)));
|
|
10584
|
+
d.add(this._selectionManagerService.selectionMoveEnd$.subscribe((params) => {
|
|
10585
|
+
var _params;
|
|
10586
|
+
this._updateEditorPosition(params);
|
|
10587
|
+
if (params === null || params === void 0 || (_params = params[params.length - 1]) === null || _params === void 0 ? void 0 : _params.primary) this._updateInputPosition();
|
|
10588
|
+
}));
|
|
10513
10589
|
}
|
|
10514
10590
|
_updateEditorPosition(params) {
|
|
10515
|
-
var
|
|
10591
|
+
var _params2;
|
|
10516
10592
|
if (this._editorBridgeService.isVisible().visible) return;
|
|
10517
|
-
const primary = params === null || params === void 0 || (
|
|
10593
|
+
const primary = params === null || params === void 0 || (_params2 = params[params.length - 1]) === null || _params2 === void 0 ? void 0 : _params2.primary;
|
|
10518
10594
|
if (primary) {
|
|
10519
10595
|
var _this$_context$unit$g, _this$_sheetSkeletonM;
|
|
10520
10596
|
const sheetObject = this._getSheetObject();
|
|
@@ -10544,6 +10620,15 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends Rx
|
|
|
10544
10620
|
});
|
|
10545
10621
|
}
|
|
10546
10622
|
}
|
|
10623
|
+
_updateInputPosition() {
|
|
10624
|
+
var _this$_renderManagerS;
|
|
10625
|
+
if (this._editorBridgeService.isVisible().visible) return;
|
|
10626
|
+
const layout = this._editorBridgeService.getEditCellLayout();
|
|
10627
|
+
const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSelectionRenderService);
|
|
10628
|
+
if (!layout || !docSelectionRenderService) return;
|
|
10629
|
+
const { position, canvasOffset } = layout;
|
|
10630
|
+
docSelectionRenderService.setInputPosition(canvasOffset.left + position.startX, canvasOffset.top + position.startY);
|
|
10631
|
+
}
|
|
10547
10632
|
refreshEditorPosition() {
|
|
10548
10633
|
const workbookSelections = this._selectionManagerService.getWorkbookSelections(this._context.unitId);
|
|
10549
10634
|
if (workbookSelections) {
|
|
@@ -13912,10 +13997,9 @@ const UNIVER_SHEET_PERMISSION_ALERT_DIALOG = "UNIVER_SHEET_PERMISSION_ALERT_DIAL
|
|
|
13912
13997
|
//#endregion
|
|
13913
13998
|
//#region src/controllers/permission/sheet-permission-check-ui.controller.ts
|
|
13914
13999
|
let SheetPermissionCheckUIController = class SheetPermissionCheckUIController extends Disposable {
|
|
13915
|
-
constructor(_commandService,
|
|
14000
|
+
constructor(_commandService, _permissionService, _dialogService, _rangeProtectionRuleModel, _localeService, _contextService, _sheetPermissionCheckController) {
|
|
13916
14001
|
super();
|
|
13917
14002
|
this._commandService = _commandService;
|
|
13918
|
-
this._univerInstanceService = _univerInstanceService;
|
|
13919
14003
|
this._permissionService = _permissionService;
|
|
13920
14004
|
this._dialogService = _dialogService;
|
|
13921
14005
|
this._rangeProtectionRuleModel = _rangeProtectionRuleModel;
|
|
@@ -13957,7 +14041,6 @@ let SheetPermissionCheckUIController = class SheetPermissionCheckUIController ex
|
|
|
13957
14041
|
let permission = true;
|
|
13958
14042
|
let errorMsg = "";
|
|
13959
14043
|
let params;
|
|
13960
|
-
let target;
|
|
13961
14044
|
switch (id) {
|
|
13962
14045
|
case InsertTextCommand.id:
|
|
13963
14046
|
case IMEInputCommand.id:
|
|
@@ -13981,20 +14064,6 @@ let SheetPermissionCheckUIController = class SheetPermissionCheckUIController ex
|
|
|
13981
14064
|
});
|
|
13982
14065
|
errorMsg = this._localeService.t("sheets-ui.permission.dialog.editErr");
|
|
13983
14066
|
break;
|
|
13984
|
-
case SheetPasteColWidthCommand.id:
|
|
13985
|
-
permission = this._sheetPermissionCheckController.permissionCheckWithoutRange({
|
|
13986
|
-
workbookTypes: [WorkbookEditablePermission],
|
|
13987
|
-
worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
|
|
13988
|
-
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
13989
|
-
});
|
|
13990
|
-
errorMsg = this._localeService.t("sheets-ui.permission.dialog.pasteErr");
|
|
13991
|
-
break;
|
|
13992
|
-
case SheetPasteShortKeyCommand.id:
|
|
13993
|
-
case SheetPasteCommand.id:
|
|
13994
|
-
params = commandInfo.params;
|
|
13995
|
-
permission = this._permissionCheckByPaste(params);
|
|
13996
|
-
errorMsg = this._localeService.t("sheets-ui.permission.dialog.pasteErr");
|
|
13997
|
-
break;
|
|
13998
14067
|
case ApplyFormatPainterCommand.id:
|
|
13999
14068
|
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14000
14069
|
workbookTypes: [WorkbookEditablePermission],
|
|
@@ -14007,28 +14076,6 @@ let SheetPermissionCheckUIController = class SheetPermissionCheckUIController ex
|
|
|
14007
14076
|
});
|
|
14008
14077
|
errorMsg = this._localeService.t("sheets-ui.permission.dialog.commonErr");
|
|
14009
14078
|
break;
|
|
14010
|
-
case SheetCopyCommand.id:
|
|
14011
|
-
var _this$_permissionServ;
|
|
14012
|
-
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14013
|
-
workbookTypes: [WorkbookCopyPermission],
|
|
14014
|
-
worksheetTypes: [WorksheetCopyPermission],
|
|
14015
|
-
rangeTypes: [RangeProtectionPermissionViewPoint]
|
|
14016
|
-
});
|
|
14017
|
-
errorMsg = this._localeService.t("sheets-ui.permission.dialog.copyErr");
|
|
14018
|
-
target = getSheetCommandTarget(this._univerInstanceService);
|
|
14019
|
-
if (!permission && target && !((_this$_permissionServ = this._permissionService.getPermissionPoint(new WorkbookCopyPermission(target.unitId).id)) === null || _this$_permissionServ === void 0 ? void 0 : _this$_permissionServ.value)) errorMsg = this._localeService.t("sheets-ui.permission.dialog.workbookCopyErr");
|
|
14020
|
-
break;
|
|
14021
|
-
case SheetCutCommand.id:
|
|
14022
|
-
var _this$_permissionServ2;
|
|
14023
|
-
permission = this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14024
|
-
workbookTypes: [WorkbookCopyPermission, WorkbookEditablePermission],
|
|
14025
|
-
worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission],
|
|
14026
|
-
rangeTypes: [RangeProtectionPermissionViewPoint, RangeProtectionPermissionEditPoint]
|
|
14027
|
-
});
|
|
14028
|
-
errorMsg = this._localeService.t("sheets-ui.permission.dialog.copyErr");
|
|
14029
|
-
target = getSheetCommandTarget(this._univerInstanceService);
|
|
14030
|
-
if (!permission && target && !((_this$_permissionServ2 = this._permissionService.getPermissionPoint(new WorkbookCopyPermission(target.unitId).id)) === null || _this$_permissionServ2 === void 0 ? void 0 : _this$_permissionServ2.value)) errorMsg = this._localeService.t("sheets-ui.permission.dialog.workbookCopyErr");
|
|
14031
|
-
break;
|
|
14032
14079
|
default: break;
|
|
14033
14080
|
}
|
|
14034
14081
|
if (!permission) this._sheetPermissionCheckController.blockExecuteWithoutPermission(errorMsg);
|
|
@@ -14041,37 +14088,15 @@ let SheetPermissionCheckUIController = class SheetPermissionCheckUIController ex
|
|
|
14041
14088
|
this._getPermissionCheck(commandInfo);
|
|
14042
14089
|
}));
|
|
14043
14090
|
}
|
|
14044
|
-
_permissionCheckByPaste(params) {
|
|
14045
|
-
if (params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_VALUE || params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMULA) return this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14046
|
-
workbookTypes: [WorkbookEditablePermission],
|
|
14047
|
-
worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
|
|
14048
|
-
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
14049
|
-
});
|
|
14050
|
-
else if (params.value === PREDEFINED_HOOK_NAME_PASTE.SPECIAL_PASTE_FORMAT) return this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14051
|
-
workbookTypes: [WorkbookEditablePermission],
|
|
14052
|
-
worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
|
|
14053
|
-
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
14054
|
-
});
|
|
14055
|
-
else return this._sheetPermissionCheckController.permissionCheckWithRanges({
|
|
14056
|
-
workbookTypes: [WorkbookEditablePermission],
|
|
14057
|
-
worksheetTypes: [
|
|
14058
|
-
WorksheetSetCellValuePermission,
|
|
14059
|
-
WorksheetSetCellStylePermission,
|
|
14060
|
-
WorksheetEditPermission
|
|
14061
|
-
],
|
|
14062
|
-
rangeTypes: [RangeProtectionPermissionEditPoint]
|
|
14063
|
-
});
|
|
14064
|
-
}
|
|
14065
14091
|
};
|
|
14066
14092
|
SheetPermissionCheckUIController = __decorate([
|
|
14067
14093
|
__decorateParam(0, ICommandService),
|
|
14068
|
-
__decorateParam(1,
|
|
14069
|
-
__decorateParam(2,
|
|
14070
|
-
__decorateParam(3,
|
|
14071
|
-
__decorateParam(4, Inject(
|
|
14072
|
-
__decorateParam(5,
|
|
14073
|
-
__decorateParam(6,
|
|
14074
|
-
__decorateParam(7, Inject(SheetPermissionCheckController))
|
|
14094
|
+
__decorateParam(1, IPermissionService),
|
|
14095
|
+
__decorateParam(2, IDialogService),
|
|
14096
|
+
__decorateParam(3, Inject(RangeProtectionRuleModel)),
|
|
14097
|
+
__decorateParam(4, Inject(LocaleService)),
|
|
14098
|
+
__decorateParam(5, IContextService),
|
|
14099
|
+
__decorateParam(6, Inject(SheetPermissionCheckController))
|
|
14075
14100
|
], SheetPermissionCheckUIController);
|
|
14076
14101
|
|
|
14077
14102
|
//#endregion
|
|
@@ -19479,11 +19504,11 @@ function Text2NumberContextMenuItemFactory(accessor) {
|
|
|
19479
19504
|
//#endregion
|
|
19480
19505
|
//#region src/views/sheet-slider/SheetZoomInput.tsx
|
|
19481
19506
|
const SHEET_ZOOM_INPUT_COMPONENT = "SHEET_ZOOM_INPUT_COMPONENT";
|
|
19482
|
-
function SheetZoomInput(props) {
|
|
19507
|
+
function SheetZoomInput({ className, ...props }) {
|
|
19483
19508
|
const commandService = useDependency(ICommandService);
|
|
19484
19509
|
return /* @__PURE__ */ jsx(ZoomInput, {
|
|
19485
19510
|
...props,
|
|
19486
|
-
className: "!univer-bg-transparent dark:!univer-bg-transparent",
|
|
19511
|
+
className: clsx("!univer-bg-transparent dark:!univer-bg-transparent", className),
|
|
19487
19512
|
onChange: (value) => commandService.executeCommand(SetZoomRatioFromToolbarCommand.id, { value })
|
|
19488
19513
|
});
|
|
19489
19514
|
}
|
|
@@ -19537,48 +19562,97 @@ const menuSchema = {
|
|
|
19537
19562
|
[RibbonStartGroup.HISTORY]: {
|
|
19538
19563
|
[SetOnceFormatPainterCommand.id]: {
|
|
19539
19564
|
order: 2,
|
|
19565
|
+
gridLayout: {
|
|
19566
|
+
row: 1,
|
|
19567
|
+
column: 2,
|
|
19568
|
+
showLabel: true
|
|
19569
|
+
},
|
|
19540
19570
|
menuItemFactory: FormatPainterMenuItemFactory
|
|
19541
19571
|
},
|
|
19542
19572
|
[ClearSelectionAllCommand.id]: {
|
|
19543
19573
|
order: 3,
|
|
19574
|
+
gridLayout: {
|
|
19575
|
+
row: 2,
|
|
19576
|
+
column: 2,
|
|
19577
|
+
showLabel: true
|
|
19578
|
+
},
|
|
19544
19579
|
menuItemFactory: ClearSelectionAllToolbarMenuItemFactory
|
|
19545
19580
|
}
|
|
19546
19581
|
},
|
|
19547
19582
|
[RibbonStartGroup.FORMAT]: {
|
|
19548
19583
|
[SetRangeFontFamilyCommand.id]: {
|
|
19549
19584
|
order: 1,
|
|
19585
|
+
gridLayout: {
|
|
19586
|
+
row: 1,
|
|
19587
|
+
column: 1,
|
|
19588
|
+
columnSpan: 4,
|
|
19589
|
+
width: 240
|
|
19590
|
+
},
|
|
19550
19591
|
menuItemFactory: FontFamilySelectorMenuItemFactory
|
|
19551
19592
|
},
|
|
19552
19593
|
[SetRangeFontSizeCommand.id]: {
|
|
19553
19594
|
order: 2,
|
|
19595
|
+
gridLayout: {
|
|
19596
|
+
row: 1,
|
|
19597
|
+
column: 5,
|
|
19598
|
+
width: 72
|
|
19599
|
+
},
|
|
19554
19600
|
menuItemFactory: FontSizeSelectorMenuItemFactory
|
|
19555
19601
|
},
|
|
19556
19602
|
[SetRangeFontIncreaseCommand.id]: {
|
|
19557
19603
|
order: 2.1,
|
|
19604
|
+
gridLayout: {
|
|
19605
|
+
row: 1,
|
|
19606
|
+
column: 6
|
|
19607
|
+
},
|
|
19558
19608
|
menuItemFactory: FontSizeIncreaseMenuItemFactory
|
|
19559
19609
|
},
|
|
19560
19610
|
[SetRangeFontDecreaseCommand.id]: {
|
|
19561
19611
|
order: 2.2,
|
|
19612
|
+
gridLayout: {
|
|
19613
|
+
row: 1,
|
|
19614
|
+
column: 7
|
|
19615
|
+
},
|
|
19562
19616
|
menuItemFactory: FontSizeDecreaseMenuItemFactory
|
|
19563
19617
|
},
|
|
19564
19618
|
[SetRangeBoldCommand.id]: {
|
|
19565
19619
|
order: 5,
|
|
19620
|
+
gridLayout: {
|
|
19621
|
+
row: 2,
|
|
19622
|
+
column: 1
|
|
19623
|
+
},
|
|
19566
19624
|
menuItemFactory: BoldMenuItemFactory
|
|
19567
19625
|
},
|
|
19568
19626
|
[SetRangeItalicCommand.id]: {
|
|
19569
19627
|
order: 6,
|
|
19628
|
+
gridLayout: {
|
|
19629
|
+
row: 2,
|
|
19630
|
+
column: 2
|
|
19631
|
+
},
|
|
19570
19632
|
menuItemFactory: ItalicMenuItemFactory
|
|
19571
19633
|
},
|
|
19572
19634
|
[SetRangeUnderlineCommand.id]: {
|
|
19573
19635
|
order: 7,
|
|
19636
|
+
gridLayout: {
|
|
19637
|
+
row: 2,
|
|
19638
|
+
column: 3
|
|
19639
|
+
},
|
|
19574
19640
|
menuItemFactory: UnderlineMenuItemFactory
|
|
19575
19641
|
},
|
|
19576
19642
|
[SetRangeStrickThroughCommand.id]: {
|
|
19577
19643
|
order: 8,
|
|
19644
|
+
gridLayout: {
|
|
19645
|
+
row: 2,
|
|
19646
|
+
column: 4
|
|
19647
|
+
},
|
|
19578
19648
|
menuItemFactory: StrikeThroughMenuItemFactory
|
|
19579
19649
|
},
|
|
19580
19650
|
[SetRangeTextColorCommand.id]: {
|
|
19581
19651
|
order: 9,
|
|
19652
|
+
gridLayout: {
|
|
19653
|
+
row: 2,
|
|
19654
|
+
column: 7
|
|
19655
|
+
},
|
|
19582
19656
|
menuItemFactory: TextColorSelectorMenuItemFactory,
|
|
19583
19657
|
[ResetTextColorCommand.id]: {
|
|
19584
19658
|
order: 0,
|
|
@@ -19587,6 +19661,10 @@ const menuSchema = {
|
|
|
19587
19661
|
},
|
|
19588
19662
|
[SetBackgroundColorCommand.id]: {
|
|
19589
19663
|
order: 10,
|
|
19664
|
+
gridLayout: {
|
|
19665
|
+
row: 2,
|
|
19666
|
+
column: 6
|
|
19667
|
+
},
|
|
19590
19668
|
menuItemFactory: BackgroundColorSelectorMenuItemFactory,
|
|
19591
19669
|
[ResetBackgroundColorCommand.id]: {
|
|
19592
19670
|
order: 0,
|
|
@@ -19595,32 +19673,60 @@ const menuSchema = {
|
|
|
19595
19673
|
},
|
|
19596
19674
|
[SetBorderBasicCommand.id]: {
|
|
19597
19675
|
order: 11,
|
|
19676
|
+
gridLayout: {
|
|
19677
|
+
row: 2,
|
|
19678
|
+
column: 5
|
|
19679
|
+
},
|
|
19598
19680
|
menuItemFactory: CellBorderSelectorMenuItemFactory
|
|
19599
19681
|
}
|
|
19600
19682
|
},
|
|
19601
19683
|
[RibbonStartGroup.LAYOUT]: {
|
|
19602
19684
|
[SetHorizontalTextAlignCommand.id]: {
|
|
19603
19685
|
order: 0,
|
|
19686
|
+
gridLayout: {
|
|
19687
|
+
row: 1,
|
|
19688
|
+
column: 3
|
|
19689
|
+
},
|
|
19604
19690
|
menuItemFactory: HorizontalAlignMenuItemFactory
|
|
19605
19691
|
},
|
|
19606
19692
|
[SetVerticalTextAlignCommand.id]: {
|
|
19607
19693
|
order: 3,
|
|
19694
|
+
gridLayout: {
|
|
19695
|
+
row: 2,
|
|
19696
|
+
column: 1
|
|
19697
|
+
},
|
|
19608
19698
|
menuItemFactory: VerticalAlignMenuItemFactory
|
|
19609
19699
|
},
|
|
19610
19700
|
[SetTextWrapCommand.id]: {
|
|
19611
19701
|
order: 6,
|
|
19702
|
+
gridLayout: {
|
|
19703
|
+
row: 1,
|
|
19704
|
+
column: 2
|
|
19705
|
+
},
|
|
19612
19706
|
menuItemFactory: WrapTextMenuItemFactory
|
|
19613
19707
|
},
|
|
19614
19708
|
[SetShrinkToFitCommand.id]: {
|
|
19615
19709
|
order: 7,
|
|
19710
|
+
gridLayout: {
|
|
19711
|
+
row: 2,
|
|
19712
|
+
column: 2
|
|
19713
|
+
},
|
|
19616
19714
|
menuItemFactory: ShrinkToFitMenuItemFactory
|
|
19617
19715
|
},
|
|
19618
19716
|
[SetTextRotationCommand.id]: {
|
|
19619
19717
|
order: 8,
|
|
19718
|
+
gridLayout: {
|
|
19719
|
+
row: 1,
|
|
19720
|
+
column: 3
|
|
19721
|
+
},
|
|
19620
19722
|
menuItemFactory: TextRotateMenuItemFactory
|
|
19621
19723
|
},
|
|
19622
19724
|
[AddWorksheetMergeCommand.id]: {
|
|
19623
19725
|
order: 9,
|
|
19726
|
+
gridLayout: {
|
|
19727
|
+
row: 2,
|
|
19728
|
+
column: 3
|
|
19729
|
+
},
|
|
19624
19730
|
menuItemFactory: CellMergeMenuItemFactory,
|
|
19625
19731
|
[AddWorksheetMergeAllCommand.id]: {
|
|
19626
19732
|
order: 0,
|
|
@@ -19642,6 +19748,10 @@ const menuSchema = {
|
|
|
19642
19748
|
},
|
|
19643
19749
|
[RibbonStartGroup.OTHERS]: { [AddRangeProtectionFromToolbarCommand.id]: {
|
|
19644
19750
|
order: 0,
|
|
19751
|
+
gridLayout: {
|
|
19752
|
+
row: 1,
|
|
19753
|
+
column: 3
|
|
19754
|
+
},
|
|
19645
19755
|
menuItemFactory: sheetPermissionToolbarMenuFactory
|
|
19646
19756
|
} }
|
|
19647
19757
|
},
|
|
@@ -19649,19 +19759,41 @@ const menuSchema = {
|
|
|
19649
19759
|
[RibbonViewGroup.DISPLAY]: {
|
|
19650
19760
|
[SHEET_FROZEN_TOOLBAR_MENU_ID]: {
|
|
19651
19761
|
order: 0,
|
|
19762
|
+
gridLayout: {
|
|
19763
|
+
row: 1,
|
|
19764
|
+
column: 1,
|
|
19765
|
+
rowSpan: 2,
|
|
19766
|
+
showLabel: true
|
|
19767
|
+
},
|
|
19652
19768
|
menuItemFactory: SheetFrozenToolbarMenuItemFactory
|
|
19653
19769
|
},
|
|
19654
19770
|
[ZOOM_RATIO_MENU_ID]: {
|
|
19655
19771
|
order: 1,
|
|
19772
|
+
gridLayout: {
|
|
19773
|
+
row: 1,
|
|
19774
|
+
column: 2,
|
|
19775
|
+
width: 112
|
|
19776
|
+
},
|
|
19656
19777
|
menuItemFactory: ZoomRatioMenuItemFactory
|
|
19657
19778
|
},
|
|
19658
19779
|
[ToggleFullscreenOperation.id]: {
|
|
19659
19780
|
order: 2,
|
|
19781
|
+
gridLayout: {
|
|
19782
|
+
row: 2,
|
|
19783
|
+
column: 2,
|
|
19784
|
+
showLabel: true,
|
|
19785
|
+
width: 112
|
|
19786
|
+
},
|
|
19660
19787
|
menuItemFactory: FullscreenMenuItemFactory
|
|
19661
19788
|
}
|
|
19662
19789
|
},
|
|
19663
19790
|
[RibbonViewGroup.VISIBILITY]: { [ToggleGridlinesCommand.id]: {
|
|
19664
19791
|
order: 0,
|
|
19792
|
+
gridLayout: {
|
|
19793
|
+
row: 1,
|
|
19794
|
+
column: 1,
|
|
19795
|
+
showLabel: true
|
|
19796
|
+
},
|
|
19665
19797
|
menuItemFactory: ToggleGridlinesMenuFactory
|
|
19666
19798
|
} }
|
|
19667
19799
|
},
|
|
@@ -24062,7 +24194,7 @@ const useHighlightRange = (ranges = []) => {
|
|
|
24062
24194
|
//#endregion
|
|
24063
24195
|
//#region package.json
|
|
24064
24196
|
var name = "@univerjs/sheets-ui";
|
|
24065
|
-
var version = "1.0.0-alpha.
|
|
24197
|
+
var version = "1.0.0-alpha.7";
|
|
24066
24198
|
|
|
24067
24199
|
//#endregion
|
|
24068
24200
|
//#region src/views/cell-popup/config.ts
|
|
@@ -26030,7 +26162,7 @@ const DefinedNameContainer = () => {
|
|
|
26030
26162
|
};
|
|
26031
26163
|
return /* @__PURE__ */ jsxs("div", {
|
|
26032
26164
|
"data-u-comp": "defined-name-container",
|
|
26033
|
-
className: "univer-relative univer-box-border univer-flex univer-h-full univer-w-full univer-flex-col",
|
|
26165
|
+
className: "univer-relative univer-box-border univer-flex univer-h-full univer-w-full univer-flex-col univer-overflow-hidden",
|
|
26034
26166
|
children: [/* @__PURE__ */ jsxs("div", {
|
|
26035
26167
|
className: "univer-mb-4",
|
|
26036
26168
|
children: [/* @__PURE__ */ jsxs(Button, {
|
|
@@ -31796,6 +31928,7 @@ let UniverSheetsMobileUIPlugin = class UniverSheetsMobileUIPlugin extends Plugin
|
|
|
31796
31928
|
[SheetContextMenuMobileRenderController],
|
|
31797
31929
|
[MobileHeaderResizeRenderController],
|
|
31798
31930
|
[MoveRangeRenderController],
|
|
31931
|
+
[AutoFillRenderController],
|
|
31799
31932
|
[EditorBridgeRenderController],
|
|
31800
31933
|
[SheetPermissionInterceptorCanvasRenderController],
|
|
31801
31934
|
[SheetPermissionInterceptorFormulaRenderController],
|
|
@@ -32416,6 +32549,7 @@ let UniverSheetsUIPlugin = class UniverSheetsUIPlugin extends Plugin {
|
|
|
32416
32549
|
[CellCustomRenderController],
|
|
32417
32550
|
[SheetContextMenuRenderController],
|
|
32418
32551
|
[MoveRangeRenderController],
|
|
32552
|
+
[AutoFillRenderController],
|
|
32419
32553
|
[EditorBridgeRenderController],
|
|
32420
32554
|
[SheetPermissionInterceptorCanvasRenderController],
|
|
32421
32555
|
[SheetPermissionInterceptorFormulaRenderController],
|