Starryi
bcf191fadb
REPORT-68127 【专题】jdk11的设计器用bat脚本启动失败,exe启动正常
...
【问题原因】
Reflect.on方法会抛出异常,需要主动catch
【改动思路】
无
【review建议】
3 years ago
Starryi
42dcfbfb32
REPORT-68062 单元格数据列高级设置-格式设置不生效
...
【问题原因】
DSColumnAdvancedPane.FormatAttrPane,
未继承AbstractAttrNoScrollPane,缺少了一些监听导致。
原有代码在合并时丢失,需要重新补充下
【改动思路】
无
【review建议】
3 years ago
starryi
f5f4d3551e
Pull request #8305 : REPORT-68062 单元格数据列高级设置-格式设置不生效
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit '71cd9c679ea40fc7c43373a830ec8a83710ecb74':
REPORT-68127 【专题】jdk11的设计器用bat脚本启动失败,exe启动正常
REPORT-68062 单元格数据列高级设置-格式设置不生效
3 years ago
Yvan
72a13f4acd
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Yvan
a9f5c15cc8
REPORT-68355 【迭代】【数据集管理优化】搜索关键字匹配数据列,数据列所在数据集没有展开
...
【问题原因】之前把切换回工具栏的调用放在TableDataTreePane的refreshDockingView里又因为TableDataTreePane的每一次getInstance都会去调用一次refreshDockingView,搜索任务过程中会经常调用到TableDataTreePane.getInstance,所以造成了搜索状态上的紊乱
【改动思路】1. 扩展TreeSearchStatus,新增Not_In_Search_Mode,视为非搜索模式,其它的状态(搜索中,搜索中止,搜索完成等)统统视为搜索模式
2. 在需要退出搜索模式的地方(切换数据集Tab和新打开一个模板),加上退出的逻辑;不把逻辑放到refreshDockingView里
3. 部分代码质量问题
【review建议】上面改动的第二点,分布在需要退出的场景里,会显得比较松散,但是我没找到一个好的地方可以统一搞。有思路的可以帮忙提供下,感谢~
3 years ago
shine
6ef8e5c774
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
3 years ago
shine
e4d80627cf
CHART-21969 fix: fvs.cpt屏蔽场景地图新建入口
3 years ago
Henry.Wang
5dd59393ed
Pull request #8308 : REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0
* commit '155264458b41737dadeba6d405e82b5c2193fe4b':
REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
3 years ago
Henry.Wang
155264458b
REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
3 years ago
Lucian.Chen
584157b41d
Pull request #8306 : REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/11.0 to final/11.0
* commit 'a0f83145e890362ffd320dacc16c7466d4bd1a4e':
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
lucian
a0f83145e8
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
Starryi
71cd9c679e
REPORT-68127 【专题】jdk11的设计器用bat脚本启动失败,exe启动正常
...
【问题原因】
Reflect.on方法会抛出异常,需要主动catch
【改动思路】
无
【review建议】
3 years ago
Starryi
c1cff83604
REPORT-68062 单元格数据列高级设置-格式设置不生效
...
【问题原因】
DSColumnAdvancedPane.FormatAttrPane,
未继承AbstractAttrNoScrollPane,缺少了一些监听导致。
原有代码在合并时丢失,需要重新补充下
【改动思路】
无
【review建议】
3 years ago
fanglei
0782eb7fe4
Pull request #8289 : REPORT-68175 FR11决策报表-绝对布局frm,鼠标在body没有组件的空白区域,点击然后拖拽,会出现组件大小被拉伸且超出body范围的错乱现象,此时点回退按钮会使模板变为宽度为1的效果
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'ee540035775dc508de3b6c6768f8e59fa9008793':
REPORT-68175 FR11决策报表-绝对布局frm,鼠标在body没有组件的空白区域,点击然后拖拽,会出现组件大小被拉伸且超出body范围的错乱现象,此时点回退按钮会使模板变为宽度为1的效果
3 years ago
pengda
1b0002e490
Pull request #8304 : CHART-22972 HyperlinkProvider接口对图表超链不起作用
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '67446e16f7f34e197d468cf79788e9a46c286d4d':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
Lucian.Chen
997c91bb2f
Pull request #8292 : REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/11.0 to release/11.0
* commit 'e6f8169b22540152e68d8e8694c37d8552233c70':
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
superman
2e8eacf5b4
Merge pull request #8303 in DESIGN/design from release/11.0 to feature/x
...
* commit '62c0e0c753d7bce8ce72da61058786f117ad1395':
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
CHART-23172 & CHART-23111 只处理没正确关闭engine
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
pengda
67446e16f7
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
3 years ago
pengda
f8c08500c4
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
9deb4fe57b
Pull request #8294 : CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '3147786e6a66d0f856281f19141facd460e1a1c5':
CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
3 years ago
superman
62c0e0c753
Merge pull request #8302 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'df69a6368f9c729d3716fc343a4a204970b335c9':
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
CHART-23172 & CHART-23111 只处理没正确关闭engine
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
Yvan
c0b174811d
Pull request #8278 : REPORT-66457 原数据集管理优化
...
Merge in DESIGN/design from ~YVAN/design:feature/x to feature/x
* commit 'e548a8301033a7fca009ff76ebe5bd49ea9e4394':
REPORT-66457 原数据集管理优化 1. 补充test 2. 删掉监听逻辑,不考虑搜索中的数据集变更问题 3. 删掉测试日志代码
REPORT-66457 原数据集管理优化 【问题原因】rt 【改动方案】rt 【review建议】详见开发文档:https://kms.fineres.com/pages/viewpage.action?pageId=340985192
3 years ago
pengda
3147786e6a
CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
3 years ago
lucian
e6f8169b22
Merge branch 'release/11.0' of https://code.fineres.com/scm/~lucian.chen/design into release/11.0
3 years ago
lucian
2e0ef36350
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
wei
df69a6368f
Pull request #8288 : CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
...
Merge in DESIGN/design from ~WEI/design:final/11.0 to final/11.0
* commit '4a8fd982c54bb83a96e3ee05ee5a7b9b7f8feae5':
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
CHART-23172 & CHART-23111 只处理没正确关闭engine
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
Link.Zhao
adb59aa17b
REPORT-66853 老决策报表-没有勾选图片压缩,报表块设置图片主体填充,web预览时图片会模糊
...
1、修改了jpg图像的存储方式,使用原文件直接存储
3 years ago
WeiYanglu
4a8fd982c5
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
3 years ago
方磊
ee54003577
REPORT-68175 FR11决策报表-绝对布局frm,鼠标在body没有组件的空白区域,点击然后拖拽,会出现组件大小被拉伸且超出body范围的错乱现象,此时点回退按钮会使模板变为宽度为1的效果
3 years ago
Yvan
e548a83010
REPORT-66457 原数据集管理优化
...
1. 补充test
2. 删掉监听逻辑,不考虑搜索中的数据集变更问题
3. 删掉测试日志代码
3 years ago
WeiYanglu
c777d0889a
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
WeiYanglu
541fd4f288
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
...
This reverts commit ea109b45f6
.
3 years ago
WeiYanglu
ea109b45f6
CHART-23172 & CHART-23111 只处理没正确关闭engine
3 years ago
WeiYanglu
c7b284ad9e
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
...
This reverts commit b069132341
.
3 years ago
WeiYanglu
b069132341
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
fly.li
abe6787d74
Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x
3 years ago
superman
407dec20ae
Merge pull request #8287 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f06122ef98329ede1e1cc9bdb26f6192412798b6':
CHART-23245 fix:模板锁定备份fvs
CHART-22994 图表背景色控件需要更换为支持透明色的控件
3 years ago
zheng
f06122ef98
Pull request #8277 : CHART-23245 fix:模板锁定备份fvs
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '9c0cb177485276df667c5c8b70d62128e4c7d367':
CHART-23245 fix:模板锁定备份fvs
3 years ago
pengda
b40293de14
Pull request #8267 : CHART-22994 图表背景色控件需要更换为支持透明色的控件
...
Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0
* commit '47caddcba06f1c88965c87eaec66d5a4a45fa6e6':
CHART-22994 图表背景色控件需要更换为支持透明色的控件
3 years ago
Yvan
dbd8493dac
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Yvan
794b06f41d
REPORT-66457 原数据集管理优化
...
【问题原因】rt
【改动方案】rt
【review建议】详见开发文档:https://kms.fineres.com/pages/viewpage.action?pageId=340985192
3 years ago
shine
9c0cb17748
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0
3 years ago
shine
9ad9cf5de1
CHART-23245 fix:模板锁定备份fvs
3 years ago
Hades
b43a01fe03
Pull request #8266 : REPORT-67331 jxbrowser 7.15升级到7.22
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'c227ce19f38608450c982005292c5df8f87c22dd':
REPORT-67311 jxbrowser 7.15升级到7.22
3 years ago
pengda
47caddcba0
CHART-22994 图表背景色控件需要更换为支持透明色的控件
3 years ago
pengda
7d516eb3e0
Pull request #8255 : REPORT-65492 新增一个千分比格式
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit 'cfe156039fb92a66a2e1798d5d84574d7829c877':
REPORT-65492 新增一个千分比格式
3 years ago
Yuan.Wang
e2158ac752
Pull request #8265 : REPORT-68117 && REPORT-68112 设计器页面,构建树的显示和点开后不一致 /控件值和数据字典均设置联动,联动异常
...
Merge in DESIGN/design from ~YUAN.WANG/design:feature/x to feature/x
* commit 'a7be566540fdacb376a2633eda765febe8db1dcd':
REPORT-68117 && REPORT-68112 1、设计器页面,构建树的显示和点开后不一致 2、控件值和数据字典均设置联动,联动异常
3 years ago
hades
c227ce19f3
REPORT-67311 jxbrowser 7.15升级到7.22
3 years ago
Harrison
253dc744f0
Pull request #8254 : KERNEL-10354 bytebuddy / 加解密性能优化 @Harrison
...
Merge in DESIGN/design from ~HARRISON/design:feature/x to feature/x
* commit '312525df0fbefca412a830ce2c1db94d473e2831':
KERNEL-10354 bytebuddy / 加解密性能优化 @Harrison 10.0.14 不发,暂时关上。代码就不回退了。
3 years ago
Yuan.Wang
a7be566540
Merge branch 'feature/x' of https://code.fineres.com/scm/~yuan.wang/design into feature/x
3 years ago