74 Commits

Author SHA1 Message Date
力皓
a17573191f chore: code style fix 2021-02-08 11:48:42 +08:00
wuyue.xht
630d3201ff feat: 重构renderer 2021-01-29 12:36:31 +08:00
力皓
1f241eafc7 fix: 删除无用代码, 解决 ts 编译报错 2020-12-10 10:58:48 +08:00
力皓
547fa1a5c8 refactor(renderer): 移除 Loading 相关的代码, 避免引入 next css
refactor(test): 增加 node 部分的单测
2020-12-09 20:22:11 +08:00
力皓
ea6bc7aeb8 feat: 合入 trunk-vision 代码 2020-12-04 20:57:35 +08:00
力皓
275b7aaef9 fix: 修复 setDevice 里获取 currentDocument 的逻辑 2020-11-20 14:15:18 +08:00
muyun.my
3d5b5d2c63 chore: 优化代码,添加注释 2020-11-10 19:28:39 +08:00
muyun.my
707de45211 fix: 设计和预览两种场景下 requestHandlersMap 的接入 2020-11-10 09:55:42 +08:00
muyun.my
aa7896090d chore: debug for alimama 2020-11-08 18:03:33 +08:00
muyun.my
98ae1ed82c fix: 修复数据源的接入问题 2020-11-07 22:01:01 +08:00
力皓
11e8e02f70 fix: 解决 device 变化后不刷新视图的 bug 2020-11-05 17:09:05 +08:00
muyun.my
806ca62c05 fix: 去除 handler 依赖 2020-11-05 10:58:45 +08:00
muyun.my
6e416d28c8 chore: resolve conflicts from release/1.0.0 2020-11-03 22:03:47 +08:00
muyun.my
512a354c54 chore: merge from release/1.0.0 2020-11-03 21:47:14 +08:00
muyun.my
a155920705 feat: renderer 接入数据源引擎 2020-11-03 18:57:02 +08:00
力皓
0aafafe6ea fix: i18n 绑定变量后消失
fix: block 区块组件无法显示
2020-09-23 21:38:58 +08:00
春希
533e09acb1 Merge branch 'release/1.0.0' into refactor/merge-rax-generator 2020-09-19 21:20:58 +08:00
zude.hzd
c7c01def80 componentDidUpdate 中处理schema中的state更新 2020-09-18 11:46:13 +08:00
力皓
933cef1c8a feat: 补充一些 vision API 2020-09-17 13:49:04 +08:00
wuji.xwt
5d259055fb refactor: code style
Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3681622

* chore: remove unnecessary code

* refactor: react-render using TypeScript

* chore: build-script

* refactor: editor-skeleton

* refactor: designer

* refactor: material-parser

* refactor: editor-setters

* refactor: js to ts for rax-provider 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3678180

* refactor: rax-provider

* feat: add build command

* chore: compilerOptions for rax-provider

* refactor: JS to TS for Rax Renderer 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3678935

* refactor: rax-renderer

* Merge remote-tracking branch 'origin/refactor/js-to-ts' into refactor/js2ts-rax-renderer

* Merge remote-tracking branch 'origin/refactor/js-to-ts' into refactor/js2ts-rax-renderer

* refactor: ts-nocheck

* chore: ts compile error

* fix: ts rootDir

* fix: compile error

* chore: using same tsconfig for rax component

* refactor: ts compile rax-renderer && rax-provider

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/js-to-ts

# Conflicts:
#	packages/rax-render/src/utils/appHelper.js
#	packages/rax-render/src/utils/appHelper.ts
#	packages/utils/src/appHelper.ts

* refactor: no JS file

* refactor: remove lint

* feat: add xima

* feat: add eslint ignore

* style: fix by lint

* feat: lint command

* fix: using the same eslint config

* style: eslint settings

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style

# Conflicts:
#	packages/plugin-event-bind-dialog/src/index.tsx
#	packages/plugin-source-editor/src/index.tsx
#	packages/runtime/src/core/container.ts
#	packages/runtime/src/core/provider.ts

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style

# Conflicts:
#	packages/designer/src/document/document-model.ts
#	packages/designer/src/document/node/node-children.ts
#	packages/designer/src/document/node/props/prop.ts
#	packages/plugin-source-editor/src/index.tsx

* fix: 修改dataSource items -> list

