diff --git a/packages/demo/public/assets.json b/packages/demo/public/assets.json index c86e586c4..9dbfde1ec 100644 --- a/packages/demo/public/assets.json +++ b/packages/demo/public/assets.json @@ -25,6 +25,12 @@ { "componentName": "Page", "title": "Page", + "props": [ + { + "name": "style", + "propType": "object" + } + ], "configure": { "events": { "supportedLifecycles": [ @@ -4265,7 +4271,12 @@ "name": "style", "propType": "object" } - ] + ], + "configure": { + "component": { + "isContainer": true + } + } }, { "componentName": "Inner", diff --git a/packages/demo/public/schema.json b/packages/demo/public/schema.json index 9d7714267..c711fa76f 100644 --- a/packages/demo/public/schema.json +++ b/packages/demo/public/schema.json @@ -5,7 +5,7 @@ "ref":"outterView", "autoLoading":true, "style":{ - "padding":20 + "padding": "0 5px 0 5px" } }, "fileName":"test", diff --git a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx index ec5d3c5b7..80abfa1c3 100644 --- a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx @@ -144,7 +144,6 @@ export class SettingsPrimaryPane extends Component<{ editor: Editor }> { animation={false} excessMode="dropdown" contentClassName="lc-settings-tabs-content" - disableKeyboard={true} extra={this.renderBreadcrumb()} > {tabs} diff --git a/packages/react-renderer/src/renderer/base.jsx b/packages/react-renderer/src/renderer/base.jsx index f9b76db64..434386358 100644 --- a/packages/react-renderer/src/renderer/base.jsx +++ b/packages/react-renderer/src/renderer/base.jsx @@ -211,11 +211,11 @@ export default class BaseRender extends PureComponent { // parentInfo 父组件的信息,包含schema和Comp // idx 若为循环渲染的循环Index __createVirtualDom = (schema, self, parentInfo, idx) => { + const { engine } = this.context || {}; try { if (!schema) return null; const { __appHelper: appHelper, __components: components = {} } = this.props || {}; - const { engine } = this.context || {}; if (isJSExpression(schema)) { return parseExpression(schema, self); } diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index c7848a05f..720a006e5 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -109,7 +109,7 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> { viewProps._leaf = leaf; viewProps._componentName = leaf?.componentName; // 如果是容器 && 无children && 高宽为空 增加一个占位容器,方便拖动 - if (leaf.isContainer() && children == null && !viewProps.style){ + if (leaf?.isContainer() && children == null && !viewProps.style){ Object.assign(viewProps, { style:{ height:'100px',