Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'd4ad4a2b4ea118396ce48b0d5ba13b6c7311137f':
CHART-16040 箱型图富文本编辑器参数修改
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'd4d970d1039e81f62d71c32aaa31c114a322d1ab':
增加空判断
CHART-16224 增加富文本条件属性界面事件
CHART-16040 箱型图富文本参数面板修改
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '51fb5858be283e905da96bb2ac9a1f16376bd0df':
CHART-15957 & CHART-15957 调整富文本打开时的鼠标位置和字符样式
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'fd630a18010a8001dda1c63e074a8b76c90672e3':
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '24d865d69176d673d4f48f88565f1f05b24f25a8':
REPORT-38872 修改下变量名
REPORT-38872 设计器https证书密码明文存储
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit 'b0c36cb10efb8cf805fcb3fb1240a33acf6a572e':
REPORT-41414 数据集-繁体设计器,共享数据集缓存到磁盘记录数输入框消失 【问题原因】之前的一个改动将MaxMexRowCountPanel中的UISpinner给拉长了一些,超过了设定的最大宽度,因此输入框没能显示 【改动思路】将最大宽度增大一些
Merge in DESIGN/design from ~YYMING/design:release/10.0 to release/10.0
* commit '9eb3b753972900ca7e58c1a0b355ee771f6fff37':
REPORT-41333 【冒烟】全局参数添加两个参数p1p2,将p2重命名为p1,不会有参数名重复的提醒
REPORT-41333 【冒烟】全局参数添加两个参数p1p2,将p2重命名为p1,不会有参数名重复的提醒
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '67497aafeb05577b54e5759de3a052194d3814ab':
REPORT-38872 修改下变量名
REPORT-38872 设计器https证书密码明文存储
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '5a69b8cdeefc10fc118a54164d4cf2ea21a5cb14':
REPORT-39629 组件块显示标题时问号按钮点不到
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '88c1f4918126b27cb2387ea3d1d9ad73bb34b84f':
CHART-16188 柱形图条件属性中增加文本方向button
CHART-16171 对富文本内容进行decode
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '74a6126df3fd7e32f9bfe240d16b658c57763b55':
REPORT-41135 【冒烟】第一次预览数据模板数据集,加载弹窗不消失 【问题原因】这个加载弹窗是个AutoProgressBar进度条,之前的逻辑中,进度条在SwingWorker线程中start并且close,而与进度条显示更新相关的逻辑在EDT中,所以有时候会出现SwingWorker中AutoProgressBar先close掉了,但是AutoProgressBar中还在继续对进度条进行赋值操作,又因为没有设置ProgressMonitor的millsToDecideToPopup,导致赋值操作会进入某个判断分支并使弹窗再度弹出,弹出后就不会自动关闭了 【改动方案】将close操作放入EDT线程中执行(顺便修复一些导包问题与过时方法)