Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'd3931cca66aeea5f0240db06044cebc428e5440a':
REPORT-58091 设计器11.0适配-.finereport110缓存文件继承问题
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'bbef610501613c581cce192a06821e4f5df649c4':
REPORT-57568 解决目录树展开收起触发打开模板的逻辑
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit '27238f73cca2804d677d10c2d927d52bdcea9dc5':
REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '963c95c524232605f78a7cbabed886299f6f67e3':
REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'c583badf065a6d30ea312f8249a02033343e7ce3':
REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '5adf17a73703d516c742926a44a0d5748b5937f5':
REPORT-57816 REPORT-57816
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'c45444606650526f49c0d1a163a709bac249e6de':
REPORT-56047 修改下判断是否为安版本的标准
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '47ec2f3b47170c0681a47336c54585d6d1793c85':
CHART-20373 gradientBar继承Jpanel之后重绘有问题
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit '089cf32374bb27387370550ba38e4f4954fdd620':
REPORT-56047 设计器11.0适配 消除自动合代码导致的问题
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit 'd21b416daada88c765ff494839839a1d22a27fbc':
REPORT-57147 【回归测试】设计器模版默认预览方式不生效
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'e7cdfce4362fc949c69e09dbf5167bea770bef5f':
REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'be41af5e515d1e9b28cebc99fb7208634def526f':
REPORT-57590 表单参数面板剪切复制按钮禁用
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'ef17b29ef7756e1ec34cf31077dd580668db8792':
REPORT-57568 解决目录树展开收起触发打开模板的逻辑
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'b14d2905e2e97b9356bdc56a555edcea1e6aa1de':
REPORT-57872 数据集-数据库查询时候,列名之间的分隔符没了
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '1beaddc1e5fcc17280242d1467aa1301a76a840f':
REPORT-57582【FRX】新自适应影响,设计器打开cpt,单元格很小
REPORT-57706 && REPORT-57694 新自适应-报表块列宽设置66.66.但展示为66像素;新自适应-报表块设置行高为3000后直接隐藏行了(行高变为0)