github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-03-07 02:47:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
力皓 2021-01-29 14:37:49 +08:00
commit 2a3ec817ca
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/rax-renderer/package.json
View File

@ -11,8 +11,7 @@
"files": [ "files": [
"dist", "dist",
"es", "es",
"lib", "lib"
"src"
], ],
"keywords": [ "keywords": [
"low-code", "low-code",

13
packages/rax-renderer/src/hoc/compFactory.tsx
View File

@ -3,16 +3,19 @@
import { Component, createElement, forwardRef } from 'rax'; import { Component, createElement, forwardRef } from 'rax';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { AppHelper } from '@ali/lowcode-utils'; import { AppHelper } from '@ali/lowcode-utils';
import { utils } from '@ali/lowcode-renderer-core'; import { utils, contextFactory } from '@ali/lowcode-renderer-core';
import CompEngine from '../engine/compEngine'; import componentRendererFactory from '../renderer/component';
import BlockEngine from '../engine/blockEngine'; import blockRendererFactory from '../renderer/block';
import AppContext from '../context/appContext';
const { forEach, isFileSchema } = utils; const { forEach, isFileSchema } = utils;
export default function compFactory(schema, components = {}, componentsMap = {}, config = {}) { export default function compFactory(schema, components = {}, componentsMap = {}, config = {}) {
// 自定义组件需要有自己独立的appHelper // 自定义组件需要有自己独立的appHelper
const appHelper = new AppHelper(config); const appHelper = new AppHelper(config);
const CompRenderer = componentRendererFactory();
const BlockRenderer = blockRendererFactory();
const AppContext = contextFactory();
class LNCompView extends Component { class LNCompView extends Component {
static dislayName = 'lce-comp-factory'; static dislayName = 'lce-comp-factory';
@ -60,7 +63,7 @@ export default function compFactory(schema, components = {}, componentsMap = {},
<CompEngine <CompEngine
{...props} {...props}
__appHelper={appHelper} __appHelper={appHelper}
__components={{ ...components, Component: CompEngine, Block: BlockEngine }} __components={{ ...components, Component: CompRenderer, Block: BlockRenderer }}
__componentsMap={componentsMap} __componentsMap={componentsMap}
/> />
); );

2
packages/rax-simulator-renderer/package.json
View File

@ -57,5 +57,5 @@
"publishConfig": { "publishConfig": {
"registry": "https://registry.npm.alibaba-inc.com" "registry": "https://registry.npm.alibaba-inc.com"
}, },
"homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.32/build/index.html" "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.33/build/index.html"
} }

3
packages/renderer-core/src/index.ts
View File

@ -1,6 +1,7 @@
import adapter from './adapter'; import adapter from './adapter';
import contextFactory from './context';
export { adapter }; export { adapter, contextFactory };
export * from './renderer'; export * from './renderer';
export * as types from './types'; export * as types from './types';