107 Commits

Author SHA1 Message Date
muyun.my
e1ab88508e Merge remote-tracking branch 'origin/release/1.0.0' into hotfix/1.0.0-datasourceinject 2020-11-10 22:49:03 +08:00
muyun.my
98ae1ed82c fix: 修复数据源的接入问题 2020-11-07 22:01:01 +08:00
mark.ck
8df5f050d7 fix: typo of onResizeEnd and remove 2020-11-07 19:15:22 +08:00
zude.hzd
7fe793a1c0 fix: 修改style-setter报错,loadAsyncLib 判断 2020-11-05 17:32:38 +08:00
muyun.my
512a354c54 chore: merge from release/1.0.0 2020-11-03 21:47:14 +08:00
muyun.my
e12e03111e feat: renderer 层透传 requestHandlersMap 2020-11-03 20:55:46 +08:00
zude.hzd
8b2f045413 fix: 修改 asyncLibraryMap 拼写错误 2020-11-03 20:34:39 +08:00
zude.hzd
aaec68377b fix: loadAsyncLibrary之后buildComponents 2020-11-03 18:55:21 +08:00
zude.hzd
2a491ae0df feat: 新增支持异步类型library 2020-10-29 21:38:36 +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
力皓
bef84b0f96 chore: fix conflicts 2020-09-08 20:05:22 +08:00
荣彬
1f45b05028 feat: 新增simulatorurl,可以设置cdn使用simulator 2020-09-01 12:47:01 +08:00
力皓
795a4e6a69 refactor: 重构判断是否是 simulator 环境的逻辑
fix: 支持 NodeChildren#find 函数
2020-08-31 17:59:54 +08:00
荣彬
252310ef8e Merge branch 'feat/canvas-size' into 'release/1.0.0'
支持切换画布宽高及显示类型的API的方案

Aone需求:<https://aone.alibaba-inc.com/req/29913392>
技术方案: <https://yuque.antfin-inc.com/docs/share/38d36583-057a-40e0-a07e-8e94e5d538e2>

See merge request !952655
2020-08-27 17:43:38 +08:00
荣彬
174a59e222 Merge branch 'master' into release/1.0.0 2020-08-20 18:00:56 +08:00
牧毅
3a5424171e feat: 🎸 支持设置模拟器的 viewport 的宽高和缩放级别 2020-08-20 16:59:36 +08:00
荣彬
5e375a2e0b Merge branch 'master' into release/1.0.0 2020-08-20 15:53:25 +08:00
mario.gk
92cbff2b1b Merge commit 'a01e4b19633323c99e727f9d801385c20dbaad2d' into fix/drop-object-is-data 2020-08-19 10:08:46 +08:00
mario.gk
809fda73be fix: support dropObject is data 2020-08-19 10:08:29 +08:00
力皓
a01e4b1963 Merge branch 'fix/minor-bugs-lianjie.lj' into 'release/0.9.6'
fix: 优化画布中点击事件屏蔽,增加富文本组件的部分屏蔽



See merge request !939584
2020-08-18 21:36:26 +08:00
林熠
ec08c6c223 fix: 优化画布中点击事件屏蔽,增加富文本组件的部分屏蔽 2020-08-18 21:36:08 +08:00
林熠
a5b65579ea fix: 优化画布中点击事件屏蔽,增加富文本组件的部分屏蔽 2020-08-18 21:17:16 +08:00
力皓
775725d3f7 fix: currentPage.id 返回 formUuid
fix: 将 engine-design-mode 移入渲染 iframe
2020-08-18 19:29:47 +08:00
rorya.lyj
91e8d6956a Merge branch 'feat/miniapp' into fix/rax
# 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/designer/setting/utils.js
#	packages/designer/src/document/document-model.ts
#	packages/designer/src/project/project.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 11:20:21 +08:00
rorya.lyj
cd7b1e6d39 fix: 修改移动端设备宽度 2020-08-13 17:47:39 +08:00
高凯
c806602e2e Merge branch 'fix/render-error-style' into 'release/0.9.3'
fix: 卡片内容不可用拖动



See merge request !932256
2020-08-13 12:12:12 +08:00
林熠
6a85c43468 fix: 卡片内容不可用拖动 2020-08-13 12:07:20 +08:00
力皓
bfc63db78d fix: 处理选区的 toolkit 位置不对的 bug 2020-08-12 17:14:33 +08:00
mario.gk
7f946f5b33 fix: createComponent 支持所有 schema 2020-08-11 18:08:20 +08:00
荣彬
628cbf6b70 1.0.0发布准备 2020-08-11 16:48:55 +08:00
林熠
aff2f346d6 fix: 组件缺失占位 2020-08-10 18:50:30 +08:00
金禅
b54208043a 1. 解决 MixedSetter currentSetter 不正确的问题;
2. DateSetter 和 TimeSetter onChange 返回字符串类型的值;
3. 解决 Children 里 Slot 无法渲染的问题;
2020-08-08 23:33:57 +08:00
mario.gk
7508fb673b fix: canDropIn 为 boolean 时失效 2020-08-07 18:39:55 +08:00
荣彬
201ff9925b Merge branch 'feat/rax-simulator-renderer' into release/0.9.0 2020-07-22 08:40:43 +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
响指
05b262dc19 feat: rax simulator 2020-07-21 18:26:52 +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
mario.gk
66ca4d7615 Merge commit '5767023d3f7d1406343a14089941e8365d029fa7' into fix/jsslot-schema-format 2020-07-20 14:14:26 +08:00
kangwei
5767023d3f Revert "Merge branch 'feat/rax-simulator' into 'release/0.9.0' "
This reverts commit 44d0f0b246c6b92af9c8c5d4d019286568d434ad, reversing
changes made to d282a375425435e7e292ab0f819141b6e50f541d.
2020-07-20 14:01:00 +08:00
mario.gk
caf9915382 fix: 修复导入的组件拖入画布报错 2020-07-17 14:06:31 +08:00
金禅
6ca9eb167c add third part lib 2020-07-16 20:40:54 +08:00
康为
618ff638a3 Merge branch 'fix/monitor' into 'release/0.9.0'
修复画布BorderAction埋点以及增加大纲树埋点



See merge request !869524
2020-07-16 12:47:20 +08:00
康为
44d0f0b246 Merge branch 'feat/rax-simulator' into 'release/0.9.0'
Feat/rax simulator

新增rax-simulator以及 simulator中新增 simulatorProps 的 renderEnv

See merge request !891686
2020-07-15 14:37:39 +08:00
荣彬
f781ea5f1d 删除无用console 2020-07-15 14:34:52 +08:00
mario.gk
9a72dd7275 fix: modal node locate 2020-07-15 13:55:03 +08:00
荣彬
17346c7a09 新增simulatorProps renderEnv 2020-07-14 11:34:50 +08:00
荣彬
29bc7b8835 新增rax simulator 2020-07-14 10:14:48 +08:00
金禅
8ffaaa1f1e demo 使用标准资产包 2020-07-07 10:41:42 +08:00
wuyue.xht
d813b5090c fix: 画布BorderAction埋点数据 2020-06-28 11:56:12 +08:00
康为
41caab2825 Merge branch 'fix/dialog' into 'release/0.9.0'
fix: 1. 修复dialog拖入不显示问题  2. dialog 只能在根节点下  3. 引入 modalNodeManager



See merge request !866677
2020-06-24 00:16:00 +08:00