143 Commits

Author SHA1 Message Date
力皓
2655c4ad58 feat: 兼容 didDropOut 接口 2020-10-23 10:27:45 +08:00
力皓
a1e7f21e21 fix: 修复修改 componentsMap 后无法刷新视图的 bug 2020-10-22 17:42:03 +08:00
力皓
66d43f2103 fix: convertI18nObject
fix: initialChildren 传入 settingTopEntry 参数
2020-10-16 17:31:02 +08:00
力皓
bdff2b1588 fix: checkId 需要传递 2020-10-12 14:55:03 +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
力皓
d2316bec65 fix: 处理 schema id 重复的问题 2020-09-14 11:24:52 +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
力皓
30bf21ca04 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
2020-09-10 21:05:43 +08:00
wuji.xwt
ae76a1cffd 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
2020-09-10 17:51:47 +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
力皓
2e616e3767 fix: 不应该限定 parent 才做解绑操作 2020-09-08 21:05:55 +08:00
wuji.xwt
c0b7bff96d 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
2020-09-08 20:38:34 +08:00
力皓
47e814f807 fix: 优化树子节点删除逻辑
refactor: 增强对 react 组件的判断
2020-09-08 17:49:38 +08:00
wuji.xwt
1952d07e86 style: fix by lint 2020-09-07 17:48:39 +08:00
力皓
7a6bf2cdb4 fix: 拖拽时要解除与原来节点的关系 2020-09-07 14:19:09 +08:00
力皓
0461a57d57 refactor: 重新梳理 purge / remove / delete 的职责,以及相应重构
refactor: 调整判断 fieldId 是否存在的逻辑
fix: 解决 redo 时页面节点数不对以及 fieldId 被重置
2020-09-02 13:46:42 +08:00
力皓
59fac25553 fix: 修复在切换页面时,没有销毁相应节点导致的一系列bug 2020-08-24 20:37:51 +08:00
mario.gk
488a5d8283 fix: nextId() 逻辑调整 2020-08-23 11:28:46 +08:00
mario.gk
809fda73be fix: support dropObject is data 2020-08-19 10:08:29 +08:00
林熠
99a7288696 fix(designer/node.ts): fix hasLoop logic 2020-08-18 11:24:17 +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
mario.gk
31a0fce529 Merge branch 'release/0.9.3' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into release/0.9.3 2020-08-14 10:07:18 +08:00
mario.gk
05957ce986 fix: 不对外暴露 Node 2020-08-13 19:58:20 +08:00
林熠
0f64829826 fix: 快捷键增加判断 2020-08-12 22:44:06 +08:00
林熠
e18a2311d8 fix: 快捷键增加判断 2020-08-12 22:41:06 +08:00
mario.gk
7f946f5b33 fix: createComponent 支持所有 schema 2020-08-11 18:08:20 +08:00
林熠
aff2f346d6 fix: 组件缺失占位 2020-08-10 18:50:30 +08:00
kangwei
45ffc98277 logic for multi documents one sim 2020-08-07 18:48:09 +08:00
mario.gk
03e7c57639 fix: getSuitablePlace 2020-07-29 20:38:43 +08:00
mario.gk
bc6401781a fix: slot 兼容问题 + loop key bug fix 2020-07-29 18:22:33 +08:00
mario.gk
31ea5d5601 fix: vc-filter bug fix 2020-07-28 10:12:53 +08:00
mario.gk
09fc1a06c9 fix: 调整 upgrade 和 init 的流程 2020-07-21 21:13:32 +08:00
mario.gk
760e6a6226 fix: updateProps before init 2020-07-20 14:59:12 +08:00
mario.gk
66ca4d7615 Merge commit '5767023d3f7d1406343a14089941e8365d029fa7' into fix/jsslot-schema-format 2020-07-20 14:14:26 +08:00
mario.gk
7eeb51cd33 feat: support subtreeModified 2020-07-20 11:53:37 +08:00
康为
d282a37542 Merge branch 'feat/support-model-node-in-outline-pane' into 'release/0.9.0'
Feat/support model node in outline pane

大纲树支持模态视图
模态视图只能在根节点

See merge request !893801
2020-07-15 14:24:31 +08:00
mario.gk
3785e1c171 feat: 大纲树支持模态视图 2020-07-15 11:34:23 +08:00
kangwei
01712f5e73 fix generate node id 2020-07-14 15:43:19 +08:00
kangwei
0777c3c9d9 sperate props upgrade & init logic 2020-07-13 22:23:18 +08:00
kangwei
e666853b1e support addon to props 2020-07-12 20:39:41 +08:00
kangwei
61e19ebd25 fix addon callbacks 2020-07-12 19:43:26 +08:00
康为
108a676ce3 Merge branch 'fix/blockAndLowCodeComponentEditor' into 'release/0.9.0'
fix: 修复低代码组件设计器、区块设计器根节点为 Page 的问题,修复 topArea 样式



See merge request !867191
2020-06-24 00:17:39 +08:00
mario.gk
e85b542161 fix: 修复低代码组件设计器、区块设计器根节点为 Page 的问题,修复 topArea 样式 2020-06-23 22:12:52 +08:00
mario.gk
65977e7668 fix: 1. 修复dialog拖入不显示问题 2. dialog 只能在根节点下 3. 引入 modalNodeManager 2020-06-23 19:23:14 +08:00
康为
f463fe8c6b Merge branch 'fix/pageHistory' into 'release/0.9.0'
Fix/page history



See merge request !864869
2020-06-23 10:35:32 +08:00
mario.gk
5d7dc2fd65 fix: 支持页面回滚 2020-06-22 22:23:13 +08:00
kangwei
be4a58fc14 add settingsEntry 2020-06-22 21:10:55 +08:00
力皓
d44f95b643 feat: 增加 node replaceWith 方法 2020-06-18 14:46:39 +08:00
力皓
5adff447c1 fix: 更改生成 id 的规则, 否则命中 recore 解析 id 的一个限制 2020-06-17 15:34:31 +08:00
mario.gk
cd91430234 modal 默认隐藏 2020-06-01 19:59:07 +08:00