shine
972c696008
conflict
4 years ago
superman
4e82018e4b
Merge pull request #4011 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '3e727767c4c47304873e761d37aa1fad363923b0':
REPORT-49034 引用JS静态资源文件路径出错
REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
4 years ago
superman
3e727767c4
Merge pull request #4010 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '45362d9fbe74df413ff8d3463f19b7bd319adc75':
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
superman
45362d9fbe
Merge pull request #4009 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '27109177e1365f707fafbcc57e2f12cdd01132c9':
4 years ago
superman
27109177e1
Merge pull request #4007 in DESIGN/design from bugfix/10.0 to final/10.0
...
* commit '0768cfeb3180578441827345da1006305dc4a0d9':
REPORT-49034 引用JS静态资源文件路径出错
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50096 处理下切换数据连接场景
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
REPORT-50096 数据填充时不需要触发监听
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
pengda
d8c5f2481e
REPORT-51153 数据连接界面优化-url全部删除后,各配置项不会自动清空
4 years ago
Hades
0e2cae97af
Pull request #3985 : REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '7026cd45683e9f84e6ec4da025c3d2baff6acbde':
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 CloseCurrentTemplateAction 换行格式问题
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 add
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化
4 years ago
Hades
0768cfeb31
Pull request #4005 : REPORT-49034 引用JS静态资源文件路径出错
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '89680425d26246edf51c165429d06fa8ea68ca0e':
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
hades
89680425d2
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hades/design into bugfix/10.0
4 years ago
hades
c763dc04a6
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
pengda
10a06ca57c
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
pengda
711ad1cfb6
REPORT-51126 数据连接界面优化-端口的联动有点问题
4 years ago
fanglei
3ab60ab761
Pull request #3989 : REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'e3385b7167b567482dd7ced5edd28a7f6433e03e':
REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
4 years ago
Xiqiu
52db93088d
Pull request #3996 : REPORT-51103 改下文件名的大小写
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '26c35c4581411543152f0ba563ae284813fdf81a':
REPORT-51103 改下文件名的大小写
4 years ago
xiqiu
26c35c4581
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
xiqiu
af08d02b12
REPORT-51103 改下文件名的大小写
4 years ago
ju|剧浩宇
ceabe33693
Pull request #3994 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '09f503171958ff3416466d8a33da4fdf38383031':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50096 处理下切换数据连接场景
4 years ago
Henry.Wang
09f5031719
无jira 解决冲突
4 years ago
superman
37b7e3c39d
Merge pull request #3992 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '215cd3f652684a821d4c9d8a864d8569373ec0d7':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50096 处理下切换数据连接场景
4 years ago
方磊
e3385b7167
REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
4 years ago
Lucian.Chen
215cd3f652
Pull request #3986 : REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit '85cfe2f9a1895f26a5ad9faf890beea726c4d399':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
85cfe2f9a1
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Xiqiu
c86c59b2c7
Pull request #3988 : REPORT-51103 优化展示效果;改个报错日志,方便定位问题
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '7149acf78ce26599aa5b0270cc812e68d3ea4ee2':
REPORT-51103 改个日志方便定位问题
REPORT-51103 优化界面显示
REPORT-51103 加上遗漏的mysql另一种驱动;优化展示效果
4 years ago
Hades
86f08d2707
Pull request #3984 : REPORT-50096 处理下切换数据连接场景
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '9dcb81b4a8317cd69139b5ec234411ab741a04da':
REPORT-50096 处理下切换数据连接场景
4 years ago
xiqiu
7149acf78c
REPORT-51103 改个日志方便定位问题
4 years ago
xiqiu
93b3afe33a
REPORT-51103 优化界面显示
4 years ago
hades
7026cd4568
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
4 years ago
hades
bb5e2d5384
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
4 years ago
xiqiu
f0dab5c0fe
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
xiqiu
0fa461fb72
REPORT-51103 加上遗漏的mysql另一种驱动;优化展示效果
4 years ago
hades
39a68171c3
REPORT-49986 CloseCurrentTemplateAction 换行格式问题
4 years ago
hades
d2e5f1f454
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 add
4 years ago
hades
46bfdaf2b3
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
4 years ago
pengda
167966ad44
Pull request #3976 : REPORT-49055 设计器数据连接配置界面优化
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '6ad9bceeeb925141cd3fc03e2a60166ac1a9de5d':
REPORT-49055 设计器数据连接配置界面优化
REPORT-49055 设计器数据连接配置界面优化
REPORT-49055 设计器数据连接配置界面优化
4 years ago
lucian
38b3c136ba
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~lucian.chen/design into bugfix/10.0
4 years ago
lucian
887bd33a2f
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
hades
15c3770f54
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化
4 years ago
Bruce.Deng
5e21e0eeac
Pull request #3974 : REPORT-49067 导出缺失字体提示
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '3b8f60ba045b0a146ade0d0b740ba272d7cc2a89':
REPORT-49067 导出缺失字体提示
4 years ago
hades
9dcb81b4a8
REPORT-50096 处理下切换数据连接场景
4 years ago
superman
97cc8c190a
Merge pull request #3981 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '091af950cdda2580494d2d8f27e66ef2980a616d':
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
REPORT-50809 frm模版与cpt模版在设计器内预览图标大小不一致
4 years ago
superman
091af950cd
Merge pull request #3980 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '18d9268b24954196922257bd001befac93fe3ce9':
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
4 years ago
pengda
6ad9bceeeb
REPORT-49055 设计器数据连接配置界面优化
4 years ago
pengda
a0f2067b79
REPORT-49055 设计器数据连接配置界面优化
4 years ago
pengda
ac8e93005d
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
pengda
7247a789a9
REPORT-49055 设计器数据连接配置界面优化
4 years ago
Henry.Wang
81d2064def
Pull request #3975 : KERNEL-7376 优化设计器上一些性能问题 && CHART-18881 单元格图表有时候无法点出图表属性面板
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '3e53124e9a7055bfa388cca4d84ce6ceb5d6fbf6':
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Henry.Wang
3e53124e9a
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
fc048bdce8
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Bruce.Deng
3b8f60ba04
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
Bruce.Deng
1698c22c07
REPORT-49067 导出缺失字体提示
4 years ago