github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-13 01:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,327 Commits 8 Branches 2,143 Tags
Commit Graph

1327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
荣彬
d41f481553 Publish 
- @ali/lowcode-code-generator@1.0.8-0
 - @ali/lowcode-demo-server@1.0.8-0
 - @ali/lowcode-demo@1.0.8-0
 - @ali/lowcode-designer@1.0.8-0
 - @ali/lowcode-editor-core@1.0.8-0
 - @ali/lowcode-editor-preset-general@1.0.8-0
 - @ali/lowcode-editor-preset-vision@1.0.8-0
 - @ali/lowcode-editor-setters@1.0.8-0
 - @ali/lowcode-editor-skeleton@1.0.8-0
 - @ali/lowcode-material-parser@1.0.8-0
 - @ali/lowcode-plugin-components-pane@1.0.8-0
 - @ali/lowcode-plugin-designer@1.0.8-0
 - @ali/lowcode-plugin-event-bind-dialog@1.0.8-0
 - @ali/lowcode-plugin-outline-pane@1.0.8-0
 - @ali/lowcode-plugin-sample-logo@1.0.8-0
 - @ali/lowcode-plugin-sample-preview@1.0.8-0
 - @ali/lowcode-plugin-source-editor@1.0.8-0
 - @ali/lowcode-plugin-undo-redo@1.0.8-0
 - @ali/lowcode-plugin-variable-bind-dialog@1.0.8-0
 - @ali/lowcode-plugin-zh-en@1.0.8-0
 - @ali/lowcode-rax-provider@1.0.8-0
 - @ali/lowcode-rax-renderer@1.0.8-0
 - @ali/lowcode-rax-simulator-renderer@1.0.8-0
 - @ali/lowcode-react-provider@1.0.8-0
 - @ali/lowcode-react-renderer@1.0.8-0
 - @ali/lowcode-react-simulator-renderer@1.0.8-0
 - @ali/lowcode-runtime@1.0.8-0
 - @ali/lowcode-types@1.0.8-0
 - @ali/lowcode-utils@1.0.8-0
@ali/lowcode-editor-core@1.0.8-0 @ali/lowcode-code-generator@1.0.8-0 @ali/lowcode-demo-server@1.0.8-0 @ali/lowcode-demo@1.0.8-0 @ali/lowcode-designer@1.0.8-0 @ali/lowcode-editor-preset-general@1.0.8-0 @ali/lowcode-editor-preset-vision@1.0.8-0 @ali/lowcode-editor-setters@1.0.8-0 @ali/lowcode-editor-skeleton@1.0.8-0 @ali/lowcode-material-parser@1.0.8-0 @ali/lowcode-plugin-components-pane@1.0.8-0 @ali/lowcode-plugin-designer@1.0.8-0 @ali/lowcode-plugin-event-bind-dialog@1.0.8-0 @ali/lowcode-plugin-outline-pane@1.0.8-0 @ali/lowcode-plugin-sample-logo@1.0.8-0 @ali/lowcode-plugin-sample-preview@1.0.8-0 @ali/lowcode-plugin-source-editor@1.0.8-0 @ali/lowcode-plugin-undo-redo@1.0.8-0 @ali/lowcode-plugin-variable-bind-dialog@1.0.8-0 @ali/lowcode-plugin-zh-en@1.0.8-0 @ali/lowcode-rax-provider@1.0.8-0 @ali/lowcode-rax-renderer@1.0.8-0 @ali/lowcode-rax-simulator-renderer@1.0.8-0 @ali/lowcode-react-provider@1.0.8-0 @ali/lowcode-react-renderer@1.0.8-0 @ali/lowcode-react-simulator-renderer@1.0.8-0 @ali/lowcode-runtime@1.0.8-0 @ali/lowcode-types@1.0.8-0 @ali/lowcode-utils@1.0.8-0 		2020-09-09 10:26:04 +08:00
荣彬
f1219f090b Merge branch 'release/0.9.18' into 'release/1.0.0' 
fix: 不应该限定 parent 才做解绑操作



