Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '28011b7151f5b2edd9b829682207e74ec73ed805':
方法名也改下,以及成员变量名
改下命名,颜色深浅模式可以作为公共枚举使用,并且层级往上抽一下
改为枚举实现
REPORT-111740 【控件显示增强】历史模板升级后,工具栏没有根据背景适配深浅
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'b41984c788d114b14ea9645f99f1bf803380b7bd':
改下实现
REPORT-111549 标签控件设置的字体背景样式等,开启控件增强,之前设置的样式丢了
Merge in DESIGN/design from ~ROGER.CHEN/design:release/11.0 to release/11.0
* commit 'ce8e777a30737d84d5c4d6b02497b9b3756deaf6':
REPORT-92893 锁定的模板,重复另存副本,设计器页面模板内容不更新
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit 'e1f72173dcf3b2995e4e38a616d291e5301b5a01':
REPORT-109129 偶现设计器关闭后进程残留 添加日志
REPORT-109129 偶现设计器关闭后进程残留
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit '31a4146d024d48b077587a31f93ce764706af52d':
REPORT-111281 控件内置后,新模版默认开启变成默认关闭
REPORT-111723 【控件显示增强】删除当前模板主题,按钮和标签控件的字体大小异常
Merge in DESIGN/design from ~ROGER.CHEN/design:release/11.0 to release/11.0
* commit '965baddd46a1a5f7d322d4d3598b1ad3196342dd':
REPORT-111690 A用户断网,B用户打开模板,A用户联网保存,副本保存异常
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '180965a1bd7fa045b7a453633b795acc418a825b':
REPORT-111841 启动后不输出任何日志
Merge in DESIGN/design from ~YUAN.WANG/design:release/11.0 to release/11.0
* commit '95c5c838cc634fa9643630e5b59d14765354365c':
REPORT-111169 数据集含有注释的参数,但参数依然生效
Merge in DESIGN/design from ~YUAN.WANG/design:release/11.0 to release/11.0
* commit '4e51294812ca53b2cc3c8fcfc4bc35200c4f0305':
REPORT-111169 数据集含有注释的参数,但参数依然生效
Merge in DESIGN/design from ~DESTINY.LIN/design:release/11.0 to release/11.0
* commit '2ba1efbfc2406459c766d41da4a20269ed6e4739':
REPORT-111279 全局查找与替换,复杂frm搜索失败
REPORT-111279 全局查找与替换,复杂frm搜索失败
Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0
* commit 'a0e17ab422bdfaa7bbf906112549c5f8fb7e8789':
格式化,优化import
去掉背景色配置面板判空,用不着
调整实现,使用组合代替之前的继承,更新的方法签名退回
REPORT-111562 【控件显示增强】下拉面板色-自定义配置无法持久化