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
feat(slides): add text editing and shapes transform operations (#3015)
白熱3284b38de9a6
diff --git a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsxindex c771c1ae6a..0f31cdc0a1 100644--- a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx+++ b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx@@ -18,7 +18,7 @@ import React from 'react';import type { SlideDataModel } from '@univerjs/core';import { connectInjector, ICommandService, Inject, Injector, IUniverInstanceService, LifecycleStages, OnLifecycle, UniverInstanceType, useDependency } from '@univerjs/core';import type { IUniverSlidesDrawingConfig } from '@univerjs/slides-ui';-import { IMAGE_MENU_ID, SHAPE_MENU_ID, SlideAddTextOperation, SlideEditorContainer, SlidesUIController } from '@univerjs/slides-ui';+import { IMAGE_MENU_ID, SHAPE_MENU_ID, SlideAddTextCommand, SlideEditorContainer, SlidesUIController } from '@univerjs/slides-ui';import { BuiltInUIPart, ComponentManager, IMenuService, IShortcutService, IUIPartsService, useObservable } from '@univerjs/ui';import { BuiltinUniToolbarItemId, UniToolbarService, UniUIPart } from '@univerjs/uniui';import { UniSlideSideBar } from '../views/UniSlideSideBar';@@ -51,7 +51,7 @@ export class UniSlidesUIController extends SlidesUIController {([[BuiltinUniToolbarItemId.IMAGE, IMAGE_MENU_ID],[BuiltinUniToolbarItemId.FONT_GROUP, SHAPE_MENU_ID],- [BuiltinUniToolbarItemId.TABLE, SlideAddTextOperation.id],+ [BuiltinUniToolbarItemId.TABLE, SlideAddTextCommand.id],]).forEach(([id, menuId]) => {this._toolbarService.implementItem(id, { id: menuId, type: UniverInstanceType.UNIVER_SLIDE });});diff --git a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsxindex 89626c4bba..6728d28ea6 100644--- a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx+++ b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx@@ -94,12 +94,12 @@ export function UniSlideSideBar() {}, []);const activatePage = useCallback((page: string) => {- commandService.syncExecuteCommand(ActivateSlidePageOperation.id, { id: page });- }, [commandService]);+ commandService.syncExecuteCommand(ActivateSlidePageOperation.id, { id: page, unitId: currentSlide?.getUnitId() });+ }, [commandService, currentSlide]);const handleAppendSlide = useCallback(() => {- commandService.syncExecuteCommand(AppendSlideOperation.id);- }, [commandService]);+ commandService.syncExecuteCommand(AppendSlideOperation.id, { unitId: currentSlide?.getUnitId() });+ }, [commandService, currentSlide]);return (<div className={styles.uniSlideBar} ref={slideBarRef}>diff --git a/packages/slides-ui/src/commands/operations/activate.operation.ts b/packages/slides-ui/src/commands/operations/activate.operation.tsindex cd26e704da..6e600fc75f 100644--- a/packages/slides-ui/src/commands/operations/activate.operation.ts+++ b/packages/slides-ui/src/commands/operations/activate.operation.ts@@ -19,6 +19,7 @@ import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerimport { CanvasView } from '@univerjs/slides';export interface IActiveSlidePageOperationParams {+ unitId: string;id: string;}export const ActivateSlidePageOperation: IOperation<IActiveSlidePageOperationParams> = {diff --git a/packages/slides-ui/src/commands/operations/append-slide.operation.ts b/packages/slides-ui/src/commands/operations/append-slide.operation.tsindex a05ab9948b..e55ffa5823 100644--- a/packages/slides-ui/src/commands/operations/append-slide.operation.ts+++ b/packages/slides-ui/src/commands/operations/append-slide.operation.ts@@ -14,11 +14,15 @@* limitations under the License.*/-import type { ICommand, SlideDataModel } from '@univerjs/core';+import type { IOperation, SlideDataModel } from '@univerjs/core';import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { CanvasView } from '@univerjs/slides';-export const AppendSlideOperation: ICommand = {+export interface IAppendSlideOperationParams {+ unitId: string;+}++export const AppendSlideOperation: IOperation<IAppendSlideOperationParams> = {id: 'slide.operation.append-slide',type: CommandType.OPERATION,handler: (accessor) => {diff --git a/packages/slides-ui/src/commands/operations/delete-element.operation.ts b/packages/slides-ui/src/commands/operations/delete-element.operation.tsindex c341fabf8a..414e9295a4 100644--- a/packages/slides-ui/src/commands/operations/delete-element.operation.ts+++ b/packages/slides-ui/src/commands/operations/delete-element.operation.ts@@ -19,6 +19,7 @@ import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerimport { CanvasView } from '@univerjs/slides';export interface IDeleteElementOperationParams {+ unitId: string;id: string;};diff --git a/packages/slides-ui/src/commands/operations/insert-image.operation.ts b/packages/slides-ui/src/commands/operations/insert-image.operation.tsindex 32c593ee88..47d28276c9 100644--- a/packages/slides-ui/src/commands/operations/insert-image.operation.ts+++ b/packages/slides-ui/src/commands/operations/insert-image.operation.ts@@ -21,6 +21,7 @@ import { CanvasView } from '@univerjs/slides';export interface IInsertImageOperationParams {files: Nullable<File[]>;+ unitId: string;};export const InsertSlideFloatImageOperation: ICommand<IInsertImageOperationParams> = {@@ -36,9 +37,16 @@ export const InsertSlideFloatImageOperation: ICommand<IInsertImageOperationParamconst { imageId, imageSourceType, source, base64Cache } = imageParam;const { width, height, image } = await getImageSize(base64Cache || '');+ const univerInstanceService = accessor.get(IUniverInstanceService);+ const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);+ if (!slideData) return false;++ const activePage = slideData.getActivePage()!;+ const maxIndex = activePage.pageElements ? Math.max(...Object.values(activePage.pageElements).map((element) => element.zIndex)) : 20;+const data = {id: imageId,- zIndex: 20,+ zIndex: maxIndex + 1,left: 0,top: 0,width,@@ -57,12 +65,6 @@ export const InsertSlideFloatImageOperation: ICommand<IInsertImageOperationParam},};- const univerInstanceService = accessor.get(IUniverInstanceService);- const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);- if (!slideData) return false;-- const activePage = slideData.getActivePage()!;-activePage.pageElements[imageId] = data;// console.log(activePage.id);diff --git a/packages/slides-ui/src/commands/operations/insert-shape.operation.ts b/packages/slides-ui/src/commands/operations/insert-shape.operation.tsindex cb0bb8c78a..48225deb59 100644--- a/packages/slides-ui/src/commands/operations/insert-shape.operation.ts+++ b/packages/slides-ui/src/commands/operations/insert-shape.operation.ts@@ -15,13 +15,25 @@*/import type { IAccessor, ICommand, SlideDataModel } from '@univerjs/core';-import { BasicShapes, CommandType, generateRandomId, IUniverInstanceService, LocaleService, PageElementType, UniverInstanceType } from '@univerjs/core';+import { BasicShapes, CommandType, generateRandomId, ICommandService, IUniverInstanceService, LocaleService, PageElementType, UniverInstanceType } from '@univerjs/core';import { ObjectType } from '@univerjs/engine-render';import { CanvasView } from '@univerjs/slides';import { ISidebarService } from '@univerjs/ui';import { COMPONENT_SLIDE_SIDEBAR } from '../../components/sidebar/Sidebar';export interface IInsertShapeOperationParams {+ unitId: string;+};++export const InsertSlideShapeRectangleCommand: ICommand = {+ id: 'slide.command.insert-float-shape',+ type: CommandType.COMMAND,+ handler: async (accessor: IAccessor) => {+ const commandService = accessor.get(ICommandService);+ const instanceService = accessor.get(IUniverInstanceService);+ const unitId = instanceService.getFocusedUnit()?.getUnitId();+ return commandService.executeCommand(InsertSlideShapeRectangleOperation.id, { unitId });+ },};export const InsertSlideShapeRectangleOperation: ICommand<IInsertShapeOperationParams> = {@@ -29,9 +41,18 @@ export const InsertSlideShapeRectangleOperation: ICommand<IInsertShapeOperationPtype: CommandType.OPERATION,handler: async (accessor, params) => {const id = generateRandomId(6);++ const univerInstanceService = accessor.get(IUniverInstanceService);+ const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);++ if (!slideData) return false;++ const activePage = slideData.getActivePage()!;+ const maxIndex = activePage.pageElements ? Math.max(...Object.values(activePage.pageElements).map((element) => element.zIndex)) : 20;+const data = {id,- zIndex: 20,+ zIndex: maxIndex + 1,left: 378,top: 142,width: 250,@@ -50,13 +71,6 @@ export const InsertSlideShapeRectangleOperation: ICommand<IInsertShapeOperationP},};- const univerInstanceService = accessor.get(IUniverInstanceService);- const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);-- if (!slideData) return false;-- const activePage = slideData.getActivePage()!;-activePage.pageElements[id] = data;slideData.updatePage(activePage.id, activePage);diff --git a/packages/slides-ui/src/commands/operations/insert-text.operation.ts b/packages/slides-ui/src/commands/operations/insert-text.operation.tsindex ba3f0685be..e6988b1bb2 100644--- a/packages/slides-ui/src/commands/operations/insert-text.operation.ts+++ b/packages/slides-ui/src/commands/operations/insert-text.operation.ts@@ -15,11 +15,24 @@*/import type { ICommand, IPageElement, SlideDataModel } from '@univerjs/core';-import { CommandType, IUniverInstanceService, PageElementType, Tools, UniverInstanceType } from '@univerjs/core';+import { CommandType, ICommandService, IUniverInstanceService, PageElementType, Tools, UniverInstanceType } from '@univerjs/core';import { CanvasView } from '@univerjs/slides';export interface ISlideAddTextParam {text: string;+ unitId: string;+};++export const SlideAddTextCommand: ICommand = {+ id: 'slide.command.add-text',+ type: CommandType.COMMAND,+ handler: async (accessor) => {+ const commandService = accessor.get(ICommandService);+ const univerInstanceService = accessor.get(IUniverInstanceService);+ const unitId = univerInstanceService.getFocusedUnit()?.getUnitId();+ return await commandService.executeCommand(SlideAddTextOperation.id, { unitId });+ },+};export const SlideAddTextOperation: ICommand<ISlideAddTextParam> = {@@ -32,9 +45,18 @@ export const SlideAddTextOperation: ICommand<ISlideAddTextParam> = {const left = 230;const top = 142;const textContent = params?.text || 'A New Text';++ const univerInstanceService = accessor.get(IUniverInstanceService);+ const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);+ if (!slideData) return false;++ const activePage = slideData.getActivePage()!;++ const maxIndex = activePage.pageElements ? Math.max(...Object.values(activePage.pageElements).map((element) => element.zIndex)) : 21;+const elementData: IPageElement = {id: elementId,- zIndex: 2,+ zIndex: maxIndex + 1,left,top,width: defaultWidth,@@ -52,11 +74,6 @@ export const SlideAddTextOperation: ICommand<ISlideAddTextParam> = {},};- const univerInstanceService = accessor.get(IUniverInstanceService);- const slideData = univerInstanceService.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);- if (!slideData) return false;-- const activePage = slideData.getActivePage()!;activePage.pageElements[elementId] = elementData;slideData.updatePage(activePage.id, activePage);diff --git a/packages/slides-ui/src/commands/operations/update-element.operation.ts b/packages/slides-ui/src/commands/operations/update-element.operation.tsindex c24773830d..548a5eeaf7 100644--- a/packages/slides-ui/src/commands/operations/update-element.operation.ts+++ b/packages/slides-ui/src/commands/operations/update-element.operation.ts@@ -18,6 +18,7 @@ import type { ICommand, SlideDataModel } from '@univerjs/core';import { CommandType, IUniverInstanceService, Tools, UniverInstanceType } from '@univerjs/core';export interface IUpdateElementOperationParams {+ unitId: string;oKey: string;props: Record<string, any>;};diff --git a/packages/slides-ui/src/components/panels/ArrangePanel.tsx b/packages/slides-ui/src/components/panels/ArrangePanel.tsxindex 34697aa5fe..0feb12a63e 100644--- a/packages/slides-ui/src/components/panels/ArrangePanel.tsx+++ b/packages/slides-ui/src/components/panels/ArrangePanel.tsx@@ -82,6 +82,7 @@ export default function ArrangePanel(props: IProps) {});commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object?.oKey,props: {zIndex,diff --git a/packages/slides-ui/src/components/panels/FillPanel.tsx b/packages/slides-ui/src/components/panels/FillPanel.tsxindex c1e2ce0d86..29e049b69b 100644--- a/packages/slides-ui/src/components/panels/FillPanel.tsx+++ b/packages/slides-ui/src/components/panels/FillPanel.tsx@@ -55,6 +55,7 @@ export default function ArrangePanel(props: IProps) {fill: color,});commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object?.oKey,props: {shape: {diff --git a/packages/slides-ui/src/components/panels/TransformPanel.tsx b/packages/slides-ui/src/components/panels/TransformPanel.tsxindex d4fe016daa..4c22d0a0cf 100644--- a/packages/slides-ui/src/components/panels/TransformPanel.tsx+++ b/packages/slides-ui/src/components/panels/TransformPanel.tsx@@ -200,6 +200,7 @@ export default function TransformPanel(props: IProps) {if (!val || !object) return;commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object.oKey,props: {width: val,@@ -214,6 +215,7 @@ export default function TransformPanel(props: IProps) {if (!val || !object) return;commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object.oKey,props: {height: val,@@ -228,6 +230,7 @@ export default function TransformPanel(props: IProps) {if (!val || !object) return;commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object.oKey,props: {left: val,@@ -242,6 +245,7 @@ export default function TransformPanel(props: IProps) {if (!val || !object) return;commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object.oKey,props: {right: val,@@ -256,6 +260,7 @@ export default function TransformPanel(props: IProps) {if (!val || !object) return;commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,oKey: object.oKey,props: {angle: val,diff --git a/packages/slides-ui/src/components/slide-bar/SlideBar.tsx b/packages/slides-ui/src/components/slide-bar/SlideBar.tsxindex 948dff93f8..6bfb4ceb47 100644--- a/packages/slides-ui/src/components/slide-bar/SlideBar.tsx+++ b/packages/slides-ui/src/components/slide-bar/SlideBar.tsx@@ -88,11 +88,11 @@ export function SlideSideBar() {}, [divRefs]); // 依赖于divRefs数组的变化const activatePage = useCallback((page: string) => {- commandService.syncExecuteCommand(ActivateSlidePageOperation.id, { id: page });- }, [commandService]);+ commandService.syncExecuteCommand(ActivateSlidePageOperation.id, { id: page, unitId: currentSlide?.getUnitId() });+ }, [commandService, currentSlide]);const handleAppendSlide = useCallback(() => {- commandService.syncExecuteCommand(AppendSlideOperation.id);+ commandService.syncExecuteCommand(AppendSlideOperation.id, { unitId: currentSlide?.getUnitId() });}, [commandService]);return (diff --git a/packages/slides-ui/src/components/upload-component/UploadFile.tsx b/packages/slides-ui/src/components/upload-component/UploadFile.tsxindex 5f334ef652..7970042046 100644--- a/packages/slides-ui/src/components/upload-component/UploadFile.tsx+++ b/packages/slides-ui/src/components/upload-component/UploadFile.tsx@@ -15,9 +15,10 @@*/import type { Nullable } from '@univerjs/core';-import { ICommandService, useDependency } from '@univerjs/core';+import { ICommandService, IUniverInstanceService, useDependency } from '@univerjs/core';import React, { useRef } from 'react';import type { ICustomComponentProps } from '@univerjs/ui';+import { useObservable } from '@univerjs/ui';import { DRAWING_IMAGE_ALLOW_IMAGE_LIST } from '@univerjs/drawing';import { InsertSlideFloatImageOperation } from '../../commands/operations/insert-image.operation';import styles from './index.module.less';@@ -31,6 +32,8 @@ export const UploadFileMenu = (props: IUploadFileProps) => {const { type } = props;const commandService = useDependency(ICommandService);+ const univerInstanceService = useDependency(IUniverInstanceService);+ const focused = useObservable(univerInstanceService.focused$);const fileInputRef = useRef<HTMLInputElement>(null);@@ -50,7 +53,7 @@ export const UploadFileMenu = (props: IUploadFileProps) => {const files: File[] = Array.from(fileList);if (type === UploadFileType.floatImage) {- commandService.executeCommand(InsertSlideFloatImageOperation.id, { files });+ commandService.executeCommand(InsertSlideFloatImageOperation.id, { files, unitId: focused });}if (fileInputRef.current) {diff --git a/packages/slides-ui/src/controllers/popup-menu.controller.ts b/packages/slides-ui/src/controllers/popup-menu.controller.tsindex b53dd704ed..6ebca091d1 100644--- a/packages/slides-ui/src/controllers/popup-menu.controller.ts+++ b/packages/slides-ui/src/controllers/popup-menu.controller.ts@@ -24,6 +24,7 @@ import { SlideCanvasPopMangerService } from '../services/slide-popup-manager.serimport { COMPONENT_SLIDE_IMAGE_POPUP_MENU } from '../components/image-popup-menu/component-name';import { DeleteSlideElementOperation } from '../commands/operations/delete-element.operation';import { ToggleSlideEditSidebarOperation } from '../commands/operations/insert-shape.operation';+import { UpdateSlideElementOperation } from '../commands/operations/update-element.operation';@OnLifecycle(LifecycleStages.Steady, SlidePopupMenuController)export class SlidePopupMenuController extends RxDisposable {@@ -152,6 +153,28 @@ export class SlidePopupMenuController extends RxDisposable {this.disposeWithMe(transformer.changing$.subscribe(() => {singletonPopupDisposer?.dispose();++ const selectedObjects = transformer.getSelectedObjectMap();+ if (selectedObjects.size > 1) {+ singletonPopupDisposer?.dispose();+ return;+ }++ const object = selectedObjects.values().next().value as Nullable<BaseObject>;+ if (!object) {+ return;+ }++ this._commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId,+ oKey: object.oKey,+ props: {+ width: object.width,+ height: object.height,+ left: object.left,+ top: object.top,+ },+ });}));});@@ -173,6 +196,7 @@ export class SlidePopupMenuController extends RxDisposable {commandId: DeleteSlideElementOperation.id,commandParams: {id: oKey,+ unitId,},disable: false,}];diff --git a/packages/slides-ui/src/controllers/shape.menu.ts b/packages/slides-ui/src/controllers/shape.menu.tsindex 6d55f2faa2..751f69b28a 100644--- a/packages/slides-ui/src/controllers/shape.menu.ts+++ b/packages/slides-ui/src/controllers/shape.menu.ts@@ -18,7 +18,7 @@ import type { IMenuButtonItem, IMenuItem } from '@univerjs/ui';import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';import type { IAccessor } from '@univerjs/core';import { UniverInstanceType } from '@univerjs/core';-import { InsertSlideShapeRectangleOperation } from '../commands/operations/insert-shape.operation';+import { InsertSlideShapeRectangleCommand } from '../commands/operations/insert-shape.operation';export const GRAPH_SINGLE_ICON = 'graph-single';export const SHAPE_MENU_ID = 'slide.menu.shape';@@ -38,7 +38,7 @@ export function SlideShapeMenuFactory(accessor: IAccessor): IMenuItem {export function UploadSlideFloatShapeMenuFactory(_accessor: IAccessor): IMenuButtonItem {return {- id: InsertSlideShapeRectangleOperation.id,+ id: InsertSlideShapeRectangleCommand.id,title: 'slide.shape.insert.rectangle',type: MenuItemType.BUTTON,positions: [SHAPE_MENU_ID],diff --git a/packages/slides-ui/src/controllers/slide-editor-bridge.render-controller.ts b/packages/slides-ui/src/controllers/slide-editor-bridge.render-controller.tsindex e28f3c69ee..dd6bf3f3db 100644--- a/packages/slides-ui/src/controllers/slide-editor-bridge.render-controller.ts+++ b/packages/slides-ui/src/controllers/slide-editor-bridge.render-controller.ts@@ -26,6 +26,7 @@ import { Subject } from 'rxjs';import type { ISetEditorInfo } from '../services/slide-editor-bridge.service';import { ISlideEditorBridgeService } from '../services/slide-editor-bridge.service';import type { ISlideRichTextProps } from '../type';+import { UpdateSlideElementOperation } from '../commands/operations/update-element.operation';// interface ICanvasOffset {// left: number;@@ -164,6 +165,26 @@ export class SlideEditorBridgeRenderController extends RxDisposable implements Ithis._editorBridgeService.endEditing$.next(curRichText);+ const richText: Record<string, any> = {+ bl: 1,+ fs: curRichText.fs,+ text: curRichText.text,+ };+ const textRuns = curRichText.documentData.body?.textRuns;+ if (textRuns && textRuns.length) {+ const textRun = textRuns[0];+ const ts = textRun.ts;++ richText.cl = ts?.cl;+ }++ this._commandService.executeCommand(UpdateSlideElementOperation.id, {+ unitId: this._renderContext.unitId,+ oKey: curRichText?.oKey,+ props: {+ richText,+ },+ });this._curRichText = null;}diff --git a/packages/slides-ui/src/controllers/slide-ui.controller.ts b/packages/slides-ui/src/controllers/slide-ui.controller.tsindex 9bcef99058..7c1f97e3bb 100644--- a/packages/slides-ui/src/controllers/slide-ui.controller.ts+++ b/packages/slides-ui/src/controllers/slide-ui.controller.ts@@ -22,8 +22,8 @@ import { BuiltInUIPart, ComponentManager, IMenuService, IShortcutService, IUIParimport { ActivateSlidePageOperation } from '../commands/operations/activate.operation';import { DeleteSlideElementOperation } from '../commands/operations/delete-element.operation';import { InsertSlideFloatImageOperation } from '../commands/operations/insert-image.operation';-import { InsertSlideShapeRectangleOperation, ToggleSlideEditSidebarOperation } from '../commands/operations/insert-shape.operation';-import { SlideAddTextOperation } from '../commands/operations/insert-text.operation';+import { InsertSlideShapeRectangleCommand, InsertSlideShapeRectangleOperation, ToggleSlideEditSidebarOperation } from '../commands/operations/insert-shape.operation';+import { SlideAddTextCommand, SlideAddTextOperation } from '../commands/operations/insert-text.operation';import { SetSlidePageThumbOperation } from '../commands/operations/set-thumb.operation';import { SetTextEditArrowOperation } from '../commands/operations/text-edit.operation';import { SlideImagePopupMenu } from '../components/image-popup-menu/ImagePopupMenu';@@ -102,7 +102,9 @@ export class SlidesUIController extends Disposable {SetSlidePageThumbOperation,InsertSlideFloatImageOperation,SlideAddTextOperation,+ SlideAddTextCommand,InsertSlideShapeRectangleOperation,+ InsertSlideShapeRectangleCommand,ToggleSlideEditSidebarOperation,DeleteSlideElementOperation,UpdateSlideElementOperation,diff --git a/packages/slides-ui/src/controllers/text.menu.ts b/packages/slides-ui/src/controllers/text.menu.tsindex 6318f0acf3..d9c814b1e4 100644--- a/packages/slides-ui/src/controllers/text.menu.ts+++ b/packages/slides-ui/src/controllers/text.menu.ts@@ -18,13 +18,13 @@ import type { IAccessor } from '@univerjs/core';import { UniverInstanceType } from '@univerjs/core';import type { IMenuButtonItem } from '@univerjs/ui';import { getMenuHiddenObservable, MenuGroup, MenuItemType, MenuPosition } from '@univerjs/ui';-import { SlideAddTextOperation } from '../commands/operations/insert-text.operation';+import { SlideAddTextCommand } from '../commands/operations/insert-text.operation';export const TEXT_ICON_ID = 'text-single';export function SlideAddTextMenuItemFactory(_accessor: IAccessor): IMenuButtonItem {return {- id: SlideAddTextOperation.id,+ id: SlideAddTextCommand.id,group: MenuGroup.TOOLBAR_FORMULAS_INSERT,type: MenuItemType.BUTTON,icon: TEXT_ICON_ID,diff --git a/packages/slides-ui/src/index.ts b/packages/slides-ui/src/index.tsindex 154980ad12..4747e552af 100644--- a/packages/slides-ui/src/index.ts+++ b/packages/slides-ui/src/index.ts@@ -28,10 +28,13 @@ export { SHAPE_MENU_ID } from './controllers/shape.menu';// #region - all commandsexport { ActivateSlidePageOperation } from './commands/operations/activate.operation';+export { DeleteSlideElementOperation } from './commands/operations/delete-element.operation';+export { InsertSlideFloatImageOperation } from './commands/operations/insert-image.operation';+export { InsertSlideShapeRectangleOperation, InsertSlideShapeRectangleCommand } from './commands/operations/insert-shape.operation';export { SetSlidePageThumbOperation } from './commands/operations/set-thumb.operation';export { AppendSlideOperation } from './commands/operations/append-slide.operation';-export { SlideAddTextOperation } from './commands/operations/insert-text.operation';-+export { SlideAddTextOperation, SlideAddTextCommand } from './commands/operations/insert-text.operation';+export { UpdateSlideElementOperation } from './commands/operations/update-element.operation';// #endregionexport { SlideEditorContainer } from './views/editor-container/EditorContainer';