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: data-validation ref-range error init form snapshot & support hyperlink target (#2975)
zhangwc1a342d4bceb
diff --git a/packages/design/src/components/scrollbar/Scrollbar.tsx b/packages/design/src/components/scrollbar/Scrollbar.tsxindex 79441aa027..4e9d99324f 100644--- a/packages/design/src/components/scrollbar/Scrollbar.tsx+++ b/packages/design/src/components/scrollbar/Scrollbar.tsx@@ -89,7 +89,10 @@ export function Scrollbar(props: IScrollbarProps) {const [thumbTop, setThumbTop] = useState(0);useEffect(() => {function resize() {- const { height: containerHeight } = containerRef.current!.parentElement!.getBoundingClientRect();+ if (!containerRef.current) {+ return;+ }+ const { height: containerHeight } = containerRef.current.parentElement!.getBoundingClientRect();const { scrollHeight } = contentRef.current!;setThumbHeight((containerHeight / scrollHeight) * 100);diff --git a/packages/docs-thread-comment-ui/src/commands/operations/show-comment-panel.operation.ts b/packages/docs-thread-comment-ui/src/commands/operations/show-comment-panel.operation.tsindex 23865d461c..0ca501b294 100644--- a/packages/docs-thread-comment-ui/src/commands/operations/show-comment-panel.operation.ts+++ b/packages/docs-thread-comment-ui/src/commands/operations/show-comment-panel.operation.ts@@ -60,7 +60,7 @@ export const ToggleCommentPanelOperation: ICommand = {const panelService = accessor.get(ThreadCommentPanelService);const sidebarService = accessor.get(ISidebarService);- if (!panelService.panelVisible) {+ if (!panelService.panelVisible || sidebarService.options.children?.label !== DocThreadCommentPanel.componentKey) {sidebarService.open({header: { title: 'threadCommentUI.panel.title' },children: { label: DocThreadCommentPanel.componentKey },diff --git a/packages/docs-thread-comment-ui/src/controllers/menu.ts b/packages/docs-thread-comment-ui/src/controllers/menu.tsindex cda2dee85c..46d9447e65 100644--- a/packages/docs-thread-comment-ui/src/controllers/menu.ts+++ b/packages/docs-thread-comment-ui/src/controllers/menu.ts@@ -74,16 +74,6 @@ export function ToolbarDocCommentMenuItemFactory(accessor: IAccessor): IMenuButttitle: 'threadCommentUI.panel.addComment',tooltip: 'threadCommentUI.panel.addComment',positions: [MenuPosition.TOOLBAR_START],- disabled$: new Observable(function (subscribe) {- const textSelectionService = accessor.get(TextSelectionManagerService);- const observer = textSelectionService.textSelection$.pipe(debounceTime(16)).subscribe(() => {- subscribe.next(shouldDisableAddComment(accessor));- });-- return () => {- observer.unsubscribe();- };- }),hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),};}diff --git a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx b/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsxindex 6baf3c054d..ca558fa12c 100644--- a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx+++ b/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx@@ -15,7 +15,7 @@*/import type { DocumentDataModel } from '@univerjs/core';-import { ICommandService, IUniverInstanceService, UniverInstanceType, useDependency, useObservable } from '@univerjs/core';+import { ICommandService, Injector, IUniverInstanceService, UniverInstanceType, useDependency, useObservable } from '@univerjs/core';import { ThreadCommentPanel } from '@univerjs/thread-comment-ui';import React, { useEffect, useMemo, useState } from 'react';import { debounceTime, Observable } from 'rxjs';@@ -26,9 +26,11 @@ import { DocThreadCommentService } from '../../services/doc-thread-comment.serviimport type { IAddDocCommentComment } from '../../commands/commands/add-doc-comment.command';import { AddDocCommentComment } from '../../commands/commands/add-doc-comment.command';import { DeleteDocCommentComment, type IDeleteDocCommentComment } from '../../commands/commands/delete-doc-comment.command';+import { shouldDisableAddComment } from '../../controllers/menu';export const DocThreadCommentPanel = () => {const univerInstanceService = useDependency(IUniverInstanceService);+ const injector = useDependency(Injector);const doc$ = useMemo(() => univerInstanceService.getCurrentTypeOfUnit$<DocumentDataModel>(UniverInstanceType.UNIVER_DOC), [univerInstanceService]);const doc = useObservable(doc$);const subUnitId$ = useMemo(() => new Observable<string>((sub) => sub.next(DEFAULT_DOC_SUBUNIT_ID)), []);@@ -72,11 +74,7 @@ export const DocThreadCommentPanel = () => {return null;}- const activeRange = textSelectionManagerService.getActiveTextRangeWithStyle();- const isInValidSelection = Boolean(- activeRange &&- (activeRange.endOffset === activeRange.startOffset || activeRange.segmentId)- );+ const isInValidSelection = shouldDisableAddComment(injector);const unitId = doc.getUnitId();diff --git a/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts b/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.tsindex 205bd618c2..a9a1c89d3a 100644--- a/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts+++ b/packages/sheets-data-validation/src/controllers/dv-ref-range.controller.ts@@ -24,7 +24,7 @@ import { FormulaRefRangeService } from '@univerjs/sheets-formula';import { DataValidationCustomFormulaService } from '../services/dv-custom-formula.service';import { DataValidationFormulaService } from '../services/dv-formula.service';-@OnLifecycle(LifecycleStages.Ready, DataValidationRefRangeController)+@OnLifecycle(LifecycleStages.Starting, DataValidationRefRangeController)export class DataValidationRefRangeController extends Disposable {private _disposableMap: Map<string, Set<() => void>> = new Map();@@ -145,7 +145,6 @@ export class DataValidationRefRangeController extends Disposable {const resultRangesOrigin = oldRanges.map((range) => {return handleCommonDefaultRangeChangeWithEffectRefCommands(range, commandInfo) as IRange | IRange[];}).filter((range) => !!range);-const resultRanges = resultRangesOrigin.flat();const isEqual = isRangesEqual(resultRanges, oldRanges);diff --git a/packages/sheets-data-validation/src/controllers/dv-render.controller.ts b/packages/sheets-data-validation/src/controllers/dv-render.controller.tsindex 0a10399ae6..24364c71b4 100644--- a/packages/sheets-data-validation/src/controllers/dv-render.controller.ts+++ b/packages/sheets-data-validation/src/controllers/dv-render.controller.ts@@ -91,7 +91,9 @@ export class SheetsDataValidationRenderController extends RxDisposable {this.disposeWithMe(this._editorBridgeService.visible$.subscribe((visible) => {if (!visible.visible) {- this._dropdownManagerService.hideDropdown();+ if (this._dropdownManagerService.activeDropdown?.trigger === 'editor-bridge') {+ this._dropdownManagerService.hideDropdown();+ }return;}@@ -141,6 +143,7 @@ export class SheetsDataValidationRenderController extends RxDisposable {},componentKey: validator.dropdown,onHide: () => { /* empty */ },+ trigger: 'editor-bridge',},false);diff --git a/packages/sheets-data-validation/src/services/dropdown-manager.service.ts b/packages/sheets-data-validation/src/services/dropdown-manager.service.tsindex 10705f4cec..46ad9f5862 100644--- a/packages/sheets-data-validation/src/services/dropdown-manager.service.ts+++ b/packages/sheets-data-validation/src/services/dropdown-manager.service.ts@@ -29,6 +29,7 @@ export interface IDropdownParam {location: ISheetLocation;onHide?: () => void;componentKey: string;+ trigger?: 'editor-bridge';}export interface IDropdownComponentProps {diff --git a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.tsindex 417bb41f73..825b46058c 100644--- a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts+++ b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts@@ -15,7 +15,7 @@*/import type { IDisposable, IPosition, ITransformState, Nullable, Serializable, Worksheet } from '@univerjs/core';-import { Disposable, DisposableCollection, DrawingTypeEnum, ICommandService, Inject, IUniverInstanceService, LifecycleStages, OnLifecycle, Tools } from '@univerjs/core';+import { Disposable, DisposableCollection, DrawingTypeEnum, generateRandomId, ICommandService, Inject, IUniverInstanceService, LifecycleStages, OnLifecycle } from '@univerjs/core';import type { IDrawingJsonUndo1 } from '@univerjs/drawing';import { getDrawingShapeKeyByDrawingSearch, IDrawingManagerService } from '@univerjs/drawing';import type { BaseObject, IBoundRectNoAngle, IRectProps, IRender, Scene, SpreadsheetSkeleton } from '@univerjs/engine-render';@@ -451,7 +451,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {);}- addFloatDomToPosition(layer: ICanvasFloatDom) {+ addFloatDomToPosition(layer: ICanvasFloatDom, propId?: string) {const target = getSheetCommandTarget(this._univerInstanceService, {unitId: layer.unitId,subUnitId: layer.subUnitId,@@ -462,7 +462,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {const { unitId, subUnitId } = target;const { initPosition, componentKey, data } = layer;- const id = Tools.generateRandomId();+ const id = propId ?? generateRandomId();const sheetTransform = this._getPosition(initPosition, unitId);if (sheetTransform == null) {diff --git a/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts b/packages/sheets-hyper-link-ui/src/controllers/ui.controller.tsindex 6a40404a4e..19a82bad83 100644--- a/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts+++ b/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts@@ -14,23 +14,20 @@* limitations under the License.*/+import type { Nullable } from '@univerjs/core';import { Disposable, ICommandService, Inject, Injector, LifecycleStages, LocaleService, OnLifecycle } from '@univerjs/core';-import type { MenuConfig } from '@univerjs/ui';import { ComponentManager, IMenuService, IShortcutService } from '@univerjs/ui';import { LinkSingle } from '@univerjs/icons';import { CellLinkPopup } from '../views/CellLinkPopup';import { CellLinkEdit } from '../views/CellLinkEdit';import { CloseHyperLinkSidebarOperation, InsertHyperLinkOperation, InsertHyperLinkToolbarOperation, OpenHyperLinkSidebarOperation } from '../commands/operations/sidebar.operations';+import type { IUniverSheetsHyperLinkUIConfig } from '../types/interfaces/i-config';import { insertLinkMenuFactory, insertLinkMenuToolbarFactory, InsertLinkShortcut } from './menu';-export interface IUniverSheetsHyperLinkUIConfig {- menu?: MenuConfig;-}-@OnLifecycle(LifecycleStages.Ready, SheetsHyperLinkUIController)export class SheetsHyperLinkUIController extends Disposable {constructor(- private _config: IUniverSheetsHyperLinkUIConfig | undefined,+ private _config: Nullable<IUniverSheetsHyperLinkUIConfig>,@Inject(ComponentManager) private _componentManager: ComponentManager,@ICommandService private _commandService: ICommandService,@Inject(LocaleService) private _localeService: LocaleService,diff --git a/packages/sheets-hyper-link-ui/src/index.ts b/packages/sheets-hyper-link-ui/src/index.tsindex 446bf57f0b..22f5fce920 100644--- a/packages/sheets-hyper-link-ui/src/index.ts+++ b/packages/sheets-hyper-link-ui/src/index.ts@@ -28,6 +28,7 @@ export { SheetHyperLinkUrlController } from './controllers/url.controller';export { UniverSheetsHyperLinkUIPlugin } from './plugin';export { InsertLinkShortcut } from './controllers/menu';+export type { IUrlHandler, IUniverSheetsHyperLinkUIConfig } from './types/interfaces/i-config';// #region - all commandsdiff --git a/packages/sheets-hyper-link-ui/src/plugin.ts b/packages/sheets-hyper-link-ui/src/plugin.tsindex a77374a2e5..0875042a16 100644--- a/packages/sheets-hyper-link-ui/src/plugin.ts+++ b/packages/sheets-hyper-link-ui/src/plugin.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { Dependency } from '@univerjs/core';+import type { Dependency, Nullable } from '@univerjs/core';import { DependentOn, Inject, Injector, Plugin, UniverInstanceType } from '@univerjs/core';import { UniverSheetsHyperLinkPlugin } from '@univerjs/sheets-hyper-link';import { IRenderManagerService } from '@univerjs/engine-render';@@ -24,7 +24,6 @@ import { SheetsHyperLinkPopupService } from './services/popup.service';import { SheetsHyperLinkResolverService } from './services/resolver.service';import { SheetHyperLinkSetRangeController } from './controllers/set-range.controller';import { SheetsHyperLinkPopupController } from './controllers/popup.controller';-import type { IUniverSheetsHyperLinkUIConfig } from './controllers/ui.controller';import { SheetsHyperLinkUIController } from './controllers/ui.controller';import { SHEET_HYPER_LINK_UI_PLUGIN } from './types/const';import { SheetsHyperLinkAutoFillController } from './controllers/auto-fill.controller';@@ -32,6 +31,7 @@ import { SheetsHyperLinkCopyPasteController } from './controllers/copy-paste.conimport { SheetHyperLinkUrlController } from './controllers/url.controller';import { SheetsHyperLinkPermissionController } from './controllers/hyper-link-permission.controller';import { SheetsHyperLinkSidePanelService } from './services/side-panel.service';+import type { IUniverSheetsHyperLinkUIConfig } from './types/interfaces/i-config';@DependentOn(UniverSheetsHyperLinkPlugin)export class UniverSheetsHyperLinkUIPlugin extends Plugin {@@ -39,7 +39,7 @@ export class UniverSheetsHyperLinkUIPlugin extends Plugin {static override type = UniverInstanceType.UNIVER_SHEET;constructor(- private _config: IUniverSheetsHyperLinkUIConfig,+ private _config: Nullable<IUniverSheetsHyperLinkUIConfig>,@Inject(Injector) protected override _injector: Injector,@IRenderManagerService private readonly _renderManagerService: IRenderManagerService) {@@ -48,7 +48,12 @@ export class UniverSheetsHyperLinkUIPlugin extends Plugin {override onStarting(): void {const dependencies: Dependency[] = [- [SheetsHyperLinkResolverService],+ [+ SheetsHyperLinkResolverService,+ {+ useFactory: () => this._injector.createInstance(SheetsHyperLinkResolverService, this._config?.urlHandler),+ },+ ],[SheetsHyperLinkPopupService],[SheetsHyperLinkSidePanelService],diff --git a/packages/sheets-hyper-link-ui/src/services/resolver.service.ts b/packages/sheets-hyper-link-ui/src/services/resolver.service.tsindex 015ebaf206..d91a12e0cc 100644--- a/packages/sheets-hyper-link-ui/src/services/resolver.service.ts+++ b/packages/sheets-hyper-link-ui/src/services/resolver.service.ts@@ -14,7 +14,7 @@* limitations under the License.*/-import type { IRange, Workbook, Worksheet } from '@univerjs/core';+import type { IRange, Nullable, Workbook, Worksheet } from '@univerjs/core';import { ICommandService, Inject, isValidRange, IUniverInstanceService, LocaleService, RANGE_TYPE, Rectangle, UniverInstanceType } from '@univerjs/core';import { MessageType } from '@univerjs/design';import { deserializeRangeWithSheet, IDefinedNamesService, serializeRangeWithSheet } from '@univerjs/engine-formula';@@ -23,6 +23,7 @@ import { SetSelectionsOperation, SetWorksheetActiveOperation } from '@univerjs/simport { ERROR_RANGE } from '@univerjs/sheets-hyper-link';import { ScrollToRangeOperation } from '@univerjs/sheets-ui';import { IMessageService } from '@univerjs/ui';+import type { IUrlHandler } from '../types/interfaces/i-config';interface ISheetUrlParams {gid?: string;@@ -65,6 +66,7 @@ export interface IHyperLinkInfo<T extends string> {export class SheetsHyperLinkResolverService {constructor(+ private _urlHandler: Nullable<IUrlHandler>,@IUniverInstanceService private _univerInstanceService: IUniverInstanceService,@ICommandService private _commandService: ICommandService,@IDefinedNamesService private _definedNamesService: IDefinedNamesService,@@ -283,6 +285,10 @@ export class SheetsHyperLinkResolverService {}async navigateToOtherWebsite(url: string) {+ if (this._urlHandler?.navigateToOtherWebsite) {+ return this._urlHandler.navigateToOtherWebsite(url);+ }+window.open(url, '_blank', 'noopener noreferrer');}}diff --git a/packages/sheets-hyper-link-ui/src/types/interfaces/i-config.ts b/packages/sheets-hyper-link-ui/src/types/interfaces/i-config.tsnew file mode 100644index 0000000000..24f816ee4d--- /dev/null+++ b/packages/sheets-hyper-link-ui/src/types/interfaces/i-config.ts@@ -0,0 +1,26 @@+/**+ * 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 type { MenuConfig } from '@univerjs/ui';++export interface IUrlHandler {+ navigateToOtherWebsite?: (url: string) => void;+}++export interface IUniverSheetsHyperLinkUIConfig {+ menu?: MenuConfig;+ urlHandler?: IUrlHandler;+}diff --git a/packages/ui/src/services/sidebar/desktop-sidebar.service.ts b/packages/ui/src/services/sidebar/desktop-sidebar.service.tsindex 43ce264950..84bcc6fb41 100644--- a/packages/ui/src/services/sidebar/desktop-sidebar.service.ts+++ b/packages/ui/src/services/sidebar/desktop-sidebar.service.ts@@ -31,6 +31,10 @@ export class DesktopSidebarService implements ISidebarService {return this._sidebarOptions.visible || false;}+ get options() {+ return this._sidebarOptions;+ }+open(params: ISidebarMethodOptions): IDisposable {this._sidebarOptions = {...params,diff --git a/packages/ui/src/services/sidebar/sidebar.service.ts b/packages/ui/src/services/sidebar/sidebar.service.tsindex 6126b8c105..194a4864a7 100644--- a/packages/ui/src/services/sidebar/sidebar.service.ts+++ b/packages/ui/src/services/sidebar/sidebar.service.ts@@ -28,6 +28,8 @@ export interface ISidebarService {close(id?: string): void;get visible(): boolean;++ get options(): ISidebarMethodOptions;}export const ILeftSidebarService = createIdentifier<ISidebarService>('ui.left-sidebar.service');