pengda
6ad9bceeeb
REPORT-49055 设计器数据连接配置界面优化
4 years ago
Hades
74a8d0f264
Pull request #3977 : 无jira 处理被冲突合并吞掉的代码
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'd5e754a671b8521ec0d43b2933b973a70026533f':
无jira 处理被冲突合并吞掉的代码
4 years ago
hades
d5e754a671
无jira 处理被冲突合并吞掉的代码
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
starryi
75fac94f43
Pull request #3951 : REPORT-50809 frm模版与cpt模版在设计器内预览图标大小不一致
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit 'e9b1ad1f909bd10c0b09588f48674ff2ca4f696d':
REPORT-50809 frm模版与cpt模版在设计器内预览图标大小不一致
4 years ago
Henry.Wang
e48a31f0bc
Pull request #3959 : CHART-18881 单元格图表有时候无法点出图表属性面板
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '0f1f2b8c7ee0c26e0e70d84c68ce84956dde6ae7':
CHART-18881 单元格图表有时候无法点出图表属性面板
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
superman
5419c6b26e
Merge pull request #3965 in DESIGN/design from feature/10.0 to feature/x
...
* commit '0468ffc971f9978dc19e19a3928d7bfbfab93e63':
CHART-18846 && CHART-18865 仪表盘面板修改
CHART-18859 文件获取路径修改
REPORT-49023 根据pr来修改代码
REPORT-49023 数据连接界面报错优化
4 years ago
Bjorn
0468ffc971
Pull request #3966 : CHART-18846 && CHART-18865 仪表盘面板修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '4e7266377e50d91ed06895ee7dbb9893925c427c':
CHART-18846 && CHART-18865 仪表盘面板修改
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
白岳
4e7266377e
CHART-18846 && CHART-18865 仪表盘面板修改
4 years ago
Henry.Wang
0f1f2b8c7e
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
fb1534f3ea
CHART-18881 单元格图表有时候无法点出图表属性面板
4 years ago
Bjorn
77662c2124
Pull request #3958 : CHART-18859 文件获取路径修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'f9fbbd68489cd522f2bbb3bc908382e40708d82a':
CHART-18859 文件获取路径修改
4 years ago
Xiqiu
31248a912f
Pull request #3934 : REPORT-49023 数据连接界面报错优化
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '4ddd6b5efef03e30ee14a6e05c31efbb7fdf4719':
REPORT-49023 根据pr来修改代码
REPORT-49023 数据连接界面报错优化
4 years ago
白岳
f9fbbd6848
CHART-18859 文件获取路径修改
4 years ago
xiqiu
4ddd6b5efe
REPORT-49023 根据pr来修改代码
4 years ago
Starryi
e9b1ad1f90
REPORT-50809 frm模版与cpt模版在设计器内预览图标大小不一致
...
【问题原因】
CPT和FRM文件的预览按钮图标使用了不同的图片。
PagePreview类规定了CPT的分页预览图标为com/fr/design/images/buttonicon/pageb24.png,而
FormPreview类规定了FRM的预览图标为com/fr/design/images/buttonicon/run24.png.
这两个图片大小都为32x32,且图形内容大致相同,但是pageb24图形周围存在透明像素,
所以可见的图形大小小于run24.png
【改动思路】
将run24.png的内容替换为pageb24.png
4 years ago
superman
fbe54355ef
Merge pull request #3950 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'f06ba0080ce32eeb54362f68f57e92bcb6715371':
4 years ago
superman
f06ba0080c
Merge pull request #3948 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'e5f46b335ff50e764a10c3b8ecc686816554a2f4':
4 years ago
superman
e5f46b335f
Merge pull request #3947 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '687b362d5d77bb2b1f189cbdda40c5533a52fa34':
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
9950029e15
Merge pull request #3944 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'c99794ce4c42f4b3c2b3bb1f43893e97bd599b9d':
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
REPORT-50598 数字文本框输入有问题
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
REPORT-50096 数据填充时不需要触发监听
4 years ago
Henry.Wang
c99794ce4c
Pull request #3935 : KERNEL-7376 优化设计器上一些性能问题
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '66bbd54f45db034d8ffaa82ff3022d687b61f1b7':
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Henry.Wang
66bbd54f45
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Henry.Wang
635742912d
KERNEL-7376 优化设计器上一些性能问题
4 years ago
superman
dcf5f45b38
Merge pull request #3942 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '36d4b2abe538e21e51808a4d4959bf61fadb561c':
REPORT-50598 数字文本框输入有问题
REPORT-50096 数据填充时不需要触发监听
4 years ago
superman
36d4b2abe5
Merge pull request #3941 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'b731c5cb420e9a75fe336660cb6e8dee2e0dc686':
REPORT-50598 数字文本框输入有问题
REPORT-50096 数据填充时不需要触发监听
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
Henry.Wang
61fee165a4
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Henry.Wang
258b8e9ccc
KERNEL-7376 优化设计器上一些性能问题
4 years ago
Henry.Wang
b29d0419b6
KERNEL-7376 优化设计器上一些性能问题
4 years ago
xiqiu
bf587d0af4
REPORT-49023 数据连接界面报错优化
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
Hades
0eaf812c23
Pull request #3932 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'fc40ab0b5d08aebacecff06deb3256dd5ec36c34':
CHART-18761 仪表盘标签增加目标值
REPORT-50788 删除数据集更新缓存 漏交
REPORT-50788 删除数据集更新缓存
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
REPORT-50664 【移动端】body设置绝对布局,组件设置侧边导航后,还能设置组件冻结,为bug
4 years ago
hades
fc40ab0b5d
无jira 解决冲突
4 years ago
superman
6f14d67c84
Merge pull request #3929 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '77962fb9648e23c0f71612561f6c3f1b0913870b':
CHART-18761 仪表盘标签增加目标值
REPORT-50788 删除数据集更新缓存 漏交
REPORT-50788 删除数据集更新缓存
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
REPORT-50664 【移动端】body设置绝对布局,组件设置侧边导航后,还能设置组件冻结,为bug
4 years ago