From 94b9aa7037bd80b8fecfd8d1272df21269ae5b48 Mon Sep 17 00:00:00 2001 From: "lihao.ylh" Date: Thu, 29 Jul 2021 14:24:12 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc.js | 2 +- packages/designer/src/designer/designer.ts | 14 ++++++-------- packages/editor-core/src/editor.ts | 14 ++++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9f3523efb..3f11e47e4 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -28,6 +28,6 @@ module.exports = { 'eol-last': 0, 'react/no-find-dom-node': 0, 'no-case-declarations': 0, - '@typescript-eslint/indent': 0, + '@typescript-eslint/indent': 0 } }; diff --git a/packages/designer/src/designer/designer.ts b/packages/designer/src/designer/designer.ts index aec49a556..25fc4e636 100644 --- a/packages/designer/src/designer/designer.ts +++ b/packages/designer/src/designer/designer.ts @@ -321,21 +321,19 @@ export class Designer { target: activedDoc.rootNode as ParentalNode, }; } - const focusNode = activedDoc.focusNode; + const focusNode = activedDoc.focusNode!; const nodes = activedDoc.selection.getNodes(); const refNode = nodes.find(item => focusNode.contains(item)); let target; let index: number | undefined; if (!refNode || refNode === focusNode) { target = focusNode; + } else if (refNode.componentMeta.isContainer) { + target = refNode; } else { - if (refNode.componentMeta.isContainer) { - target = refNode; - } else { - // FIXME!!, parent maybe null - target = refNode.parent!; - index = refNode.index + 1; - } + // FIXME!!, parent maybe null + target = refNode.parent!; + index = refNode.index + 1; } if (target && insertNode && !target.componentMeta.checkNestingDown(target, insertNode)) { diff --git a/packages/editor-core/src/editor.ts b/packages/editor-core/src/editor.ts index 9c336c6a6..c29d03ba0 100644 --- a/packages/editor-core/src/editor.ts +++ b/packages/editor-core/src/editor.ts @@ -5,7 +5,7 @@ import { PluginClassSet, KeyType, GetReturnType, - HookConfig + HookConfig, } from '@ali/lowcode-types'; import { globalLocale } from './intl'; import * as utils from './utils'; @@ -156,13 +156,15 @@ export class Editor extends EventEmitter implements IEditor { }); }; + /* eslint-disable */ private waits = new Map< - KeyType, - Array<{ - once?: boolean; - resolve: (data: any) => void; - }> + KeyType, + Array<{ + once?: boolean; + resolve: (data: any) => void; + }> >(); + /* eslint-enable */ private notifyGot(key: KeyType) { let waits = this.waits.get(key);