From 21d92ffd2dae69a0c3c2ece11b87d505593c653c Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Fri, 11 Dec 2020 12:25:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20svg-icon=20=E9=BB=98=E8=AE=A4=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20large?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/designer/src/component-meta.ts | 15 ++++----------- packages/utils/src/svg-icon.tsx | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/packages/designer/src/component-meta.ts b/packages/designer/src/component-meta.ts index b55c14d20..396ddbf55 100644 --- a/packages/designer/src/component-meta.ts +++ b/packages/designer/src/component-meta.ts @@ -280,17 +280,10 @@ export class ComponentMeta { checkNestingDown(my: Node, target: Node | NodeSchema | NodeSchema[]) { // 检查父子关系,直接约束型,在画布中拖拽直接掠过目标容器 if (this.childWhitelist) { - let _target: any = target; - if (!Array.isArray(_target)) { - _target = [_target]; - } - - return !_target.some((item: Node | NodeSchema) => { - let _item = item; - if (!isNode(_item)) { - _item = new Node(my.document, _item); - } - return this.childWhitelist && !this.childWhitelist(_item, my); + const _target: any = !Array.isArray(target) ? [target] : target; + return _target.every((item: Node | NodeSchema) => { + const _item = !isNode(item) ? new Node(my.document, item) : item; + return this.childWhitelist && this.childWhitelist(_item, my); }); } return true; diff --git a/packages/utils/src/svg-icon.tsx b/packages/utils/src/svg-icon.tsx index f75724b06..a0bde9eab 100644 --- a/packages/utils/src/svg-icon.tsx +++ b/packages/utils/src/svg-icon.tsx @@ -18,7 +18,7 @@ export interface IconProps { export function SVGIcon({ fill, - size = 'medium', + size = 'large', viewBox, style, children,