Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '55031a4fd22c3819db5432e2b6150413c4c99fe0':
代码修改
REPORT-60674 FR11老自适应-报表块右侧选择自定义时,没有手动修改pc浏览器自适应的设置,应该是随着工具栏PC端报表块自适应属性的设置吧,但是出现了不一致现象;10.0是正常的
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit 'b51266bafae505fb3143f12a6bca45c500dae652':
REPORT-60900 修正图片不符合视觉的问题
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit 'dd202b36b9a9eccb19fc2045882f8b967737344b':
REPORT-60724 服务器数据集的提示信息视觉问题 && REPORT-60892 全局自适应-样式细节优化-国际化显示不全
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit '7e78ffd7e327118f2fd27fa4e284f542fdd7202a':
无jira任务 漏了编辑事件
REPORT-60991 导出-导出事件-其它模板-参数设置自定义时无按钮
Merge in DESIGN/design from ~STARRYI/design:REPORT-58744/release/11.0 to release/11.0
* commit 'fcaf293f105fdf6efcf3686549fd33ec0a311c34':
REPORT-58744 【主题切换】撤销操作后,样式设置不符合预期
REPORT-58744 【主题切换】撤销操作后,样式设置不符合预期
Merge in DESIGN/design from ~LIDONGY/design:feature/x to feature/x
* commit 'bfc1f47a0600e75ba5ce906c5c5097b3da30217d':
KERNEL-8509 fix: 部署向导重构导致打包失败。这里适配一下
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'f0442da478781daf7b736f7172328e09c5c7c720':
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit '3d4e74d5bf8d6581d4c89886c18a91dad0bf259f':
REPORT-61095 数据连接与服务器数据集两次重命名后设计器与服务器不一致
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit 'abf637fd2a5f1fbacf6719fea4e8b7f5ed7872aa':
REPORT-60897
REPORT-60897 【固定布局-原布局推荐4.1】决策报表-自适应布局-布局推荐弹窗右上方的简约视图和真实视图,交互设计预期是一开始默认是简约视图,且记录用户的选择,下次打开时显示上次的选择;现在效果是默认真实,且没有记录
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit '304eb116e14d4c078d295dedb561e3cc91fe1dc1':
REPORT-61055 【主题获取】主题导出插件几个小问题
REPORT-61054 【主题获取】有主题xml的组件和组件包的预览图提示缺失文字
Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0
* commit 'c06eab66115cdd334e12d0ac2c21b447b87cb3d3':
REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