Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets-hyper-link-ui): link redo undo (#3465)
zhangw9ddcaf502180
diff --git a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts b/packages/docs-ui/src/services/selection/doc-selection-render.service.tsindex 8bbff15422..2c3438eb29 100644--- a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts+++ b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts@@ -979,6 +979,9 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMothis.disposeWithMe(fromEvent(this._input, 'input').subscribe((e) => {// Prevent input when there is any rect ranges.+ if ((e as InputEvent).inputType === 'historyUndo' || (e as InputEvent).inputType === 'historyRedo') {+ return;+ }if (this._rectRangeList.length > 0) {e.stopPropagation();return e.preventDefault();diff --git a/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts b/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.tsindex 4963e00a69..def571f523 100644--- a/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts+++ b/packages/sheets-hyper-link-ui/src/commands/commands/add-hyper-link.command.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import { BuildTextUtils, CellValueType, CommandType, CustomRangeType, DataStreamTreeTokenType, generateRandomId, ICommandService, IUndoRedoService, IUniverInstanceService, sequenceExecuteAsync, TextX, UniverInstanceType } from '@univerjs/core';+import { BuildTextUtils, CellValueType, CommandType, CustomRangeType, DataStreamTreeTokenType, generateRandomId, ICommandService, IUndoRedoService, IUniverInstanceService, sequenceExecuteAsync, TextX, Tools, UniverInstanceType } from '@univerjs/core';import { DocSelectionManagerService } from '@univerjs/docs';import { addCustomRangeBySelectionFactory } from '@univerjs/docs-ui';import { IRenderManagerService } from '@univerjs/engine-render';@@ -63,7 +63,7 @@ export const AddHyperLinkCommand: ICommand<IAddHyperLinkCommandParams> = {const cellData = worksheet.getCell(row, column);const doc = skeleton.getBlankCellDocumentModel(cellData);const snapshot = doc.documentModel!.getSnapshot();- const body = snapshot.body;+ const body = Tools.deepClone(snapshot.body);if (!body) {return false;}diff --git a/packages/sheets-hyper-link-ui/src/commands/commands/update-hyper-link.command.ts b/packages/sheets-hyper-link-ui/src/commands/commands/update-hyper-link.command.tsindex 539c625d89..1c0b5d8b51 100644--- a/packages/sheets-hyper-link-ui/src/commands/commands/update-hyper-link.command.ts+++ b/packages/sheets-hyper-link-ui/src/commands/commands/update-hyper-link.command.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import { CellValueType, CommandType, CustomRangeType, DataStreamTreeTokenType, generateRandomId, getBodySlice, ICommandService, IUndoRedoService, IUniverInstanceService, sequenceExecuteAsync, TextX, UniverInstanceType } from '@univerjs/core';+import { CellValueType, CommandType, CustomRangeType, DataStreamTreeTokenType, generateRandomId, getBodySlice, ICommandService, IUndoRedoService, IUniverInstanceService, sequenceExecuteAsync, TextX, Tools, UniverInstanceType } from '@univerjs/core';import { replaceSelectionFactory } from '@univerjs/docs-ui';import { IRenderManagerService } from '@univerjs/engine-render';import { SetRangeValuesMutation, SetRangeValuesUndoMutationFactory } from '@univerjs/sheets';@@ -104,7 +104,7 @@ export const UpdateHyperLinkCommand: ICommand<IUpdateHyperLinkCommandParams> = {if (!replaceSelection) {return false;}- const newBody = TextX.apply(snapshot.body!, replaceSelection.textX.serialize());+ const newBody = TextX.apply(Tools.deepClone(snapshot.body!), replaceSelection.textX.serialize());const redo = {id: SetRangeValuesMutation.id,diff --git a/packages/sheets-hyper-link-ui/src/commands/operations/popup.operations.ts b/packages/sheets-hyper-link-ui/src/commands/operations/popup.operations.tsindex edcd8e8838..46cbbf0b9f 100644--- a/packages/sheets-hyper-link-ui/src/commands/operations/popup.operations.ts+++ b/packages/sheets-hyper-link-ui/src/commands/operations/popup.operations.ts@@ -19,6 +19,7 @@ import { getSheetCommandTarget, type ISheetCommandSharedParams, SheetsSelectionsimport { IEditorBridgeService } from '@univerjs/sheets-ui';import { SheetsHyperLinkPopupService } from '../../services/popup.service';import { HyperLinkEditSourceType } from '../../types/enums/edit-source';+import { getShouldDisableCurrentCellLink } from '../../utils';export interface IOpenHyperLinkEditPanelOperationParams extends ISheetCommandSharedParams {row: number;@@ -93,6 +94,9 @@ export const InsertHyperLinkToolbarOperation: ICommand = {type: CommandType.OPERATION,id: 'sheet.operation.insert-hyper-link-toolbar',handler(accessor) {+ if (getShouldDisableCurrentCellLink(accessor)) {+ return false;+ }const commandService = accessor.get(ICommandService);const popupService = accessor.get(SheetsHyperLinkPopupService);if (popupService.currentEditing) {diff --git a/packages/sheets-hyper-link-ui/src/controllers/menu.ts b/packages/sheets-hyper-link-ui/src/controllers/menu.tsindex 250542a415..7d96cf761b 100644--- a/packages/sheets-hyper-link-ui/src/controllers/menu.ts+++ b/packages/sheets-hyper-link-ui/src/controllers/menu.ts@@ -14,15 +14,16 @@* limitations under the License.*/-import { BuildTextUtils, CustomRangeType, DataValidationType, DOCS_ZEN_EDITOR_UNIT_ID_KEY, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';-import type { IMenuItem, IShortcutItem } from '@univerjs/ui';+import { DOCS_ZEN_EDITOR_UNIT_ID_KEY, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';+import { DocSelectionManagerService } from '@univerjs/docs';+import { getSheetCommandTarget, RangeProtectionPermissionEditPoint, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetInsertHyperlinkPermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';+import { getCurrentRangeDisable$, IEditorBridgeService, whenSheetEditorFocused } from '@univerjs/sheets-ui';import { getMenuHiddenObservable, KeyCode, MenuGroup, MenuItemType, MenuPosition, MetaKeys } from '@univerjs/ui';-import type { DocumentDataModel, IAccessor, ITextRange, Workbook } from '@univerjs/core';-import { getCurrentRangeDisable$, whenSheetEditorFocused } from '@univerjs/sheets-ui';-import { RangeProtectionPermissionEditPoint, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetInsertHyperlinkPermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';import { map, mergeMap, Observable } from 'rxjs';-import { DocSelectionManagerService } from '@univerjs/docs';+import type { IAccessor, Workbook } from '@univerjs/core';+import type { IMenuItem, IShortcutItem } from '@univerjs/ui';import { InsertHyperLinkOperation, InsertHyperLinkToolbarOperation } from '../commands/operations/popup.operations';+import { getShouldDisableCellLink, shouldDisableAddLink } from '../utils';const getLinkDisable$ = (accessor: IAccessor) => {const disableRange$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetInsertHyperlinkPermission], rangeTypes: [RangeProtectionPermissionEditPoint] });@@ -55,63 +56,13 @@ const getLinkDisable$ = (accessor: IAccessor) => {}const row = selections[0].range.startRow;const col = selections[0].range.startColumn;- const cell = sheet.getCell(row, col);- if (cell?.f || cell?.si) {- return true;- }- const disables = [- DataValidationType.CHECKBOX,- DataValidationType.LIST,- DataValidationType.LIST_MULTIPLE,- ];-- if (cell?.dataValidation && disables.includes(cell.dataValidation.rule.type)) {- return true;- }-- return false;+ return getShouldDisableCellLink(sheet, row, col);}));return disableRange$.pipe(mergeMap(((disableRange) => disableCell$.pipe(map((disableCell) => disableRange || disableCell)))));};-export const shouldDisableAddLink = (accessor: IAccessor) => {- const textSelectionService = accessor.get(DocSelectionManagerService);- const univerInstanceService = accessor.get(IUniverInstanceService);- const textRanges = textSelectionService.getDocRanges();- if (!textRanges.length || textRanges.length > 1) {- return true;- }-- const activeRange = textRanges[0];- const doc = univerInstanceService.getCurrentUnitForType<DocumentDataModel>(UniverInstanceType.UNIVER_DOC);- if (!doc || !activeRange || activeRange.collapsed) {- return true;- }-- const body = doc.getSelfOrHeaderFooterModel(activeRange.segmentId).getBody();- const paragraphs = body?.paragraphs;- if (!paragraphs) {- return true;- }-- for (let i = 0, len = paragraphs.length; i < len; i++) {- const p = paragraphs[i];- if (activeRange.startOffset! <= p.startIndex && activeRange.endOffset! > p.startIndex) {- return true;- }-- if (p.startIndex > activeRange.endOffset!) {- break;- }- }-- const insertCustomRanges = BuildTextUtils.customRange.getCustomRangesInterestsWithRange(activeRange as ITextRange, body.customRanges ?? []);- // can't insert hyperlink in range contains other custom ranges- return !insertCustomRanges.every((range) => range.rangeType === CustomRangeType.HYPERLINK);-};-const getZenLinkDisable$ = (accessor: IAccessor) => {const univerInstanceService = accessor.get(IUniverInstanceService);return univerInstanceService.focused$.pipe(@@ -126,6 +77,19 @@ const getZenLinkDisable$ = (accessor: IAccessor) => {if (!selection || selection.unitId !== DOCS_ZEN_EDITOR_UNIT_ID_KEY) {return true;}+ const editorBridgeService = accessor.get(IEditorBridgeService);+ const state = editorBridgeService.getEditCellState();+ if (!state) {+ return true;+ }+ const target = getSheetCommandTarget(univerInstanceService, { unitId: state.unitId, subUnitId: state.sheetId });+ if (!target?.worksheet) {+ return true;+ }++ if (getShouldDisableCellLink(target.worksheet, state.row, state.column)) {+ return true;+ }return shouldDisableAddLink(accessor);})diff --git a/packages/sheets-hyper-link-ui/src/utils/index.ts b/packages/sheets-hyper-link-ui/src/utils/index.tsnew file mode 100644index 0000000000..f6b862959b--- /dev/null+++ b/packages/sheets-hyper-link-ui/src/utils/index.ts@@ -0,0 +1,89 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++import { BuildTextUtils, CustomRangeType, DataValidationType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';+import { DocSelectionManagerService } from '@univerjs/docs';+import { SheetsSelectionsService } from '@univerjs/sheets';+import type { DocumentDataModel, IAccessor, ITextRange, Workbook, Worksheet } from '@univerjs/core';++export const getShouldDisableCellLink = (worksheet: Worksheet, row: number, col: number) => {+ const cell = worksheet.getCell(row, col);+ if (cell?.f || cell?.si) {+ return true;+ }+ const disables = [+ DataValidationType.CHECKBOX,+ DataValidationType.LIST,+ DataValidationType.LIST_MULTIPLE,+ ];++ if (cell?.dataValidation && disables.includes(cell.dataValidation.rule.type)) {+ return true;+ }++ return false;+};++export const getShouldDisableCurrentCellLink = (accessor: IAccessor) => {+ const unit = accessor.get(IUniverInstanceService).getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);+ if (!unit) {+ return true;+ }+ const worksheet = unit.getActiveSheet();+ const selections = accessor.get(SheetsSelectionsService).getCurrentSelections();+ if (!selections.length) {+ return true;+ }+ const row = selections[0].range.startRow;+ const col = selections[0].range.startColumn;+ return getShouldDisableCellLink(worksheet, row, col);+};++export const shouldDisableAddLink = (accessor: IAccessor) => {+ const textSelectionService = accessor.get(DocSelectionManagerService);+ const univerInstanceService = accessor.get(IUniverInstanceService);+ const textRanges = textSelectionService.getDocRanges();+ if (!textRanges.length || textRanges.length > 1) {+ return true;+ }++ const activeRange = textRanges[0];+ const doc = univerInstanceService.getCurrentUnitForType<DocumentDataModel>(UniverInstanceType.UNIVER_DOC);+ if (!doc || !activeRange || activeRange.collapsed) {+ return true;+ }++ const body = doc.getSelfOrHeaderFooterModel(activeRange.segmentId).getBody();+ const paragraphs = body?.paragraphs;+ if (!paragraphs) {+ return true;+ }++ for (let i = 0, len = paragraphs.length; i < len; i++) {+ const p = paragraphs[i];+ if (activeRange.startOffset! <= p.startIndex && activeRange.endOffset! > p.startIndex) {+ return true;+ }++ if (p.startIndex > activeRange.endOffset!) {+ break;+ }+ }++ const insertCustomRanges = BuildTextUtils.customRange.getCustomRangesInterestsWithRange(activeRange as ITextRange, body.customRanges ?? []);+ // can't insert hyperlink in range contains other custom ranges+ return !insertCustomRanges.every((range) => range.rangeType === CustomRangeType.HYPERLINK);+};