See merge request !971416
 2020-09-08 21:09:36 +08:00
力皓
2e616e3767 fix: 不应该限定 parent 才做解绑操作 2020-09-08 21:05:55 +08:00
荣彬
122eeb4141 Merge branch 'release/0.9.18' into 'release/1.0.0' 
Release/0.9.18



See merge request !971251
 2020-09-08 20:19:22 +08:00
力皓
458b4952b4 chore: fix conflicts 2020-09-08 20:16:27 +08:00
力皓
bef84b0f96 chore: fix conflicts 2020-09-08 20:05:22 +08:00
高凯
f786147397 Merge branch 'fix/lihao-bugs-200902' into 'release/0.9.18' 
fix: 优化树子节点删除逻辑

refactor: 增强对 react 组件的判断

See merge request !971013
 2020-09-08 17:58:25 +08:00
力皓
47e814f807 fix: 优化树子节点删除逻辑 
refactor: 增强对 react 组件的判断
 2020-09-08 17:49:38 +08:00
荣彬
2343946730 Merge branch 'fix/editor-bugs' into 'release/1.0.0' 
fix:js面板每次打开的时候重新获取最新schema



See merge request !970161
 2020-09-08 16:11:32 +08:00
zude.hzd
cb72e4ce92 fix:js面板每次打开的时候重新获取最新schema 2020-09-08 12:45:59 +08:00
力皓
e62aa94d9e Publish 
- @ali/lowcode-demo@0.8.65
 - @ali/lowcode-designer@0.9.55
 - @ali/lowcode-editor-preset-general@0.9.40
 - @ali/lowcode-editor-preset-vision@0.8.57
 - @ali/lowcode-editor-skeleton@0.8.61
 - @ali/lowcode-plugin-components-pane@0.8.57
 - @ali/lowcode-plugin-designer@0.9.55
 - @ali/lowcode-plugin-outline-pane@0.8.61
 - @ali/lowcode-plugin-sample-preview@0.8.59
 - @ali/lowcode-plugin-undo-redo@0.8.59
 - @ali/lowcode-rax-simulator-renderer@0.8.60
 - @ali/lowcode-react-simulator-renderer@0.8.61
publish/0.9.17 @ali/lowcode-demo@0.8.65 @ali/lowcode-designer@0.9.55 @ali/lowcode-editor-preset-general@0.9.40 @ali/lowcode-editor-preset-vision@0.8.57 @ali/lowcode-editor-skeleton@0.8.61 @ali/lowcode-plugin-components-pane@0.8.57 @ali/lowcode-plugin-designer@0.9.55 @ali/lowcode-plugin-outline-pane@0.8.61 @ali/lowcode-plugin-sample-preview@0.8.59 @ali/lowcode-plugin-undo-redo@0.8.59 @ali/lowcode-rax-simulator-renderer@0.8.60 @ali/lowcode-react-simulator-renderer@0.8.61 		2020-09-08 11:25:30 +08:00
高凯
67f34ea3b4 Merge branch 'fix/lihao-bugs-200902' into 'release/0.9.17' 
refactor: 重新梳理 purge / remove / delete 的职责，以及相应重构

refactor: 调整判断 fieldId 是否存在的逻辑
fix: 解决 redo 时页面节点数不对以及 fieldId 被重置

See merge request !960745
 2020-09-08 10:44:03 +08:00
荣彬
3c39c33694 Merge branch 'refactor/runtime' into 'release/1.0.0' 
Refactor/runtime



See merge request !962652
 2020-09-08 10:08:32 +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
wuyue.xht
09d5562fe7 Merge branch 'release/1.0.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into refactor/runtime 2020-09-07 20:32:18 +08:00
wuyue.xht
9c3390c273 chore: use @ali/lowcode-utils@^1.0.7 2020-09-07 16:59:29 +08:00
rongbin.arb
6d09bfde9e Merge branch feat/container-place-holder into release/1.0.0 
Title: feat: 容器组件支持传入 placeholder 和对应样式 

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3643443
 2020-09-07 16:26:21 +08:00
