359 Commits

Author SHA1 Message Date
牧毅
425c24d03b feat: 完成 utils 面板的基本功能 2020-12-02 03:48:09 +08:00
mark.ck
a4fa203f75 Merge branch 'fix/slot-duplication' into 'release/1.0.0'
Code review title: fix: 修复 slot 以及子节点不销毁
Code review Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/4057087
2020-11-11 11:22:17 +08:00
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
力皓
8ef62c84b1 fix: 修复 slot 以及子节点不销毁 2020-11-09 14:06:48 +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
力皓
bdff2b1588 fix: checkId 需要传递 2020-10-12 14:55:03 +08:00
力皓
44bdda1187 fix: 支持 checkId 开关功能, 在 setSchema 时关闭, 避免 id 被不断重置 2020-09-21 17:05:16 +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
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
力皓
2e616e3767 fix: 不应该限定 parent 才做解绑操作 2020-09-08 21:05:55 +08:00
力皓
bef84b0f96 chore: fix conflicts 2020-09-08 20:05:22 +08:00
力皓
47e814f807 fix: 优化树子节点删除逻辑
refactor: 增强对 react 组件的判断
2020-09-08 17:49:38 +08:00
荣彬
4e08ebabe5 Merge branch 'fix/event-dialog-bug' into 'release/1.0.0'
add feature: setSchema and render page

add feature:add function project.setSchema 
fix : event-dialog bugs

See merge request !965319
2020-09-08 10:04:57 +08:00
力皓
7a6bf2cdb4 fix: 拖拽时要解除与原来节点的关系 2020-09-07 14:19:09 +08:00
力皓
2bcd87741e Merge branch 'trunk-vision' into fix/lihao-bugs-200902 2020-09-07 09:52:44 +08:00
zude.hzd
2462596fbd add feature: setSchema and render page
fix : event-dialog bugs
2020-09-03 22:03:57 +08:00
力皓
a171d3ef46 fix: 解决 set('schema') 后 componentsTree 越来越多的 bug 2020-09-03 11:38:50 +08:00
力皓
0461a57d57 refactor: 重新梳理 purge / remove / delete 的职责,以及相应重构
refactor: 调整判断 fieldId 是否存在的逻辑
fix: 解决 redo 时页面节点数不对以及 fieldId 被重置
2020-09-02 13:46:42 +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
荣彬
bd2c6ad341 fix: 合并master分支 2020-08-29 22:54:31 +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
力皓
1f920dd959 fix: 在 renderer 层面做 function component 包装,避免影响 rax 等其他场景 2020-08-26 21:22:56 +08:00
力皓
fa94aab3cb fix: 处理 function component 无法选中的问题,本质上是没有 ref
fix: 处理 filter 组件在每次重绘时 fieldId 变更的 bug
2020-08-26 11:08:12 +08:00
力皓
59fac25553 fix: 修复在切换页面时,没有销毁相应节点导致的一系列bug 2020-08-24 20:37:51 +08:00
力皓
fe0fa8ea0b Merge branch 'release/0.9.12' into fix/lihao-bugs-200824 2020-08-24 17:09:35 +08:00
mario.gk
c07b447fb5 fix: 实现 removeDocument 2020-08-24 17:04:51 +08:00
力皓
0e7e03887b fix: 在设计器里,所有组件都需要展示,不管 condition 为何值 2020-08-24 15:31:56 +08:00
mario.gk
488a5d8283 fix: nextId() 逻辑调整 2020-08-23 11:28:46 +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
力皓
d8221dbfe7 fix: 修复获取 currentPage 的逻辑 2020-08-19 16:40:28 +08:00
力皓
649394e8ce Merge branch 'fix/drop-object-is-data' into 'release/0.9.7'
Fix/drop object is data



See merge request !940210
2020-08-19 12:17:18 +08:00
高凯
3fc1ff8be6 Merge branch 'fix/lihao-bugs' into 'release/0.9.6'
Fix/lihao bugs



See merge request !939843
2020-08-19 11:16:36 +08:00
力皓
d936d2bdde fix: 区块组件无法删除
fix: 修改 currentPage 逻辑
2020-08-19 10:42:12 +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
高凯
89bf07f1b6 Merge branch 'fix/miniapp' into 'release/0.9.6'
fix: currentPage.id 返回 formUuid

fix: 将 engine-design-mode 移入渲染 iframe

See merge request !939360
2020-08-18 19:50:06 +08:00
力皓
775725d3f7 fix: currentPage.id 返回 formUuid
fix: 将 engine-design-mode 移入渲染 iframe
2020-08-18 19:29:47 +08:00