From fc398c25c6208026f500b7499fe9f742c29f8a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E7=86=A0?= Date: Tue, 4 Aug 2020 15:04:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=80=8E=E4=B9=88=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/settings/settings-pane.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx index 1513fb05b..50ea8d574 100644 --- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx @@ -16,8 +16,9 @@ class SettingFieldView extends Component<{ field: SettingField }> { render() { const { field } = this.props; - const { extraProps } = field; + const { extraProps, componentMeta } = field; const { condition, defaultValue, display } = extraProps; + const { prototype } = componentMeta; let visible; try { visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true; @@ -33,6 +34,8 @@ class SettingFieldView extends Component<{ field: SettingField }> { let setterProps: any = {}; let setterType: any; let initialValue: any = null; + const isReactComponent = prototype === null || prototype === undefined; + console.log(111, this.props); if (Array.isArray(setter)) { setterType = 'MixedSetter'; setterProps = { @@ -49,12 +52,13 @@ class SettingFieldView extends Component<{ field: SettingField }> { if (setter.initialValue != null) { initialValue = setter.initialValue; } - } else if (setter) { - // 默认配置上变量绑定功能 + } else if (isReactComponent) { setterType = 'MixedSetter'; setterProps = { setters: [setter, 'VariableSetter'], }; + } else if (setter) { + setterType = setter; } let value = null;