192 Commits

Author SHA1 Message Date
力皓
8ba26ee880 fix: 修复修改 勾选框、富文本编辑器、下拉选择 等组件标题报错
fix: 修复不存在组件无法选中问题
2020-09-22 11:09:56 +08:00
力皓
e591abacec fix: JSSlot 格式也需要转换成 JSBlock 2020-09-20 16:48:19 +08:00
力皓
91fdb160f3 chore: fix conflicts 2020-09-18 15:12:48 +08:00
力皓
e7cc9bc7d8 fix: 修改 renderer 需等待 document 才开始渲染 2020-09-18 14:44:56 +08:00
牧毅
56e3ae25f7 Merge branch 'trunk-vision' into release/0.9.51 2020-09-17 21:00:31 +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
力皓
419064308d chore: 去除无用代码 2020-09-14 15:08:47 +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
力皓
33b5a26a5c Merge branch 'refactor/code-style' into release/0.9.18 2020-09-11 10:49:25 +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
mario.gk
eb51b5e1e2 feat: 增加 defaultFixed,面板可默认固定 2020-09-10 15:57:16 +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
力皓
bef84b0f96 chore: fix conflicts 2020-09-08 20:05:22 +08:00
wuji.xwt
1952d07e86 style: fix by lint 2020-09-07 17:48:39 +08:00
力皓
2bcd87741e Merge branch 'trunk-vision' into fix/lihao-bugs-200902 2020-09-07 09:52:44 +08:00
荣彬
9e4756107f fix: 去除乐高vision兼容影响 2020-09-05 16:39:45 +08:00
wanying.jwy
fe50442bb1 lifecycles 2020-09-04 10:44:23 +08:00
荣彬
394db8db1b fix: vision兼容标准api 2020-09-03 22:23:06 +08:00
力皓
88e5008139 fix: 补全 packageName, 否则在组件面板会被隐藏 2020-09-03 19:54:29 +08:00
力皓
6370889c76 fix: 移除 isInSimulator 函数 2020-09-03 18:40:26 +08:00
力皓
0461a57d57 refactor: 重新梳理 purge / remove / delete 的职责,以及相应重构
refactor: 调整判断 fieldId 是否存在的逻辑
fix: 解决 redo 时页面节点数不对以及 fieldId 被重置
2020-09-02 13:46:42 +08:00
力皓
795a4e6a69 refactor: 重构判断是否是 simulator 环境的逻辑
fix: 支持 NodeChildren#find 函数
2020-08-31 17:59:54 +08:00
carlos.czw
82c5d2ea27 fix: 使用深拷贝赋值并修改 dataSource.list 避免影响 legao 现有逻辑 2020-08-30 17:43:22 +08:00
荣彬
bd2c6ad341 fix: 合并master分支 2020-08-29 22:54:31 +08:00
carlos.czw
68c0bde59a Merge branch 'feat/rax-miniapp' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into feat/rax-miniapp 2020-08-28 16:20:45 +08:00
carlos.czw
91f17024de feat: 适配 webtable 2020-08-28 16:20:39 +08:00
wanying.jwy
17e1624669 Merge branch 'feat/rax-miniapp' of http://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine into feat/rax-miniapp 2020-08-28 15:59:22 +08:00
wanying.jwy
9287d842f0 chore: fix set designmode 2020-08-28 15:59:09 +08:00
carlos.czw
aa135c0554 feat: 适配乐高 OneApi 数据源,将 options.params 从 Array 改为 Object 2020-08-27 22:09:57 +08:00
力皓
66c21c07be fix: 用户在动态修改 prototype 时也需要重新计算 meta 2020-08-27 09:43:13 +08:00
力皓
4f426f29d6 Merge branch 'fix/minor-bugs-lianjie.lj' into 'release/0.9.13'
fix(editor-skeleton): add canSetFixed prop to panel config



See merge request !951079
2020-08-26 21:29:23 +08:00
林熠
1b57d5cfdf fix(editor-skeleton): add canSetFixed prop to panel config 2020-08-26 21:26:08 +08:00
力皓
1f920dd959 fix: 在 renderer 层面做 function component 包装,避免影响 rax 等其他场景 2020-08-26 21:22:56 +08:00
carlos.czw
398204bda8 chore: 去掉恼人的 console.log 2020-08-26 17:04:52 +08:00
力皓
fa94aab3cb fix: 处理 function component 无法选中的问题,本质上是没有 ref
fix: 处理 filter 组件在每次重绘时 fieldId 变更的 bug
2020-08-26 11:08:12 +08:00
mario.gk
31215da05b fix: fieldId 重置bug 2020-08-23 13:14:01 +08:00
荣彬
d53c9026b8 Merge branch 'master' into release/1.0.0 2020-08-22 08:05:39 +08:00
荣彬
8118b5e7cc 临时启用vision测试 2020-08-22 07:57:24 +08:00
力皓
d542a404ce fix: 兼容原来 prototype 的 componentName/view 2020-08-20 20:12:44 +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
d9b5adbc04 feat: 支持多 pages 的 schema 结构 2020-08-20 11:21:02 +08:00
carlos.czw
8029905ffd Merge branch 'feat/rax-miniapp' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into feat/rax-miniapp 2020-08-20 00:34:52 +08:00
carlos.czw
786791713a feat: 在 editor-preset-vision 中对 legao schema 进行向前兼容 2020-08-20 00:34:15 +08:00
wanying.jwy
66f0c79dec feat: live mode lifeCycles 2020-08-19 23:27:11 +08:00
力皓
d8221dbfe7 fix: 修复获取 currentPage 的逻辑 2020-08-19 16:40:28 +08:00
carlos.czw
ab66fd4ca5 feat: live 模式取消 mock 兼容 2020-08-19 16:39:04 +08:00