wuji.xwt
93c9fb0286 Merge branch 'feat/appHelper' into 'release/1.0.0' 
Code review title: feat: 抽离AppHelper
Code review Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3680170
 2020-09-07 16:14:10 +08:00
wuyue.xht
1f6d131300 feat: 抽离AppHelper 
fix: 导出AppHelper
 2020-09-07 16:06:49 +08:00
wuyue.xht
9ffbdc2d1c feat:支持appHelper 2020-09-07 15:41:26 +08:00
荣彬
c52731879d Merge branch 'fix/multiple-tree' into 'release/1.0.0' 
fix: 解决 set('schema') 后 componentsTree 越来越多的 bug



See merge request !962981
 2020-09-07 14:30:28 +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
力皓
88e5008139 fix: 补全 packageName, 否则在组件面板会被隐藏 publish/0.9.16 2020-09-03 19:54:29 +08:00
力皓
6370889c76 fix: 移除 isInSimulator 函数 2020-09-03 18:40:26 +08:00
力皓
4ce7e00ba5 Publish 
- @ali/lowcode-demo@0.8.64
 - @ali/lowcode-designer@0.9.54
 - @ali/lowcode-editor-core@0.8.36
 - @ali/lowcode-editor-preset-general@0.9.39
 - @ali/lowcode-editor-preset-vision@0.8.56
 - @ali/lowcode-editor-setters@0.9.21
 - @ali/lowcode-editor-skeleton@0.8.60
 - @ali/lowcode-plugin-components-pane@0.8.56
 - @ali/lowcode-plugin-designer@0.9.54
 - @ali/lowcode-plugin-event-bind-dialog@0.8.34
 - @ali/lowcode-plugin-outline-pane@0.8.60
 - @ali/lowcode-plugin-sample-logo@0.8.33
 - @ali/lowcode-plugin-sample-preview@0.8.58
 - @ali/lowcode-plugin-source-editor@0.8.31
 - @ali/lowcode-plugin-undo-redo@0.8.58
 - @ali/lowcode-plugin-variable-bind-dialog@0.8.32
 - @ali/lowcode-plugin-zh-en@0.8.36
 - @ali/lowcode-rax-simulator-renderer@0.8.59
 - @ali/lowcode-react-simulator-renderer@0.8.60
 - @ali/lowcode-types@0.8.19
 - @ali/lowcode-utils@0.8.22
@ali/lowcode-utils@0.8.22 @ali/lowcode-demo@0.8.64 @ali/lowcode-designer@0.9.54 @ali/lowcode-editor-core@0.8.36 @ali/lowcode-editor-preset-general@0.9.39 @ali/lowcode-editor-preset-vision@0.8.56 @ali/lowcode-editor-setters@0.9.21 @ali/lowcode-editor-skeleton@0.8.60 @ali/lowcode-plugin-components-pane@0.8.56 @ali/lowcode-plugin-designer@0.9.54 @ali/lowcode-plugin-event-bind-dialog@0.8.34 @ali/lowcode-plugin-outline-pane@0.8.60 @ali/lowcode-plugin-sample-logo@0.8.33 @ali/lowcode-plugin-sample-preview@0.8.58 @ali/lowcode-plugin-source-editor@0.8.31 @ali/lowcode-plugin-undo-redo@0.8.58 @ali/lowcode-plugin-variable-bind-dialog@0.8.32 @ali/lowcode-plugin-zh-en@0.8.36 @ali/lowcode-rax-simulator-renderer@0.8.59 @ali/lowcode-react-simulator-renderer@0.8.60 @ali/lowcode-types@0.8.19 		2020-09-03 18:26:56 +08:00
力皓
218101deda Merge remote-tracking branch 'origin/trunk-vision' into release/0.9.16 2020-09-03 18:23:09 +08:00
力皓
f0a9c43b7a Publish 
- @ali/lowcode-demo@0.8.63
 - @ali/lowcode-designer@0.9.53
 - @ali/lowcode-editor-core@0.8.35
 - @ali/lowcode-editor-preset-general@0.9.38
 - @ali/lowcode-editor-preset-vision@0.8.55
 - @ali/lowcode-editor-setters@0.9.20
 - @ali/lowcode-editor-skeleton@0.8.59
 - @ali/lowcode-plugin-components-pane@0.8.55
 - @ali/lowcode-plugin-designer@0.9.53
 - @ali/lowcode-plugin-event-bind-dialog@0.8.33
 - @ali/lowcode-plugin-outline-pane@0.8.59
 - @ali/lowcode-plugin-sample-logo@0.8.32
 - @ali/lowcode-plugin-sample-preview@0.8.57
 - @ali/lowcode-plugin-source-editor@0.8.30
 - @ali/lowcode-plugin-undo-redo@0.8.57
 - @ali/lowcode-plugin-variable-bind-dialog@0.8.31
 - @ali/lowcode-plugin-zh-en@0.8.35
 - @ali/lowcode-rax-simulator-renderer@0.8.58
 - @ali/lowcode-react-simulator-renderer@0.8.59
 - @ali/lowcode-types@0.8.18
 - @ali/lowcode-utils@0.8.21
