Yvan
f3029b94d7
Pull request #8310 : REPORT-68355 【迭代】【数据集管理优化】搜索关键字匹配数据列,数据列所在数据集没有展开
...
Merge in DESIGN/design from ~YVAN/design:feature/x to feature/x
* commit '72a13f4acd12ab715a7fbf29f179c32da1cd867e':
REPORT-68355 【迭代】【数据集管理优化】搜索关键字匹配数据列,数据列所在数据集没有展开 【问题原因】之前把切换回工具栏的调用放在TableDataTreePane的refreshDockingView里又因为TableDataTreePane的每一次getInstance都会去调用一次refreshDockingView,搜索任务过程中会经常调用到TableDataTreePane.getInstance,所以造成了搜索状态上的紊乱 【改动思路】1. 扩展TreeSearchStatus,新增Not_In_Search_Mode,视为非搜索模式,其它的状态(搜索中,搜索中止,搜索完成等)统统视为搜索模式 2. 在需要退出搜索模式的地方(切换数据集Tab和新打开一个模板),加上退出的逻辑;不把逻辑放到refreshDockingView里 3. 部分代码质量问题 【review建议】上面改动的第二点,分布在需要退出的场景里,会显得比较松散,但是我没找到一个好的地方可以统一搞。有思路的可以帮忙提供下,感谢~
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
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
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
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
WeiYanglu
4a8fd982c5
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
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
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
Yuan.Wang
8c45f4a331
REPORT-68117 && REPORT-68112
...
1、设计器页面,构建树的显示和点开后不一致
2、控件值和数据字典均设置联动,联动异常
3 years ago
superman
c583b97cdc
Merge pull request #8264 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e3fc6e6ed38f411fb1d7376f2facfa975cd7fe5a':
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
superman
e3fc6e6ed3
Merge pull request #8263 in DESIGN/design from final/11.0 to release/11.0
...
* commit '47961506b87e3b293135d8863281be167541238f':
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
superman
70370bac0a
Merge pull request #8253 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e1168fd8c5b42cd2d8a4ec4ff1e9ce844d66207f':
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
3 years ago
pengda
47961506b8
Pull request #8242 : REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '39b29d40664f9bd7041073c5c3c6cdb54ff10ba2':
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
superman
e1168fd8c5
Merge pull request #8252 in DESIGN/design from final/11.0 to release/11.0
...
* commit '59681036062f3e533c9c070c976b935a10c4f8fe':
3 years ago
superman
5968103606
Merge pull request #8244 in DESIGN/design from release/11.0 to final/11.0
...
* commit '51558d540d72d6673c1f3149cc9d61d722d31efc':
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
REPORT-67329 填报-web端预览-10升级11,透明的纸张背景变成了白色
无JIRA项目 对Install4j方法的调用全部改用反射实现,避免出现引用异常
REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时,老预览下看不到该控件,新预览下可以看到 1、在修改布局的时候,同时修改参数面板的width
REPORT-67092 交互视觉修改
REPORT-66690 tab块名称不允许重复
3 years ago
pengda
cfe156039f
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
06be416572
REPORT-65492 新增一个千分比格式
3 years ago
Harrison
312525df0f
KERNEL-10354
...
bytebuddy / 加解密性能优化 @Harrison
10.0.14 不发,暂时关上。代码就不回退了。
3 years ago
pengda
39b29d4066
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
Hades
51558d540d
Pull request #8239 : REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
...
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit 'cad840da238e03d6dc86df14077dcd62d65b4cf7':
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
3 years ago
hades
cad840da23
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
3 years ago
superman
62a0ae8a97
Merge pull request #8238 in DESIGN/design from release/11.0 to feature/x
...
* commit 'bf975f7f193386207ab7d98aecfdf621e3519710':
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
3 years ago
rinoux
bf975f7f19
Pull request #8229 : REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'b26a85d3f668ffe41d402d7089420744ec45acd9':
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
3 years ago
rinoux
b26a85d3f6
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
3 years ago
Hoky.He
76e4e222f1
Pull request #8228 : REPORT-68014【层次坐标优化】新增的ACCSUM、COUNTIFS、SUMIFS函数在编辑器内函数名未蓝色加粗显示
...
Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x
* commit '0506b12a612fa3b462b4f00c1d76927d8bdf1606':
REPORT-68014【层次坐标优化】新增的ACCSUM、COUNTIFS、SUMIFS函数在编辑器内函数名未蓝色加粗显示 1.适配语法加粗
3 years ago
Hoky
0506b12a61
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Hoky
909c1bb6f9
REPORT-68014【层次坐标优化】新增的ACCSUM、COUNTIFS、SUMIFS函数在编辑器内函数名未蓝色加粗显示
...
1.适配语法加粗
3 years ago
Xiqiu
40be447e02
Pull request #8225 : REPORT-67986 显示结果调整,之前不显示改成不响应目录变化事件
...
Merge in DESIGN/design from ~XIQIU/design:feature/x to feature/x
* commit '7b5754b1790fd4650d43ed81e24310c16da406d7':
REPORT-67986 显示结果调整
3 years ago
Hades
287a2a74ed
Pull request #8224 : KERNEL-10324 DB模块 优化
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'a322a11f0f578d02acf438a9e10843cd7efdcc42':
KERNEL-10324 fix 大小写
KERNEL-10324 DB模块 优化
3 years ago
hades
a322a11f0f
KERNEL-10324 fix 大小写
3 years ago