From b26266547b7a46bdb083e6d3e04e10d01af7a116 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Sun, 27 Sep 2020 10:46:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=20lc-container-placeholder=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20children=20=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/renderer-view.tsx | 26 +++++++-------- .../src/renderer.less | 32 ------------------- 2 files changed, 13 insertions(+), 45 deletions(-) diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 07b63d6f7..aa758fe16 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -151,18 +151,18 @@ class Renderer extends Component<{ viewProps._leaf = leaf; viewProps._componentName = leaf?.componentName; // 如果是容器 && 无children && 高宽为空 增加一个占位容器,方便拖动 - // if ( - // !viewProps.dataSource && - // leaf?.isContainer() && - // (children == null || (Array.isArray(children) && !children.length)) && - // (!viewProps.style || Object.keys(viewProps.style).length === 0) - // ) { - // children = ( - //
- // {viewProps.placeholder || '拖拽组件或模板到这里'} - //
- // ); - // } + if ( + !viewProps.dataSource && + leaf?.isContainer() && + (children == null || (Array.isArray(children) && !children.length)) && + (!viewProps.style || Object.keys(viewProps.style).length === 0) + ) { + children = ( +
+ {viewProps.placeholder || '拖拽组件或模板到这里'} +
+ ); + } if (viewProps._componentName === 'a') { delete viewProps.href; } @@ -189,7 +189,7 @@ class Renderer extends Component<{ return createElement( getDeviceView(Component, device, designMode), viewProps, - leaf?.isContainer() ? (children == null ? [] : Array.isArray(children) ? children : [children]) : null, + leaf?.isContainer() ? (children == null ? [] : Array.isArray(children) ? children : [children]) : children, ); }} onCompGetRef={(schema: any, ref: ReactInstance | null) => { diff --git a/packages/react-simulator-renderer/src/renderer.less b/packages/react-simulator-renderer/src/renderer.less index 0e77cb867..d8c580549 100644 --- a/packages/react-simulator-renderer/src/renderer.less +++ b/packages/react-simulator-renderer/src/renderer.less @@ -63,28 +63,6 @@ html.engine-cursor-ew-resize, html.engine-cursor-ew-resize * { text-align: center; } -.engine-empty { - background: #f2f3f5; - color: #a7b1bd; - outline: 1px dashed rgba(31, 56, 88, 0.2); - outline-offset: -1px !important; - height: 66px; - max-height: 100%; - min-width: 140px; - text-align: center; - overflow: hidden; - display: flex; - align-items: center; -} - -.engine-empty:before { - content: '\62D6\62FD\7EC4\4EF6\6216\6A21\677F\5230\8FD9\91CC'; - font-size: 14px; - z-index: 1; - width: 100%; - white-space: nowrap; -} - body.engine-document { &:after, &:before { content: ""; @@ -93,16 +71,6 @@ body.engine-document { &:after { clear: both; } - - /* - .next-input-group, - .next-checkbox-group,.next-date-picker,.next-input,.next-month-picker, - .next-number-picker,.next-radio-group,.next-range,.next-range-picker, - .next-rating,.next-select,.next-switch,.next-time-picker,.next-upload, - .next-year-picker, - .next-breadcrumb-item,.next-calendar-header,.next-calendar-table { - pointer-events: none !important; - }*/ } .engine-live-editing {