* Merge remote-tracking branch 'origin/relase/1.0.0' into refactor/code-style

# Conflicts:
#	packages/react-renderer/package.json

* refactor: component-panel 

plugin-component-pane 代码规范化

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3703771

* feat: support bizcomps

* refactor: component-panel

* style: eslint

* Merge branch 'refactor/code-style' into fix/ducheng-source-style

* style: code style

* Merge branch 'fix/ducheng-source-style' into 'refactor/code-style'
Code review title: Fix/ducheng source style
Code review Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3705972

* style: for demo

* style: for demo-server

* style: for plugin-event-bind-dialog

* style: for plugin-sample-preview

* style: for plugin-undo-redo

* style: plugin-variable-bind-dialog

* style: types

* style: for utils

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style

# Conflicts:
#	packages/editor-setters/src/expression-setter/locale/snippets.ts
#	packages/editor-setters/src/json-setter/locale/snippets.ts
#	packages/editor-setters/src/locale/snippets.ts
#	packages/plugin-components-pane/package.json
#	packages/rax-render/src/hoc/compWrapper.tsx
#	packages/rax-render/src/utils/index.ts
#	packages/react-renderer/src/context/appContext.ts

* style: editor-preset-general 

editor-preset-general 代码规范化

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3707974

* style: editor-preset-general

* fix: should set field

* fix: should set field - demo-server

* refactor(style): fix code style for designer

refactor(style): fix code style for editor-core

refactor(style): fix code style for editor-skeleton

refactor(style): fix code style for react-simulator-renderer

refactor(style): fix code style for rax-simulator-renderer

* Merge branch 'refactor/lihao-code-style' into 'refactor/code-style'
Code review title: refactor(style): fix code style for designer
Code review description: refactor(style): fix code style for editor-core

refactor(style): fix code style for editor-skeleton

refactor(style): fix code style for react-simulator-renderer

refactor(style): fix code style for rax-simulator-renderer
Code review Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3709472

* style: react/no-multi-comp set to 0 for designer

* style: ignore editor-prset-vision

* style: fix for plugin-outline-pane

* style: fix for rax-provider

* style: react-provider

* style: runtime

* style: rax-render

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style

# Conflicts:
#	packages/editor-setters/src/expression-setter/index.tsx
#	packages/plugin-source-editor/src/index.tsx
#	packages/plugin-source-editor/src/transform.ts

* refactor: material parser code style 

1. 修复eslint问题
2. instanceOf => any
3. 修复node类型解析失败问题

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3716330

* refactor: material parser code style

* refactor: code-generator code style 

1. rax 出码合并
2. code style 修复

注:合并的代码中带了 datasource 的

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3717159

* Merge branch 'feat/rax-code-generator' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into feat/rax-code-generator

# Conflicts:
#	packages/code-generator/src/generator/ProjectBuilder.ts
#	packages/code-generator/src/parser/SchemaParser.ts
#	packages/code-generator/src/plugins/component/rax/jsx.ts
#	packages/code-generator/src/plugins/project/constants.ts
#	packages/code-generator/src/plugins/project/framework/rax/plugins/packageJSON.ts
#	packages/code-generator/src/plugins/project/i18n.ts
#	packages/code-generator/src/publisher/disk/index.ts
#	packages/code-generator/src/publisher/disk/utils.ts
#	packages/code-generator/src/types/core.ts
#	packages/code-generator/src/types/schema.ts
#	packages/code-generator/src/utils/compositeType.ts
#	packages/code-generator/src/utils/nodeToJSX.ts

* refactor: code-generator

* Merge remote-tracking branch 'origin/refactor/code-style' into refactor/code-style-code-generator

# Conflicts:
#	.vscode/launch.json

* Revert "refactor: code-generator code style "

This reverts commit ebc78e8788f83e8fda0e146758af43b878125c10.

* chore: eslintrc && eslintignore

* style: for plugin-source-editor

* style: fix by eslint --fix

* style: scripts/

* style: datasource-engine

* feat: pre-commit

* Merge branch 'refactor/code-style' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into refactor/code-style

