From 8d05f3017784af58e90a989c3de955d6f010f8d0 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Tue, 20 Apr 2021 17:26:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81children=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E5=AF=B9=E9=BD=90react-simulator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-simulator-renderer/src/renderer-view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rax-simulator-renderer/src/renderer-view.tsx b/packages/rax-simulator-renderer/src/renderer-view.tsx index b80e26ca4..883c4a437 100644 --- a/packages/rax-simulator-renderer/src/renderer-view.tsx +++ b/packages/rax-simulator-renderer/src/renderer-view.tsx @@ -231,7 +231,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, ); }} /> From 6f290abe9162fa93612aa9075b4dacce39745c6a Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 21 Apr 2021 20:32:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=E5=8E=BB=E9=99=A4luna=E5=93=81?= =?UTF-8?q?=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderer-core/src/renderer/addon.tsx | 2 +- packages/renderer-core/src/utils/common.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/renderer-core/src/renderer/addon.tsx b/packages/renderer-core/src/renderer/addon.tsx index 4e2a7ca25..cedb3e065 100644 --- a/packages/renderer-core/src/renderer/addon.tsx +++ b/packages/renderer-core/src/renderer/addon.tsx @@ -27,7 +27,7 @@ export default function addonRendererFactory() { const schema = props.__schema || {}; this.state = this.__parseData(schema.state || {}); if (isEmpty(props.config) || !props.config.addonKey) { - console.warn('luna addon has wrong config'); + console.warn('lce addon has wrong config'); this.state.__hasError = true; return; } diff --git a/packages/renderer-core/src/utils/common.ts b/packages/renderer-core/src/utils/common.ts index adb09080d..928ddbfd8 100644 --- a/packages/renderer-core/src/utils/common.ts +++ b/packages/renderer-core/src/utils/common.ts @@ -90,7 +90,7 @@ export function inSameDomain() { export function getFileCssName(fileName: string) { if (!fileName) return; const name = fileName.replace(/([A-Z])/g, '-$1').toLowerCase(); - return (`luna-${name}`) + return (`lce-${name}`) .split('-') .filter((p) => !!p) .join('-'); From e3710929529a5faa274795223417511b0319a43f Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 21 Apr 2021 21:58:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=85=A8?= =?UTF-8?q?=E5=B1=80css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderer-core/src/renderer/base.tsx | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx index 02b0b61b3..965d6ae1d 100644 --- a/packages/renderer-core/src/renderer/base.tsx +++ b/packages/renderer-core/src/renderer/base.tsx @@ -268,9 +268,32 @@ export default function baseRenererFactory() { this.setLocale = (loc: string) => this.appHelper?.utils?.i18n?.setLocale && this.appHelper?.utils?.i18n?.setLocale(loc); }; + __writeCss = () => { + const css = getValue(this.props.__schema, 'css', ''); + let style = this.styleElement; + if (!this.styleElement) { + style = document.createElement('style'); + style.type = 'text/css'; + style.setAttribute('from', 'style-sheet'); + if (style.firstChild) { + style.removeChild(style.firstChild); + } + const head = document.head || document.getElementsByTagName('head')[0]; + head.appendChild(style); + this.styleElement = style; + } + + if (style.innerHTML === css) { + return; + } + + style.innerHTML = css; + }; + __render = () => { const schema = this.props.__schema; this.__setLifeCycleMethods('render'); + this.__writeCss(); const { engine } = this.context; if (engine) { From f0d2d569108629b3ad1054f4e92e91a0b84f6104 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Thu, 22 Apr 2021 11:20:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=BB=84=E4=BB=B6=E5=BC=95=E7=94=A8=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderer-core/src/renderer/base.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx index 965d6ae1d..1d81ac6d8 100644 --- a/packages/renderer-core/src/renderer/base.tsx +++ b/packages/renderer-core/src/renderer/base.tsx @@ -464,7 +464,7 @@ export default function baseRenererFactory() { Comp = compWrapper(Comp); } otherProps.ref = (ref: any) => { - this.$(props.fieldId, ref); // 收集ref + this.$(props.fieldId || props.ref, ref); // 收集ref const refProps = props.ref; if (refProps && typeof refProps === 'string') { this[refProps] = ref; @@ -691,7 +691,7 @@ export default function baseRenererFactory() { $(filedId: string, instance?: any) { this.__instanceMap = this.__instanceMap || {}; - if (!filedId) { + if (!filedId || typeof filedId !== 'string') { return this.__instanceMap; } if (instance) {