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:兼容内嵌式容器
4 weeks 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搜索的模板意为报价咨询销售,但是实际价格为负数
4 weeks ago
shengzu.xue
fa9b09d3d0
REPORT-151361 AlphaFine搜索的模板意为报价咨询销售,但是实际价格为负数
...
价格为-1时显示咨询销售
4 weeks 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
4 weeks ago
zheng-郑潇
809df003d0
fix: 场景地图报错npe #REPORT-152115
4 weeks 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
4 weeks ago
zheng-郑潇
f244777943
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
4 weeks ago
zheng-郑潇
fa7a5139d8
fix: npe #REPORT-125730
4 weeks 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
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-占盈
cc559c316d
Pull request #17118 : feat: FRM支持屏蔽在线资源 REPORT-151746
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit 'e0b5f092fb397effbc8bf479091e4f7f7d43489c':
代码质量检测
feat: FRM支持屏蔽在线资源 REPORT-151746
1 month ago
Zhanying
e0b5f092fb
代码质量检测
1 month ago
Zhanying
560f6cfe38
feat: FRM支持屏蔽在线资源 REPORT-151746
1 month ago
superman
e1efc3ae0e
Merge pull request #17117 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit 'b2ee4bea1e955bc275fadd678b69880229d0416d':
REPORT-149471 feat:FR11支持取数数据中心
REPORT-150879 fix: 新老方案兼容问题
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
REPORT-146147 feat:兼容内嵌式容器
1 month ago
superman
b2ee4bea1e
Merge pull request #17116 in DESIGN/design from feature/x to bugfix/11.0
...
* commit 'b0d65fbd7833e94b007f39dfe617e9039e6cc280':
REPORT-149471 feat:FR11支持取数数据中心
REPORT-150879 fix: 新老方案兼容问题
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
REPORT-146147 feat:兼容内嵌式容器
1 month ago
Levy.Xie-解安森
b0d65fbd78
Pull request #17115 : REPORT-149471 feat:FR11支持取数数据中心
...
Merge in DESIGN/design from ~LEVY.XIE/design:feature/x to feature/x
* commit '4dc18f5d488457ca55de7bf3e25eb2a49aa4ef89':
REPORT-149471 feat:FR11支持取数数据中心
1 month ago
Levy.Xie-解安森
4dc18f5d48
REPORT-149471 feat:FR11支持取数数据中心
1 month ago
Zongyu.Wang-王宗雨
c78c7a47c1
Pull request #17114 : REPORT-150879 fix: 新老方案兼容问题
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:feature/x to feature/x
* commit '651ac827ec9824cf6f1e83f48c3f9694604cca9a':
REPORT-150879 fix: 新老方案兼容问题
1 month ago
lemon
651ac827ec
Merge remote-tracking branch 'origin/feature/x' into feature/x
1 month ago
lemon
c200741244
REPORT-150879 fix: 新老方案兼容问题
1 month ago
superman
53f03502a2
Merge pull request #17108 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '01be8bfeaf17dc4071cd6ff958d368c75c2d7a0e':
1 month ago
superman
01be8bfeaf
Merge pull request #17107 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '541f59e392571a6045f7b33f7ee20be21bcf663d':
1 month ago
superman
541f59e392
Merge pull request #17106 in DESIGN/design from final/11.0 to release/11.0
...
* commit '883ce51ff604f2856245eabcbc0016c783707540':
1 month ago
superman
883ce51ff6
Merge pull request #17105 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '5bd56a90afa1de43de7c16862d91afbee7c8103b':
1 month ago
superman
5bd56a90af
Merge pull request #17100 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '4841ed4f72b22dae7a9c9211a19828570e76cbde': (26 commits)
REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
REPORT-149012 alphafine中搜索之前可以在设计器中搜到BI的模板,现在增加cid参数,只搜索fr相关模板
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
REPORT-148096 整体代码已重构,删除无效单测
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
REPORT-148096 暂时过滤掉与UI相关的单测
REPORT-149091 修复动态参数切换异常
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
KERNEL-20792 报表工程中使用的仓库地址修改
feat: JSContentPane支持自定义提示功能 #REPORT-144004
fix: pr问题处理 #REPORT-147689
fix: 颜色选择面板数组越界 #REPORT-147689
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
REPORT-147166 修改代码质量
REPORT-147166 修改代码质量
REPORT-147166 统信uos下切换条件属性后,卡片不能及时更新。
REPORT-147166 统信uos下切换条件属性后,卡片不能及时更新。
...
1 month ago
superman
4ff6afeafb
Merge pull request #17074 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '06a6a8f6e64684ebd8bd864c940309556a2cb4ac':
REPORT-148096 单测修复
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
2 months ago
superman
06a6a8f6e6
Merge pull request #17073 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '414e970044853211a211f6f93156df89e3799c53':
REPORT-148096 单测修复
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
2 months ago
Leo.Qin-覃宇攀
414e970044
Pull request #17066 : REPORT-148096 单测修复
...
Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0
* commit '3deceaf034863624d242006a33b63943a8fdea88':
REPORT-148096 单测修复
2 months ago
Shengzu.Xue-薛胜祖
e47fce7d4c
Pull request #17041 : REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit 'b71998d2ea08746b0b8f6a082b2c9ef1ddcc2c3f':
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
2 months ago
Leo.Qin
3deceaf034
REPORT-148096 单测修复
2 months ago
superman
e0fcbc9aea
Merge pull request #17049 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '64370315819c0770c052432e84cea1719b982153':
REPORT-148096 修复单测
2 months ago
superman
6437031581
Merge pull request #17048 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'ff8a5dd02cfdbdd2757c8c1d1e63fbc0d736ba4d':
REPORT-148096 修复单测
2 months ago
Zhanying-占盈
df8dd7f545
Pull request #17030 : fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
...
Merge in DESIGN/design from ~ZHANYING/design:feature/x to feature/x
* commit '9b619cceb7ba4bb810bee664ed7d55f13392e274':
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
2 months ago
shengzu.xue
b71998d2ea
REPORT-148530 修复使用数据集分组插件情况下,fr设计器数据集搜索查询不出来
...
getCurrentTableDataTree这里用了强制类型转换把BasicTableDataTreePane转换成了TableDataTreePane,导致插件接口返回的BasicTableDataTreePane实现无法转换导致报错
2 months ago
Leo.Qin-覃宇攀
ff8a5dd02c
Pull request #17040 : REPORT-148096 修复单测
...
Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0
* commit 'd201169659d96022befd6655c14dd9a01f12c84b':
REPORT-148096 修复单测
2 months ago
Leo.Qin
d201169659
REPORT-148096 修复单测
2 months ago
superman
00a08a2e8e
Merge pull request #17039 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'a8052ea901225ebd5fce69cc3dc3c28edc63422f':
REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
2 months ago
superman
a8052ea901
Merge pull request #17038 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'aa1bfc32ac44f6b86aaeabb80c80b5df4a5cd839':
REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
2 months ago
superman
aa1bfc32ac
Merge pull request #17037 in DESIGN/design from final/11.0 to release/11.0
...
* commit '4841ed4f72b22dae7a9c9211a19828570e76cbde':
2 months ago
superman
4841ed4f72
Merge pull request #17031 in DESIGN/design from release/11.0 to final/11.0
...
* commit '5cd411fdaf76ebd57a82251de62cb2c7a5c04075': (25 commits)
REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
REPORT-149012 alphafine中搜索之前可以在设计器中搜到BI的模板,现在增加cid参数,只搜索fr相关模板
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
REPORT-148096 整体代码已重构,删除无效单测
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
REPORT-148096 暂时过滤掉与UI相关的单测
REPORT-149091 修复动态参数切换异常
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
feat: JSContentPane支持自定义提示功能 #REPORT-144004
fix: pr问题处理 #REPORT-147689
fix: 颜色选择面板数组越界 #REPORT-147689
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
REPORT-147166 修改代码质量
REPORT-147166 修改代码质量
REPORT-147166 统信uos下切换条件属性后,卡片不能及时更新。
REPORT-147166 统信uos下切换条件属性后,卡片不能及时更新。
REPORT-147166 统信uos下切换条件属性后,卡片不能及时更新。
...
2 months ago
Zhanying
9b619cceb7
fix: frm引导fvs提示链接支持其他语言的帮助文档链接 #REPORT-150676
2 months ago
Shengzu.Xue-薛胜祖
5cd411fdaf
Pull request #17021 : REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit '6cd3fd258386c4bbb201d38375675ca5b3b0e13a':
REPORT-143899 设计器新建文件夹没有权限 修改逻辑删除单个节点后默认选中上层节点
2 months ago