Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '3b2df497446786e5cdd932de9931d8b370e50e78':
使用内部类代替重复的方法
CHART-18139 修改富文本字段样式
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '9ae87be65372a77383a0b6ada37701bfbcf15ca0':
修改富文本编辑器界面
merge code
CHART-18070 富文本新增字段支持组合图
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '2a56160bbc4f47261ca9092c02062f6cf01b351b':
CHART-18055 修改新增字段汇总方式默认值
CHART-18127 修改富文本参数分隔符
Merge in DESIGN/design from ~ABEL.CHEN/design:release/10.0 to release/10.0
* commit 'bc5f73dc3962d97e1b144911083a60a021c6c136':
REPORT-47453 和产品商量一下,控件编辑行默认不开启颜色
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '4ef03597a5275fd228931037dd67828c691362a1':
REPORT-47797 本地和远程工程切换,日志有两个插件的报错 【问题原因】有些插件只用了_normal和_selected两种图标,没有使用_disabled图标,但是之前的逻辑没有对资源是否存在进行判断,会导致IOUtils中输出错误日志 【改动思路】添加判断;把适配插件的逻辑抽取一下
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '9f56de62b6d9842a02b4488f1f2f35a138aa03f5':
CHART-18182 模糊匹配方法移动到平台 & CHART-18190 点地图透明度控件
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'ebe3a7fa59e833ff2c7881c76ea4ac2b208f763a':
REPORT-47101 海外设计器通行证相关链接替换
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'b2a771607b7da8105562265a0380b529dbd95736':
REPORT-47606 聚合报表拖拽时停止编辑会回退到原位置
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '66acb052a4a89b8697f29303fdac098ed913dfb6':
REPORT-47632 远程锁定-从远程切换到本地后,数据集窗口的锁定图标不消失 【问题原因】之前的逻辑不完善,如果处于远程状态下是锁定的,isLock变量为true,然后切回本地了,这个变量没有被置为false,会导致数据集窗口图标一直为锁定状态 【改动思路】加个判断,如果不是远程设计状态且isLock为true,将其置为false,再通知观察者们
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'ea33914d7adcb4787bc0b0cd790228c5b5e9a85d':
REPORT-47193 插件管理提示弹窗优化
REPORT-47193 插件管理提示弹窗优化
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '1f5f4613a1f8d589b43e8643f3af04739d763e0d':
REPORT-45901 【10.0.14】oem设计器多开接口 --加上端口限制
REPORT-45901 【10.0.14】设计器多开接口
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '753ece1aab42e86aec8c1951d3f2e41533709459':
REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 漏掉了这个panel,将解锁放到aftercommit()中
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '161c8a87f43566887027c911accfe77a3161cca5':
REPORT-43833 【10.0.14】远程设计数据连接/服务器数据集增加锁定 【问题原因】在设计器启动的过程中,UILockButton会调用isLocked方法,此时工作空间对象池中还没有对象,因此获取到的operator是null,会报npe 【改动方案】做个判断