github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-13 01:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts from release/1.0.0

Browse Source
This commit is contained in:
muyun.my 2020-11-03 22:03:47 +08:00
parent 512a354c54
commit 6e416d28c8
7 changed files with 3 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/demo/src/editor/components.ts
View File

@ -2,12 +2,8 @@ import logo from '@ali/lowcode-plugin-sample-logo';
import samplePreview from '@ali/lowcode-plugin-sample-preview';
import undoRedo from '@ali/lowcode-plugin-undo-redo';
import componentsPane from '@ali/lowcode-plugin-components-pane';
<<<<<<< HEAD
import outline, { OutlinePane } from '@ali/lowcode-plugin-outline-pane';
import dataSourcePane from '@ali/lowcode-plugin-datasource-pane';
=======
import outline from '@ali/lowcode-plugin-outline-pane';
>>>>>>> origin/release/1.0.0
import zhEn from '@ali/lowcode-plugin-zh-en';
import eventBindDialog from '@ali/lowcode-plugin-event-bind-dialog';
import variableBindDialog from '@ali/lowcode-plugin-variable-bind-dialog';

7
packages/demo/src/editor/config.ts
View File

@ -180,16 +180,11 @@ export default {
const assets = await editor.utils.get('./assets.json');
editor.set('assets', assets);
const simulatorUrl = [
<<<<<<< HEAD:packages/demo/src/editor/config.js
'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.css',
'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.js',
=======
'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.css',
//'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/0.9.50/react-simulator-renderer.js',
//'https://dev.g.alicdn.com/ali-lowcode/ali-lowcode-engine/1.0.0/react-simulator-renderer.js',
// for debug
'http://localhost:3333/js/react-simulator-renderer.js',
// 'http://localhost:3333/js/react-simulator-renderer.css',
>>>>>>> origin/release/1.0.0:packages/demo/src/editor/config.ts
];
editor.set('simulatorUrl', simulatorUrl);
editor.set('requestHandlersMap', {

5
packages/plugin-components-pane/package.json
View File

@ -1,12 +1,7 @@
{
"name": "@ali/lowcode-plugin-components-pane",
<<<<<<< HEAD
"version": "0.1.0-beta.0",
"description": "低代码引擎数据源配置面板",
=======
"version": "1.0.12",
"description": "alibaba lowcode editor component-list plugin",
>>>>>>> origin/release/1.0.0
"files": [
"es/",
"lib/"

2
packages/plugin-datasource-pane/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-datasource-pane",
"version": "0.1.0-beta.6",
"version": "1.0.12",
"description": "低代码引擎数据源面板",
"main": "lib/index.js",
"files": [

5
packages/rax-render/package.json
View File

@ -36,11 +36,8 @@
"@ali/b3-one": "^0.0.17",
"@ali/bzb-request": "2.6.1",
"@ali/lib-mtop": "^2.5.1",
<<<<<<< HEAD
"@ali/lowcode-datasource-engine": "1.0.7-0",
=======
"@ali/lowcode-datasource-engine": "^1.0.12",
"@ali/lowcode-utils": "^1.0.12",
>>>>>>> origin/release/1.0.0
"classnames": "^2.2.6",
"debug": "^4.1.1",
"events": "^3.0.0",

28
packages/rax-render/src/engine/base.tsx
View File

@ -87,34 +87,6 @@ export default class BaseEngine extends Component {
console.warn(e);
}
<<<<<<< HEAD:packages/rax-render/src/engine/base.jsx
=======
reloadDataSource = () => new Promise((resolve, reject) => {
debug('reload data source');
if (!this.__dataHelper) {
this.__showPlaceholder = false;
return resolve();
}
this.__dataHelper
.getInitData()
.then((res) => {
this.__showPlaceholder = false;
if (isEmpty(res)) {
this.forceUpdate();
return resolve();
}
this.setState(res, resolve);
})
.catch((err) => {
if (this.__showPlaceholder) {
this.__showPlaceholder = false;
this.forceUpdate();
}
reject(err);
});
});
>>>>>>> origin/release/1.0.0:packages/rax-render/src/engine/base.tsx
__setLifeCycleMethods = (method, args) => {
const lifeCycleMethods = getValue(this.props.__schema, 'lifeCycles', {});
if (lifeCycleMethods[method]) {

28
packages/react-renderer/src/renderer/base.tsx
View File

@ -83,34 +83,6 @@ export default class BaseRender extends PureComponent {
console.warn(e);
}
<<<<<<< HEAD:packages/react-renderer/src/renderer/base.jsx
=======
reloadDataSource = () => new Promise((resolve, reject) => {
debug('reload data source');
if (!this.__dataHelper) {
this.__showPlaceholder = false;
return resolve();
}
this.__dataHelper
.getInitData()
.then((res) => {
this.__showPlaceholder = false;
if (isEmpty(res)) {
this.forceUpdate();
return resolve();
}
this.setState(res, resolve);
})
.catch((err) => {
if (this.__showPlaceholder) {
this.__showPlaceholder = false;
this.forceUpdate();
}
reject(err);
});
});
>>>>>>> origin/release/1.0.0:packages/react-renderer/src/renderer/base.tsx
__setLifeCycleMethods = (method, args) => {
const lifeCycleMethods = getValue(this.props.__schema, 'lifeCycles', {});
let fn = lifeCycleMethods[method];