Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '6b70b8a239602313b1e0bb5230d9fe0e51292694':
REPORT-39601 在单元格中插入 富文本。 字体设置为14的时候,自动给我变成13了
Merge in DESIGN/design from ~HANS/design:release/10.0 to release/10.0
* commit '4860a9c94c4f7c171f07cb7885e8c8a0db1348f2':
MOBILE-29516【设计器】tab手势切换样式》圆点指示器设置项在不勾选滑动的时候也会显示修改 按照交互的设计调整显示规则
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit '80052d7b9668e467c2fcd612a0ba7200bcc1b4fd':
REPORT-40028 在UI类的paint方法中已经进行了顶层组件的绘制,就不将其加入FormDesigner了
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '2812d09ea389566fb812d4c96cd11ab7f789c711':
REPORT-38618【回归】表单-下方缩放缩小之后,拖入tab块,查看右侧边框线消失
Merge in DESIGN/design from ~YYMING/design:release/10.0 to release/10.0
* commit '41309234d2b63cfc827e57cacd92f0cee6df1c5f':
REPORT-39884 回退成国际化版本
REPORT-39884 服务器数据集和模板数据集同名时,数据字典显示问题
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '5910f0a3e42805e32d85503a183242fdc8860e87':
MOBILE-29339 两个横向布局块中间无法插入新报表块
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '2a416ce6ade9a2ac0f9230a2ee62717f150a8fd4':
CHART-15730 甘特图的大数据不允许选择里程碑为图片
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '0c681257d3833dd97980153c77d1a1ef84962b2d':
REPORT-38917 模板短时间内的保存记录对应多个UUID
REPORT-38917 模板短时间内的保存记录对应多个UUID
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '4e93f6d235d8f02d265252b47b8164329c311d56':
REPORT-39911 海外版设计器右侧属性栏默认宽度调整、不可拖拽 REPORT-39340 【回归】修复设计器闪退提示存在乱码
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'eeda38b25a41a2b981aed9f69243448900448e1e':
REPORT-38872 设计器https证书密码明文存储
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit 'c686b6956a82aefc099cdc7a17a3bd0ddc663526':
REPORT-39894 不将自适应布局和绝对布局的子类加入顶层