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
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
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
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
9dcb81b4a8
REPORT-50096 处理下切换数据连接场景
4 years ago
Yvan
18d9268b24
Pull request #3967 : REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小
...
Merge in DESIGN/design from ~YVAN/design:bugfix/10.0 to bugfix/10.0
* commit '009735a50441b864d1faa090eb50dec56da92664':
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
4 years ago
Yvan
009735a504
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
4 years ago
Yvan
5f0d39ecb9
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小
...
【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象
【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
4 years ago
superman
687b362d5d
Merge pull request #3946 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '46aebacc9ce8f323c130ec54da2c74df908f81d2':
4 years ago
superman
46aebacc9c
Merge pull request #3945 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd399a5e79aff300828d09ab6028e9f384c8dc8b8':
4 years ago
superman
b731c5cb42
Merge pull request #3940 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'afec70c4324ff68ddbfce4c9503ad309f06b798d':
REPORT-50598 数字文本框输入有问题
4 years ago
jeo
d399a5e79a
Pull request #3939 : REPORT-50598 数字文本框输入有问题
...
Merge in DESIGN/design from ~TOMMY/design:persist/10.0 to persist/10.0
* commit 'a2330f99ef16dec600fe03a4b8d8ad1eb64a5d52':
REPORT-50598 数字文本框输入有问题
4 years ago
Tommy
a2330f99ef
Pull request #1 : REPORT-50598 数字文本框输入有问题
...
Merge in ~TOMMY/design from final/10.0 to persist/10.0
* commit 'afec70c4324ff68ddbfce4c9503ad309f06b798d':
REPORT-50598 数字文本框输入有问题
4 years ago
Kara
afec70c432
Pull request #3937 : REPORT-50598 数字文本框输入有问题
...
Merge in DESIGN/design from ~TOMMY/design:final/10.0 to final/10.0
* commit '3660aba3911adcc043852269d41cd1f673acb1c0':
REPORT-50598 数字文本框输入有问题
4 years ago
kuangshuai
3660aba391
REPORT-50598 数字文本框输入有问题
4 years ago
Hades
6500b45045
Pull request #3924 : REPORT-50096 数据填充时不需要触发监听
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '2d4a7c8bcb1d6455048e3f9b7b182fac8e49e5f6':
REPORT-50096 数据填充时不需要触发监听
4 years ago
superman
c10d9ce50b
Merge pull request #3927 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'f55503ab3058e9baadd0278ff32aceb73fef020d':
REPORT-50788 删除数据集更新缓存 漏交
REPORT-50788 删除数据集更新缓存
4 years ago
superman
f55503ab30
Merge pull request #3926 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '6cba3093c69d1d91c521e7cd7b467e4739aeb0ac':
4 years ago
superman
6cba3093c6
Merge pull request #3925 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'ed17f126893a1b2b54fe1da60197300fb1dfe64d':
4 years ago
superman
ed17f12689
Merge pull request #3922 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '4207c93a2e253898c57c0105f2faba0903e9ca01':
4 years ago
hades
2d4a7c8bcb
REPORT-50096 数据填充时不需要触发监听
4 years ago
superman
4207c93a2e
Merge pull request #3919 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'cad52a3e5e6b8447fc4b9984ac539579a19c6c5c':
REPORT-50788 删除数据集更新缓存 漏交
REPORT-50788 删除数据集更新缓存
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
CHART-18772 frm下初始化需要选中gisButton
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
Hades
26b0b28a3b
Pull request #3916 : REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '510f592dbad34326c220b5094b59dec8467fd2d5':
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
4 years ago
Kara
cad52a3e5e
Pull request #3918 : REPORT-50788 删除数据集更新缓存 漏交
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c818cab8a8a04873cdfe41bf7d8d9706da18272a':
REPORT-50788 删除数据集更新缓存 漏交
4 years ago
hades
c818cab8a8
Merge branch 'final/10.0' of https://code.fineres.com/scm/~hades/design into final/10.0
4 years ago
hades
413279dd3a
REPORT-50788 删除数据集更新缓存 漏交
4 years ago
Kara
bccee9f48e
Pull request #3917 : REPORT-50788 删除数据集更新缓存
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '851dec0a40b5b7b2880ee938ecd984103170cb36':
REPORT-50788 删除数据集更新缓存
4 years ago
hades
851dec0a40
Merge branch 'final/10.0' of https://code.fineres.com/scm/~hades/design into final/10.0
4 years ago
hades
5fb883b5a2
REPORT-50788 删除数据集更新缓存
4 years ago
hades
510f592dba
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hades/design into bugfix/10.0
4 years ago
hades
82fa6142d1
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
4 years ago
superman
dc90fc88da
Merge pull request #3911 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'f23a823916bd5f4449ececd8d754539a103f56c2':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
CHART-18772 frm下初始化需要选中gisButton
4 years ago
Kara
f23a823916
Pull request #3909 : REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'e2cc87e26d6daf38ca5d2d29a04e9809e6e848c7':
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
4 years ago
hades
e2cc87e26d
REPORT-50788 【10.0.15】参数面板不会自动生成第二个数据集设置的参数
4 years ago
Kara
e721c47d9e
Pull request #3908 : CHART-18772 frm下初始化需要选中gisButton
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit 'e70787b8c48e6037ac390b77d09b3b6ef19eb0d4':
CHART-18772 frm下初始化需要选中gisButton
4 years ago
白岳
e70787b8c4
CHART-18772 frm下初始化需要选中gisButton
4 years ago
Hades
8746ba08fb
Pull request #3907 : REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'cc5c4753c9fc73d916ba182007e1fff75873f769':
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
hades
cc5c4753c9
REPORT-50096 fix 预防npe
4 years ago
hades
c0d6f5f36a
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~hades/design into bugfix/10.0
4 years ago
hades
33d55e89c8
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
superman
09e3cd5450
Merge pull request #3895 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'f141bf91c14468ce8e2f0ed9ded61b81a79fd27a':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
Kara
f141bf91c1
Pull request #3886 : REPORT-50662 设计器运行一段时间后会卡死
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'b5dee97f77a922bbb5f709712a2c753101438367':
REPORT-50662 fix ;
REPORT-50662 设计器运行一段时间后会卡死
4 years ago
superman
440555fa0c
Merge pull request #3889 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '8ca9e09f23028b1aecd2cc925583ff5898284c0a':
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
4 years ago
superman
8ca9e09f23
Merge pull request #3888 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd237ce615b5ad9d7511dd0684fe79b9a047ac2b0':
4 years ago
superman
d237ce615b
Merge pull request #3887 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'c6f801adb09fab6222ed610a289ad6aac565784b': (39 commits)
CHART-18720 试管型仪表盘用横向状态初始标签面板有问题
REPORT-50184 首次添加数据集参数 参数面板无显示
REPORT-50204 未保存点击预览,提示保存模板的弹窗,点击取消后再弹窗
REPORT-50191 设计器-服务器数据集-左下角图标变化失效 【问题原因】REPORT-49782任务中补充图标的时候,图标名称写错了,导致没识别出来 【改动思路】修改图标名称
CHART-18080 变量名更换
CHART-18619 gis国际化默认值修改
REPORT-50030 单元格外边框设置其他颜色设计器内显示与黑色不一样
CHART-18348 调整富文本组件尺寸
KERNEL-6368【代码检测】XML注入(XML External Entity Injection)
无JIRA任务 上传下因代码冲突被删除的svg图标
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
CHART-18080 修复数字输入框输入中文时自动删除数字问题
REPORT-45944 ui调整
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
REPORT-45944 日文版模板重命名弹窗显示不全
...
4 years ago
hades
b5dee97f77
REPORT-50662 fix ;
4 years ago