@univerjs/sheets-ui 1.0.0-alpha.7 → 1.0.0-alpha.8
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/facade.js +2 -22
- package/lib/cjs/index.js +333 -371
- package/lib/cjs/locale/ar-SA.js +0 -2
- package/lib/cjs/locale/ca-ES.js +1 -3
- package/lib/cjs/locale/de-DE.js +0 -2
- package/lib/cjs/locale/en-US.js +0 -2
- package/lib/cjs/locale/es-ES.js +1 -3
- package/lib/cjs/locale/fa-IR.js +0 -2
- package/lib/cjs/locale/fr-FR.js +0 -2
- package/lib/cjs/locale/id-ID.js +1 -3
- package/lib/cjs/locale/it-IT.js +0 -2
- package/lib/cjs/locale/ja-JP.js +0 -2
- package/lib/cjs/locale/ko-KR.js +9 -11
- package/lib/cjs/locale/pl-PL.js +0 -2
- package/lib/cjs/locale/pt-BR.js +1 -3
- package/lib/cjs/locale/ru-RU.js +0 -2
- package/lib/cjs/locale/sk-SK.js +0 -2
- package/lib/cjs/locale/vi-VN.js +0 -2
- package/lib/cjs/locale/zh-CN.js +0 -2
- package/lib/cjs/locale/zh-HK.js +0 -2
- package/lib/cjs/locale/zh-TW.js +0 -2
- package/lib/es/facade.js +3 -23
- package/lib/es/index.js +339 -377
- package/lib/es/locale/ar-SA.js +0 -2
- package/lib/es/locale/ca-ES.js +1 -3
- package/lib/es/locale/de-DE.js +0 -2
- package/lib/es/locale/en-US.js +0 -2
- package/lib/es/locale/es-ES.js +1 -3
- package/lib/es/locale/fa-IR.js +0 -2
- package/lib/es/locale/fr-FR.js +0 -2
- package/lib/es/locale/id-ID.js +1 -3
- package/lib/es/locale/it-IT.js +0 -2
- package/lib/es/locale/ja-JP.js +0 -2
- package/lib/es/locale/ko-KR.js +9 -11
- package/lib/es/locale/pl-PL.js +0 -2
- package/lib/es/locale/pt-BR.js +1 -3
- package/lib/es/locale/ru-RU.js +0 -2
- package/lib/es/locale/sk-SK.js +0 -2
- package/lib/es/locale/vi-VN.js +0 -2
- package/lib/es/locale/zh-CN.js +0 -2
- package/lib/es/locale/zh-HK.js +0 -2
- package/lib/es/locale/zh-TW.js +0 -2
- package/lib/facade.js +3 -23
- package/lib/index.js +339 -377
- package/lib/locale/ar-SA.js +0 -2
- package/lib/locale/ca-ES.js +1 -3
- package/lib/locale/de-DE.js +0 -2
- package/lib/locale/en-US.js +0 -2
- package/lib/locale/es-ES.js +1 -3
- package/lib/locale/fa-IR.js +0 -2
- package/lib/locale/fr-FR.js +0 -2
- package/lib/locale/id-ID.js +1 -3
- package/lib/locale/it-IT.js +0 -2
- package/lib/locale/ja-JP.js +0 -2
- package/lib/locale/ko-KR.js +9 -11
- package/lib/locale/pl-PL.js +0 -2
- package/lib/locale/pt-BR.js +1 -3
- package/lib/locale/ru-RU.js +0 -2
- package/lib/locale/sk-SK.js +0 -2
- package/lib/locale/vi-VN.js +0 -2
- package/lib/locale/zh-CN.js +0 -2
- package/lib/locale/zh-HK.js +0 -2
- package/lib/locale/zh-TW.js +0 -2
- package/lib/types/commands/operations/cell-edit.operation.d.ts +0 -2
- package/lib/types/config/config.d.ts +0 -4
- package/lib/types/facade/f-workbook.d.ts +1 -63
- package/lib/types/facade/f-worksheet.d.ts +6 -35
- package/lib/types/locale/en-US.d.ts +0 -2
- package/lib/types/services/clipboard/type.d.ts +0 -1
- package/lib/types/services/editor-bridge.service.d.ts +1 -1
- package/lib/types/services/selection/base-selection-render.service.d.ts +0 -17
- package/lib/types/services/selection/selection-control.d.ts +0 -12
- package/lib/types/services/selection/selection-render-model.d.ts +1 -1
- package/lib/types/views/sheet-container/SheetContainer.d.ts +1 -1
- package/lib/umd/facade.js +1 -1
- package/lib/umd/index.js +9 -9
- package/lib/umd/locale/ar-SA.js +1 -1
- package/lib/umd/locale/ca-ES.js +1 -1
- package/lib/umd/locale/de-DE.js +1 -1
- package/lib/umd/locale/en-US.js +1 -1
- package/lib/umd/locale/es-ES.js +1 -1
- package/lib/umd/locale/fa-IR.js +1 -1
- package/lib/umd/locale/fr-FR.js +1 -1
- package/lib/umd/locale/id-ID.js +1 -1
- package/lib/umd/locale/it-IT.js +1 -1
- package/lib/umd/locale/ja-JP.js +1 -1
- package/lib/umd/locale/ko-KR.js +1 -1
- package/lib/umd/locale/pl-PL.js +1 -1
- package/lib/umd/locale/pt-BR.js +1 -1
- package/lib/umd/locale/ru-RU.js +1 -1
- package/lib/umd/locale/sk-SK.js +1 -1
- package/lib/umd/locale/vi-VN.js +1 -1
- package/lib/umd/locale/zh-CN.js +1 -1
- package/lib/umd/locale/zh-HK.js +1 -1
- package/lib/umd/locale/zh-TW.js +1 -1
- package/package.json +14 -14
- package/lib/types/views/editor-container/EditorContainer.spec.d.ts +0 -16
package/lib/es/index.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
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
|
-
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,
|
|
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, UniverDocsUIPlugin, VIEWPORT_KEY, convertBodyToHtml, getCanvasOffsetByEngine, getLineBounding } from "@univerjs/docs-ui";
|
|
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_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, createDocumentModelWithStyle, createIdentifier, createInterceptorKey, createParagraphId, createSectionId, dateKit, debounce, extractPureTextFromCell, fromEventSubject, generateRandomId, get, getEmptyCell, getIntersectRange, 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
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";
|
|
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";
|
|
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";
|
|
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, UniverUIPlugin, ZoomInput, connectInjector, getMenuHiddenObservable, handleStringToStyle, imageMimeTypeSet, sanitizeParsedHtml, textTrim, useComponentsOfPart, useConfigValue, useDependency, useEvent, useObservable, useSidebarClick, useVirtualList } from "@univerjs/ui";
|
|
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, UniverRenderEnginePlugin, Vector2, Viewport, cancelRequestFrame, convertTextRotation, convertTransformToOffsetX, convertTransformToOffsetY, fixLineWidthByScale, getCurrentTypeOfRenderer, getNextWheelZoomRatio, ptToPixel, requestNewFrame, withCurrentTypeOfRenderer } from "@univerjs/engine-render";
|
|
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
|
-
import { DocSelectionManagerService, DocSkeletonManagerService, InsertTextCommand, RichTextEditingMutation, SetTextSelectionsOperation } from "@univerjs/docs";
|
|
7
|
+
import { DocSelectionManagerService, DocSkeletonManagerService, InsertTextCommand, RichTextEditingMutation, SetTextSelectionsOperation, UniverDocsPlugin } from "@univerjs/docs";
|
|
8
8
|
import { ObjectScope, UnitAction, UnitObject, UnitRole } from "@univerjs/protocol";
|
|
9
9
|
import { Avatar, Button, Calendar, CascaderList, ColorPicker, ConfigContext, Confirm, Dropdown, DropdownMenu, FormLayout, Input, InputNumber, MessageType, Radio, RadioGroup, Select, Separator, Switch, TimeInput, Tooltip, borderBottomClassName, borderClassName, borderRightClassName, borderTopClassName, clsx, scrollbarClassName } from "@univerjs/design";
|
|
10
10
|
import { AddImageIcon, AdjustHeightDoubleIcon, AdjustWidthDoubleIcon, AlignBottomIcon, AlignTopIcon, AllBorderIcon, AutoHeightDoubleIcon, AutoWidthDoubleIcon, AutofillDoubleIcon, AutowrapIcon, BackSlashDoubleIcon, BoldIcon, BrushIcon, CancelFreezeIcon, CancelMergeIcon, CheckMarkIcon, ClearFormatDoubleIcon, CloseIcon, CodeIcon, ConvertIcon, ConvertToNumberIcon, CopyDoubleIcon, CutIcon, DeleteCellShiftLeftDoubleIcon, DeleteCellShiftUpDoubleIcon, DeleteColumnDoubleIcon, DeleteIcon, DeleteRowDoubleIcon, DownBorderDoubleIcon, DownIcon, DownloadImageIcon, ErrorIcon, EyeIcon, EyelashIcon, FontColorDoubleIcon, FontSizeIncreaseIcon, FontSizeReduceIcon, FreezeColumnIcon, FreezeRowIcon, FreezeToSelectedIcon, FxIcon, HideDoubleIcon, HideGridlinesIcon, HorizontalBorderDoubleIcon, HorizontalMergeIcon, HorizontallyIcon, IncreaseIcon, InfoIcon, InnerBorderDoubleIcon, InsertCellDownDoubleIcon, InsertCellShiftRightDoubleIcon, InsertDoubleIcon, InsertRowAboveDoubleIcon, InsertRowBelowDoubleIcon, ItalicIcon, LeftBorderDoubleIcon, LeftDoubleDiagonalDoubleIcon, LeftInsertColumnDoubleIcon, LeftJustifyingIcon, LeftRotationFortyFiveDegreesIcon, LeftRotationNinetyDegreesIcon, LeftTridiagonalDoubleIcon, LoadingMultiIcon, LockIcon, MergeAllIcon, MoreDownIcon, MoreLeftIcon, MoreRightIcon, NoBorderIcon, NoColorDoubleIcon, NoRotationIcon, OuterBorderDoubleIcon, OverflowIcon, PaintBucketDoubleIcon, PasteSpecialDoubleIcon, PenIcon, ProtectIcon, ReduceDoubleIcon, RightBorderDoubleIcon, RightDoubleDiagonalDoubleIcon, RightInsertColumnDoubleIcon, RightJustifyingIcon, RightRotationFortyFiveDegreesIcon, RightRotationNinetyDegreesIcon, ShrinkToFitIcon, SlashDoubleIcon, StrikethroughIcon, SubscriptIcon, SuperscriptIcon, TruncationIcon, UnderlineIcon, UpBorderDoubleIcon, VerticalBorderDoubleIcon, VerticalCenterIcon, VerticalIntegrationIcon, VerticalTextIcon, WarningIcon, WriteIcon } from "@univerjs/icons";
|
|
11
11
|
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
|
|
12
|
-
import { FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT, FormulaDataModel, IDefinedNamesService, IFunctionService, ISuperTableService, LexerTreeBuilder, NullValueObject, SetFormulaCalculationNotificationMutation, deserializeRangeWithSheet, isReferenceStringWithEffectiveColumn, isReferenceStrings, matchToken, operatorToken, sequenceNodeType, serializeRange, serializeRangeWithSheet } from "@univerjs/engine-formula";
|
|
12
|
+
import { FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT, FormulaDataModel, IDefinedNamesService, IFunctionService, ISuperTableService, LexerTreeBuilder, NullValueObject, SetFormulaCalculationNotificationMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheet, isReferenceStringWithEffectiveColumn, isReferenceStrings, matchToken, operatorToken, sequenceNodeType, serializeRange, serializeRangeWithSheet } from "@univerjs/engine-formula";
|
|
13
13
|
import { ITelemetryService } from "@univerjs/telemetry";
|
|
14
14
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
15
15
|
import { debounceTime, filter as filter$1, map as map$1, shareReplay as shareReplay$1, startWith as startWith$1, switchMap as switchMap$1 } from "rxjs/operators";
|
|
@@ -17,7 +17,7 @@ import { debounceTime, filter as filter$1, map as map$1, shareReplay as shareRep
|
|
|
17
17
|
//#region src/basics/editor/get-editor-object.ts
|
|
18
18
|
function getEditorObject(unitId, renderManagerService) {
|
|
19
19
|
if (unitId == null) return;
|
|
20
|
-
const currentRender = renderManagerService.
|
|
20
|
+
const currentRender = renderManagerService.getRenderUnitById(unitId);
|
|
21
21
|
if (currentRender == null) return;
|
|
22
22
|
const { mainComponent, scene, engine, components } = currentRender;
|
|
23
23
|
return {
|
|
@@ -185,7 +185,7 @@ let SHEET_VIEW_KEY = /* @__PURE__ */ function(SHEET_VIEW_KEY) {
|
|
|
185
185
|
}({});
|
|
186
186
|
|
|
187
187
|
//#endregion
|
|
188
|
-
//#region \0@oxc-project+runtime@0.
|
|
188
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
|
|
189
189
|
function _typeof(o) {
|
|
190
190
|
"@babel/helpers - typeof";
|
|
191
191
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -196,7 +196,7 @@ function _typeof(o) {
|
|
|
196
196
|
}
|
|
197
197
|
|
|
198
198
|
//#endregion
|
|
199
|
-
//#region \0@oxc-project+runtime@0.
|
|
199
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
|
|
200
200
|
function toPrimitive(t, r) {
|
|
201
201
|
if ("object" != _typeof(t) || !t) return t;
|
|
202
202
|
var e = t[Symbol.toPrimitive];
|
|
@@ -209,14 +209,14 @@ function toPrimitive(t, r) {
|
|
|
209
209
|
}
|
|
210
210
|
|
|
211
211
|
//#endregion
|
|
212
|
-
//#region \0@oxc-project+runtime@0.
|
|
212
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
|
|
213
213
|
function toPropertyKey(t) {
|
|
214
214
|
var i = toPrimitive(t, "string");
|
|
215
215
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
216
216
|
}
|
|
217
217
|
|
|
218
218
|
//#endregion
|
|
219
|
-
//#region \0@oxc-project+runtime@0.
|
|
219
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
|
|
220
220
|
function _defineProperty(e, r, t) {
|
|
221
221
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
222
222
|
value: t,
|
|
@@ -276,7 +276,7 @@ var SelectionRenderModel = class {
|
|
|
276
276
|
return this._rangeType;
|
|
277
277
|
}
|
|
278
278
|
/**
|
|
279
|
-
*
|
|
279
|
+
* Compares row and column bounds only.
|
|
280
280
|
*/
|
|
281
281
|
isEqual(rangeWithCoord) {
|
|
282
282
|
const { startColumn, startRow, endColumn, endRow } = this;
|
|
@@ -353,9 +353,9 @@ const SetRowHeaderWidthCommand = {
|
|
|
353
353
|
const renderManagerSrv = accessor.get(IRenderManagerService);
|
|
354
354
|
if (!renderManagerSrv) return false;
|
|
355
355
|
const { unitId, subUnitId, size } = params;
|
|
356
|
-
const render = renderManagerSrv.
|
|
356
|
+
const render = renderManagerSrv.getRenderUnitById(unitId);
|
|
357
357
|
if (render) {
|
|
358
|
-
renderManagerSrv.
|
|
358
|
+
renderManagerSrv.getRenderUnitById(unitId).with(SheetSkeletonManagerService).setRowHeaderSize(render, subUnitId, size);
|
|
359
359
|
const { components } = render;
|
|
360
360
|
const renderComponent = components.get("__SpreadsheetRowHeader__");
|
|
361
361
|
if (renderComponent) renderComponent.setCustomHeader({ headerStyle: { size } }, subUnitId);
|
|
@@ -371,9 +371,9 @@ const SetColumnHeaderHeightCommand = {
|
|
|
371
371
|
const renderManagerSrv = accessor.get(IRenderManagerService);
|
|
372
372
|
if (!renderManagerSrv) return false;
|
|
373
373
|
const { unitId, subUnitId, size } = params;
|
|
374
|
-
const render = renderManagerSrv.
|
|
374
|
+
const render = renderManagerSrv.getRenderUnitById(unitId);
|
|
375
375
|
if (render) {
|
|
376
|
-
renderManagerSrv.
|
|
376
|
+
renderManagerSrv.getRenderUnitById(unitId).with(SheetSkeletonManagerService).setColumnHeaderSize(render, subUnitId, size);
|
|
377
377
|
const { components } = render;
|
|
378
378
|
const renderComponent = components.get("__SpreadsheetColumnHeader__");
|
|
379
379
|
if (renderComponent) renderComponent.setCustomHeader({ headerStyle: { size } }, subUnitId);
|
|
@@ -493,10 +493,6 @@ var BaseSelectionRenderService = class extends Disposable {
|
|
|
493
493
|
/**
|
|
494
494
|
* Reset this._selectionStyle to default normal selection style
|
|
495
495
|
*/
|
|
496
|
-
/** @deprecated This should not be provided by the selection render service. */
|
|
497
|
-
getViewPort() {
|
|
498
|
-
return this._activeViewport;
|
|
499
|
-
}
|
|
500
496
|
setSingleSelectionEnabled(enabled = false) {
|
|
501
497
|
this._singleSelectionEnabled = enabled;
|
|
502
498
|
}
|
|
@@ -607,7 +603,7 @@ var BaseSelectionRenderService = class extends Disposable {
|
|
|
607
603
|
}
|
|
608
604
|
_getFreeze() {
|
|
609
605
|
var _this$_sheetSkeletonM;
|
|
610
|
-
return (_this$_sheetSkeletonM = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM === void 0 ? void 0 : _this$_sheetSkeletonM.skeleton.
|
|
606
|
+
return (_this$_sheetSkeletonM = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM === void 0 ? void 0 : _this$_sheetSkeletonM.skeleton.worksheet.getFreeze();
|
|
611
607
|
}
|
|
612
608
|
_getViewportByCell(row, column) {
|
|
613
609
|
if (row === void 0 || column === void 0) return null;
|
|
@@ -768,12 +764,6 @@ var BaseSelectionRenderService = class extends Disposable {
|
|
|
768
764
|
});
|
|
769
765
|
});
|
|
770
766
|
}
|
|
771
|
-
/**
|
|
772
|
-
* @deprecated Please use `getCellWithCoordByOffset` instead.
|
|
773
|
-
*/
|
|
774
|
-
getSelectionCellByPosition(x, y) {
|
|
775
|
-
return this.getCellWithCoordByOffset(x, y);
|
|
776
|
-
}
|
|
777
767
|
getCellWithCoordByOffset(x, y, skeletonParam) {
|
|
778
768
|
const scene = this._scene;
|
|
779
769
|
const skeleton = skeletonParam !== null && skeletonParam !== void 0 ? skeletonParam : this._skeleton;
|
|
@@ -983,7 +973,7 @@ function genSelectionByRange(skeleton, range) {
|
|
|
983
973
|
}
|
|
984
974
|
|
|
985
975
|
//#endregion
|
|
986
|
-
//#region \0@oxc-project+runtime@0.
|
|
976
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
|
|
987
977
|
function __decorateParam(paramIndex, decorator) {
|
|
988
978
|
return function(target, key) {
|
|
989
979
|
decorator(target, key, paramIndex);
|
|
@@ -991,7 +981,7 @@ function __decorateParam(paramIndex, decorator) {
|
|
|
991
981
|
}
|
|
992
982
|
|
|
993
983
|
//#endregion
|
|
994
|
-
//#region \0@oxc-project+runtime@0.
|
|
984
|
+
//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
|
|
995
985
|
function __decorate(decorators, target, key, desc) {
|
|
996
986
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
997
987
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -1217,7 +1207,7 @@ var SelectionShapeExtension = class {
|
|
|
1217
1207
|
}
|
|
1218
1208
|
_getFreeze() {
|
|
1219
1209
|
var _withCurrentTypeOfRen;
|
|
1220
|
-
return (_withCurrentTypeOfRen = withCurrentTypeOfRenderer(UniverInstanceType.UNIVER_SHEET, SheetSkeletonManagerService, this._injector.get(IUniverInstanceService), this._injector.get(IRenderManagerService))) === null || _withCurrentTypeOfRen === void 0 || (_withCurrentTypeOfRen = _withCurrentTypeOfRen.getCurrentParam()) === null || _withCurrentTypeOfRen === void 0 ? void 0 : _withCurrentTypeOfRen.skeleton.
|
|
1210
|
+
return (_withCurrentTypeOfRen = withCurrentTypeOfRenderer(UniverInstanceType.UNIVER_SHEET, SheetSkeletonManagerService, this._injector.get(IUniverInstanceService), this._injector.get(IRenderManagerService))) === null || _withCurrentTypeOfRen === void 0 || (_withCurrentTypeOfRen = _withCurrentTypeOfRen.getCurrentParam()) === null || _withCurrentTypeOfRen === void 0 ? void 0 : _withCurrentTypeOfRen.skeleton.worksheet.getFreeze();
|
|
1221
1211
|
}
|
|
1222
1212
|
_isSelectionInViewport(selection, viewport) {
|
|
1223
1213
|
const freeze = this._getFreeze() || {
|
|
@@ -2240,29 +2230,6 @@ var SelectionControl = class extends Disposable {
|
|
|
2240
2230
|
this._updateControlCoord();
|
|
2241
2231
|
}
|
|
2242
2232
|
/**
|
|
2243
|
-
* Update selection model with new range & primary cell(aka: highlight/current), also update row/col selection size & style.
|
|
2244
|
-
*
|
|
2245
|
-
* @deprecated use `updateRangeBySelectionWithCoord` and `updateStyle` to do same thing.
|
|
2246
|
-
*
|
|
2247
|
-
* @param newSelectionRange
|
|
2248
|
-
* @param rowHeaderWidth
|
|
2249
|
-
* @param columnHeaderHeight
|
|
2250
|
-
* @param style
|
|
2251
|
-
* @param primaryCell primary cell
|
|
2252
|
-
*/
|
|
2253
|
-
update(newSelectionRange, rowHeaderWidth = 0, columnHeaderHeight = 0, style, primaryCell) {
|
|
2254
|
-
this._rowHeaderWidth = rowHeaderWidth;
|
|
2255
|
-
this._columnHeaderHeight = columnHeaderHeight;
|
|
2256
|
-
this._rowHeaderOffsetX = 0;
|
|
2257
|
-
this._columnHeaderOffsetY = 0;
|
|
2258
|
-
this.updateRangeBySelectionWithCoord({
|
|
2259
|
-
rangeWithCoord: newSelectionRange,
|
|
2260
|
-
primaryWithCoord: primaryCell,
|
|
2261
|
-
style
|
|
2262
|
-
});
|
|
2263
|
-
if (style) this.updateStyle(style);
|
|
2264
|
-
}
|
|
2265
|
-
/**
|
|
2266
2233
|
* Update primary range.
|
|
2267
2234
|
* highlight cell would update if primary cell has value.
|
|
2268
2235
|
* highlight cell would be cleared if primary cell is null.
|
|
@@ -2659,7 +2626,7 @@ let MarkSelectionService = class MarkSelectionService extends Disposable {
|
|
|
2659
2626
|
const { unitId, subUnitId, selection, control: oldControl, zIndex } = shape;
|
|
2660
2627
|
oldControl === null || oldControl === void 0 || oldControl.dispose();
|
|
2661
2628
|
if (unitId !== currentUnitId || subUnitId !== currentSubUnitId) return;
|
|
2662
|
-
const renderUnit = this._renderManagerService.
|
|
2629
|
+
const renderUnit = this._renderManagerService.getRenderUnitById(unitId);
|
|
2663
2630
|
if (!renderUnit) return;
|
|
2664
2631
|
const skeleton = this._sheetSkeletonService.getSkeleton(unitId, subUnitId);
|
|
2665
2632
|
if (!skeleton) return;
|
|
@@ -2944,7 +2911,6 @@ function convertToCellStyle(cell, dataStream, textRuns) {
|
|
|
2944
2911
|
s: textRuns[0].ts
|
|
2945
2912
|
};
|
|
2946
2913
|
else return cell;
|
|
2947
|
-
return cell;
|
|
2948
2914
|
}
|
|
2949
2915
|
|
|
2950
2916
|
//#endregion
|
|
@@ -3404,13 +3370,12 @@ var HtmlToUSMService = class HtmlToUSMService {
|
|
|
3404
3370
|
let cellText = "";
|
|
3405
3371
|
let cellRichStyle;
|
|
3406
3372
|
if (/<[^>]+>/.test(cellHtml) && skeleton) {
|
|
3407
|
-
var _skeleton$getBlankCel;
|
|
3408
3373
|
const newDocBody = {
|
|
3409
3374
|
dataStream: "",
|
|
3410
3375
|
textRuns: []
|
|
3411
3376
|
};
|
|
3412
3377
|
this._parseCellHtml(null, cell.childNodes, newDocBody, void 0, styleStr);
|
|
3413
|
-
const documentModel = (
|
|
3378
|
+
const documentModel = createDocumentModelWithStyle("", {});
|
|
3414
3379
|
const p = documentModel === null || documentModel === void 0 ? void 0 : documentModel.getSnapshot();
|
|
3415
3380
|
const singleDataStream = `${newDocBody.dataStream}\r\n`;
|
|
3416
3381
|
const documentData = {
|
|
@@ -3431,11 +3396,8 @@ var HtmlToUSMService = class HtmlToUSMService {
|
|
|
3431
3396
|
};
|
|
3432
3397
|
}
|
|
3433
3398
|
_generateDocumentDataModelSnapshot(snapshot) {
|
|
3434
|
-
|
|
3435
|
-
const
|
|
3436
|
-
if (currentSkeleton == null) return null;
|
|
3437
|
-
const { skeleton } = currentSkeleton;
|
|
3438
|
-
const documentModel = (_skeleton$getBlankCel2 = skeleton.getBlankCellDocumentModel()) === null || _skeleton$getBlankCel2 === void 0 ? void 0 : _skeleton$getBlankCel2.documentModel;
|
|
3399
|
+
if (this._getCurrentSkeleton() == null) return null;
|
|
3400
|
+
const documentModel = createDocumentModelWithStyle("", {});
|
|
3439
3401
|
const documentData = {
|
|
3440
3402
|
...documentModel === null || documentModel === void 0 ? void 0 : documentModel.getSnapshot(),
|
|
3441
3403
|
...snapshot
|
|
@@ -4249,7 +4211,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4249
4211
|
return this._clipboardHooks;
|
|
4250
4212
|
}
|
|
4251
4213
|
_generateCopyContent(unitId, subUnitId, range, hooks, copyHookType = PREDEFINED_HOOK_NAME_COPY.DEFAULT_COPY) {
|
|
4252
|
-
const workbook = this._univerInstanceService.
|
|
4214
|
+
const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
|
|
4253
4215
|
const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
|
|
4254
4216
|
if (!workbook || !worksheet) return null;
|
|
4255
4217
|
const filteredRows = hooks.reduce((acc, cur) => {
|
|
@@ -4454,7 +4416,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4454
4416
|
if (!cellMatrix) return false;
|
|
4455
4417
|
const pasteTarget = this._getPastedRange(cellMatrix);
|
|
4456
4418
|
if (!pasteTarget) return false;
|
|
4457
|
-
const worksheet = (_this$_univerInstance = this._univerInstanceService.
|
|
4419
|
+
const worksheet = (_this$_univerInstance = this._univerInstanceService.getUnit(pasteTarget.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(pasteTarget.subUnitId);
|
|
4458
4420
|
if (!worksheet) return false;
|
|
4459
4421
|
const mergeData = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getMergeData();
|
|
4460
4422
|
if (mergeData.length) {
|
|
@@ -4484,7 +4446,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4484
4446
|
const { range, matrix: cachedMatrix, unitId: copyUnitId, subUnitId: copySubUnitId } = cachedData || {};
|
|
4485
4447
|
if (!cachedMatrix || !cachedData || !range || !copyUnitId || !copySubUnitId) return false;
|
|
4486
4448
|
const { mapFunc } = virtualizeDiscreteRanges([range]);
|
|
4487
|
-
const worksheet = (_this$_univerInstance2 = this._univerInstanceService.
|
|
4449
|
+
const worksheet = (_this$_univerInstance2 = this._univerInstanceService.getUnit(copyUnitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance2 === void 0 ? void 0 : _this$_univerInstance2.getSheetBySheetId(copySubUnitId);
|
|
4488
4450
|
const cellMatrix = new ObjectMatrix();
|
|
4489
4451
|
cachedMatrix.forValue((row, col, value) => {
|
|
4490
4452
|
const { row: actualRow, col: actualColumn } = mapFunc(row, col);
|
|
@@ -4507,7 +4469,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4507
4469
|
});
|
|
4508
4470
|
const pasteTarget = this._getPastedRange(cellMatrix);
|
|
4509
4471
|
if (!pasteTarget) return false;
|
|
4510
|
-
const pasteToWorksheet = (_this$_univerInstance3 = this._univerInstanceService.
|
|
4472
|
+
const pasteToWorksheet = (_this$_univerInstance3 = this._univerInstanceService.getUnit(pasteTarget.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance3 === void 0 ? void 0 : _this$_univerInstance3.getSheetBySheetId(pasteTarget.subUnitId);
|
|
4511
4473
|
if (!pasteToWorksheet) return false;
|
|
4512
4474
|
const mergeData = pasteToWorksheet === null || pasteToWorksheet === void 0 ? void 0 : pasteToWorksheet.getMergeData();
|
|
4513
4475
|
if (mergeData) {
|
|
@@ -4683,7 +4645,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4683
4645
|
var _this$_univerInstance4, _this$_renderManagerS;
|
|
4684
4646
|
const worksheet = (_this$_univerInstance4 = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance4 === void 0 ? void 0 : _this$_univerInstance4.getSheetBySheetId(subUnitId);
|
|
4685
4647
|
if (!worksheet) return null;
|
|
4686
|
-
const skeleton = (_this$_renderManagerS = this._renderManagerService.
|
|
4648
|
+
const skeleton = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
4687
4649
|
if (!skeleton) return null;
|
|
4688
4650
|
const rowManager = worksheet.getRowManager();
|
|
4689
4651
|
const defaultRowHeight = worksheet.getConfig().defaultRowHeight;
|
|
@@ -4723,7 +4685,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4723
4685
|
}
|
|
4724
4686
|
_getSetSelectionOperation(unitId, subUnitId, range, cellMatrix, pasteType) {
|
|
4725
4687
|
var _this$_univerInstance5;
|
|
4726
|
-
const worksheet = (_this$_univerInstance5 = this._univerInstanceService.
|
|
4688
|
+
const worksheet = (_this$_univerInstance5 = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance5 === void 0 ? void 0 : _this$_univerInstance5.getSheetBySheetId(subUnitId);
|
|
4727
4689
|
if (!worksheet) return null;
|
|
4728
4690
|
const { rows, cols } = range;
|
|
4729
4691
|
const startRow = rows[0];
|
|
@@ -4915,7 +4877,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4915
4877
|
if (rowCount <= 0 || colCount <= 0) return null;
|
|
4916
4878
|
const pasteSelectionRangeRowLen = discreteRange.rows.length;
|
|
4917
4879
|
const pasteSelectionRangeColLen = discreteRange.cols.length;
|
|
4918
|
-
const worksheet = (_this$_univerInstance6 = this._univerInstanceService.
|
|
4880
|
+
const worksheet = (_this$_univerInstance6 = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance6 === void 0 ? void 0 : _this$_univerInstance6.getSheetBySheetId(subUnitId);
|
|
4919
4881
|
if (!worksheet) return null;
|
|
4920
4882
|
const mergeData = worksheet === null || worksheet === void 0 ? void 0 : worksheet.getMergeData();
|
|
4921
4883
|
if (pasteSelectionRangeRowLen % rowCount === 0 && pasteSelectionRangeColLen % colCount === 0) {
|
|
@@ -4942,7 +4904,7 @@ let SheetClipboardService = class SheetClipboardService extends Disposable {
|
|
|
4942
4904
|
}
|
|
4943
4905
|
_expandOrShrinkRowsCols(unitId, subUnitId, range, colCount, rowCount) {
|
|
4944
4906
|
const { rows, cols } = range;
|
|
4945
|
-
const workbook = this._univerInstanceService.
|
|
4907
|
+
const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
|
|
4946
4908
|
const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
|
|
4947
4909
|
let newRows;
|
|
4948
4910
|
let newCols;
|
|
@@ -5240,7 +5202,7 @@ const DeleteRangeMoveLeftConfirmCommand = {
|
|
|
5240
5202
|
};
|
|
5241
5203
|
const getRowLength = (range) => range.endRow - range.startRow;
|
|
5242
5204
|
if (!worksheet.getMergeData().find((mergeRange) => {
|
|
5243
|
-
const interSectedRange =
|
|
5205
|
+
const interSectedRange = getIntersectRange(mergeRange, range);
|
|
5244
5206
|
return interSectedRange ? getRowLength(mergeRange) > getRowLength(interSectedRange) : false;
|
|
5245
5207
|
})) return commandService.executeCommand(DeleteRangeMoveLeftCommand.id);
|
|
5246
5208
|
if (await confirmService.confirm({
|
|
@@ -5286,7 +5248,7 @@ const DeleteRangeMoveUpConfirmCommand = {
|
|
|
5286
5248
|
}
|
|
5287
5249
|
const getColLength = (range) => range.endColumn - range.startColumn;
|
|
5288
5250
|
if (!worksheet.getMergeData().find((mergeRange) => {
|
|
5289
|
-
const interSectedRange =
|
|
5251
|
+
const interSectedRange = getIntersectRange(mergeRange, range);
|
|
5290
5252
|
return interSectedRange ? getColLength(mergeRange) > getColLength(interSectedRange) : false;
|
|
5291
5253
|
})) return commandService.executeCommand(DeleteRangeMoveUpCommand.id);
|
|
5292
5254
|
if (await confirmService.confirm({
|
|
@@ -5976,7 +5938,7 @@ const InsertRangeMoveDownConfirmCommand = {
|
|
|
5976
5938
|
}
|
|
5977
5939
|
const getColLength = (range) => range.endColumn - range.startColumn;
|
|
5978
5940
|
if (!worksheet.getMergeData().find((mergeRange) => {
|
|
5979
|
-
const interSectedRange =
|
|
5941
|
+
const interSectedRange = getIntersectRange(mergeRange, range);
|
|
5980
5942
|
return interSectedRange ? getColLength(mergeRange) > getColLength(interSectedRange) : false;
|
|
5981
5943
|
})) return commandService.executeCommand(InsertRangeMoveDownCommand.id);
|
|
5982
5944
|
if (await confirmService.confirm({
|
|
@@ -6014,7 +5976,7 @@ const InsertRangeMoveRightConfirmCommand = {
|
|
|
6014
5976
|
};
|
|
6015
5977
|
const getRowLength = (range) => range.endRow - range.startRow;
|
|
6016
5978
|
if (!worksheet.getMergeData().find((mergeRange) => {
|
|
6017
|
-
const interSectedRange =
|
|
5979
|
+
const interSectedRange = getIntersectRange(mergeRange, range);
|
|
6018
5980
|
return interSectedRange ? getRowLength(mergeRange) > getRowLength(interSectedRange) : false;
|
|
6019
5981
|
})) return commandService.executeCommand(InsertRangeMoveRightCommand.id);
|
|
6020
5982
|
if (await confirmService.confirm({
|
|
@@ -6731,7 +6693,7 @@ const SetSelectionFrozenCommand = {
|
|
|
6731
6693
|
const commandService = accessor.get(ICommandService);
|
|
6732
6694
|
const selections = accessor.get(SheetsSelectionsService).getCurrentSelections();
|
|
6733
6695
|
if (!selections) return false;
|
|
6734
|
-
const { sheetViewStartRow = 0, sheetViewStartColumn = 0 } = accessor.get(IRenderManagerService).
|
|
6696
|
+
const { sheetViewStartRow = 0, sheetViewStartColumn = 0 } = accessor.get(IRenderManagerService).getRenderUnitById(unitId).with(SheetScrollManagerService).getCurrentScrollState() || {};
|
|
6735
6697
|
let startRow;
|
|
6736
6698
|
let startColumn;
|
|
6737
6699
|
let freezedRowCount;
|
|
@@ -7082,7 +7044,7 @@ const MoveSelectionEnterAndTabCommand = {
|
|
|
7082
7044
|
reveal: true,
|
|
7083
7045
|
extra: params.extra
|
|
7084
7046
|
});
|
|
7085
|
-
const selectionService = (_renderManagerService = accessor.get(IRenderManagerService).
|
|
7047
|
+
const selectionService = (_renderManagerService = accessor.get(IRenderManagerService).getRenderUnitById(unitId)) === null || _renderManagerService === void 0 ? void 0 : _renderManagerService.with(ISheetSelectionRenderService);
|
|
7086
7048
|
selectionService === null || selectionService === void 0 || selectionService.refreshSelectionMoveEnd();
|
|
7087
7049
|
return rs;
|
|
7088
7050
|
}
|
|
@@ -7216,7 +7178,7 @@ function getSheetObject(univerInstanceService, renderManagerService) {
|
|
|
7216
7178
|
const unitId = workbook.getUnitId();
|
|
7217
7179
|
let components, mainComponent, scene, engine;
|
|
7218
7180
|
if (isRenderManagerService(renderManagerService)) {
|
|
7219
|
-
const currentRender = renderManagerService.
|
|
7181
|
+
const currentRender = renderManagerService.getRenderUnitById(unitId);
|
|
7220
7182
|
if (currentRender == null) return null;
|
|
7221
7183
|
components = currentRender.components;
|
|
7222
7184
|
components = currentRender.components;
|
|
@@ -7553,9 +7515,7 @@ let SheetsScrollRenderController = class SheetsScrollRenderController extends Di
|
|
|
7553
7515
|
}
|
|
7554
7516
|
_getFreeze() {
|
|
7555
7517
|
var _this$_sheetSkeletonM4;
|
|
7556
|
-
|
|
7557
|
-
if (snapshot == null) return;
|
|
7558
|
-
return snapshot.freeze;
|
|
7518
|
+
return (_this$_sheetSkeletonM4 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM4 === void 0 ? void 0 : _this$_sheetSkeletonM4.skeleton.worksheet.getFreeze();
|
|
7559
7519
|
}
|
|
7560
7520
|
_getSheetObject() {
|
|
7561
7521
|
return getSheetObject(this._context.unit, this._context);
|
|
@@ -7692,8 +7652,8 @@ const SetScrollOperation = {
|
|
|
7692
7652
|
if (!params) return false;
|
|
7693
7653
|
const { unitId, sheetId, offsetX = 0, offsetY = 0, sheetViewStartColumn, sheetViewStartRow, duration, screenRatioX, screenRatioY } = params;
|
|
7694
7654
|
const renderManagerService = accessor.get(IRenderManagerService);
|
|
7695
|
-
const scrollManagerService = renderManagerService.
|
|
7696
|
-
const renderUnit = renderManagerService.
|
|
7655
|
+
const scrollManagerService = renderManagerService.getRenderUnitById(unitId).with(SheetScrollManagerService);
|
|
7656
|
+
const renderUnit = renderManagerService.getRenderUnitById(unitId);
|
|
7697
7657
|
if (!renderUnit) return false;
|
|
7698
7658
|
const engine = renderUnit.engine;
|
|
7699
7659
|
const canvasWidth = engine.width;
|
|
@@ -7730,7 +7690,7 @@ const SetScrollRelativeCommand = {
|
|
|
7730
7690
|
const target = getSheetCommandTarget(univerInstanceService);
|
|
7731
7691
|
if (!target) return false;
|
|
7732
7692
|
const { unitId, subUnitId } = target;
|
|
7733
|
-
const currentScroll = renderManagerSrv.
|
|
7693
|
+
const currentScroll = renderManagerSrv.getRenderUnitById(unitId).with(SheetScrollManagerService).getCurrentScrollState();
|
|
7734
7694
|
const { offsetX = 0, offsetY = 0 } = params || {};
|
|
7735
7695
|
const { sheetViewStartRow = 0, sheetViewStartColumn = 0, offsetX: currentOffsetX = 0, offsetY: currentOffsetY = 0 } = currentScroll || {};
|
|
7736
7696
|
return commandService.executeCommand(SetScrollOperation.id, {
|
|
@@ -7758,7 +7718,7 @@ const ScrollCommand = {
|
|
|
7758
7718
|
const target = params.unitId ? getScrollCommandTargetByParams(univerInstanceService, params) : getSheetCommandTarget(univerInstanceService);
|
|
7759
7719
|
if (!target) return false;
|
|
7760
7720
|
const { workbook, worksheet, unitId } = target;
|
|
7761
|
-
const renderUnit = renderManagerSrv.
|
|
7721
|
+
const renderUnit = renderManagerSrv.getRenderUnitById(unitId);
|
|
7762
7722
|
if (!renderUnit) return false;
|
|
7763
7723
|
const currentScroll = renderUnit.with(SheetScrollManagerService).getCurrentScrollState();
|
|
7764
7724
|
if (!worksheet) return false;
|
|
@@ -7796,7 +7756,7 @@ const ScrollToCellCommand = {
|
|
|
7796
7756
|
type: CommandType.COMMAND,
|
|
7797
7757
|
handler: (accessor, params) => {
|
|
7798
7758
|
const instanceService = accessor.get(IUniverInstanceService);
|
|
7799
|
-
return accessor.get(IRenderManagerService).
|
|
7759
|
+
return accessor.get(IRenderManagerService).getRenderUnitById(instanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getUnitId()).with(SheetsScrollRenderController).scrollToRange(params.range, params.forceTop, params.forceLeft);
|
|
7800
7760
|
}
|
|
7801
7761
|
};
|
|
7802
7762
|
/**
|
|
@@ -7850,7 +7810,7 @@ let AutoWidthController = class AutoWidthController extends Disposable {
|
|
|
7850
7810
|
const target = getSheetCommandTarget(univerInstanceService, params);
|
|
7851
7811
|
if (!target) return defaultValue;
|
|
7852
7812
|
const { unitId, subUnitId, worksheet } = target;
|
|
7853
|
-
const sheetSkeletonService = this._renderManagerService.
|
|
7813
|
+
const sheetSkeletonService = this._renderManagerService.getRenderUnitById(unitId).with(SheetSkeletonManagerService);
|
|
7854
7814
|
if (!sheetSkeletonService.getCurrentParam()) return defaultValue;
|
|
7855
7815
|
const { skeleton } = sheetSkeletonService.getCurrentParam();
|
|
7856
7816
|
const colsAutoWidthInfo = skeleton.calculateAutoWidthInRange(params.ranges);
|
|
@@ -7914,6 +7874,162 @@ const SetWorksheetColAutoWidthCommand = {
|
|
|
7914
7874
|
}
|
|
7915
7875
|
};
|
|
7916
7876
|
|
|
7877
|
+
//#endregion
|
|
7878
|
+
//#region src/common/utils.ts
|
|
7879
|
+
function getUserListEqual(userList1, userList2) {
|
|
7880
|
+
if (userList1.length !== userList2.length) return false;
|
|
7881
|
+
const sorted1 = userList1.sort((a, b) => a.id.localeCompare(b.id));
|
|
7882
|
+
const sorted2 = userList2.sort((a, b) => a.id.localeCompare(b.id));
|
|
7883
|
+
return sorted1.every((user, index) => {
|
|
7884
|
+
var _user$subject, _sorted2$index$subjec;
|
|
7885
|
+
return ((_user$subject = user.subject) === null || _user$subject === void 0 ? void 0 : _user$subject.userID) === ((_sorted2$index$subjec = sorted2[index].subject) === null || _sorted2$index$subjec === void 0 ? void 0 : _sorted2$index$subjec.userID) && user.role === sorted2[index].role;
|
|
7886
|
+
});
|
|
7887
|
+
}
|
|
7888
|
+
function checkCellContentInRanges(worksheet, ranges) {
|
|
7889
|
+
return ranges.some((range) => checkCellContentInRange(worksheet, range));
|
|
7890
|
+
}
|
|
7891
|
+
function checkCellContentInRange(worksheet, range) {
|
|
7892
|
+
const { startRow, startColumn, endColumn, endRow } = range;
|
|
7893
|
+
const cellMatrix = worksheet.getMatrixWithMergedCells(startRow, startColumn, endRow, endColumn);
|
|
7894
|
+
let someCellGoingToBeRemoved = false;
|
|
7895
|
+
cellMatrix.forValue((row, col, cellData) => {
|
|
7896
|
+
if (cellData && (row !== startRow || col !== startColumn) && worksheet.cellHasValue(cellData)) {
|
|
7897
|
+
someCellGoingToBeRemoved = true;
|
|
7898
|
+
return false;
|
|
7899
|
+
}
|
|
7900
|
+
});
|
|
7901
|
+
return someCellGoingToBeRemoved;
|
|
7902
|
+
}
|
|
7903
|
+
function getCellIndexByOffsetWithMerge(offsetX, offsetY, scene, skeleton) {
|
|
7904
|
+
const activeViewport = scene.getActiveViewportByCoord(Vector2.FromArray([offsetX, offsetY]));
|
|
7905
|
+
if (!activeViewport) return;
|
|
7906
|
+
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
7907
|
+
const scrollXY = {
|
|
7908
|
+
x: activeViewport.viewportScrollX,
|
|
7909
|
+
y: activeViewport.viewportScrollY
|
|
7910
|
+
};
|
|
7911
|
+
const cellIndex = skeleton.getCellIndexByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);
|
|
7912
|
+
const mergeCell = skeleton.worksheet.getMergedCell(cellIndex.row, cellIndex.column);
|
|
7913
|
+
return {
|
|
7914
|
+
actualRow: mergeCell ? mergeCell.startRow : cellIndex.row,
|
|
7915
|
+
actualCol: mergeCell ? mergeCell.startColumn : cellIndex.column,
|
|
7916
|
+
mergeCell,
|
|
7917
|
+
row: cellIndex.row,
|
|
7918
|
+
col: cellIndex.column
|
|
7919
|
+
};
|
|
7920
|
+
}
|
|
7921
|
+
function getViewportByCell(row, column, scene, worksheet) {
|
|
7922
|
+
const freeze = worksheet.getFreeze();
|
|
7923
|
+
if (!freeze || freeze.startRow <= 0 && freeze.startColumn <= 0) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
7924
|
+
if (row >= freeze.startRow && column >= freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
7925
|
+
if (row < freeze.startRow && column < freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP);
|
|
7926
|
+
if (row < freeze.startRow && column >= freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP);
|
|
7927
|
+
if (row >= freeze.startRow && column < freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT);
|
|
7928
|
+
}
|
|
7929
|
+
function transformBound2OffsetBound(originBound, scene, skeleton, worksheet) {
|
|
7930
|
+
const topLeft = transformPosition2Offset(originBound.left, originBound.top, scene, skeleton, worksheet);
|
|
7931
|
+
const bottomRight = transformPosition2Offset(originBound.right, originBound.bottom, scene, skeleton, worksheet);
|
|
7932
|
+
return {
|
|
7933
|
+
left: topLeft.x,
|
|
7934
|
+
top: topLeft.y,
|
|
7935
|
+
right: bottomRight.x,
|
|
7936
|
+
bottom: bottomRight.y
|
|
7937
|
+
};
|
|
7938
|
+
}
|
|
7939
|
+
function transformPosition2Offset(x, y, scene, skeleton, worksheet) {
|
|
7940
|
+
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
7941
|
+
const viewMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
7942
|
+
if (!viewMain) return {
|
|
7943
|
+
x,
|
|
7944
|
+
y
|
|
7945
|
+
};
|
|
7946
|
+
const { startColumn, startRow, xSplit, ySplit } = worksheet.getFreeze();
|
|
7947
|
+
const startSheetView = skeleton.getNoMergeCellWithCoordByIndex(startRow - ySplit, startColumn - xSplit, false);
|
|
7948
|
+
const endSheetView = skeleton.getNoMergeCellWithCoordByIndex(startRow, startColumn, false);
|
|
7949
|
+
const { rowHeaderWidth, columnHeaderHeight } = skeleton;
|
|
7950
|
+
const freezeWidth = endSheetView.startX - startSheetView.startX;
|
|
7951
|
+
const freezeHeight = endSheetView.startY - startSheetView.startY;
|
|
7952
|
+
const { top, left, viewportScrollX, viewportScrollY } = viewMain;
|
|
7953
|
+
let offsetX;
|
|
7954
|
+
if (x > left) offsetX = (x - viewportScrollX) * scaleX;
|
|
7955
|
+
else offsetX = (freezeWidth + rowHeaderWidth - (left - x)) * scaleX;
|
|
7956
|
+
let offsetY;
|
|
7957
|
+
if (y > top) offsetY = (y - viewportScrollY) * scaleY;
|
|
7958
|
+
else offsetY = (freezeHeight + columnHeaderHeight - (top - y)) * scaleX;
|
|
7959
|
+
return {
|
|
7960
|
+
x: offsetX,
|
|
7961
|
+
y: offsetY
|
|
7962
|
+
};
|
|
7963
|
+
}
|
|
7964
|
+
function getCellRealRange(workbook, worksheet, skeleton, row, col) {
|
|
7965
|
+
let actualRow = row;
|
|
7966
|
+
let actualCol = col;
|
|
7967
|
+
skeleton.overflowCache.forValue((r, c, range) => {
|
|
7968
|
+
if (range.startRow <= actualRow && range.endRow >= actualRow && range.startColumn <= actualCol && range.endColumn >= actualCol) {
|
|
7969
|
+
actualCol = c;
|
|
7970
|
+
actualRow = r;
|
|
7971
|
+
}
|
|
7972
|
+
});
|
|
7973
|
+
const actualCell = skeleton.getCellWithCoordByIndex(actualRow, actualCol);
|
|
7974
|
+
return {
|
|
7975
|
+
unitId: workbook.getUnitId(),
|
|
7976
|
+
subUnitId: worksheet.getSheetId(),
|
|
7977
|
+
workbook,
|
|
7978
|
+
worksheet,
|
|
7979
|
+
row: actualCell.actualRow,
|
|
7980
|
+
col: actualCell.actualColumn
|
|
7981
|
+
};
|
|
7982
|
+
}
|
|
7983
|
+
function getHoverCellPosition(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY) {
|
|
7984
|
+
const { scene } = currentRender;
|
|
7985
|
+
const unitId = workbook.getUnitId();
|
|
7986
|
+
const { skeleton, sheetId } = skeletonParam;
|
|
7987
|
+
const cellIndex = getCellIndexByOffsetWithMerge(offsetX, offsetY, scene, skeleton);
|
|
7988
|
+
if (!cellIndex) return null;
|
|
7989
|
+
let { actualCol, actualRow } = cellIndex;
|
|
7990
|
+
const originLocation = {
|
|
7991
|
+
unitId,
|
|
7992
|
+
subUnitId: sheetId,
|
|
7993
|
+
workbook,
|
|
7994
|
+
worksheet,
|
|
7995
|
+
row: actualRow,
|
|
7996
|
+
col: actualCol
|
|
7997
|
+
};
|
|
7998
|
+
skeleton.overflowCache.forValue((r, c, range) => {
|
|
7999
|
+
if (range.startRow <= actualRow && range.endRow >= actualRow && range.startColumn <= actualCol && range.endColumn >= actualCol) {
|
|
8000
|
+
actualCol = c;
|
|
8001
|
+
actualRow = r;
|
|
8002
|
+
}
|
|
8003
|
+
});
|
|
8004
|
+
const actualCell = skeleton.getCellWithCoordByIndex(actualRow, actualCol);
|
|
8005
|
+
const location = getCellRealRange(workbook, worksheet, skeleton, actualRow, actualCol);
|
|
8006
|
+
let anchorCell;
|
|
8007
|
+
if (actualCell.mergeInfo) anchorCell = actualCell.mergeInfo;
|
|
8008
|
+
else anchorCell = {
|
|
8009
|
+
startRow: location.row,
|
|
8010
|
+
endRow: location.row,
|
|
8011
|
+
startColumn: location.col,
|
|
8012
|
+
endColumn: location.col
|
|
8013
|
+
};
|
|
8014
|
+
const activeViewport = scene.getActiveViewportByCoord(Vector2.FromArray([offsetX, offsetY]));
|
|
8015
|
+
if (!activeViewport) return;
|
|
8016
|
+
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
8017
|
+
const scrollXY = {
|
|
8018
|
+
x: activeViewport.viewportScrollX,
|
|
8019
|
+
y: activeViewport.viewportScrollY
|
|
8020
|
+
};
|
|
8021
|
+
return {
|
|
8022
|
+
position: {
|
|
8023
|
+
startX: (skeleton.getOffsetByColumn(anchorCell.startColumn - 1) - scrollXY.x) * scaleX,
|
|
8024
|
+
endX: (skeleton.getOffsetByColumn(anchorCell.endColumn) - scrollXY.x) * scaleX,
|
|
8025
|
+
startY: (skeleton.getOffsetByRow(anchorCell.startRow - 1) - scrollXY.y) * scaleY,
|
|
8026
|
+
endY: (skeleton.getOffsetByRow(anchorCell.endRow) - scrollXY.y) * scaleY
|
|
8027
|
+
},
|
|
8028
|
+
location: originLocation,
|
|
8029
|
+
overflowLocation: location
|
|
8030
|
+
};
|
|
8031
|
+
}
|
|
8032
|
+
|
|
7917
8033
|
//#endregion
|
|
7918
8034
|
//#region src/services/editor-bridge.service.ts
|
|
7919
8035
|
let EditorBridgeService = class EditorBridgeService extends Disposable {
|
|
@@ -7987,15 +8103,16 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
|
|
|
7987
8103
|
if (!workbook || workbook.getUnitId() !== unitId) return;
|
|
7988
8104
|
const worksheet = workbook.getActiveSheet();
|
|
7989
8105
|
if (!worksheet || worksheet.getSheetId() !== sheetId) return;
|
|
7990
|
-
|
|
7991
|
-
if (!renderUnit) return;
|
|
8106
|
+
if (!this._renderManagerService.getRenderUnitById(unitId)) return;
|
|
7992
8107
|
const skeleton = this._sheetSkeletonService.getSkeleton(unitId, sheetId);
|
|
7993
8108
|
if (!skeleton) return;
|
|
7994
8109
|
const actualRangeWithCoord = convertCellToRange(attachPrimaryWithCoord(skeleton, primary));
|
|
7995
8110
|
const canvasOffset = getCanvasOffsetByEngine(engine);
|
|
7996
8111
|
let { startX, startY, endX, endY } = actualRangeWithCoord;
|
|
7997
8112
|
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
7998
|
-
const
|
|
8113
|
+
const viewport = getViewportByCell(primary.startRow, primary.startColumn, scene, worksheet);
|
|
8114
|
+
if (!viewport) return;
|
|
8115
|
+
const scrollXY = scene.getViewportScrollXY(viewport);
|
|
7999
8116
|
startX = convertTransformToOffsetX(startX, scaleX, scrollXY);
|
|
8000
8117
|
startY = convertTransformToOffsetY(startY, scaleY, scrollXY);
|
|
8001
8118
|
endX = convertTransformToOffsetX(endX, scaleX, scrollXY);
|
|
@@ -8086,8 +8203,7 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
|
|
|
8086
8203
|
if (!workbook || workbook.getUnitId() !== unitId) return;
|
|
8087
8204
|
const worksheet = workbook.getActiveSheet();
|
|
8088
8205
|
if (!worksheet || worksheet.getSheetId() !== sheetId) return;
|
|
8089
|
-
|
|
8090
|
-
if (!renderUnit) return;
|
|
8206
|
+
if (!this._renderManagerService.getRenderUnitById(unitId)) return;
|
|
8091
8207
|
const skeleton = this._sheetSkeletonService.getSkeleton(unitId, sheetId);
|
|
8092
8208
|
if (!skeleton) return;
|
|
8093
8209
|
const { startRow, startColumn } = primary;
|
|
@@ -8095,7 +8211,9 @@ let EditorBridgeService = class EditorBridgeService extends Disposable {
|
|
|
8095
8211
|
const canvasOffset = getCanvasOffsetByEngine(engine);
|
|
8096
8212
|
let { startX, startY, endX, endY } = actualRangeWithCoord;
|
|
8097
8213
|
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
8098
|
-
const
|
|
8214
|
+
const viewport = getViewportByCell(startRow, startColumn, scene, worksheet);
|
|
8215
|
+
if (!viewport) return;
|
|
8216
|
+
const scrollXY = scene.getViewportScrollXY(viewport);
|
|
8099
8217
|
startX = convertTransformToOffsetX(startX, scaleX, scrollXY);
|
|
8100
8218
|
startY = convertTransformToOffsetY(startY, scaleY, scrollXY);
|
|
8101
8219
|
endX = convertTransformToOffsetX(endX, scaleX, scrollXY);
|
|
@@ -8277,7 +8395,7 @@ const SetZoomRatioOperation = {
|
|
|
8277
8395
|
id: "sheet.operation.set-zoom-ratio",
|
|
8278
8396
|
type: CommandType.OPERATION,
|
|
8279
8397
|
handler: (accessor, params) => {
|
|
8280
|
-
const renderUnit = accessor.get(IRenderManagerService).
|
|
8398
|
+
const renderUnit = accessor.get(IRenderManagerService).getRenderUnitById(params.unitId);
|
|
8281
8399
|
if (!renderUnit) return false;
|
|
8282
8400
|
return renderUnit.with(SheetsZoomRenderController).updateZoom(params.subUnitId, params.zoomRatio);
|
|
8283
8401
|
}
|
|
@@ -8462,7 +8580,6 @@ const SHEETS_UI_PLUGIN_CONFIG_KEY = "sheets-ui.config";
|
|
|
8462
8580
|
const configSymbol = Symbol(SHEETS_UI_PLUGIN_CONFIG_KEY);
|
|
8463
8581
|
const defaultPluginConfig = {
|
|
8464
8582
|
formulaBar: true,
|
|
8465
|
-
statusBarStatistic: true,
|
|
8466
8583
|
protectedRangeShadow: true,
|
|
8467
8584
|
maxAutoHeightCount: 1e3
|
|
8468
8585
|
};
|
|
@@ -8515,8 +8632,6 @@ const SetCellEditVisibleWithF2Operation = {
|
|
|
8515
8632
|
/**
|
|
8516
8633
|
* When the editor is not clicked to change the cursor,
|
|
8517
8634
|
* the arrow keys will exit editing and move the cell.
|
|
8518
|
-
*
|
|
8519
|
-
* @deprecated Should not use operation as an event.
|
|
8520
8635
|
*/
|
|
8521
8636
|
const SetCellEditVisibleArrowOperation = {
|
|
8522
8637
|
id: "sheet.operation.set-cell-edit-visible-arrow",
|
|
@@ -8548,7 +8663,7 @@ const ScrollToRangeOperation = {
|
|
|
8548
8663
|
const renderManagerService = accessor.get(IRenderManagerService);
|
|
8549
8664
|
const unitId = (_params$unitId = params.unitId) !== null && _params$unitId !== void 0 ? _params$unitId : (_instanceService$getC = instanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET)) === null || _instanceService$getC === void 0 ? void 0 : _instanceService$getC.getUnitId();
|
|
8550
8665
|
if (!unitId) return false;
|
|
8551
|
-
const renderUnit = renderManagerService.
|
|
8666
|
+
const renderUnit = renderManagerService.getRenderUnitById(unitId);
|
|
8552
8667
|
if (!renderUnit) return false;
|
|
8553
8668
|
return renderUnit.with(SheetsScrollRenderController).scrollToRange(params.range, params.forceTop, params.forceLeft);
|
|
8554
8669
|
}
|
|
@@ -8567,7 +8682,6 @@ const SheetPermissionOpenDialogOperation = {
|
|
|
8567
8682
|
title: { title: "sheets-ui.permission.dialog.allowedPermissionType" },
|
|
8568
8683
|
children: { label: UNIVER_SHEET_PERMISSION_DIALOG },
|
|
8569
8684
|
width: 393,
|
|
8570
|
-
destroyOnClose: true,
|
|
8571
8685
|
onClose: () => dialogService.close(UNIVER_SHEET_PERMISSION_DIALOG_ID)
|
|
8572
8686
|
});
|
|
8573
8687
|
return true;
|
|
@@ -8623,162 +8737,6 @@ const SidebarDefinedNameOperation = {
|
|
|
8623
8737
|
}
|
|
8624
8738
|
};
|
|
8625
8739
|
|
|
8626
|
-
//#endregion
|
|
8627
|
-
//#region src/common/utils.ts
|
|
8628
|
-
function getUserListEqual(userList1, userList2) {
|
|
8629
|
-
if (userList1.length !== userList2.length) return false;
|
|
8630
|
-
const sorted1 = userList1.sort((a, b) => a.id.localeCompare(b.id));
|
|
8631
|
-
const sorted2 = userList2.sort((a, b) => a.id.localeCompare(b.id));
|
|
8632
|
-
return sorted1.every((user, index) => {
|
|
8633
|
-
var _user$subject, _sorted2$index$subjec;
|
|
8634
|
-
return ((_user$subject = user.subject) === null || _user$subject === void 0 ? void 0 : _user$subject.userID) === ((_sorted2$index$subjec = sorted2[index].subject) === null || _sorted2$index$subjec === void 0 ? void 0 : _sorted2$index$subjec.userID) && user.role === sorted2[index].role;
|
|
8635
|
-
});
|
|
8636
|
-
}
|
|
8637
|
-
function checkCellContentInRanges(worksheet, ranges) {
|
|
8638
|
-
return ranges.some((range) => checkCellContentInRange(worksheet, range));
|
|
8639
|
-
}
|
|
8640
|
-
function checkCellContentInRange(worksheet, range) {
|
|
8641
|
-
const { startRow, startColumn, endColumn, endRow } = range;
|
|
8642
|
-
const cellMatrix = worksheet.getMatrixWithMergedCells(startRow, startColumn, endRow, endColumn);
|
|
8643
|
-
let someCellGoingToBeRemoved = false;
|
|
8644
|
-
cellMatrix.forValue((row, col, cellData) => {
|
|
8645
|
-
if (cellData && (row !== startRow || col !== startColumn) && worksheet.cellHasValue(cellData)) {
|
|
8646
|
-
someCellGoingToBeRemoved = true;
|
|
8647
|
-
return false;
|
|
8648
|
-
}
|
|
8649
|
-
});
|
|
8650
|
-
return someCellGoingToBeRemoved;
|
|
8651
|
-
}
|
|
8652
|
-
function getCellIndexByOffsetWithMerge(offsetX, offsetY, scene, skeleton) {
|
|
8653
|
-
const activeViewport = scene.getActiveViewportByCoord(Vector2.FromArray([offsetX, offsetY]));
|
|
8654
|
-
if (!activeViewport) return;
|
|
8655
|
-
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
8656
|
-
const scrollXY = {
|
|
8657
|
-
x: activeViewport.viewportScrollX,
|
|
8658
|
-
y: activeViewport.viewportScrollY
|
|
8659
|
-
};
|
|
8660
|
-
const cellIndex = skeleton.getCellIndexByOffset(offsetX, offsetY, scaleX, scaleY, scrollXY);
|
|
8661
|
-
const mergeCell = skeleton.worksheet.getMergedCell(cellIndex.row, cellIndex.column);
|
|
8662
|
-
return {
|
|
8663
|
-
actualRow: mergeCell ? mergeCell.startRow : cellIndex.row,
|
|
8664
|
-
actualCol: mergeCell ? mergeCell.startColumn : cellIndex.column,
|
|
8665
|
-
mergeCell,
|
|
8666
|
-
row: cellIndex.row,
|
|
8667
|
-
col: cellIndex.column
|
|
8668
|
-
};
|
|
8669
|
-
}
|
|
8670
|
-
function getViewportByCell(row, column, scene, worksheet) {
|
|
8671
|
-
const freeze = worksheet.getFreeze();
|
|
8672
|
-
if (!freeze || freeze.startRow <= 0 && freeze.startColumn <= 0) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
8673
|
-
if (row >= freeze.startRow && column >= freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
8674
|
-
if (row < freeze.startRow && column < freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT_TOP);
|
|
8675
|
-
if (row < freeze.startRow && column >= freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_TOP);
|
|
8676
|
-
if (row >= freeze.startRow && column < freeze.startColumn) return scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN_LEFT);
|
|
8677
|
-
}
|
|
8678
|
-
function transformBound2OffsetBound(originBound, scene, skeleton, worksheet) {
|
|
8679
|
-
const topLeft = transformPosition2Offset(originBound.left, originBound.top, scene, skeleton, worksheet);
|
|
8680
|
-
const bottomRight = transformPosition2Offset(originBound.right, originBound.bottom, scene, skeleton, worksheet);
|
|
8681
|
-
return {
|
|
8682
|
-
left: topLeft.x,
|
|
8683
|
-
top: topLeft.y,
|
|
8684
|
-
right: bottomRight.x,
|
|
8685
|
-
bottom: bottomRight.y
|
|
8686
|
-
};
|
|
8687
|
-
}
|
|
8688
|
-
function transformPosition2Offset(x, y, scene, skeleton, worksheet) {
|
|
8689
|
-
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
8690
|
-
const viewMain = scene.getViewport(SHEET_VIEWPORT_KEY.VIEW_MAIN);
|
|
8691
|
-
if (!viewMain) return {
|
|
8692
|
-
x,
|
|
8693
|
-
y
|
|
8694
|
-
};
|
|
8695
|
-
const { startColumn, startRow, xSplit, ySplit } = worksheet.getFreeze();
|
|
8696
|
-
const startSheetView = skeleton.getNoMergeCellWithCoordByIndex(startRow - ySplit, startColumn - xSplit, false);
|
|
8697
|
-
const endSheetView = skeleton.getNoMergeCellWithCoordByIndex(startRow, startColumn, false);
|
|
8698
|
-
const { rowHeaderWidth, columnHeaderHeight } = skeleton;
|
|
8699
|
-
const freezeWidth = endSheetView.startX - startSheetView.startX;
|
|
8700
|
-
const freezeHeight = endSheetView.startY - startSheetView.startY;
|
|
8701
|
-
const { top, left, viewportScrollX, viewportScrollY } = viewMain;
|
|
8702
|
-
let offsetX;
|
|
8703
|
-
if (x > left) offsetX = (x - viewportScrollX) * scaleX;
|
|
8704
|
-
else offsetX = (freezeWidth + rowHeaderWidth - (left - x)) * scaleX;
|
|
8705
|
-
let offsetY;
|
|
8706
|
-
if (y > top) offsetY = (y - viewportScrollY) * scaleY;
|
|
8707
|
-
else offsetY = (freezeHeight + columnHeaderHeight - (top - y)) * scaleX;
|
|
8708
|
-
return {
|
|
8709
|
-
x: offsetX,
|
|
8710
|
-
y: offsetY
|
|
8711
|
-
};
|
|
8712
|
-
}
|
|
8713
|
-
function getCellRealRange(workbook, worksheet, skeleton, row, col) {
|
|
8714
|
-
let actualRow = row;
|
|
8715
|
-
let actualCol = col;
|
|
8716
|
-
skeleton.overflowCache.forValue((r, c, range) => {
|
|
8717
|
-
if (range.startRow <= actualRow && range.endRow >= actualRow && range.startColumn <= actualCol && range.endColumn >= actualCol) {
|
|
8718
|
-
actualCol = c;
|
|
8719
|
-
actualRow = r;
|
|
8720
|
-
}
|
|
8721
|
-
});
|
|
8722
|
-
const actualCell = skeleton.getCellWithCoordByIndex(actualRow, actualCol);
|
|
8723
|
-
return {
|
|
8724
|
-
unitId: workbook.getUnitId(),
|
|
8725
|
-
subUnitId: worksheet.getSheetId(),
|
|
8726
|
-
workbook,
|
|
8727
|
-
worksheet,
|
|
8728
|
-
row: actualCell.actualRow,
|
|
8729
|
-
col: actualCell.actualColumn
|
|
8730
|
-
};
|
|
8731
|
-
}
|
|
8732
|
-
function getHoverCellPosition(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY) {
|
|
8733
|
-
const { scene } = currentRender;
|
|
8734
|
-
const unitId = workbook.getUnitId();
|
|
8735
|
-
const { skeleton, sheetId } = skeletonParam;
|
|
8736
|
-
const cellIndex = getCellIndexByOffsetWithMerge(offsetX, offsetY, scene, skeleton);
|
|
8737
|
-
if (!cellIndex) return null;
|
|
8738
|
-
let { actualCol, actualRow } = cellIndex;
|
|
8739
|
-
const originLocation = {
|
|
8740
|
-
unitId,
|
|
8741
|
-
subUnitId: sheetId,
|
|
8742
|
-
workbook,
|
|
8743
|
-
worksheet,
|
|
8744
|
-
row: actualRow,
|
|
8745
|
-
col: actualCol
|
|
8746
|
-
};
|
|
8747
|
-
skeleton.overflowCache.forValue((r, c, range) => {
|
|
8748
|
-
if (range.startRow <= actualRow && range.endRow >= actualRow && range.startColumn <= actualCol && range.endColumn >= actualCol) {
|
|
8749
|
-
actualCol = c;
|
|
8750
|
-
actualRow = r;
|
|
8751
|
-
}
|
|
8752
|
-
});
|
|
8753
|
-
const actualCell = skeleton.getCellWithCoordByIndex(actualRow, actualCol);
|
|
8754
|
-
const location = getCellRealRange(workbook, worksheet, skeleton, actualRow, actualCol);
|
|
8755
|
-
let anchorCell;
|
|
8756
|
-
if (actualCell.mergeInfo) anchorCell = actualCell.mergeInfo;
|
|
8757
|
-
else anchorCell = {
|
|
8758
|
-
startRow: location.row,
|
|
8759
|
-
endRow: location.row,
|
|
8760
|
-
startColumn: location.col,
|
|
8761
|
-
endColumn: location.col
|
|
8762
|
-
};
|
|
8763
|
-
const activeViewport = scene.getActiveViewportByCoord(Vector2.FromArray([offsetX, offsetY]));
|
|
8764
|
-
if (!activeViewport) return;
|
|
8765
|
-
const { scaleX, scaleY } = scene.getAncestorScale();
|
|
8766
|
-
const scrollXY = {
|
|
8767
|
-
x: activeViewport.viewportScrollX,
|
|
8768
|
-
y: activeViewport.viewportScrollY
|
|
8769
|
-
};
|
|
8770
|
-
return {
|
|
8771
|
-
position: {
|
|
8772
|
-
startX: (skeleton.getOffsetByColumn(anchorCell.startColumn - 1) - scrollXY.x) * scaleX,
|
|
8773
|
-
endX: (skeleton.getOffsetByColumn(anchorCell.endColumn) - scrollXY.x) * scaleX,
|
|
8774
|
-
startY: (skeleton.getOffsetByRow(anchorCell.startRow - 1) - scrollXY.y) * scaleY,
|
|
8775
|
-
endY: (skeleton.getOffsetByRow(anchorCell.endRow) - scrollXY.y) * scaleY
|
|
8776
|
-
},
|
|
8777
|
-
location: originLocation,
|
|
8778
|
-
overflowLocation: location
|
|
8779
|
-
};
|
|
8780
|
-
}
|
|
8781
|
-
|
|
8782
8740
|
//#endregion
|
|
8783
8741
|
//#region src/consts/plugin-name.ts
|
|
8784
8742
|
/**
|
|
@@ -9130,7 +9088,7 @@ let AutoHeightController = class AutoHeightController extends Disposable {
|
|
|
9130
9088
|
subUnitId = worksheet.getSheetId();
|
|
9131
9089
|
}
|
|
9132
9090
|
}
|
|
9133
|
-
const skeleton = this._renderManagerService.
|
|
9091
|
+
const skeleton = this._renderManagerService.getRenderUnitById(unitId).with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
9134
9092
|
if (!skeleton) return {
|
|
9135
9093
|
redos: [],
|
|
9136
9094
|
undos: []
|
|
@@ -9196,7 +9154,7 @@ let CellCustomRenderController = class CellCustomRenderController extends Dispos
|
|
|
9196
9154
|
if (!skeletonParam) return;
|
|
9197
9155
|
const unitId = this._context.unitId;
|
|
9198
9156
|
const { skeleton } = skeletonParam;
|
|
9199
|
-
const currentRender = this._renderManagerService.
|
|
9157
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
9200
9158
|
if (currentRender && currentRender.mainComponent) {
|
|
9201
9159
|
const spreadsheet = currentRender.mainComponent;
|
|
9202
9160
|
const getActiveRender = (evt) => {
|
|
@@ -9231,7 +9189,7 @@ let CellCustomRenderController = class CellCustomRenderController extends Dispos
|
|
|
9231
9189
|
const subUnitId = worksheet.getSheetId();
|
|
9232
9190
|
const info = {
|
|
9233
9191
|
data: cellData,
|
|
9234
|
-
style:
|
|
9192
|
+
style: worksheet.getComposedCellStyleByCellData(row, col, cellData),
|
|
9235
9193
|
primaryWithCoord: skeleton.getCellWithCoordByIndex(cellIndex.actualRow, cellIndex.actualCol),
|
|
9236
9194
|
unitId,
|
|
9237
9195
|
subUnitId,
|
|
@@ -9716,7 +9674,7 @@ let SheetSkeletonRenderController = class SheetSkeletonRenderController extends
|
|
|
9716
9674
|
if (param == null) return;
|
|
9717
9675
|
const { unitId } = this._context;
|
|
9718
9676
|
const { skeleton } = param;
|
|
9719
|
-
const scene = (_this$_renderManagerS = this._renderManagerService.
|
|
9677
|
+
const scene = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.scene;
|
|
9720
9678
|
if (skeleton == null || scene == null) return;
|
|
9721
9679
|
const { rowTotalHeight, columnTotalWidth, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
|
|
9722
9680
|
if (!this._context.unit.getActiveSheet()) return;
|
|
@@ -9774,7 +9732,9 @@ let SheetLoadingRenderService = class SheetLoadingRenderService extends Disposab
|
|
|
9774
9732
|
if (!loadingRender) return;
|
|
9775
9733
|
let shouldRender = false;
|
|
9776
9734
|
if (!loadingRender.render) {
|
|
9777
|
-
|
|
9735
|
+
const contentElement = this._layoutService.getContentElement();
|
|
9736
|
+
if (!contentElement) return;
|
|
9737
|
+
loadingRender.render = this._createLoadingRender(loadingRender.workbook, loadingRender.sourceUnitId, contentElement);
|
|
9778
9738
|
shouldRender = true;
|
|
9779
9739
|
}
|
|
9780
9740
|
const worksheet = loadingRender.workbook.getSheetBySheetId(activeSheetId);
|
|
@@ -9813,6 +9773,10 @@ let SheetLoadingRenderService = class SheetLoadingRenderService extends Disposab
|
|
|
9813
9773
|
async handoff(sourceUnitId, timeoutMs) {
|
|
9814
9774
|
var _this$_loadingRender2, _this$_finalCanvasGua;
|
|
9815
9775
|
if (((_this$_loadingRender2 = this._loadingRender) === null || _this$_loadingRender2 === void 0 ? void 0 : _this$_loadingRender2.sourceUnitId) !== sourceUnitId) return true;
|
|
9776
|
+
if (!this._loadingRender.render) {
|
|
9777
|
+
this.hide(sourceUnitId);
|
|
9778
|
+
return true;
|
|
9779
|
+
}
|
|
9816
9780
|
(_this$_finalCanvasGua = this._finalCanvasGuard) === null || _this$_finalCanvasGua === void 0 || _this$_finalCanvasGua.unsubscribe();
|
|
9817
9781
|
this._finalCanvasGuard = null;
|
|
9818
9782
|
try {
|
|
@@ -9848,9 +9812,8 @@ let SheetLoadingRenderService = class SheetLoadingRenderService extends Disposab
|
|
|
9848
9812
|
if (activeSheet) workbook.setActiveSheet(activeSheet);
|
|
9849
9813
|
return workbook;
|
|
9850
9814
|
}
|
|
9851
|
-
_createLoadingRender(workbook, sourceUnitId) {
|
|
9815
|
+
_createLoadingRender(workbook, sourceUnitId, contentElement) {
|
|
9852
9816
|
const previewUnitId = workbook.getUnitId();
|
|
9853
|
-
const contentElement = this._layoutService.getContentElement();
|
|
9854
9817
|
const { width, height } = contentElement.getBoundingClientRect();
|
|
9855
9818
|
const engine = this._injector.createInstance(Engine, previewUnitId, void 0);
|
|
9856
9819
|
const scene = new Scene(`${PREVIEW_SCENE_PREFIX}${previewUnitId}`, engine, {
|
|
@@ -9885,10 +9848,10 @@ let SheetLoadingRenderService = class SheetLoadingRenderService extends Disposab
|
|
|
9885
9848
|
_waitForFinalCanvas(render) {
|
|
9886
9849
|
return new Observable((subscriber) => {
|
|
9887
9850
|
let frameId;
|
|
9888
|
-
const contentElement = this._layoutService.getContentElement();
|
|
9889
9851
|
const canvasElement = render.engine.getCanvasElement();
|
|
9890
9852
|
const checkMounted = () => {
|
|
9891
|
-
|
|
9853
|
+
const contentElement = this._layoutService.getContentElement();
|
|
9854
|
+
if (contentElement && canvasElement.parentElement === contentElement && canvasElement.width > 0 && canvasElement.height > 0) {
|
|
9892
9855
|
subscriber.next();
|
|
9893
9856
|
subscriber.complete();
|
|
9894
9857
|
return;
|
|
@@ -9902,7 +9865,7 @@ let SheetLoadingRenderService = class SheetLoadingRenderService extends Disposab
|
|
|
9902
9865
|
});
|
|
9903
9866
|
}
|
|
9904
9867
|
_getFinalRender$(sourceUnitId) {
|
|
9905
|
-
const existingRender = this._renderManagerService.
|
|
9868
|
+
const existingRender = this._renderManagerService.getRenderUnitById(sourceUnitId);
|
|
9906
9869
|
return existingRender ? of(existingRender) : this._renderManagerService.created$.pipe(filter((render) => render.unitId === sourceUnitId));
|
|
9907
9870
|
}
|
|
9908
9871
|
_guardFinalCanvas(sourceUnitId) {
|
|
@@ -10042,14 +10005,14 @@ const useMenuPosition = (range) => {
|
|
|
10042
10005
|
endCol: range.cols[range.cols.length - 1]
|
|
10043
10006
|
};
|
|
10044
10007
|
if (anchor.endRow < 0 || anchor.endCol < 0) return null;
|
|
10045
|
-
const ru = renderManagerService.
|
|
10008
|
+
const ru = renderManagerService.getRenderUnitById(workbook.getUnitId());
|
|
10046
10009
|
const sheetSkeletonManagerService = ru === null || ru === void 0 ? void 0 : ru.with(SheetSkeletonManagerService);
|
|
10047
|
-
const selectionRenderService = ru === null || ru === void 0 ? void 0 : ru.with(ISheetSelectionRenderService);
|
|
10048
10010
|
const sheetObject = getSheetObject(univerInstanceService, renderManagerService);
|
|
10049
|
-
if (!sheetObject
|
|
10011
|
+
if (!sheetObject) return null;
|
|
10050
10012
|
const { scene } = sheetObject;
|
|
10051
10013
|
const skeleton = sheetSkeletonManagerService === null || sheetSkeletonManagerService === void 0 ? void 0 : sheetSkeletonManagerService.getCurrentSkeleton();
|
|
10052
|
-
const viewport =
|
|
10014
|
+
const viewport = getViewportByCell(anchor.endRow, anchor.endCol, scene, workbook.getActiveSheet());
|
|
10015
|
+
if (!viewport) return null;
|
|
10053
10016
|
const scaleX = scene === null || scene === void 0 ? void 0 : scene.scaleX;
|
|
10054
10017
|
const scaleY = scene === null || scene === void 0 ? void 0 : scene.scaleY;
|
|
10055
10018
|
const scrollXY = scene === null || scene === void 0 ? void 0 : scene.getViewportScrollXY(viewport);
|
|
@@ -10082,7 +10045,8 @@ const ClipboardPopupMenu = () => {
|
|
|
10082
10045
|
const commandService = useDependency(ICommandService);
|
|
10083
10046
|
const [menuHovered, setMenuHovered] = useState(false);
|
|
10084
10047
|
const [visible, setVisible] = useState(false);
|
|
10085
|
-
const
|
|
10048
|
+
const range = pasteOptionsCache === null || pasteOptionsCache === void 0 ? void 0 : pasteOptionsCache.target.pastedRange;
|
|
10049
|
+
const relativePosition = useMenuPosition(range);
|
|
10086
10050
|
if (!relativePosition || !showMenu) return null;
|
|
10087
10051
|
if (relativePosition.positionX < 50 || relativePosition.positionY < 30) return null;
|
|
10088
10052
|
const showMore = menuHovered || visible;
|
|
@@ -10272,7 +10236,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10272
10236
|
return (_this$_editorBridgeSe = (_this$_editorBridgeSe2 = this._editorBridgeService.getEditCellState()) === null || _this$_editorBridgeSe2 === void 0 ? void 0 : _this$_editorBridgeSe2.unitId) !== null && _this$_editorBridgeSe !== void 0 ? _this$_editorBridgeSe : "";
|
|
10273
10237
|
}
|
|
10274
10238
|
get _editingRenderer() {
|
|
10275
|
-
return this._renderManagerService.
|
|
10239
|
+
return this._renderManagerService.getRenderUnitById(this._editingUnitId);
|
|
10276
10240
|
}
|
|
10277
10241
|
get _renderer() {
|
|
10278
10242
|
var _this$_editingRendere;
|
|
@@ -10526,7 +10490,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends Di
|
|
|
10526
10490
|
}
|
|
10527
10491
|
_getEditorSkeleton() {
|
|
10528
10492
|
var _this$_renderManagerS;
|
|
10529
|
-
return (_this$_renderManagerS = this._renderManagerService.
|
|
10493
|
+
return (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSkeletonManagerService).getSkeleton();
|
|
10530
10494
|
}
|
|
10531
10495
|
};
|
|
10532
10496
|
SheetCellEditorResizeService = __decorate([
|
|
@@ -10624,7 +10588,7 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends Rx
|
|
|
10624
10588
|
var _this$_renderManagerS;
|
|
10625
10589
|
if (this._editorBridgeService.isVisible().visible) return;
|
|
10626
10590
|
const layout = this._editorBridgeService.getEditCellLayout();
|
|
10627
|
-
const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.
|
|
10591
|
+
const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSelectionRenderService);
|
|
10628
10592
|
if (!layout || !docSelectionRenderService) return;
|
|
10629
10593
|
const { position, canvasOffset } = layout;
|
|
10630
10594
|
docSelectionRenderService.setInputPosition(canvasOffset.left + position.startX, canvasOffset.top + position.startY);
|
|
@@ -10686,7 +10650,7 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends Rx
|
|
|
10686
10650
|
d.add(disposable);
|
|
10687
10651
|
}
|
|
10688
10652
|
};
|
|
10689
|
-
const render = this._renderManagerService.
|
|
10653
|
+
const render = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
|
|
10690
10654
|
if (render) addEvent(render);
|
|
10691
10655
|
else this.disposeWithMe(this._renderManagerService.created$.pipe(filter((render) => render.unitId === DOCS_NORMAL_EDITOR_UNIT_ID_KEY)).subscribe((render) => {
|
|
10692
10656
|
disposable === null || disposable === void 0 || disposable.dispose();
|
|
@@ -10700,7 +10664,7 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends Rx
|
|
|
10700
10664
|
}));
|
|
10701
10665
|
}
|
|
10702
10666
|
_focusCellEditorInput() {
|
|
10703
|
-
const render = this._renderManagerService.
|
|
10667
|
+
const render = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
|
|
10704
10668
|
const docSelectionRenderService = render === null || render === void 0 ? void 0 : render.with(DocSelectionRenderService);
|
|
10705
10669
|
if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
|
|
10706
10670
|
}
|
|
@@ -11498,7 +11462,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11498
11462
|
unitId: this._editingUnit
|
|
11499
11463
|
});
|
|
11500
11464
|
if (!unit) return;
|
|
11501
|
-
const editorBridgeRenderController = (_this$_renderManagerS = this._renderManagerService.
|
|
11465
|
+
const editorBridgeRenderController = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unit.getUnitId())) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(EditorBridgeRenderController);
|
|
11502
11466
|
if (editorBridgeRenderController) editorBridgeRenderController.refreshEditorPosition();
|
|
11503
11467
|
}
|
|
11504
11468
|
}));
|
|
@@ -11531,7 +11495,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11531
11495
|
const editorId = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) ? DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY : this._editorBridgeService.getCurrentEditorId();
|
|
11532
11496
|
const docUnitId = editorId !== null && editorId !== void 0 ? editorId : (_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_DOC)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId();
|
|
11533
11497
|
if (!docUnitId) return;
|
|
11534
|
-
const docSelectionRenderManager = (_this$_renderManagerS2 = this._renderManagerService.
|
|
11498
|
+
const docSelectionRenderManager = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(docUnitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSelectionRenderService);
|
|
11535
11499
|
if (!docSelectionRenderManager) return;
|
|
11536
11500
|
docSelectionRenderManager.sync();
|
|
11537
11501
|
}));
|
|
@@ -11595,7 +11559,6 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11595
11559
|
unitId: editorUnitId,
|
|
11596
11560
|
snapshot: documentModel.getSnapshot()
|
|
11597
11561
|
});
|
|
11598
|
-
this._contextService.setContextValue(FOCUSING_EDITOR_BUT_HIDDEN, true);
|
|
11599
11562
|
this._textSelectionManagerService.replaceDocRanges([{
|
|
11600
11563
|
startOffset: 0,
|
|
11601
11564
|
endOffset: 0
|
|
@@ -11603,8 +11566,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11603
11566
|
unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
|
|
11604
11567
|
subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY
|
|
11605
11568
|
});
|
|
11606
|
-
const cellSelectionRenderManager = (_this$_renderManagerS3 = this._renderManagerService.
|
|
11607
|
-
const formulaSelectionRenderManager = (_this$_renderManagerS4 = this._renderManagerService.
|
|
11569
|
+
const cellSelectionRenderManager = (_this$_renderManagerS3 = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS3 === void 0 ? void 0 : _this$_renderManagerS3.with(DocSelectionRenderService);
|
|
11570
|
+
const formulaSelectionRenderManager = (_this$_renderManagerS4 = this._renderManagerService.getRenderUnitById(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS4 === void 0 ? void 0 : _this$_renderManagerS4.with(DocSelectionRenderService);
|
|
11608
11571
|
if ((cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 ? void 0 : cellSelectionRenderManager.canFocusing) || (formulaSelectionRenderManager === null || formulaSelectionRenderManager === void 0 ? void 0 : formulaSelectionRenderManager.canFocusing)) {
|
|
11609
11572
|
this._univerInstanceService.setCurrentUnitForType(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
|
|
11610
11573
|
cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 || cellSelectionRenderManager.activate(HIDDEN_EDITOR_POSITION$1, HIDDEN_EDITOR_POSITION$1, true);
|
|
@@ -11719,7 +11682,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11719
11682
|
endOffset: cursor
|
|
11720
11683
|
}]);
|
|
11721
11684
|
}
|
|
11722
|
-
(_this$_renderManagerS5 = this._renderManagerService.
|
|
11685
|
+
(_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS5 === void 0 || _this$_renderManagerS5.scene.resetCursor();
|
|
11723
11686
|
}
|
|
11724
11687
|
_refreshCurrentSelections(sheetId) {
|
|
11725
11688
|
const selections = this._workbookSelections.getSelectionsOfWorksheet(sheetId);
|
|
@@ -11832,7 +11795,6 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11832
11795
|
var _editorObject$scene$g;
|
|
11833
11796
|
this._contextService.setContextValue(FOCUSING_EDITOR_INPUT_FORMULA, false);
|
|
11834
11797
|
this._contextService.setContextValue(EDITOR_ACTIVATED, false);
|
|
11835
|
-
this._contextService.setContextValue(FOCUSING_EDITOR_BUT_HIDDEN, false);
|
|
11836
11798
|
this._contextService.setContextValue(FOCUSING_FX_BAR_EDITOR, false);
|
|
11837
11799
|
this._cellEditorManagerService.setState({ show: param.visible });
|
|
11838
11800
|
const formulaBarEditor = this._editorService.getEditor(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
@@ -11911,11 +11873,11 @@ let EditingRenderController = class EditingRenderController extends Disposable {
|
|
|
11911
11873
|
}
|
|
11912
11874
|
_getEditorSkeleton(editorId) {
|
|
11913
11875
|
var _this$_renderManagerS6;
|
|
11914
|
-
return (_this$_renderManagerS6 = this._renderManagerService.
|
|
11876
|
+
return (_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS6 === void 0 ? void 0 : _this$_renderManagerS6.with(DocSkeletonManagerService).getSkeleton();
|
|
11915
11877
|
}
|
|
11916
11878
|
_getEditorViewModel(editorId) {
|
|
11917
11879
|
var _this$_renderManagerS7;
|
|
11918
|
-
return (_this$_renderManagerS7 = this._renderManagerService.
|
|
11880
|
+
return (_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS7 === void 0 ? void 0 : _this$_renderManagerS7.with(DocSkeletonManagerService).getViewModel();
|
|
11919
11881
|
}
|
|
11920
11882
|
_getEditingUnit() {
|
|
11921
11883
|
return this._editingUnit ? this._univerInstanceService.getUnit(this._editingUnit, UniverInstanceType.UNIVER_SHEET) : null;
|
|
@@ -12486,12 +12448,12 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
12486
12448
|
if (event.event.key === "Escape") this._sheetClipboardService.removeMarkSelection();
|
|
12487
12449
|
});
|
|
12488
12450
|
};
|
|
12489
|
-
let docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.
|
|
12451
|
+
let docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSelectionRenderService);
|
|
12490
12452
|
if (docSelectionRenderService) sheetPasteShortKeyFn(docSelectionRenderService);
|
|
12491
12453
|
this._renderManagerService.created$.subscribe((renderer) => {
|
|
12492
12454
|
if (renderer.unitId === DOCS_NORMAL_EDITOR_UNIT_ID_KEY) {
|
|
12493
12455
|
var _this$_renderManagerS2;
|
|
12494
|
-
docSelectionRenderService = (_this$_renderManagerS2 = this._renderManagerService.
|
|
12456
|
+
docSelectionRenderService = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSelectionRenderService);
|
|
12495
12457
|
if (docSelectionRenderService) sheetPasteShortKeyFn(docSelectionRenderService);
|
|
12496
12458
|
}
|
|
12497
12459
|
});
|
|
@@ -12716,11 +12678,9 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
12716
12678
|
};
|
|
12717
12679
|
}
|
|
12718
12680
|
_generateDocumentDataModelSnapshot(snapshot) {
|
|
12719
|
-
var _withCurrentTypeOfRen
|
|
12720
|
-
|
|
12721
|
-
|
|
12722
|
-
const { skeleton } = currentSkeleton;
|
|
12723
|
-
const documentModel = (_skeleton$getBlankCel = skeleton.getBlankCellDocumentModel()) === null || _skeleton$getBlankCel === void 0 ? void 0 : _skeleton$getBlankCel.documentModel;
|
|
12681
|
+
var _withCurrentTypeOfRen;
|
|
12682
|
+
if (((_withCurrentTypeOfRen = withCurrentTypeOfRenderer(UniverInstanceType.UNIVER_SHEET, SheetSkeletonManagerService, this._instanceService, this._renderManagerService)) === null || _withCurrentTypeOfRen === void 0 ? void 0 : _withCurrentTypeOfRen.getCurrentParam()) == null) return null;
|
|
12683
|
+
const documentModel = createDocumentModelWithStyle("", {});
|
|
12724
12684
|
const documentData = {
|
|
12725
12685
|
...documentModel === null || documentModel === void 0 ? void 0 : documentModel.getSnapshot(),
|
|
12726
12686
|
...snapshot
|
|
@@ -12900,7 +12860,7 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
12900
12860
|
const setValuesMutation = {
|
|
12901
12861
|
unitId,
|
|
12902
12862
|
subUnitId,
|
|
12903
|
-
cellValue: valueMatrix.
|
|
12863
|
+
cellValue: valueMatrix.clone()
|
|
12904
12864
|
};
|
|
12905
12865
|
redoMutationsInfo.push({
|
|
12906
12866
|
id: SetRangeValuesMutation.id,
|
|
@@ -12926,7 +12886,7 @@ let SheetClipboardController = class SheetClipboardController extends RxDisposab
|
|
|
12926
12886
|
}
|
|
12927
12887
|
_getWorksheet(unitId, subUnitId) {
|
|
12928
12888
|
var _this$_instanceServic;
|
|
12929
|
-
const worksheet = (_this$_instanceServic = this._instanceService.
|
|
12889
|
+
const worksheet = (_this$_instanceServic = this._instanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_instanceServic === void 0 ? void 0 : _this$_instanceServic.getSheetBySheetId(subUnitId);
|
|
12930
12890
|
if (!worksheet) throw new Error(`[SheetClipboardController]: cannot find a worksheet with unitId ${unitId} and subUnitId ${subUnitId}.`);
|
|
12931
12891
|
return worksheet;
|
|
12932
12892
|
}
|
|
@@ -13005,7 +12965,7 @@ let DragManagerService = class DragManagerService extends Disposable {
|
|
|
13005
12965
|
if (!workbook) return null;
|
|
13006
12966
|
const worksheet = workbook.getActiveSheet();
|
|
13007
12967
|
if (!worksheet) return;
|
|
13008
|
-
const currentRender = this._renderManagerService.
|
|
12968
|
+
const currentRender = this._renderManagerService.getRenderUnitById(workbook.getUnitId());
|
|
13009
12969
|
if (!currentRender) return;
|
|
13010
12970
|
const skeletonParam = currentRender.with(SheetSkeletonManagerService).getCurrentParam();
|
|
13011
12971
|
const scrollInfo = currentRender.with(SheetScrollManagerService).getCurrentScrollState();
|
|
@@ -13178,7 +13138,7 @@ let FormulaEditorController = class FormulaEditorController extends RxDisposable
|
|
|
13178
13138
|
}
|
|
13179
13139
|
_create(unitId) {
|
|
13180
13140
|
if (unitId !== DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) return;
|
|
13181
|
-
const formulaEditorDocObject = this._renderManagerService.
|
|
13141
|
+
const formulaEditorDocObject = this._renderManagerService.getRenderUnitById(unitId);
|
|
13182
13142
|
if (formulaEditorDocObject == null) return;
|
|
13183
13143
|
const { mainComponent: documentComponent } = formulaEditorDocObject;
|
|
13184
13144
|
if (documentComponent == null) return;
|
|
@@ -13186,7 +13146,7 @@ let FormulaEditorController = class FormulaEditorController extends RxDisposable
|
|
|
13186
13146
|
}
|
|
13187
13147
|
_listenFxBtnClick() {
|
|
13188
13148
|
this._formulaEditorManagerService.fxBtnClick$.pipe(takeUntil(this.dispose$)).subscribe(() => {
|
|
13189
|
-
if (this._contextService.getContextValue(
|
|
13149
|
+
if (this._contextService.getContextValue(FOCUSING_UNIVER_EDITOR) && !this._contextService.getContextValue(EDITOR_ACTIVATED)) {
|
|
13190
13150
|
var _formulaEditorDataMod;
|
|
13191
13151
|
this._univerInstanceService.setCurrentUnitForType(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
13192
13152
|
const formulaEditorDataModel = this._univerInstanceService.getUnit(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, UniverInstanceType.UNIVER_DOC);
|
|
@@ -13246,8 +13206,8 @@ let FormulaEditorController = class FormulaEditorController extends RxDisposable
|
|
|
13246
13206
|
autoScroll() {
|
|
13247
13207
|
var _this$_renderManagerS;
|
|
13248
13208
|
const position = this._formulaEditorManagerService.getPosition();
|
|
13249
|
-
const skeleton = (_this$_renderManagerS = this._renderManagerService.
|
|
13250
|
-
const editorObject = this._renderManagerService.
|
|
13209
|
+
const skeleton = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSkeletonManagerService).getSkeleton();
|
|
13210
|
+
const editorObject = this._renderManagerService.getRenderUnitById(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
13251
13211
|
const formulaEditorDataModel = this._univerInstanceService.getUnit(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, UniverInstanceType.UNIVER_DOC);
|
|
13252
13212
|
if (skeleton == null || position == null || editorObject == null || formulaEditorDataModel == null) return;
|
|
13253
13213
|
const { marginTop = 0, marginBottom = 0 } = formulaEditorDataModel.getSnapshot().documentStyle;
|
|
@@ -13468,7 +13428,7 @@ const getCustomRangePosition = (injector, unitId, subUnitId, row, col, rangeId)
|
|
|
13468
13428
|
if (!workbook) return null;
|
|
13469
13429
|
const worksheet = workbook.getSheetBySheetId(subUnitId);
|
|
13470
13430
|
if (!worksheet) return null;
|
|
13471
|
-
const currentRender = renderManagerService.
|
|
13431
|
+
const currentRender = renderManagerService.getRenderUnitById(workbook.getUnitId());
|
|
13472
13432
|
const skeletonParam = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(SheetSkeletonManagerService).getSkeletonParam(worksheet.getSheetId());
|
|
13473
13433
|
const skeleton = skeletonParam === null || skeletonParam === void 0 ? void 0 : skeletonParam.skeleton;
|
|
13474
13434
|
if (!skeleton || !currentRender) return;
|
|
@@ -13514,8 +13474,8 @@ const getEditingCustomRangePosition = (injector, unitId, subUnitId, row, col, ra
|
|
|
13514
13474
|
const { editorUnitId, unitId: editingUnitId, sheetId, row: editRow, column: editCol } = state;
|
|
13515
13475
|
if (unitId !== editingUnitId || subUnitId !== sheetId || editRow !== row || editCol !== col) return null;
|
|
13516
13476
|
const renderManagerService = injector.get(IRenderManagerService);
|
|
13517
|
-
const renderer = renderManagerService.
|
|
13518
|
-
const sheetRenderer = renderManagerService.
|
|
13477
|
+
const renderer = renderManagerService.getRenderUnitById(editorUnitId);
|
|
13478
|
+
const sheetRenderer = renderManagerService.getRenderUnitById(unitId);
|
|
13519
13479
|
if (!renderer || !sheetRenderer) return null;
|
|
13520
13480
|
const docSkeleton = renderer.with(DocSkeletonManagerService).getSkeleton();
|
|
13521
13481
|
const sheetSkeleton = (_sheetRenderer$with$g = sheetRenderer.with(SheetSkeletonManagerService).getSkeletonParam(sheetId)) === null || _sheetRenderer$with$g === void 0 ? void 0 : _sheetRenderer$with$g.skeleton;
|
|
@@ -13667,7 +13627,7 @@ let HoverManagerService = class HoverManagerService extends Disposable {
|
|
|
13667
13627
|
if (!workbook) return null;
|
|
13668
13628
|
const worksheet = workbook.getActiveSheet();
|
|
13669
13629
|
if (!worksheet) return null;
|
|
13670
|
-
const currentRender = this._renderManagerService.
|
|
13630
|
+
const currentRender = this._renderManagerService.getRenderUnitById(workbook.getUnitId());
|
|
13671
13631
|
if (!currentRender) return null;
|
|
13672
13632
|
const skeletonParam = currentRender.with(SheetSkeletonManagerService).getSkeletonParam(worksheet.getSheetId());
|
|
13673
13633
|
if (!skeletonParam) return null;
|
|
@@ -14024,7 +13984,6 @@ let SheetPermissionCheckUIController = class SheetPermissionCheckUIController ex
|
|
|
14024
13984
|
errorMsg
|
|
14025
13985
|
},
|
|
14026
13986
|
width: 320,
|
|
14027
|
-
destroyOnClose: true,
|
|
14028
13987
|
showOk: true,
|
|
14029
13988
|
onClose: () => {
|
|
14030
13989
|
this._dialogService.close(UNIVER_SHEET_PERMISSION_ALERT_DIALOG_ID);
|
|
@@ -15022,9 +14981,7 @@ let HeaderFreezeRenderController = class HeaderFreezeRenderController extends Di
|
|
|
15022
14981
|
}
|
|
15023
14982
|
_getFreeze() {
|
|
15024
14983
|
var _this$_sheetSkeletonM6;
|
|
15025
|
-
|
|
15026
|
-
if (config == null) return;
|
|
15027
|
-
return config.freeze;
|
|
14984
|
+
return (_this$_sheetSkeletonM6 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM6 === void 0 ? void 0 : _this$_sheetSkeletonM6.skeleton.worksheet.getFreeze();
|
|
15028
14985
|
}
|
|
15029
14986
|
_getSheetObject() {
|
|
15030
14987
|
return getSheetObject(this._context.unit, this._context);
|
|
@@ -19685,7 +19642,7 @@ const menuSchema = {
|
|
|
19685
19642
|
order: 0,
|
|
19686
19643
|
gridLayout: {
|
|
19687
19644
|
row: 1,
|
|
19688
|
-
column:
|
|
19645
|
+
column: 1
|
|
19689
19646
|
},
|
|
19690
19647
|
menuItemFactory: HorizontalAlignMenuItemFactory
|
|
19691
19648
|
},
|
|
@@ -19750,7 +19707,9 @@ const menuSchema = {
|
|
|
19750
19707
|
order: 0,
|
|
19751
19708
|
gridLayout: {
|
|
19752
19709
|
row: 1,
|
|
19753
|
-
column:
|
|
19710
|
+
column: 1,
|
|
19711
|
+
rowSpan: 2,
|
|
19712
|
+
showLabel: true
|
|
19754
19713
|
},
|
|
19755
19714
|
menuItemFactory: sheetPermissionToolbarMenuFactory
|
|
19756
19715
|
} }
|
|
@@ -20322,18 +20281,12 @@ function AutoFillPopupMenu() {
|
|
|
20322
20281
|
const selected = useObservable(autoFillService.applyType$, AUTO_FILL_APPLY_TYPE.SERIES);
|
|
20323
20282
|
const [isHovered, setHovered] = useState(false);
|
|
20324
20283
|
const workbook = useActiveWorkbook();
|
|
20325
|
-
const
|
|
20284
|
+
const sheetSkeletonManagerService = useMemo(() => {
|
|
20326
20285
|
if (workbook) {
|
|
20327
|
-
const ru = renderManagerService.
|
|
20328
|
-
return
|
|
20329
|
-
sheetSkeletonManagerService: ru === null || ru === void 0 ? void 0 : ru.with(SheetSkeletonManagerService),
|
|
20330
|
-
selectionRenderService: ru === null || ru === void 0 ? void 0 : ru.with(ISheetSelectionRenderService)
|
|
20331
|
-
};
|
|
20286
|
+
const ru = renderManagerService.getRenderUnitById(workbook.getUnitId());
|
|
20287
|
+
return ru === null || ru === void 0 ? void 0 : ru.with(SheetSkeletonManagerService);
|
|
20332
20288
|
}
|
|
20333
|
-
return
|
|
20334
|
-
sheetSkeletonManagerService: null,
|
|
20335
|
-
selectionRenderService: null
|
|
20336
|
-
};
|
|
20289
|
+
return null;
|
|
20337
20290
|
}, [workbook, renderManagerService]);
|
|
20338
20291
|
const handleMouseEnter = () => {
|
|
20339
20292
|
setHovered(true);
|
|
@@ -20364,10 +20317,11 @@ function AutoFillPopupMenu() {
|
|
|
20364
20317
|
}, [visible]);
|
|
20365
20318
|
if (anchor.col < 0 || anchor.row < 0) return null;
|
|
20366
20319
|
const sheetObject = getSheetObject(univerInstanceService, renderManagerService);
|
|
20367
|
-
if (!sheetObject || !
|
|
20320
|
+
if (!sheetObject || !workbook) return null;
|
|
20368
20321
|
const { scene } = sheetObject;
|
|
20369
20322
|
const skeleton = sheetSkeletonManagerService === null || sheetSkeletonManagerService === void 0 ? void 0 : sheetSkeletonManagerService.getCurrentSkeleton();
|
|
20370
|
-
const viewport =
|
|
20323
|
+
const viewport = getViewportByCell(anchor.row, anchor.col, scene, workbook.getActiveSheet());
|
|
20324
|
+
if (!viewport) return null;
|
|
20371
20325
|
const scaleX = scene === null || scene === void 0 ? void 0 : scene.scaleX;
|
|
20372
20326
|
const scaleY = scene === null || scene === void 0 ? void 0 : scene.scaleY;
|
|
20373
20327
|
const scrollXY = scene === null || scene === void 0 ? void 0 : scene.getViewportScrollXY(viewport);
|
|
@@ -21156,7 +21110,8 @@ function DefinedName({ disable }) {
|
|
|
21156
21110
|
const definedNames = useObservable(() => definedNamesService.update$.pipe(map(getDefinedNameMap), startWith(getDefinedNameMap())), getDefinedNameMap(), false, [definedNamesService, unitId]);
|
|
21157
21111
|
useEffect(() => {
|
|
21158
21112
|
const subscription = definedNamesService.currentRange$.subscribe(() => {
|
|
21159
|
-
const
|
|
21113
|
+
const selections = selectionManagerService.getCurrentSelections();
|
|
21114
|
+
const absoluteRef = getAbsoluteRefStringFromSelection(workbook, selections, lexerTreeBuilder);
|
|
21160
21115
|
const definedName = definedNamesService.getDefinedNameByRefString(unitId, absoluteRef);
|
|
21161
21116
|
if (definedName) {
|
|
21162
21117
|
setRangeString(definedName.name);
|
|
@@ -21590,7 +21545,7 @@ function SheetBarMenu() {
|
|
|
21590
21545
|
if (!workbook) return;
|
|
21591
21546
|
const sheets = workbook.getSheets();
|
|
21592
21547
|
const activeSheet = workbook.getActiveSheet();
|
|
21593
|
-
|
|
21548
|
+
const worksheetMenuItems = sheets.map((sheet, index) => {
|
|
21594
21549
|
return {
|
|
21595
21550
|
label: sheet.getName(),
|
|
21596
21551
|
index: `${index}`,
|
|
@@ -21598,7 +21553,8 @@ function SheetBarMenu() {
|
|
|
21598
21553
|
hidden: sheet.isSheetHidden() === BooleanNumber.TRUE,
|
|
21599
21554
|
selected: activeSheet === sheet
|
|
21600
21555
|
};
|
|
21601
|
-
})
|
|
21556
|
+
});
|
|
21557
|
+
setMenu(worksheetMenuItems);
|
|
21602
21558
|
}, [workbook, worksheetProtectionRuleModel]);
|
|
21603
21559
|
const setupStatusUpdate = useCallback(() => commandService.onCommandExecuted((commandInfo) => {
|
|
21604
21560
|
switch (commandInfo.id) {
|
|
@@ -22753,7 +22709,7 @@ function SheetBarTabs() {
|
|
|
22753
22709
|
var _activeSheet$getSheet;
|
|
22754
22710
|
const activeSheet = workbook.getActiveSheet();
|
|
22755
22711
|
const currentSubUnitId = (_activeSheet$getSheet = activeSheet === null || activeSheet === void 0 ? void 0 : activeSheet.getSheetId()) !== null && _activeSheet$getSheet !== void 0 ? _activeSheet$getSheet : "";
|
|
22756
|
-
|
|
22712
|
+
const sheetListItems = workbook.getSheets().filter((sheet) => !sheet.isSheetHidden()).map((sheet, index) => {
|
|
22757
22713
|
var _sheet$getTabColor;
|
|
22758
22714
|
const worksheetRule = worksheetProtectionRuleModel.getRule(workbook.getUnitId(), sheet.getSheetId());
|
|
22759
22715
|
const hasSelectionRule = rangeProtectionRuleModel.getSubunitRuleList(workbook.getUnitId(), sheet.getSheetId()).length > 0;
|
|
@@ -22771,7 +22727,8 @@ function SheetBarTabs() {
|
|
|
22771
22727
|
selected: activeSheet === sheet,
|
|
22772
22728
|
color: (_sheet$getTabColor = sheet.getTabColor()) !== null && _sheet$getTabColor !== void 0 ? _sheet$getTabColor : void 0
|
|
22773
22729
|
};
|
|
22774
|
-
})
|
|
22730
|
+
});
|
|
22731
|
+
setSheetList(sheetListItems);
|
|
22775
22732
|
setActiveSheetId(currentSubUnitId);
|
|
22776
22733
|
}, [
|
|
22777
22734
|
rangeProtectionRuleModel,
|
|
@@ -22803,7 +22760,7 @@ function SheetBarTabs() {
|
|
|
22803
22760
|
workbookRef.current = workbook;
|
|
22804
22761
|
}, [workbook]);
|
|
22805
22762
|
const syncActiveSheetRender = useCallback((subUnitId) => {
|
|
22806
|
-
const render = renderManagerService.
|
|
22763
|
+
const render = renderManagerService.getRenderUnitById(workbookRef.current.getUnitId());
|
|
22807
22764
|
try {
|
|
22808
22765
|
render === null || render === void 0 || render.with(SheetSkeletonManagerService).setCurrent({ sheetId: subUnitId });
|
|
22809
22766
|
render === null || render === void 0 || render.scene.makeDirty(true);
|
|
@@ -23174,7 +23131,10 @@ function ZoomSlider() {
|
|
|
23174
23131
|
useEffect(() => {
|
|
23175
23132
|
setZoom(getCurrentZoom());
|
|
23176
23133
|
return commandService.onCommandExecuted((commandInfo) => {
|
|
23177
|
-
if (commandInfo.id === SetZoomRatioOperation.id || commandInfo.id === SetWorksheetActiveOperation.id)
|
|
23134
|
+
if (commandInfo.id === SetZoomRatioOperation.id || commandInfo.id === SetWorksheetActiveOperation.id) {
|
|
23135
|
+
const currentZoom = getCurrentZoom();
|
|
23136
|
+
setZoom(currentZoom);
|
|
23137
|
+
}
|
|
23178
23138
|
}).dispose;
|
|
23179
23139
|
}, [commandService, getCurrentZoom]);
|
|
23180
23140
|
function handleChange(value) {
|
|
@@ -23274,8 +23234,6 @@ function formatNumber(item) {
|
|
|
23274
23234
|
const SINGLE_MODE_WIDTH = 800;
|
|
23275
23235
|
const ROW_COUNT_THRESHOLD = 3;
|
|
23276
23236
|
const StatusBar = () => {
|
|
23277
|
-
var _useConfigValue$statu, _useConfigValue;
|
|
23278
|
-
const showStatistic = (_useConfigValue$statu = (_useConfigValue = useConfigValue("sheets-ui.config")) === null || _useConfigValue === void 0 ? void 0 : _useConfigValue.statusBarStatistic) !== null && _useConfigValue$statu !== void 0 ? _useConfigValue$statu : true;
|
|
23279
23237
|
const [isSingle, setIsSingle] = useState(window.innerWidth < SINGLE_MODE_WIDTH);
|
|
23280
23238
|
const statusBarService = useDependency(IStatusBarService);
|
|
23281
23239
|
const items = statusBarService.getFunctions().map((item, index) => ({
|
|
@@ -23285,7 +23243,7 @@ const StatusBar = () => {
|
|
|
23285
23243
|
disable: false,
|
|
23286
23244
|
pattern: null
|
|
23287
23245
|
}));
|
|
23288
|
-
const useStatistics = (initialItems, statusBarService, isSingle
|
|
23246
|
+
const useStatistics = (initialItems, statusBarService, isSingle) => {
|
|
23289
23247
|
const [statistics, setStatistics] = useState(initialItems);
|
|
23290
23248
|
const [show, setShow] = useState(true);
|
|
23291
23249
|
const filteredStatistics = useMemo(() => statistics.filter((item) => item.show && !item.disable), [statistics]);
|
|
@@ -23313,21 +23271,16 @@ const StatusBar = () => {
|
|
|
23313
23271
|
}));
|
|
23314
23272
|
}, []);
|
|
23315
23273
|
useEffect(() => {
|
|
23316
|
-
if (!showStatistic) return;
|
|
23317
23274
|
const subscription = statusBarService.state$.subscribe(updateStatistics);
|
|
23318
23275
|
return () => subscription.unsubscribe();
|
|
23319
|
-
}, [
|
|
23320
|
-
showStatistic,
|
|
23321
|
-
statusBarService,
|
|
23322
|
-
updateStatistics
|
|
23323
|
-
]);
|
|
23276
|
+
}, [statusBarService, updateStatistics]);
|
|
23324
23277
|
return {
|
|
23325
23278
|
statistics,
|
|
23326
23279
|
showList,
|
|
23327
23280
|
show
|
|
23328
23281
|
};
|
|
23329
23282
|
};
|
|
23330
|
-
const { showList, show } = useStatistics(items, statusBarService, isSingle
|
|
23283
|
+
const { showList, show } = useStatistics(items, statusBarService, isSingle);
|
|
23331
23284
|
const handleResize = debounce(() => {
|
|
23332
23285
|
const newSingleState = window.innerWidth < SINGLE_MODE_WIDTH;
|
|
23333
23286
|
if (isSingle !== newSingleState) setIsSingle(newSingleState);
|
|
@@ -23339,7 +23292,6 @@ const StatusBar = () => {
|
|
|
23339
23292
|
};
|
|
23340
23293
|
}, [isSingle]);
|
|
23341
23294
|
const getStatisticLayout = (showList, rowCountThreshold, CopyableStatisticItem) => {
|
|
23342
|
-
if (!showStatistic) return null;
|
|
23343
23295
|
if (showList.length > rowCountThreshold) return showList.reduce((acc, _, index) => {
|
|
23344
23296
|
if (index % 2 === 0) acc.push(showList.slice(index, index + 2));
|
|
23345
23297
|
return acc;
|
|
@@ -23440,7 +23392,7 @@ function RenderSheetHeader() {
|
|
|
23440
23392
|
return null;
|
|
23441
23393
|
}
|
|
23442
23394
|
/**
|
|
23443
|
-
*
|
|
23395
|
+
* We should not write into this component anymore.
|
|
23444
23396
|
*/
|
|
23445
23397
|
function RenderSheetContent() {
|
|
23446
23398
|
var _componentManager$get;
|
|
@@ -24152,7 +24104,7 @@ let SheetUIController = class SheetUIController extends Disposable {
|
|
|
24152
24104
|
}
|
|
24153
24105
|
_initFocusHandler() {
|
|
24154
24106
|
this.disposeWithMe(this._layoutService.registerFocusHandler(UniverInstanceType.UNIVER_SHEET, (_unitId) => {
|
|
24155
|
-
const cellEditorRender = this._injector.get(IRenderManagerService).
|
|
24107
|
+
const cellEditorRender = this._injector.get(IRenderManagerService).getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
|
|
24156
24108
|
const docSelectionRenderService = cellEditorRender === null || cellEditorRender === void 0 ? void 0 : cellEditorRender.with(DocSelectionRenderService);
|
|
24157
24109
|
docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
|
|
24158
24110
|
}));
|
|
@@ -24194,7 +24146,7 @@ const useHighlightRange = (ranges = []) => {
|
|
|
24194
24146
|
//#endregion
|
|
24195
24147
|
//#region package.json
|
|
24196
24148
|
var name = "@univerjs/sheets-ui";
|
|
24197
|
-
var version = "1.0.0-alpha.
|
|
24149
|
+
var version = "1.0.0-alpha.8";
|
|
24198
24150
|
|
|
24199
24151
|
//#endregion
|
|
24200
24152
|
//#region src/views/cell-popup/config.ts
|
|
@@ -24387,8 +24339,8 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends Di
|
|
|
24387
24339
|
};
|
|
24388
24340
|
const unitId = workbook.getUnitId();
|
|
24389
24341
|
const subUnitId = worksheet.getSheetId();
|
|
24390
|
-
const skeleton = (_this$_renderManagerS = this._renderManagerService.
|
|
24391
|
-
const currentRender = this._renderManagerService.
|
|
24342
|
+
const skeleton = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
24343
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
24392
24344
|
if (!currentRender || !skeleton) return {
|
|
24393
24345
|
dispose: () => {},
|
|
24394
24346
|
canDispose: () => true
|
|
@@ -24441,8 +24393,8 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends Di
|
|
|
24441
24393
|
const subUnitId = worksheet.getSheetId();
|
|
24442
24394
|
if (unitId !== location.unitId || location.subUnitId !== subUnitId) return null;
|
|
24443
24395
|
if (this._isSelectionMoving && !popup.showOnSelectionMoving) return;
|
|
24444
|
-
const skeleton = (_this$_renderManagerS2 = this._renderManagerService.
|
|
24445
|
-
const currentRender = this._renderManagerService.
|
|
24396
|
+
const skeleton = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
24397
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
24446
24398
|
if (!currentRender || !skeleton) return null;
|
|
24447
24399
|
const { position, position$, disposable } = this._createPositionObserver(bound, currentRender, skeleton, worksheet);
|
|
24448
24400
|
const { rects$, disposable: rectsObserverDisposable } = this._createHiddenRectObserver({
|
|
@@ -24495,8 +24447,8 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends Di
|
|
|
24495
24447
|
const unitId = workbook.getUnitId();
|
|
24496
24448
|
const subUnitId = worksheet.getSheetId();
|
|
24497
24449
|
if (_unitId && unitId !== _unitId || _subUnitId && _subUnitId !== subUnitId) return null;
|
|
24498
|
-
const skeleton = (_this$_renderManagerS3 = this._renderManagerService.
|
|
24499
|
-
const currentRender = this._renderManagerService.
|
|
24450
|
+
const skeleton = (_this$_renderManagerS3 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS3 === void 0 ? void 0 : _this$_renderManagerS3.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
24451
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
24500
24452
|
if (!currentRender || !skeleton) return null;
|
|
24501
24453
|
if (this._isSelectionMoving && !popup.showOnSelectionMoving) return;
|
|
24502
24454
|
const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
|
|
@@ -24538,7 +24490,7 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends Di
|
|
|
24538
24490
|
if (!worksheet) return null;
|
|
24539
24491
|
const unitId = workbook.getUnitId();
|
|
24540
24492
|
const subUnitId = worksheet.getSheetId();
|
|
24541
|
-
const currentRender = this._renderManagerService.
|
|
24493
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
24542
24494
|
const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
24543
24495
|
const sheetSelectionRenderService = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(ISheetSelectionRenderService);
|
|
24544
24496
|
if (!currentRender || !skeleton || !sheetSelectionRenderService) return null;
|
|
@@ -24607,7 +24559,7 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends Di
|
|
|
24607
24559
|
const unitId = workbook.getUnitId();
|
|
24608
24560
|
const subUnitId = worksheet.getSheetId();
|
|
24609
24561
|
if (_unitId && unitId !== _unitId || _subUnitId && subUnitId !== _subUnitId) return null;
|
|
24610
|
-
const currentRender = this._renderManagerService.
|
|
24562
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
24611
24563
|
const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(SheetSkeletonManagerService).ensureSkeleton(subUnitId);
|
|
24612
24564
|
const sheetSelectionRenderService = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(ISheetSelectionRenderService);
|
|
24613
24565
|
if (!currentRender || !skeleton || !sheetSelectionRenderService) return null;
|
|
@@ -25730,7 +25682,7 @@ let CellAlertManagerService = class CellAlertManagerService extends Disposable {
|
|
|
25730
25682
|
}
|
|
25731
25683
|
const { location } = alert;
|
|
25732
25684
|
const { row, col, unitId, subUnitId } = location;
|
|
25733
|
-
if (!this._renderManagerService.
|
|
25685
|
+
if (!this._renderManagerService.getRenderUnitById(unitId)) return;
|
|
25734
25686
|
const disposable = this._cellPopupManagerService.showPopup({
|
|
25735
25687
|
unitId,
|
|
25736
25688
|
subUnitId,
|
|
@@ -25927,7 +25879,7 @@ function DefinedNameInputContent(props) {
|
|
|
25927
25879
|
const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
|
|
25928
25880
|
useSidebarClick((e) => {
|
|
25929
25881
|
var _formulaEditorRef$cur;
|
|
25930
|
-
|
|
25882
|
+
(_formulaEditorRef$cur = formulaEditorRef.current) !== null && _formulaEditorRef$cur !== void 0 && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
|
|
25931
25883
|
});
|
|
25932
25884
|
return /* @__PURE__ */ jsxs("div", {
|
|
25933
25885
|
className: clsx("univer-grid univer-space-y-2 univer-pb-1", borderBottomClassName, { "univer-hidden": !state }),
|
|
@@ -26483,7 +26435,8 @@ function ListDropDown(props) {
|
|
|
26483
26435
|
multiple,
|
|
26484
26436
|
onChange: async (newValue) => {
|
|
26485
26437
|
var _newValue$;
|
|
26486
|
-
|
|
26438
|
+
const str = multiple ? serializeListOptions(newValue) : (_newValue$ = newValue[0]) !== null && _newValue$ !== void 0 ? _newValue$ : "";
|
|
26439
|
+
setLocalValue(str);
|
|
26487
26440
|
if (!(await (onChange === null || onChange === void 0 ? void 0 : onChange(newValue)) === false)) hideFn();
|
|
26488
26441
|
},
|
|
26489
26442
|
options,
|
|
@@ -26570,13 +26523,14 @@ const SheetPermissionDialog = () => {
|
|
|
26570
26523
|
actions: defaultWorksheetUnitActionList
|
|
26571
26524
|
}).then((result) => {
|
|
26572
26525
|
if (cancelled) return;
|
|
26573
|
-
|
|
26526
|
+
const actions = result[0].strategies.reduce((p, c) => {
|
|
26574
26527
|
if (subUnitPermissionTypeMap[c.action]) p[c.action] = {
|
|
26575
26528
|
text: localeService.t(`sheets-ui.permission.panel.${subUnitPermissionTypeMap[c.action]}`),
|
|
26576
26529
|
allowed: c.role !== UnitRole.Owner
|
|
26577
26530
|
};
|
|
26578
26531
|
return p;
|
|
26579
|
-
}, {})
|
|
26532
|
+
}, {});
|
|
26533
|
+
setPermissionMap(actions);
|
|
26580
26534
|
loadingTimer = setTimeout(() => {
|
|
26581
26535
|
setLoading(false);
|
|
26582
26536
|
}, 100);
|
|
@@ -26971,7 +26925,8 @@ const PermissionDetailMainPart = (props) => {
|
|
|
26971
26925
|
setEndForRange(range, worksheet.getRowCount(), worksheet.getColumnCount());
|
|
26972
26926
|
return range;
|
|
26973
26927
|
});
|
|
26974
|
-
|
|
26928
|
+
const rangeErrorString = checkRangeValid(injector, transformedRange, permissionId, unitId, subUnitId);
|
|
26929
|
+
onRangesChange(transformedRange, rangeErrorString);
|
|
26975
26930
|
};
|
|
26976
26931
|
return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(FormLayout, {
|
|
26977
26932
|
className: "univer-font-medium",
|
|
@@ -27044,7 +26999,6 @@ const PermissionDetailUserPart = (props) => {
|
|
|
27044
26999
|
title: { title: "" },
|
|
27045
27000
|
children: { label: UNIVER_SHEET_PERMISSION_USER_DIALOG },
|
|
27046
27001
|
width: "auto",
|
|
27047
|
-
destroyOnClose: true,
|
|
27048
27002
|
closable: false,
|
|
27049
27003
|
onClose: () => dialogService.close(UNIVER_SHEET_PERMISSION_USER_DIALOG_ID),
|
|
27050
27004
|
className: "sheet-permission-user-dialog"
|
|
@@ -27593,10 +27547,13 @@ const SheetPermissionUserDialog = () => {
|
|
|
27593
27547
|
})) === -1) {
|
|
27594
27548
|
const select = { ...item };
|
|
27595
27549
|
setSelectUserInfo([...selectUserInfo, select]);
|
|
27596
|
-
} else
|
|
27597
|
-
|
|
27598
|
-
|
|
27599
|
-
|
|
27550
|
+
} else {
|
|
27551
|
+
const newSelectUserInfo = selectUserInfo.filter((v) => {
|
|
27552
|
+
var _v$subject2, _item$subject3;
|
|
27553
|
+
return ((_v$subject2 = v.subject) === null || _v$subject2 === void 0 ? void 0 : _v$subject2.userID) !== ((_item$subject3 = item.subject) === null || _item$subject3 === void 0 ? void 0 : _item$subject3.userID);
|
|
27554
|
+
});
|
|
27555
|
+
setSelectUserInfo(newSelectUserInfo);
|
|
27556
|
+
}
|
|
27600
27557
|
};
|
|
27601
27558
|
return /* @__PURE__ */ jsxs("div", { children: [
|
|
27602
27559
|
/* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Input, {
|
|
@@ -27961,7 +27918,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
27961
27918
|
}
|
|
27962
27919
|
_getEditorViewModel(unitId) {
|
|
27963
27920
|
var _this$_renderManagerS;
|
|
27964
|
-
return (_this$_renderManagerS = this._renderManagerService.
|
|
27921
|
+
return (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocSkeletonManagerService).getViewModel();
|
|
27965
27922
|
}
|
|
27966
27923
|
_syncFormulaEditorContent() {
|
|
27967
27924
|
this.disposeWithMe(this._editorBridgeService.currentEditCellState$.subscribe((editCellState) => {
|
|
@@ -28030,7 +27987,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
28030
27987
|
}
|
|
28031
27988
|
_syncActionsAndRender(unitId, parmas) {
|
|
28032
27989
|
const INCLUDE_LIST = [DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY];
|
|
28033
|
-
const currentRender = this._renderManagerService.
|
|
27990
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
28034
27991
|
if (currentRender == null) return;
|
|
28035
27992
|
const skeleton = currentRender.with(DocSkeletonManagerService).getSkeleton();
|
|
28036
27993
|
const docDataModel = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
|
|
@@ -28057,7 +28014,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
28057
28014
|
if (body.paragraphs) body.paragraphs = this._clearParagraph(body.paragraphs);
|
|
28058
28015
|
}
|
|
28059
28016
|
const INCLUDE_LIST = [DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY];
|
|
28060
|
-
const skeleton = (_this$_renderManagerS2 = this._renderManagerService.
|
|
28017
|
+
const skeleton = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(DocSkeletonManagerService).getSkeleton();
|
|
28061
28018
|
const docDataModel = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
|
|
28062
28019
|
const docViewModel = this._getEditorViewModel(unitId);
|
|
28063
28020
|
if (docDataModel == null || docViewModel == null || skeleton == null) return;
|
|
@@ -28066,7 +28023,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
28066
28023
|
docDataModel.getSnapshot().drawingsOrder = drawingsOrder !== null && drawingsOrder !== void 0 ? drawingsOrder : [];
|
|
28067
28024
|
this._checkAndSetRenderStyleConfig(docDataModel);
|
|
28068
28025
|
docViewModel.reset(docDataModel);
|
|
28069
|
-
const currentRender = this._renderManagerService.
|
|
28026
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
28070
28027
|
if (currentRender == null) return;
|
|
28071
28028
|
skeleton.calculate();
|
|
28072
28029
|
if (INCLUDE_LIST.includes(unitId)) {
|
|
@@ -28083,7 +28040,7 @@ let EditorDataSyncController = class EditorDataSyncController extends Disposable
|
|
|
28083
28040
|
}
|
|
28084
28041
|
_refreshRenderStyleConfig(unitId) {
|
|
28085
28042
|
var _currentRender$mainCo3;
|
|
28086
|
-
const currentRender = this._renderManagerService.
|
|
28043
|
+
const currentRender = this._renderManagerService.getRenderUnitById(unitId);
|
|
28087
28044
|
const skeleton = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(DocSkeletonManagerService).getSkeleton();
|
|
28088
28045
|
const docDataModel = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
|
|
28089
28046
|
const docViewModel = this._getEditorViewModel(unitId);
|
|
@@ -28586,7 +28543,7 @@ function MobileSheetBarImpl(props) {
|
|
|
28586
28543
|
const currentSubUnitId = workbook.getActiveSheet().getSheetId();
|
|
28587
28544
|
const sheets = workbook.getSheets();
|
|
28588
28545
|
const activeSheet = workbook.getActiveSheet();
|
|
28589
|
-
|
|
28546
|
+
const sheetListItems = sheets.filter((sheet) => !sheet.isSheetHidden()).map((sheet, index) => {
|
|
28590
28547
|
var _sheet$getTabColor;
|
|
28591
28548
|
return {
|
|
28592
28549
|
sheetId: sheet.getSheetId(),
|
|
@@ -28595,7 +28552,8 @@ function MobileSheetBarImpl(props) {
|
|
|
28595
28552
|
selected: activeSheet === sheet,
|
|
28596
28553
|
color: (_sheet$getTabColor = sheet.getTabColor()) !== null && _sheet$getTabColor !== void 0 ? _sheet$getTabColor : void 0
|
|
28597
28554
|
};
|
|
28598
|
-
})
|
|
28555
|
+
});
|
|
28556
|
+
setSheetList(sheetListItems);
|
|
28599
28557
|
setActiveKey(currentSubUnitId);
|
|
28600
28558
|
if (tabMapRef.current.has(currentSubUnitId)) {
|
|
28601
28559
|
const element = tabMapRef.current.get(currentSubUnitId);
|
|
@@ -29360,7 +29318,7 @@ let WorksheetProtectionRenderController = class WorksheetProtectionRenderControl
|
|
|
29360
29318
|
}
|
|
29361
29319
|
_initRender() {
|
|
29362
29320
|
const renderId = this._context.unitId;
|
|
29363
|
-
const render = renderId && this._renderManagerService.
|
|
29321
|
+
const render = renderId && this._renderManagerService.getRenderUnitById(renderId);
|
|
29364
29322
|
const spreadsheetRender = render && render.mainComponent;
|
|
29365
29323
|
if (spreadsheetRender) {
|
|
29366
29324
|
if (!spreadsheetRender.getExtensionByKey("worksheet-protection")) spreadsheetRender.register(this._worksheetProtectionRenderExtension);
|
|
@@ -29780,7 +29738,7 @@ let SheetContextMenuMobileRenderController = class SheetContextMenuMobileRenderC
|
|
|
29780
29738
|
}
|
|
29781
29739
|
_getCurrentRenderSelections() {
|
|
29782
29740
|
var _selectionRenderServi;
|
|
29783
|
-
const currentRender = this._renderManagerService.
|
|
29741
|
+
const currentRender = this._renderManagerService.getRenderUnitById(this._context.unitId);
|
|
29784
29742
|
const selectionRenderService = currentRender === null || currentRender === void 0 ? void 0 : currentRender.with(ISheetSelectionRenderService);
|
|
29785
29743
|
return (_selectionRenderServi = selectionRenderService === null || selectionRenderService === void 0 ? void 0 : selectionRenderService.getSelectionControls().map((control) => convertSelectionDataToRange(control.getValue()))) !== null && _selectionRenderServi !== void 0 ? _selectionRenderServi : [];
|
|
29786
29744
|
}
|
|
@@ -30264,9 +30222,7 @@ let MobileSheetsScrollRenderController = class MobileSheetsScrollRenderControlle
|
|
|
30264
30222
|
}
|
|
30265
30223
|
_getFreeze() {
|
|
30266
30224
|
var _this$_sheetSkeletonM;
|
|
30267
|
-
|
|
30268
|
-
if (snapshot == null) return;
|
|
30269
|
-
return snapshot.freeze;
|
|
30225
|
+
return (_this$_sheetSkeletonM = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM === void 0 ? void 0 : _this$_sheetSkeletonM.skeleton.worksheet.getFreeze();
|
|
30270
30226
|
}
|
|
30271
30227
|
_initScrollEventListener() {
|
|
30272
30228
|
const { scene } = this._context;
|
|
@@ -30432,7 +30388,10 @@ let MobileSheetsScrollRenderController = class MobileSheetsScrollRenderControlle
|
|
|
30432
30388
|
const speedFactor = Math.min(swipeSpeed / 2, 1);
|
|
30433
30389
|
multiplier = MIN_VELOCITY_MULTIPLIER + (MAX_VELOCITY_MULTIPLIER - MIN_VELOCITY_MULTIPLIER) * speedFactor;
|
|
30434
30390
|
if (swipeDuration < 150 && Math.abs(instantVelocity) > 3) multiplier *= 1.3;
|
|
30435
|
-
} else
|
|
30391
|
+
} else {
|
|
30392
|
+
const velocityFactor = Math.min(Math.abs(instantVelocity) / 5, 1);
|
|
30393
|
+
multiplier = MIN_VELOCITY_MULTIPLIER * (.5 + velocityFactor * .5);
|
|
30394
|
+
}
|
|
30436
30395
|
return Math.max(MIN_VELOCITY_MULTIPLIER * .5, Math.min(MAX_VELOCITY_MULTIPLIER * 1.5, multiplier));
|
|
30437
30396
|
};
|
|
30438
30397
|
/**
|
|
@@ -30758,7 +30717,10 @@ let MobileSheetsScrollRenderController = class MobileSheetsScrollRenderControlle
|
|
|
30758
30717
|
if (!_touchScrolling) return;
|
|
30759
30718
|
_touchScrolling = false;
|
|
30760
30719
|
const avgVelocity = calculateAverageVelocity();
|
|
30761
|
-
const
|
|
30720
|
+
const swipeDuration = performance.now() - swipeStartTime;
|
|
30721
|
+
const totalDistance = Math.sqrt(swipeTotalDisplacement.x * swipeTotalDisplacement.x + swipeTotalDisplacement.y * swipeTotalDisplacement.y);
|
|
30722
|
+
const instantVelocity = Math.sqrt(avgVelocity.x * avgVelocity.x + avgVelocity.y * avgVelocity.y);
|
|
30723
|
+
const dynamicMultiplier = calculateDynamicVelocityMultiplier(swipeDuration, totalDistance, instantVelocity);
|
|
30762
30724
|
const { maxVelocity, minVelocityThreshold } = getZoomAdjustedParams();
|
|
30763
30725
|
const cappedVelX = Math.max(-maxVelocity, Math.min(maxVelocity, avgVelocity.x * dynamicMultiplier));
|
|
30764
30726
|
const cappedVelY = Math.max(-maxVelocity, Math.min(maxVelocity, avgVelocity.y * dynamicMultiplier));
|
|
@@ -30851,7 +30813,7 @@ let MobileSheetsScrollRenderController = class MobileSheetsScrollRenderControlle
|
|
|
30851
30813
|
if (param == null) return;
|
|
30852
30814
|
const { unitId } = this._context;
|
|
30853
30815
|
const { skeleton } = param;
|
|
30854
|
-
const scene = (_this$_renderManagerS = this._renderManagerService.
|
|
30816
|
+
const scene = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.scene;
|
|
30855
30817
|
if (skeleton == null || scene == null) return;
|
|
30856
30818
|
const { rowTotalHeight, columnTotalWidth, rowHeaderWidthAndMarginLeft, columnHeaderHeightAndMarginTop } = skeleton;
|
|
30857
30819
|
scene === null || scene === void 0 || scene.transformByState({
|
|
@@ -31088,7 +31050,7 @@ let SheetCellDropdownManagerService = class SheetCellDropdownManagerService exte
|
|
|
31088
31050
|
const { location, onHide, closeOnOutSide = true } = param;
|
|
31089
31051
|
const { row, col, unitId, subUnitId } = location;
|
|
31090
31052
|
const component = dropdownMap[param.type];
|
|
31091
|
-
const currentRender = this._renderManagerService.
|
|
31053
|
+
const currentRender = this._renderManagerService.getRenderUnitById(DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
|
|
31092
31054
|
const disposable = new DisposableCollection();
|
|
31093
31055
|
const popupDisposable = this._canvasPopupManagerService.attachPopupToCell(row, col, {
|
|
31094
31056
|
componentKey: component.componentKey,
|
|
@@ -31956,7 +31918,7 @@ _defineProperty(UniverSheetsMobileUIPlugin, "packageName", name);
|
|
|
31956
31918
|
_defineProperty(UniverSheetsMobileUIPlugin, "version", version);
|
|
31957
31919
|
_defineProperty(UniverSheetsMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
|
|
31958
31920
|
UniverSheetsMobileUIPlugin = __decorate([
|
|
31959
|
-
DependentOn(UniverSheetsPlugin, UniverMobileUIPlugin),
|
|
31921
|
+
DependentOn(UniverDocsPlugin, UniverFormulaEnginePlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, UniverMobileUIPlugin, UniverDocsUIPlugin),
|
|
31960
31922
|
__decorateParam(1, Inject(Injector)),
|
|
31961
31923
|
__decorateParam(2, IRenderManagerService),
|
|
31962
31924
|
__decorateParam(3, IConfigService),
|
|
@@ -32577,7 +32539,7 @@ _defineProperty(UniverSheetsUIPlugin, "packageName", name);
|
|
|
32577
32539
|
_defineProperty(UniverSheetsUIPlugin, "version", version);
|
|
32578
32540
|
_defineProperty(UniverSheetsUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
|
|
32579
32541
|
UniverSheetsUIPlugin = __decorate([
|
|
32580
|
-
DependentOn(UniverSheetsPlugin),
|
|
32542
|
+
DependentOn(UniverDocsPlugin, UniverFormulaEnginePlugin, UniverRenderEnginePlugin, UniverSheetsPlugin, UniverUIPlugin, UniverDocsUIPlugin),
|
|
32581
32543
|
__decorateParam(1, Inject(Injector)),
|
|
32582
32544
|
__decorateParam(2, IRenderManagerService),
|
|
32583
32545
|
__decorateParam(3, IConfigService),
|