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: editing text and save (#2929)
lumix09a0832146ed
diff --git a/examples/src/data/slides/default-pages/page1.ts b/examples/src/data/slides/default-pages/page1.tsindex 35fcb01026..7b1e0ae111 100644--- a/examples/src/data/slides/default-pages/page1.ts+++ b/examples/src/data/slides/default-pages/page1.ts@@ -106,7 +106,7 @@ export const DEFAULT_FIRST_PAGE = {zIndex: 2,left: 430,top: 42,- width: 100,+ width: 120,height: 40,title: 'mask',description: '',diff --git a/packages/engine-render/src/base-object.ts b/packages/engine-render/src/base-object.tsindex 16575fcd6d..654198a8f7 100644--- a/packages/engine-render/src/base-object.ts+++ b/packages/engine-render/src/base-object.ts@@ -537,6 +537,10 @@ export abstract class BaseObject extends Disposable {return this;}+ /**+ * this[pKey] = option[pKey]+ * @param option+ */transformByState(option: IObjectFullState) {const optionKeys = Object.keys(option);const preKeys: IObjectFullState = {};diff --git a/packages/engine-render/src/render-manager/render-manager.service.ts b/packages/engine-render/src/render-manager/render-manager.service.tsindex 14a0b3908b..8bd04bcdea 100644--- a/packages/engine-render/src/render-manager/render-manager.service.ts+++ b/packages/engine-render/src/render-manager/render-manager.service.ts@@ -37,6 +37,10 @@ export interface IRenderManagerService extends IDisposable {createRender(unitId: string): IRender;removeRender(unitId: string): void;setCurrent(unitId: string): void;+ /**+ * get RenderUnit By Id, RenderUnit implements IRender+ * @param unitId+ */getRenderById(unitId: string): Nullable<IRender>;getAllRenderersOfType(type: UniverInstanceType): RenderUnit[];getCurrentTypeOfRenderer(type: UniverInstanceType): Nullable<RenderUnit>;diff --git a/packages/engine-render/src/shape/rich-text.ts b/packages/engine-render/src/shape/rich-text.tsindex cfba893f3f..59d74f5757 100644--- a/packages/engine-render/src/shape/rich-text.ts+++ b/packages/engine-render/src/shape/rich-text.ts@@ -59,34 +59,68 @@ export class RichText extends BaseObject {private _documents!: Documents;+ /**+ * fontFamily+ */private _ff?: Nullable<string>;+ /**+ * fontSize+ * pt+ */private _fs?: number = 12;+ /**+ * italic+ * 0: false+ * 1: true+ */private _it?: BooleanNumber = BooleanNumber.FALSE;+ /**+ * bold+ * 0: false+ * 1: true+ */private _bl?: BooleanNumber = BooleanNumber.FALSE;+ /**+ * underline+ */private _ul?: ITextDecoration = {s: BooleanNumber.FALSE,};+ /**+ * strikethrough+ */private _st?: ITextDecoration = {s: BooleanNumber.FALSE,};+ /**+ * overline+ */private _ol?: ITextDecoration = {s: BooleanNumber.FALSE,};+ /**+ * background+ */private _bg?: Nullable<IColorStyle>;+ /**+ * border+ */private _bd?: Nullable<IBorderData>;+ /**+ * foreground+ */private _cl?: Nullable<IColorStyle>;override objectType = ObjectType.RICH_TEXT;- private _originProps: IRichTextProps;constructor(private _localeService: LocaleService,@@ -108,8 +142,6 @@ export class RichText extends BaseObject {this._bd = props.bd;this._cl = props.cl;- this._originProps = props;-this._documentData = this._convertToDocumentData(props.text || '');}@@ -134,6 +166,8 @@ export class RichText extends BaseObject {const size = this.getDocsSkeletonPageSize();this.height = size?.height || this.height;this._setTransForm();++ this.refreshDocumentByDocData();}});}@@ -305,7 +339,10 @@ export class RichText extends BaseObject {this.makeDirty(true);}- updateDocumentByDocData() {+ /**+ * _documentData changed ---> update _documentSkeleton & _documentSkeleton+ */+ refreshDocumentByDocData() {const docModel = new DocumentDataModel(this._documentData);const docViewModel = new DocumentViewModel(docModel);@@ -316,11 +353,10 @@ export class RichText extends BaseObject {pageMarginTop: 0,});- const props = this._originProps;this._documentSkeleton.getViewModel().getDataModel()- .updateDocumentDataPageSize(props?.width, props?.height);+ .updateDocumentDataPageSize(this.width, this.height);this._documentSkeleton.calculate();}diff --git a/packages/slides-ui/src/controllers/slide-editing.render-controller.ts b/packages/slides-ui/src/controllers/slide-editing.render-controller.tsindex 70ca41d65e..2af622dc2a 100644--- a/packages/slides-ui/src/controllers/slide-editing.render-controller.ts+++ b/packages/slides-ui/src/controllers/slide-editing.render-controller.ts@@ -186,6 +186,7 @@ export class SlideEditingRenderController extends Disposable implements IRenderM}private _initEditorVisibilityListener(): void {+ // startEditing --> slide-editor-bridge.render-controller.ts@changeVisible --> _editorBridgeService.changeVisiblethis.disposeWithMe(this._editorBridgeService.visible$// .pipe(distinctUntilChanged((prev, curr) => prev.visible === curr.visible)).subscribe((param) => {@@ -242,7 +243,9 @@ export class SlideEditingRenderController extends Disposable implements IRenderM* @param d DisposableCollection*/private _subscribeToCurrentCell(d: DisposableCollection) {- // invoked by slide-editor-bridge.service.ts@setEditorRectn---> currentEditRectState$.next+ // first part of editing.+ // startEditing --> _updateEditor --> slide-editor-bridge.service.ts@setEditorRect---> currentEditRectState$.next(editCellState)+ // startEditing --> changeVisibled.add(this._editorBridgeService.currentEditRectState$.subscribe((editCellState) => {if (editCellState == null) {return;@@ -272,11 +275,13 @@ export class SlideEditingRenderController extends Disposable implements IRenderMendOffset: 0,}]);- // hide the editor, but the editor is still exist.// the last active, calling stack trace:// EditorContainer.tsx cellEditorManagerService.state$.subscribe -->// EditorContainer.tsx cellEditorManagerService.setFocus(true) -->// _textSelectionRenderManager.sync() --> _updateInputPosition --> activate++ // hide the editor, but the editor is still exist.+ // the last and valid call activate is in _textSelectionRenderManager.sync() --> _updateInputPositionthis._textSelectionRenderManager.activate(HIDDEN_EDITOR_POSITION, HIDDEN_EDITOR_POSITION);}));}@@ -427,6 +432,9 @@ export class SlideEditingRenderController extends Disposable implements IRenderMlet { startX, startY } = actualRangeWithCoord;+ startX += canvasOffset.left;+ startY += canvasOffset.top;+const { document: documentComponent, scene, engine: docEngine } = editorObject;const viewportMain = scene.getViewport(DOC_VIEWPORT_KEY.VIEW_MAIN);@@ -546,10 +554,14 @@ export class SlideEditingRenderController extends Disposable implements IRenderM}/**+ * show input area, resize input area and then place input to right place.* invoked when this._editorBridgeService.visible$ param.visible = true+ *+ * handleVisible is the 2nd part of editing.+ * startEditing --> _updateEditor+ * startEditing --> changeVisible --> slide-editor-bridge.render-controller.ts@changeVisible --> _editorBridgeService.changeVisible* @param param*/-private _handleEditorVisible(param: IEditorBridgeServiceVisibleParam) {const { eventType, keycode } = param;@@ -567,7 +579,7 @@ export class SlideEditingRenderController extends Disposable implements IRenderMconst {position,documentLayoutObject,- canvasOffset,+ slideCardOffset: canvasOffset,scaleX,scaleY,editorUnitId,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 2ed2c02d39..d240e655af 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@@ -14,12 +14,12 @@* limitations under the License.*/-import type { IDisposable, SlideDataModel, UnitModel } from '@univerjs/core';+import type { IDisposable, Nullable, SlideDataModel, UnitModel } from '@univerjs/core';import { DisposableCollection, ICommandService, IContextService, Inject, IUniverInstanceService, RxDisposable, UniverInstanceType } from '@univerjs/core';import {TextSelectionManagerService,} from '@univerjs/docs';-import type { IChangeObserverConfig, IRenderContext, IRenderModule, RichText } from '@univerjs/engine-render';+import type { BaseObject, IChangeObserverConfig, IRenderContext, IRenderModule, RichText } from '@univerjs/engine-render';import { ITextSelectionRenderManager, ObjectType } from '@univerjs/engine-render';import { CanvasView } from '@univerjs/slides';import { Subject } from 'rxjs';@@ -100,35 +100,61 @@ export class SlideEditorBridgeRenderController extends RxDisposable implements Ifor (let i = 0; i < pages.length; i++) {const page = pages[i];const { scene } = this._canvasView.getRenderUnitByPageId(page.id);- const transformer = scene?.getTransformer();+ if (!scene) break;- if (!transformer) return;+ const transformer = scene.getTransformer();+ if (!transformer) break;++ d.add(transformer.clearControl$.subscribe(() => {+ this.setEditorVisible(false);+ }));+ d.add(transformer.createControl$.subscribe(() => {+ this.setEditorVisible(false);+ }));- // calling twice when add an object.d.add(transformer.changeStart$.subscribe((param: IChangeObserverConfig) => {const target = param.target;if (!target) return;if (target.objectType !== ObjectType.RICH_TEXT) {- this.saveCurrEditingState();+ this.pickOtherObjects();+ } else if (target === this._curRichText) {+ // do nothing+ }+ }));++ d.add(scene.onDblclick$.subscribeEvent(() => {+ transformer.clearControls();+ const selectedObjects = transformer.getSelectedObjectMap();+ const object = selectedObjects.values().next().value as Nullable<BaseObject>;+ if (!object) return;- // rm other text editor- this.changeVisible(false);+ if (object.objectType !== ObjectType.RICH_TEXT) {+ this.pickOtherObjects();} else {- // const elementData = (target as RichText).toJson();- this._curRichText = target as RichText;- this.startEditing(target as RichText);+ this.startEditing(object as RichText);}}));}}- saveCurrEditingState() {+ pickOtherObjects() {+ this.setEditorVisible(false);+ this.endEditing();+ }++ /**+ * invoked when picking other object.+ *+ * save editing state to curr richText.+ */+ endEditing() {if (!this._curRichText) return;const curRichText = this._curRichText;const slideData = this._instanceSrv.getCurrentUnitForType<SlideDataModel>(UniverInstanceType.UNIVER_SLIDE);if (!slideData) return false;- curRichText.updateDocumentByDocData();+ curRichText.refreshDocumentByDocData();+ this._curRichText = null;}/**@@ -136,15 +162,21 @@ export class SlideEditorBridgeRenderController extends RxDisposable implements I* editingParam derives from RichText object.** TODO @lumixraku need scale param- * @param editingParam+ * @param target*/startEditing(target: RichText) {// this.setSlideTextEditor$.next({ content, rect });+ this._curRichText = target as RichText;this._updateEditor(target);- this.changeVisible(true);+ this.setEditorVisible(true);}- changeVisible(visible: boolean) {+ setEditorVisible(visible: boolean) {+ if (visible) {+ this._curRichText?.hide();+ } else {+ this._curRichText?.show();+ }const { unitId } = this._renderContext;this._editorBridgeService.changeVisible({ visible, eventType: 3, unitId });}diff --git a/packages/slides-ui/src/services/slide-editor-bridge.service.ts b/packages/slides-ui/src/services/slide-editor-bridge.service.tsindex c67de57e9e..f2b4372907 100644--- a/packages/slides-ui/src/services/slide-editor-bridge.service.ts+++ b/packages/slides-ui/src/services/slide-editor-bridge.service.ts@@ -22,22 +22,32 @@ import {EDITOR_ACTIVATED,FOCUSING_EDITOR_STANDALONE,FOCUSING_UNIVER_EDITOR_STANDALONE_SINGLE_MODE,+ HorizontalAlign,IContextService,VerticalAlign,} from '@univerjs/core';import type { Engine, IDocumentLayoutObject, RichText, Scene } from '@univerjs/engine-render';-import { DeviceInputEventType } from '@univerjs/engine-render';+import { DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';+import { SLIDE_KEY } from '@univerjs/slides';import type { KeyCode } from '@univerjs/ui';import { IEditorService } from '@univerjs/ui';import type { Observable } from 'rxjs';import { BehaviorSubject } from 'rxjs';+// TODO same as @univerjs/slides/views/render/adaptors/index.js+export enum SLIDE_VIEW_KEY {+ MAIN = '__SLIDERender__',+ SCENE_VIEWER = '__SLIDEViewer__',+ SCENE = '__SLIDEScene__',+ VIEWPORT = '__SLIDEViewPort_',+}+export const ISlideEditorBridgeService = createIdentifier<SlideEditorBridgeService>('univer.slide-editor-bridge.service');export interface IEditorBridgeServiceParam {unitId: string;position: IPosition;- canvasOffset: { left: number; top: number };+ slideCardOffset: { left: number; top: number };documentLayoutObject: IDocumentLayoutObject;scaleX: number;scaleY: number;@@ -109,7 +119,8 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditorconstructor(@IEditorService private readonly _editorService: IEditorService,- @IContextService private readonly _contextService: IContextService+ @IContextService private readonly _contextService: IContextService,+ @IRenderManagerService private readonly _renderManagerService: IRenderManagerService) {super();}@@ -139,7 +150,7 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditorconst editCellState = this.getEditRectState();this._currentEditRectState = editCellState;- // editing render controller @_subscribeToCurrentCell+ // slide-editing.render-controller.ts@_subscribeToCurrentCell --> activate(-1000, -1000)this._currentEditRectState$.next(editCellState);}@@ -167,8 +178,9 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditor/*** get info from _currentEditRectInfo+ *+ * invoked by slide-editing.render-controller.ts@_handleEditorVisible & this@setEditorRect*/-getEditRectState(): Readonly<Nullable<IEditorBridgeServiceParam>> {const editorUnitId = DOCS_NORMAL_EDITOR_UNIT_ID_KEY;@@ -193,8 +205,8 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditorfontString: 'document',textRotation: { a: 0, v: 0 },wrapStrategy: 0,- verticalAlign: VerticalAlign.MIDDLE,- horizontalAlign: 0,+ verticalAlign: VerticalAlign.TOP,+ horizontalAlign: HorizontalAlign.LEFT,paddingData: { t: 0, b: 1, l: 2, r: 2 },};@@ -204,6 +216,26 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditorconst editorHeight = editorRectInfo.richTextObj.height;const left = editorRectInfo.richTextObj.left;const top = editorRectInfo.richTextObj.top;++ const canvasOffset = {+ left: 0,+ top: 0,+ };+ // canvasOffset will be used in slide-editing.render-controller.ts@_handleEditorVisible+ // const mainScene = this._mainScene;+ const renderUnit = this._renderManagerService.getRenderById(unitId);+ const mainScene = renderUnit?.scene;+ const mainViewport = mainScene?.getViewport(SLIDE_KEY.VIEW);+ const slideMainRect = mainScene?.getObject(SLIDE_KEY.COMPONENT);+ const slidePos = {+ x: slideMainRect?.left || 0,+ y: slideMainRect?.top || 0,+ };+ const scrollX = mainViewport?.viewportScrollX || 0;+ const scrollY = mainViewport?.viewportScrollY || 0;+ canvasOffset.left = slidePos.x - scrollX;+ canvasOffset.top = slidePos.y - scrollY;+return {position: {startX: left,@@ -213,7 +245,7 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditor},scaleX: 1,scaleY: 1,- canvasOffset: { left: 0, top: 0 },+ slideCardOffset: canvasOffset,unitId,editorUnitId,documentLayoutObject,@@ -236,6 +268,9 @@ export class SlideEditorBridgeService extends Disposable implements ISlideEditorreturn this._editorUnitId;}+ /**+ * @deprecated+ */genDocData(target: RichText) {const editorUnitId = this.getCurrentEditorId();const content = target.text;diff --git a/packages/slides-ui/src/views/editor-container/EditorContainer.tsx b/packages/slides-ui/src/views/editor-container/EditorContainer.tsxindex d71b3eacdd..1298b611c9 100644--- a/packages/slides-ui/src/views/editor-container/EditorContainer.tsx+++ b/packages/slides-ui/src/views/editor-container/EditorContainer.tsx@@ -121,7 +121,7 @@ export const EditorContainer: React.FC<ICellIEditorProps> = () => {return (<div- className={styles.editorContainer}+ className={styles.slideEditorContainer}style={{left: state.left,top: state.top,diff --git a/packages/slides-ui/src/views/editor-container/index.module.less b/packages/slides-ui/src/views/editor-container/index.module.lessindex 6576f6c816..464c167bd5 100644--- a/packages/slides-ui/src/views/editor-container/index.module.less+++ b/packages/slides-ui/src/views/editor-container/index.module.less@@ -1,4 +1,4 @@-.editor-container {+.slide-editor-container {position: absolute;z-index: 10;top: 200px;@@ -21,7 +21,7 @@width: 100%;height: 100%;- background: white;+ background: rgba(174, 174, 174, 0.2);canvas {position: absolute;