Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'd09a4584793f1dcc35147ebf8a383ebe1355b013':
REPORT-57233 修正本地调试的修改
REPORT-57233 【FRM布局推荐】组件复用-对齐、自动间距、手动间距,调整后没有触发模板的保存和还原按钮,导致关闭再打开此模板还是调整前的效果
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '1415f85b9f7218793db645f7890748fe148f81fa':
撤销
REPORT-57147 设计器模版默认预览方式不生效
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '1d76a4bbcd64046b86afc76e2b07c445c5a8aad9':
REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '0fd8b045d62155b8dca8071cda1564d98c3dea5c':
REPORT-53615 调整代码格式
REPORT-53615 驱动管理的设计器适配
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'c95c24b7b6ce626b2d8b22ce54f523c9376c7c61':
KERNEL-7634 jxbrowser 小版本再升级下
Merge in DESIGN/design from ~YUAN.WANG/design:feature/10.0 to feature/10.0
* commit '2146d43f0364f5e9d2c2ab2d787441a8b911b835':
REPORT-56134js提交事件报错中添加定位信息
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '74a947c089df0f3e0f530235e866ee3e3d23e33a':
REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小,挤压绝对画布块,绝对画布块内组件会保持尺寸不变且超出绝对画布块;但开发者调试下,此场景,绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '9b8f88406762c4eb9b677cf50cd9e427d1b84707':
REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit '6fa53eda15eb07c0f150f60c6f2bd6428c24defb':
REPORT-51472 平台开启的模版读不到状态的问题
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'bee3075e5f291f3436ad1d4e74ade0648b0dfa42':
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
REPORT-56595 数据集预览时可复制-表头复制问题