90 Commits

Author SHA1 Message Date
wanying.jwy
9baba75ca1 fix: modify layout props 2020-08-17 21:15:56 +08:00
wanying.jwy
dad21e2994 fix: revert 2020-08-16 16:38:58 +08:00
wanying.jwy
92c303967a feat: merge live mode 2020-08-16 15:28:25 +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
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
kangwei
6c0a656558 detecting 2020-08-13 15:48:31 +08:00
kangwei
006aa31b18 complete router redirect 2020-08-13 15:05:23 +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
kangwei
dc8542a8fa complete router 2020-08-12 18:05:07 +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
林熠
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
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
kangwei
3b6dd61f3c fix dispatch events 2020-06-23 22:40:20 +08:00
mario.gk
65977e7668 fix: 1. 修复dialog拖入不显示问题 2. dialog 只能在根节点下 3. 引入 modalNodeManager 2020-06-23 19:23:14 +08:00
kangwei
c1acc2b26b mark too dirty 2020-06-22 21:08:38 +08:00
kangwei
6e41fbb8c2 Merge branch 'release/0.9.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into release/0.9.0 2020-06-22 11:44:27 +08:00
kangwei
462e0956cf Merge branch 'code-83' into release/0.9.0 2020-06-22 11:09:24 +08:00
kangwei
9058ac82d5 fix: add extraEnv 2020-06-22 11:09:01 +08:00
wuyue.xht
35f255a229 Merge branch 'release/0.9.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into feat/monitor 2020-06-22 09:53:18 +08:00
wuyue.xht
9915937e98 chore: 优化 2020-06-22 09:51:06 +08:00
力皓
21d4f64780 fix: 根据目标元素的canDropIn函数判断是否能放入其他元素 2020-06-17 15:23:51 +08:00
wuyue.xht
46951ca4f9 chore: 埋点相关优化 2020-06-17 12:12:30 +08:00
wuyue.xht
32f0264e45 Merge branch 'preset-vision/0.9.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into preset-vision/0.9.0 2020-06-17 10:33:58 +08:00
wuyue.xht
69de533131 feat: 引擎层埋点 2020-06-17 10:33:54 +08:00
kangwei
662dde14f8 fix propsentry 2020-06-16 15:06:23 +08:00
力皓
d93a2913cc fix: 禁止组件拉到 Page 的直接子节点, 以及替换 tab 组件 2020-06-11 10:31:39 +08:00
kangwei
3ac08ba779 feat: complete live-editing expr & i18n 2020-05-29 01:56:14 +08:00
kangwei
4ea1c775ec merge 2020-05-28 17:37:55 +08:00
kangwei
8f1a9de33b propagation frame event out 2020-05-28 17:34:01 +08:00