diff --git a/packages/rax-render/package.json b/packages/rax-render/package.json index 3d94e3d9f..c0ed599de 100644 --- a/packages/rax-render/package.json +++ b/packages/rax-render/package.json @@ -61,5 +61,6 @@ "publishConfig": { "registry": "https://registry.npm.alibaba-inc.com" }, - "license": "MIT" + "license": "MIT", + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-renderer@0.1.2/build/index.html" } diff --git a/packages/rax-render/src/engine/index.jsx b/packages/rax-render/src/engine/index.jsx index 67f5d5fd9..2a4af143f 100644 --- a/packages/rax-render/src/engine/index.jsx +++ b/packages/rax-render/src/engine/index.jsx @@ -1,8 +1,8 @@ /* eslint-disable */ -import { Component, createElement as raxCreateElement } from 'rax'; +import { Component, createElement } from 'rax'; import PropTypes from 'prop-types'; import Debug from 'debug'; -import * as isEmpty from 'lodash/isEmpty'; +import isEmpty from 'lodash/isEmpty'; import findDOMNode from 'rax-find-dom-node'; import { isFileSchema, goldlog } from '../utils'; import AppContext from '../context/appContext'; @@ -21,6 +21,8 @@ const ENGINE_COMPS = { TempEngine, }; +const raxCreateElement = createElement; + class FaultComponent extends Component { render() { // FIXME: errorlog @@ -169,9 +171,10 @@ export default class Engine extends Component { Comp = ENGINE_COMPS[`${componentName}Engine`]; } } - if (Comp) { - return ( - - ); - } - return null; + : null + ); } } diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 874fa07df..f2bbbde4c 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -8,6 +8,7 @@ "license": "MIT", "files": [], "scripts": { + "build": "build-scripts build", "cloud-build": "build-scripts build --skip-demo", "test": "ava", "test:snapshot": "ava --update-snapshots" diff --git a/packages/rax-simulator-renderer/src/renderer-view.tsx b/packages/rax-simulator-renderer/src/renderer-view.tsx index 6956c4ceb..5f8e974ca 100644 --- a/packages/rax-simulator-renderer/src/renderer-view.tsx +++ b/packages/rax-simulator-renderer/src/renderer-view.tsx @@ -1,6 +1,7 @@ import { Fragment, Component, createElement } from 'rax'; // import { observer } from './obx-rax/observer'; -import RaxEngine from '@ali/lowcode-rax-renderer'; +// import RaxEngine from '@ali/lowcode-rax-renderer/lib/index'; +import RaxEngine from '../../rax-render/lib/index'; import { SimulatorRenderer } from './renderer'; import { host } from './host'; diff --git a/packages/rax-simulator-renderer/src/renderer.ts b/packages/rax-simulator-renderer/src/renderer.ts index 71cffbba0..67bb30b01 100644 --- a/packages/rax-simulator-renderer/src/renderer.ts +++ b/packages/rax-simulator-renderer/src/renderer.ts @@ -393,20 +393,20 @@ function matcher(parent: any) { function getNodeInstance(dom: HTMLElement): NodeInstance | null { const INTERNAL = '_internal'; let instance = Instance.get(dom); - let parent; + let node; while (instance && instance[INTERNAL]) { if (matcher(instance)) { - parent = instance; + node = instance; break; } instance = instance[INTERNAL].__parentInstance; } - if (!parent) { + if (!node) { return null; } return { - nodeId: parent.props.componentId, - instance: parent + nodeId: node.props.componentId, + instance: node } // return parent; // const instance = fiberNode.stateNode;