@ali/lowcode-react-simulator-renderer@0.8.59 @ali/lowcode-rax-simulator-renderer@0.8.58 @ali/lowcode-demo@0.8.63 @ali/lowcode-designer@0.9.53 @ali/lowcode-editor-core@0.8.35 @ali/lowcode-editor-preset-general@0.9.38 @ali/lowcode-editor-preset-vision@0.8.55 @ali/lowcode-editor-setters@0.9.20 @ali/lowcode-editor-skeleton@0.8.59 @ali/lowcode-plugin-components-pane@0.8.55 @ali/lowcode-plugin-designer@0.9.53 @ali/lowcode-plugin-event-bind-dialog@0.8.33 @ali/lowcode-plugin-outline-pane@0.8.59 @ali/lowcode-plugin-sample-logo@0.8.32 @ali/lowcode-plugin-sample-preview@0.8.57 @ali/lowcode-plugin-source-editor@0.8.30 @ali/lowcode-plugin-undo-redo@0.8.57 @ali/lowcode-plugin-variable-bind-dialog@0.8.31 @ali/lowcode-plugin-zh-en@0.8.35 @ali/lowcode-utils@0.8.21 @ali/lowcode-types@0.8.18 		2020-09-03 18:21:26 +08:00
力皓
7b8cfa594b chore: 无用修改, 为了让重新生成 npm 包 2020-09-03 17:42:32 +08:00
力皓
a171d3ef46 fix: 解决 set('schema') 后 componentsTree 越来越多的 bug 2020-09-03 11:38:50 +08:00
mark.ck
b50efd82ac 通过Aone-IDE合并冲突 2020-09-03 10:35:57 +08:00
wuji.xwt
d4ab19a671 docs: i18n/dataSource demo for React Renderer 
Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3642343

* docs: add dataSource demo

* docs: i18n demo
 2020-09-03 10:20:35 +08:00
荣彬
ac543a1c3b Merge branch 'feat/container-placeholder' into 'release/1.0.0' 
feat: 🎸 为容器的占位元素增加一个特定的 class 方便在设计器里定制样式

