Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit '17534e63dc2efb7d965c8686e984f8667d3aad16':
REPORT-39601 在单元格中插入 富文本。 字体设置为14的时候,自动给我变成13了
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit '28cde5e899b3a9151f191d315a82006ca53eed89':
REPORT-40025 修改在已选择组件中按坐标获取组件的逻辑
REPORT-40025 修改在已选择组件中按坐标获取组件的逻辑
Merge in DESIGN/design from ~YYMING/design:release/10.0 to release/10.0
* commit 'b306fea3705407c7cf5bde824be3c43540aa5c5e':
REPORT-39884 换一个改动方案
REPORT-39965 新建聚合报表下方没有添加普通报表的按钮
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '50b2fcfde5e90b817e860a8d535ae56ed1333bbb':
CHART-15518 轴数量控制到20个
CHART-15840 图表第一次加载慢
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2bac14ada6b3eaf947adfb4b78489fd18c1cf2e6':
REPORT-40094 【回归】远程切换回本地,网页框控件不显示
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