322 Commits

Author SHA1 Message Date
荣彬
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
力皓
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
林熠
99a7288696 fix(designer/node.ts): fix hasLoop logic 2020-08-18 11:24:17 +08:00
mario.gk
5d643124c4 fix: fieldId 重复 2020-08-17 19:01:02 +08:00
mario.gk
28f0213bcb fix: 去掉根据 componentName 判断 isModal 的逻辑 2020-08-17 15:33:57 +08:00
mario.gk
2840d2747f fix: 页面加载之后就被标记位 isModified 2020-08-14 18:13:09 +08:00
荣彬
1092ee9fc8 fix: 兼容modal模式 2020-08-14 16:35:37 +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
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
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
高凯
c245f49274 Merge branch 'fix/render-error-style' into 'release/0.9.3'
Fix/render error style



See merge request !931751
2020-08-13 12:06:56 +08:00
林熠
0f64829826 fix: 快捷键增加判断 2020-08-12 22:44:06 +08:00
林熠
e18a2311d8 fix: 快捷键增加判断 2020-08-12 22:41:06 +08:00
力皓
bfc63db78d fix: 处理选区的 toolkit 位置不对的 bug 2020-08-12 17:14:33 +08:00
康为
7d02aad795 Merge branch 'feat/componentsMap' into 'release/0.9.3'
feat: 导出的schema增加componentsMap



See merge request !915588
2020-08-12 17:05:54 +08:00
金禅
9f9c38c676 fix merge bug 2020-08-11 23:55:13 +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
wuyue.xht
15d0d57492 Merge branch 'release/0.9.3' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into feat/componentsMap 2020-08-06 21:58:59 +08:00
mario.gk
e761b1ae86 fix: fieldId 重复问题 2020-08-06 20:45:08 +08:00
mario.gk
2960446197 fix: 增加兼容 API 2020-08-06 15:19:22 +08:00
mario.gk
36621ea55c fix: 复制之后 fieldId 重复 2020-08-06 14:49:00 +08:00
mario.gk
7cf6d24601 fix: 修复 preset-vision 版本 lifeCycles 丢失以及 slot 初始化问题 2020-08-06 12:55:39 +08:00
林熠
fcc1a6f02d fix: 修复js面板引用计数问题 2020-08-04 19:18:08 +08:00
wuyue.xht
dbc958c6bc feat: 导出的schema增加componentsMap 2020-07-30 23:16:54 +08:00
林熠
7171aa218d fix: 灵犀vc组件中调用config, 补充进去 2020-07-30 12:42:04 +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
f5d8c9c002 Merge commit '3cc8b33db4f30a26ab80bc2dcbe4812d8f4e1b98' into fix/filter-bug
# Conflicts:
#	packages/designer/src/document/node/node-children.ts
#	packages/designer/src/document/node/props/props.ts
2020-07-28 10:16:26 +08:00
mario.gk
31ea5d5601 fix: vc-filter bug fix 2020-07-28 10:12:53 +08:00
林熠
47dbd68dc5 Merge branch 'release/0.9.0' into fix/getAddonData 2020-07-27 15:28:46 +08:00
林熠
da592355f4 fix: 调整visionNode修改未知 2020-07-26 22:49:06 +08:00
林熠
444e25cf24 fix: props.getNode 防死循环 2020-07-26 14:56:57 +08:00