superman
953558a266
Merge pull request #17420 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '2f55e5c13278252cd9814ed06590e462c17484e6':
REPORT-153749 繁体环境下,frm-组件设置--水印下图片是简中图片
REPORT-87781 图表渐变支持到30阶
1 week ago
superman
2f55e5c132
Merge pull request #17419 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '96186172332f24781498122b9aeb5330dc51468a':
REPORT-153749 繁体环境下,frm-组件设置--水印下图片是简中图片
REPORT-87781 图表渐变支持到30阶
1 week ago
zack-申凯鹏
9618617233
Pull request #17412 : REPORT-153749 繁体环境下,frm-组件设置--水印下图片是简中图片
...
Merge in DESIGN/design from ~ZACK/design:release/11.0 to release/11.0
* commit 'b9f42497e30c44cd7756fbc6e2bc7236737d4262':
REPORT-153749 繁体环境下,frm-组件设置--水印下图片是简中图片
REPORT-87781 图表渐变支持到30阶
1 week ago
zack-申凯鹏
b9f42497e3
Merging in latest from upstream (DESIGN/design:refs/heads/release/11.0)
...
* commit '613a0f248325c804a4c78a508b418aa436332169': (22 commits)
REPORT-153340 修复SCA扫描 Access Specifier Manipulation
REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
fix: 场景地图报错npe #REPORT-152115
fix: npe #REPORT-125730
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
REPORT-149471 feat:FR11支持取数数据中心
REPORT-150879 fix: 新老方案兼容问题
REPORT-148096 单测修复
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
REPORT-148096 修复单测
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
...
1 week ago
zack
6a6ffe7564
REPORT-153749 繁体环境下,frm-组件设置--水印下图片是简中图片
1 week ago
superman
cac5c6e9a6
Merge pull request #17315 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '6e5e7a84dcb57f958e781fe849db0320c750601a':
REPORT-153340 修复SCA扫描 Access Specifier Manipulation
3 weeks ago
superman
6e5e7a84dc
Merge pull request #17314 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '613a0f248325c804a4c78a508b418aa436332169':
REPORT-153340 修复SCA扫描 Access Specifier Manipulation
3 weeks ago
Shengzu.Xue-薛胜祖
613a0f2483
Pull request #17307 : REPORT-153340 修复SCA扫描 Access Specifier Manipulation
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit 'fdcaedfc0d3032888f84ef7105eef96a50fc5562':
REPORT-153340 修复SCA扫描 Access Specifier Manipulation
3 weeks ago
shengzu.xue
fdcaedfc0d
REPORT-153340 修复SCA扫描 Access Specifier Manipulation
...
使用org.springframework.util.ReflectionUtils#makeAccessible 替代
java.lang.reflect.Field.setAccessible 方法
3 weeks ago
superman
a53dcb61eb
Merge pull request #17305 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'c604544efe4e5ef729027c5cfac7029fcbf35a74':
REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
3 weeks ago
superman
c604544efe
Merge pull request #17304 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'c039946000c0bd02e3f5b91902f51c1ba10773ca':
REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
3 weeks ago
Shengzu.Xue-薛胜祖
c039946000
Pull request #17297 : REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit 'b186297457971acd9c1c79ad5b9015fee7eb1c4d':
REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
3 weeks ago
shengzu.xue
b186297457
REPORT-153340 代码中部分资源流未关闭,使用 try-with-resources 自动关闭流
3 weeks ago
Bruce.Deng-邓铖臻
e6cc4d7367
Pull request #17255 : REPORT-151045 设计器隐藏新建决策报表入口
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/x to feature/x
* commit '3e7f8e03efd7f7f8957e7f26b344a8b2fcf056ea':
REPORT-151045 设计器隐藏新建决策报表入口
4 weeks ago
superman
7f2ecd6aaf
Merge pull request #17264 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '01f9c1edb8663cac3383e1caaec54edc70396d37':
4 weeks ago
superman
01f9c1edb8
Merge pull request #17263 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '784ae4b5f1005f3e97e62e6890d2d281800e6007':
4 weeks ago
superman
784ae4b5f1
Merge pull request #17262 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'cfac9643a47b6f18164d1aa524fcb0a9395823ff':
4 weeks ago
superman
cfac9643a4
Merge pull request #17261 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'c884dd1ca8b46e0e7688c4ebe6fab9af2c3038ae':
4 weeks ago
superman
c884dd1ca8
Merge pull request #17256 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '320080cae14f31a0a0435bcb2ae4a5f196a70d59':
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
fix: 场景地图报错npe #REPORT-152115
fix: npe #REPORT-125730
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
REPORT-149471 feat:FR11支持取数数据中心
REPORT-150879 fix: 新老方案兼容问题
REPORT-148096 单测修复
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
REPORT-148096 修复单测
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
REPORT-146147 feat:兼容内嵌式容器
4 weeks ago
Bruce.Deng
3e7f8e03ef
REPORT-151045 设计器隐藏新建决策报表入口
4 weeks ago
superman
d23b1a0dc9
Merge pull request #17215 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '71a9b59abcc9421af523d7300cbd88574bc0d73e':
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
1 month ago
superman
71a9b59abc
Merge pull request #17214 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd0b45d819cf211dfbc9c58e017fc45da3b0ce27a':
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
1 month ago
superman
d0b45d819c
Merge pull request #17213 in DESIGN/design from final/11.0 to release/11.0
...
* commit '320080cae14f31a0a0435bcb2ae4a5f196a70d59':
1 month ago
superman
320080cae1
Merge pull request #17207 in DESIGN/design from release/11.0 to final/11.0
...
* commit 'c72b29ca7123b01c5de06f7078cfb51263a0d5b6':
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
fix: 场景地图报错npe #REPORT-152115
fix: npe #REPORT-125730
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
REPORT-149471 feat:FR11支持取数数据中心
REPORT-150879 fix: 新老方案兼容问题
REPORT-148096 单测修复
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
REPORT-148096 修复单测
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
REPORT-146147 feat:兼容内嵌式容器
1 month ago
Shengzu.Xue-薛胜祖
c72b29ca71
Pull request #17206 : REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit 'fa9b09d3d077e9b451021093c475e241cdb0a726':
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
1 month ago
shengzu.xue
fa9b09d3d0
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
...
价格为-1时显示咨询销售
1 month ago
superman
9bfcde9213
Merge pull request #17197 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '65873564b61c0a58424ea83bd25c55a7e4a191c7':
fix: 场景地图报错npe #REPORT-152115
1 month ago
superman
65873564b6
Merge pull request #17196 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'e95249cbae204b54226d173f545067da907938ad':
fix: 场景地图报错npe #REPORT-152115
1 month ago
zheng-郑潇
e95249cbae
Pull request #17189 : fix: 场景地图报错npe #REPORT-152115
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '809df003d0763d6ceddf93ef3feef09945ee7c77':
fix: 场景地图报错npe #REPORT-152115
1 month ago
zheng-郑潇
809df003d0
fix: 场景地图报错npe #REPORT-152115
1 month ago
superman
a16fc23401
Merge pull request #17172 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '0bc096c6d83b4dce9a5ca28203dd0b2a1552dbfb':
fix: npe #REPORT-125730
1 month ago
superman
0bc096c6d8
Merge pull request #17171 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd6ddebe1f751c6ca3a255bf6586d07079ceb43f8':
fix: npe #REPORT-125730
1 month ago
zheng-郑潇
d6ddebe1f7
Pull request #17164 : fix: npe #REPORT-125730
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit 'f2447779437e1b8ea30ef53fa70274f0ba72217d':
fix: npe #REPORT-125730
1 month ago
zheng-郑潇
f244777943
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
1 month ago
zheng-郑潇
fa7a5139d8
fix: npe #REPORT-125730
1 month ago
superman
df5c0b2bd3
Merge pull request #17163 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'd656d78f0f9747b6d6ad0c2382e7619274c07e76':
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
1 month ago
superman
d656d78f0f
Merge pull request #17162 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '79e911535726cfc9f64c5226b857f1ef17a94503':
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
1 month ago
zheng-郑潇
79e9115357
Pull request #17155 : fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829 && fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '0ac9502022733947a82b723345a7a55fe8f51ca9':
fix: 代码质量 #none
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
1 month ago
zheng-郑潇
0ac9502022
fix: 代码质量 #none
1 month ago
zheng-郑潇
a6e0c4c16f
fix: 提供内嵌浏览器启动参数配置方案 #REPORT-125730
1 month ago
zheng-郑潇
747aa5c3b1
fix: 扩展图表插件场景地图无法使用自签名证书远程https环境 #REPORT-151829
1 month ago
Brian.Luo-罗旭
1e30506eb8
Pull request #17138 : REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
...
Merge in DESIGN/design from ~BRIAN.LUO/design:release/11.0 to release/11.0
* commit '282f51dff6d1cbbdc17a942c5c8960e5f3b6dd9f':
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
1 month ago
superman
8bcd9f7017
Merge pull request #17146 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '2336d59fd0ffe774ae0ce764188be59f943f1fa6':
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
1 month ago
superman
2336d59fd0
Merge pull request #17145 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '2f3f8d069ad9f77b7ebc20ff1c0b13b574598a73':
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
1 month ago
Brian.Luo-罗旭
282f51dff6
REPORT-148261 支持远程设计连接断开后自动停止心跳与锁状态检测,避免服务器重启后产生大量连接报错。连接恢复后设计器自动重启相关任务。
1 month ago
Zhanying-占盈
2f3f8d069a
Pull request #17137 : feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit '3aa10edb79c73881fed87c75cf840403d1b6325e':
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
1 month ago
Zhanying
3aa10edb79
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
1 month ago
Zhanying
6b69c62f85
feat: </div>始终放在最后拼接 #REPORT-150676
1 month ago
Zhanying
4cb8fb6b1d
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
1 month ago
Zhanying-占盈
54816c77e0
Pull request #17119 : feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
...
Merge in DESIGN/design from ~ZHANYING/design:feature/x to feature/x
* commit 'f29d62b9bf25329f67110d5ccdb35e675201f731':
feat: showGuideLink放到初始化的时候赋值 #REPORT-150676
feat: </div>始终放在最后拼接 #REPORT-150676
feat: frm中fvs引导支持配置屏蔽超链跳转 #REPORT-150676
1 month ago