Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '768b74b87b32dfeff62658b2f5307c76a7f537b0':
REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'ff116685b16d6d906840c777c04a7b5d250934ba':
REPORT-57238 解决自动间距计算不正确的问题
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '42f24c5bcf1f09c2421cad431eac7d087bb396b6':
REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'ea2a93476e2fc297c30f8d5f000b4b26fd384e65':
REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'bccc08590de08ae3b4f386c52b93cafaca6e33e0':
REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '92825af427883c4e7b7e84c67ce37741d25a4f70':
REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数(允许输入小数,但自动取整处理)
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '2502b232a93886df2b1c96387a4ae48786a54099':
REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题
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 ~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 ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '9b8f88406762c4eb9b677cf50cd9e427d1b84707':
REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'bee3075e5f291f3436ad1d4e74ade0648b0dfa42':
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
REPORT-56595 数据集预览时可复制-表头复制问题