Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '5028683f568c66667eed0da8cfa3eb7bc7d0691f':
REPORT-57128&REPORT-57657 优化代码冗余逻辑
REPORT-57128&REPORT-57657 修复参数面板中会显示间距线的问题&修复报表块图表块不显示间距线的问题
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'd357671ce55a7b260e29a0dc4c86a66d4ad57467':
REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '03c1ccc659d63a613c3beb7785632a60bb321798':
REPORT-57128 【FRM布局推荐】组件复用-关于悬浮hover组件的交互设计更新
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '27b2c177b002bbe9d60b69f4abbaf4002ed8e7a2':
REPORT-53615 调整下combox的展示顺序
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '7c72424b8bbf3c07e6827811a8ac3c0b3ea677f1':
REPORT-57438 【回归测试】权限细粒度控制-参数面板控件,控件权限编辑栏无法正常显示
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '5b524fefbd317b63c60890434898ef71d97c8e9e':
REPORT-57317 修改间距提示文字的大小
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '52d9dfdf35449753a4e3f2f83a69408545264007':
REPORT-56049 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '2018937ad70336f88d8efda4b55afc1570e325c2':
REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'e77b612aa7af2156c0cae01dd0836deb20ae13a5':
REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '69bfee3359ca16974c8c82b9a2b68cd881ad4abe':
REPORT-56895 还是计算间距线相对位置的问题
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布局推荐】组件复用-手动间距输入框没有显示水印