# Conflicts:
#	.eslintignore
#	packages/code-generator/src/parser/SchemaParser.ts
#	packages/code-generator/src/plugins/component/rax/containerInitState.ts
#	packages/code-generator/src/plugins/component/rax/containerInjectDataSourceEngine.ts
#	packages/code-generator/src/plugins/component/rax/containerLifeCycle.ts
#	packages/code-generator/src/plugins/project/framework/rax/plugins/buildConfig.ts
#	packages/code-generator/src/utils/OrderedSet.ts
#	packages/code-generator/src/utils/ScopeBindings.ts
#	packages/code-generator/src/utils/expressionParser.ts
#	packages/code-generator/src/utils/schema.ts
#	packages/datasource-engine/src/core/DataSourceEngine.ts
#	packages/datasource-engine/src/core/RuntimeDataSource.ts
#	packages/datasource-engine/src/types/IRuntimeContext.ts
#	packages/datasource-engine/src/types/index.ts

* refactor: code style code-generator 

对 code style 分支上次合并的  code-generator 修改做了 revert

重新在 code style 分支基础上对代码样式做了修复

rax 合并分支会另行 fix 后向 release 分支提 MR

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3719702

* refactor: code style fix

* style: for code-generator

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style

# Conflicts:
#	packages/editor-skeleton/src/transducers/addon-combine.ts
#	packages/plugin-components-pane/package.json
#	packages/plugin-components-pane/src/components/base/index.tsx
#	packages/plugin-components-pane/src/components/component-list/index.tsx
#	packages/plugin-components-pane/src/i18n/index.ts
#	packages/plugin-components-pane/src/i18n/strings/index.ts
#	packages/plugin-components-pane/src/index.tsx
#	packages/plugin-event-bind-dialog/src/index.tsx
#	packages/plugin-source-editor/src/index.tsx
#	packages/plugin-source-editor/src/transform.ts

* style: auto fix
2020-09-15 19:06:35 +08:00
wanying.jwy
d4f8467abd Merge remote-tracking branch 'origin/release/0.9.18' into feat/rax-miniapp 2020-09-14 09:53:22 +08:00
wanying.jwy
7fe13d15e3 Merge remote-tracking branch 'origin/release/1.0.0' into feat/rax-miniapp 2020-09-10 10:27:44 +08:00
wuji.xwt
9efa9ffa69 refactor: JS to TS
Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3677476

* chore: remove unnecessary code

* refactor: react-render using TypeScript

* chore: build-script

* refactor: editor-skeleton

* refactor: designer

* refactor: material-parser

* refactor: editor-setters

* refactor: js to ts for rax-provider 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3678180

* refactor: rax-provider

* feat: add build command

* chore: compilerOptions for rax-provider

* refactor: JS to TS for Rax Renderer 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3678935

* refactor: rax-renderer

* Merge remote-tracking branch 'origin/refactor/js-to-ts' into refactor/js2ts-rax-renderer

* Merge remote-tracking branch 'origin/refactor/js-to-ts' into refactor/js2ts-rax-renderer

* refactor: ts-nocheck

* chore: ts compile error

* fix: ts rootDir

* fix: compile error

* chore: using same tsconfig for rax component

* refactor: ts compile rax-renderer && rax-provider

* Merge remote-tracking branch 'origin/release/1.0.0' into refactor/js-to-ts

# Conflicts:
#	packages/rax-render/src/utils/appHelper.js
#	packages/rax-render/src/utils/appHelper.ts
#	packages/utils/src/appHelper.ts