React 环境下默认对于空容器会增加一个这样的 div 元素方便拖放其内容：
![image](http://git.cn-hangzhou.oss-cdn.aliyun-inc.com/uploads/ali-lowcode/ali-lowcode-engine/743017dbc83ce51fc28fcd55a696d0a2/image.png)
但是注意，其中红线标出的 class 其实之前没有，结果会导致很难定制这个占位元素的样式 -- 比如在卡片组件中，如下图（1）所示标题栏右侧占位的高度就会很高，比较丑；更严重的是如下图（2）所示的，副标题插槽会被换行到看不见的位置：

![image](http://git.cn-hangzhou.oss-cdn.aliyun-inc.com/uploads/ali-lowcode/ali-lowcode-engine/277ccca69f1678fed49a550fcb1b9d41/image.png)

所以，建议增加这样一个特定 class，这样以后可以在设计器里来调整这个占位元素的样式。


See merge request !955505
 2020-09-03 09:43:20 +08:00
荣彬
fa4415e333 Merge branch 'fix/mixsetter-bugs' into 'release/1.0.0' 
fix-mixsetter bugs



See merge request !962380
 2020-09-02 23:02:15 +08:00
zude.hzd
138e36b5ae fix-mixsetter bugs 2020-09-02 22:57:45 +08:00
荣彬
1f03857532 fix: demo 中引入locode-editor-general 2020-09-02 17:08:20 +08:00
荣彬
ee34aff5f8 Publish 
- @ali/lowcode-code-generator@1.0.7-0
 - @ali/lowcode-demo-server@1.0.7-0
 - @ali/lowcode-demo@1.0.7-0
 - @ali/lowcode-designer@1.0.7-0
 - @ali/lowcode-editor-core@1.0.7-0
 - @ali/lowcode-editor-preset-general@1.0.7-0
 - @ali/lowcode-editor-preset-vision@1.0.7-0
 - @ali/lowcode-editor-setters@1.0.7-0
 - @ali/lowcode-editor-skeleton@1.0.7-0
 - @ali/lowcode-material-parser@1.0.7-0
 - @ali/lowcode-plugin-components-pane@1.0.7-0
 - @ali/lowcode-plugin-designer@1.0.7-0
 - @ali/lowcode-plugin-event-bind-dialog@1.0.7-0
 - @ali/lowcode-plugin-outline-pane@1.0.7-0
 - @ali/lowcode-plugin-sample-logo@1.0.7-0
 - @ali/lowcode-plugin-sample-preview@1.0.7-0
 - @ali/lowcode-plugin-source-editor@1.0.7-0
 - @ali/lowcode-plugin-undo-redo@1.0.7-0
 - @ali/lowcode-plugin-variable-bind-dialog@1.0.7-0
 - @ali/lowcode-plugin-zh-en@1.0.7-0
 - @ali/lowcode-rax-provider@1.0.7-0
 - @ali/lowcode-rax-renderer@1.0.7-0
 - @ali/lowcode-rax-simulator-renderer@1.0.7-0
 - @ali/lowcode-react-provider@1.0.7-0
 - @ali/lowcode-react-renderer@1.0.7-0
 - @ali/lowcode-react-simulator-renderer@1.0.7-0
 - @ali/lowcode-runtime@1.0.7-0
 - @ali/lowcode-types@1.0.7-0
 - @ali/lowcode-utils@1.0.7-0
@ali/lowcode-plugin-variable-bind-dialog@1.0.7-0 @ali/lowcode-plugin-zh-en@1.0.7-0 @ali/lowcode-utils@1.0.7-0 @ali/lowcode-types@1.0.7-0 @ali/lowcode-runtime@1.0.7-0 @ali/lowcode-react-simulator-renderer@1.0.7-0 @ali/lowcode-react-renderer@1.0.7-0 @ali/lowcode-react-provider@1.0.7-0 @ali/lowcode-rax-simulator-renderer@1.0.7-0 @ali/lowcode-rax-renderer@1.0.7-0 @ali/lowcode-rax-provider@1.0.7-0 @ali/lowcode-plugin-sample-logo@1.0.7-0 @ali/lowcode-plugin-components-pane@1.0.7-0 @ali/lowcode-plugin-designer@1.0.7-0 @ali/lowcode-plugin-event-bind-dialog@1.0.7-0 @ali/lowcode-plugin-outline-pane@1.0.7-0 @ali/lowcode-plugin-undo-redo@1.0.7-0 @ali/lowcode-plugin-source-editor@1.0.7-0 @ali/lowcode-plugin-sample-preview@1.0.7-0 @ali/lowcode-editor-preset-vision@1.0.7-0 @ali/lowcode-material-parser@1.0.7-0 @ali/lowcode-editor-skeleton@1.0.7-0 @ali/lowcode-editor-setters@1.0.7-0 @ali/lowcode-editor-preset-general@1.0.7-0 @ali/lowcode-editor-core@1.0.7-0 @ali/lowcode-designer@1.0.7-0 @ali/lowcode-demo@1.0.7-0 @ali/lowcode-demo-server@1.0.7-0 @ali/lowcode-code-generator@1.0.7-0 		2020-09-02 16:38:37 +08:00
荣彬
07ddf1789a Publish 
- @ali/lowcode-code-generator@1.0.6-0
 - @ali/lowcode-demo-server@1.0.6-0
 - @ali/lowcode-demo@1.0.6-0
 - @ali/lowcode-designer@1.0.6-0
 - @ali/lowcode-editor-core@1.0.6-0
 - @ali/lowcode-editor-preset-general@1.0.6-0
 - @ali/lowcode-editor-preset-vision@1.0.6-0
 - @ali/lowcode-editor-setters@1.0.6-0
 - @ali/lowcode-editor-skeleton@1.0.6-0
 - @ali/lowcode-material-parser@1.0.6-0
 - @ali/lowcode-plugin-components-pane@1.0.6-0
 - @ali/lowcode-plugin-designer@1.0.6-0
 - @ali/lowcode-plugin-event-bind-dialog@1.0.6-0
 - @ali/lowcode-plugin-outline-pane@1.0.6-0
 - @ali/lowcode-plugin-sample-logo@1.0.6-0
 - @ali/lowcode-plugin-sample-preview@1.0.6-0
 - @ali/lowcode-plugin-source-editor@1.0.6-0
 - @ali/lowcode-plugin-undo-redo@1.0.6-0
 - @ali/lowcode-plugin-variable-bind-dialog@1.0.6-0
 - @ali/lowcode-plugin-zh-en@1.0.6-0
 - @ali/lowcode-rax-provider@1.0.6-0
 - @ali/lowcode-rax-renderer@1.0.6-0
 - @ali/lowcode-rax-simulator-renderer@1.0.6-0
 - @ali/lowcode-react-provider@1.0.6-0
 - @ali/lowcode-react-renderer@1.0.6-0
 - @ali/lowcode-react-simulator-renderer@1.0.6-0
 - @ali/lowcode-runtime@1.0.6-0
 - @ali/lowcode-types@1.0.6-0
 - @ali/lowcode-utils@1.0.6-0
 2020-09-02 15:59:49 +08:00
荣彬
796d09d6c6 fix: remove 1.txt 2020-09-02 15:59:00 +08:00
荣彬
0b15d309b7 fix: 清理代码依赖及版本 2020-09-02 15:19:55 +08:00
力皓
0461a57d57 refactor: 重新梳理 purge / remove / delete 的职责，以及相应重构 
refactor: 调整判断 fieldId 是否存在的逻辑
fix: 解决 redo 时页面节点数不对以及 fieldId 被重置
 2020-09-02 13:46:42 +08:00
wuyue.xht
f224abffff feat: 透出错误边界捕捉不到的错误 2020-09-01 19:15:46 +08:00
金禅
0c4de43358 feat: 容器组件支持传入 placeholder 和对应样式 2020-09-01 19:11:09 +08:00
zude.hzd
adf492779d Merge branch 'release/1.0.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into release/1.0.0 2020-09-01 15:46:14 +08:00
zude.hzd
ce77375f66 fix: fix NextTable callback function 2020-09-01 15:45:27 +08:00
mark.ck
08b93f9c0a fix: remove vision dependency from plugin-undo-redo 
undo-redo 插件移除 vison 相关依赖

Link: https://code.aone.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/codereview/3629531

* fix: remove vision dependency from plugin-undo-redo
 2020-09-01 14:08:37 +08:00
荣彬
1f45b05028 feat: 新增simulatorurl，可以设置cdn使用simulator 2020-09-01 12:47:01 +08:00
wuyue.xht
55948e1d3f refactor: 重构runtime 2020-08-31 22:21:36 +08:00
高凯
294f742585 Merge branch 'fix/lihao-bugs-200827' into 'release/0.9.15' 
Fix/lihao bugs 200827



See merge request !957193
publish/0.9.15 		2020-08-31 18:22:28 +08:00