feat(sheet): empty formular bar when in array range (#1532)

* feat: empty formular bar when in array range * refactor: remove unused codes
dream-num · Mar 9, 2024 · eea95ac · eea95ac
1 parent 0da7b64
commit eea95ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts b/packages/sheets-ui/src/controllers/editor/formula-editor.controller.ts
@@ -62,12 +62,12 @@ export class FormulaEditorController extends RxDisposable {
         @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
         @IRenderManagerService private readonly _renderManagerService: IRenderManagerService,
         @IEditorBridgeService private readonly _editorBridgeService: IEditorBridgeService,
-        @Inject(DocSkeletonManagerService) private readonly _docSkeletonManagerService: DocSkeletonManagerService,
-        @Inject(DocViewModelManagerService) private readonly _docViewModelManagerService: DocViewModelManagerService,
         @ICommandService private readonly _commandService: ICommandService,
         @IContextService private readonly _contextService: IContextService,
         @IFormulaEditorManagerService private readonly _formulaEditorManagerService: IFormulaEditorManagerService,
         @IUndoRedoService private readonly _undoRedoService: IUndoRedoService,
+        @Inject(DocSkeletonManagerService) private readonly _docSkeletonManagerService: DocSkeletonManagerService,
+        @Inject(DocViewModelManagerService) private readonly _docViewModelManagerService: DocViewModelManagerService,
         @Inject(TextSelectionManagerService) private readonly _textSelectionManagerService: TextSelectionManagerService
     ) {
         super();
@@ -207,7 +207,7 @@ export class FormulaEditorController extends RxDisposable {
                     if (visibleState.visible === false) {
                         this._editorBridgeService.changeVisible({
                             visible: true,
-                            eventType: DeviceInputEventType.PointerDown,
+                            eventType: DeviceInputEventType.Dblclick,
                         });
                     }
                 })

diff --git a/packages/sheets-ui/src/controllers/editor/start-edit.controller.ts b/packages/sheets-ui/src/controllers/editor/start-edit.controller.ts
@@ -523,7 +523,7 @@ export class StartEditController extends Disposable {
                         return;
                     }
 
-                    this._resetBodyStyle(snapshot.body!);
+                    this._resetBodyStyle(snapshot.body!, !!isInArrayFormulaRange);
 
                     documentDataModel.reset(snapshot);
                     documentViewModel.reset(documentDataModel);
@@ -563,11 +563,11 @@ export class StartEditController extends Disposable {
         );
     }
 
-    private _resetBodyStyle(body: IDocumentBody) {
+    private _resetBodyStyle(body: IDocumentBody, removeStyle = false) {
         body.dataStream = DEFAULT_EMPTY_DOCUMENT_VALUE;
 
         if (body.textRuns != null) {
-            if (body.textRuns.length === 1) {
+            if (body.textRuns.length === 1 && !removeStyle) {
                 body.textRuns[0].st = 0;
                 body.textRuns[0].ed = 1;
             } else {