* refactor: no JS file
2020-09-09 19:15:50 +08:00
wuji.xwt
1862b5564f Merge remote-tracking branch 'origin/release/1.0.0' into refactor/code-style
# Conflicts:
#	packages/plugin-event-bind-dialog/src/index.tsx
#	packages/plugin-source-editor/src/index.tsx
#	packages/runtime/src/core/container.ts
#	packages/runtime/src/core/provider.ts
2020-09-08 15:26:15 +08:00
wuji.xwt
7e2f4d6577 style: eslint settings 2020-09-08 10:30:51 +08:00
wuji.xwt
1952d07e86 style: fix by lint 2020-09-07 17:48:39 +08:00
wuji.xwt
ebe05056f0 refactor: react-render using TypeScript 2020-09-04 18:27:52 +08:00
zude.hzd
2462596fbd add feature: setSchema and render page
fix : event-dialog bugs
2020-09-03 22:03:57 +08:00
zude.hzd
77b0b2ccec fix: add FaultComponent style 2020-08-21 16:44:59 +08:00
荣彬
c3e6b4b35f fix: 合并后bugfix 2020-08-20 22:13:13 +08:00
荣彬
174a59e222 Merge branch 'master' into release/1.0.0 2020-08-20 18:00:56 +08:00
荣彬
5e375a2e0b Merge branch 'master' into release/1.0.0 2020-08-20 15:53:25 +08:00
carlos.czw
786791713a feat: 在 editor-preset-vision 中对 legao schema 进行向前兼容 2020-08-20 00:34:15 +08:00
林熠
577e0eb540 fix(react-renderer): fix hasLoop logic 2020-08-18 13:34:33 +08:00
力皓
d195d7fed8 fix: 修复判断动态 setter 的逻辑
fix: 修复 Page 中包含 Block 不渲染的 bug
2020-08-17 20:31:58 +08:00
rorya.lyj
a088bb1ec0 Merge branch 'release/0.9.3' into feat/miniapp
# Conflicts:
#	packages/code-generator/demo/demo.js
#	packages/code-generator/src/index.ts
#	packages/code-generator/src/utils/nodeToJSX.ts
#	packages/demo/src/editor/components.ts
#	packages/designer/src/builtin-simulator/host.ts
#	packages/designer/src/builtin-simulator/renderer.ts
#	packages/designer/src/designer/setting/utils.js
#	packages/designer/src/document/document-model.ts
#	packages/designer/src/project/project.ts
#	packages/editor-preset-vision/src/editor.ts
#	packages/editor-setters/src/index.tsx
#	packages/editor-skeleton/src/transducers/addon-combine.ts
#	packages/plugin-sample-preview/package.json
#	packages/react-renderer/package.json
#	packages/react-renderer/src/engine/index.jsx
#	packages/react-renderer/src/renderer/page.jsx
#	packages/react-simulator-renderer/src/renderer-view.tsx
#	packages/react-simulator-renderer/src/renderer.ts
2020-08-14 14:09:47 +08:00
林熠
d601d5e1a9 fix: render error样式 2020-08-11 17:15:37 +08:00
荣彬
628cbf6b70 1.0.0发布准备 2020-08-11 16:48:55 +08:00
林熠
a835dc6059 fix: remove debugger 2020-08-10 18:52:23 +08:00
林熠
aff2f346d6 fix: 组件缺失占位 2020-08-10 18:50:30 +08:00
金禅
007f53435c 1. ReactRender 使用了 shouldComponentUpdate ,不能继承自 PureComponent,改为继承 Component;
2. 预览样式修改;
2020-08-09 18:28:35 +08:00
金禅
a600cf4b37 1. 修复 BoolSetter 不响应 value 的bug;
2. setter 支持配置 extraProps;
3. button 支持 icon 配置;
2020-08-09 05:17:46 +08:00
金禅
b54208043a 1. 解决 MixedSetter currentSetter 不正确的问题;
2. DateSetter 和 TimeSetter onChange 返回字符串类型的值;
3. 解决 Children 里 Slot 无法渲染的问题;
2020-08-08 23:33:57 +08:00
金禅
6a2541fd4e 组件 schema 补充 2020-08-04 12:35:24 +08:00
金禅
41baa71c5c 修复预览时部分文案缺失的问题 2020-07-31 16:21:45 +08:00
mario.gk
bc6401781a fix: slot 兼容问题 + loop key bug fix 2020-07-29 18:22:33 +08:00
mark.ck
3e85c283f4 1. dialog 设置为 container,解决无法拖动 form 到 container 的问题;
2. page 设置 style prop 解决 page 无法设置样式的问题;
3. 解决 render error 无法找到 engine 对象的 bug
2020-07-22 01:03:08 +08:00
mario.gk
d701eaa1bf Merge commit '11c45d3be6ef9665d5dd1869a6c1a94507cdb0e4' into fix/jsslot-schema-format
# Conflicts:
#	packages/react-simulator-renderer/src/renderer.ts
2020-07-21 18:40:46 +08:00
行心
d8456fb1cd Revert "Revert "Merge branch 'feat/rax-simulator' into 'release/0.9.0' ""
This reverts commit 5767023d3f7d1406343a14089941e8365d029fa7.
2020-07-20 22:51:00 +08:00
wuji.xwt
d3c69a1703 Merge remote-tracking branch 'origin/components-panel' into refactor/react-renderer 2020-07-20 16:07:11 +08:00