Kara
|
c2f74f6918
|
Merge pull request #784 in DESIGN/design from release/10.0 to final/10.0
* commit '4b88605e8dfc6a367dd0c6f12e654d1cd8f6efdd':
CHART-3956 数据配置界面显示'数据集'
CHART-3954 改善设计器的自定义区间值使用公式时,其邻值背景颜色显示逻辑
|
6 years ago |
Wim.Zhai
|
4b88605e8d
|
Merge pull request #783 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit '9fa1c91985c709c16e331d6cae37e5bc250ccb7f':
CHART-3956 数据配置界面显示'数据集'
CHART-3954 改善设计器的自定义区间值使用公式时,其邻值背景颜色显示逻辑
|
6 years ago |
Wim.Zhai
|
9fa1c91985
|
CHART-3956 数据配置界面显示'数据集'
|
6 years ago |
Wim.Zhai
|
46da85b73b
|
CHART-3954 改善设计器的自定义区间值使用公式时,其邻值背景颜色显示逻辑
|
6 years ago |
Kara
|
46dce9a79a
|
Merge pull request #782 in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit 'bd0538716870661bb60db7295510c9f91a22e7a3': (105 commits)
REPORT-15027 两个自定义按钮设置,第一个的提交入库会显示在第二个上
REPORT-14624 Rename 方式导出
大屏插件jartime更新 顺便解决之前的一些代码质量
REPORT-14526 【0123回归】文件控件,只支持单文件上传设置文字被遮挡
REPORT-14981 按钮控件自定义图标预览后无法显示
REPORT-14668 设计器语言切换成英文后的显示问题
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
REPORT-14908 启动设计器后,非reportlets文件夹下的模板,无法双击打开
CHART-3865 '位置'改为显示'布局'
REPORT-14790 填报问题 1、修改算子关于当前格子位置的俩接口命名问题,提取出CalculatorLocator 2、不小心改大了,把所有的FRContext.getLogger都改了,赶紧传到release和feature。。
REPORT-14790 填报问题 先重构一下,删了一些没用的分支和逻辑,把代码弄清晰明天再继续定位bug原因- -
REPORT-14624【0123回归】输出内置数据集到设计器工作目录覆盖原文件,导出失败 这里转OutputStream时,需要保留原文件,否则覆盖自身时会找不到文件
CHART-3017 为区域段图例面板指定Parent 传FR10
代码质量:从源头返回空list
REPORT-14465 【10.0冒烟】 数字控件“双精度型” 全部展开显示,最底端文字被遮挡
REPORT-14569 10.0release的alphafine显示问题 定位到是多线程的bug,某些情况下list里放入了之前的线程搜索的结果。目前策略是各线程各自维护一个列表,获取结果后再赋给全局变量
REPORT-14103 单元格控件设置左父格自动消失 10.0 同步 & REPORT-14558 【回归测试】单元格属性--修改自动调整属性,控件会消失
CHART-3856 自动播放界面问题
CHART-3791 从其他图表切换至地图,重置地图数据配置
...
|
6 years ago |
jeo
|
bd05387168
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java
# designer-base/src/main/java/com/fr/file/StashedFILE.java
|
6 years ago |
Hades
|
79f9887fc0
|
Merge pull request #781 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3b14961c20a5702af204e82e047a08a9d79036bc':
REPORT-15027 两个自定义按钮设置,第一个的提交入库会显示在第二个上
|
6 years ago |
Hades
|
3b14961c20
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
3a426fbe99
|
REPORT-15027 两个自定义按钮设置,第一个的提交入库会显示在第二个上
|
6 years ago |
yaoh.wu
|
bfff8eefdf
|
Merge pull request #780 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '052f9357e2b688099f530baf7026d2040e3df094':
REPORT-14624 Rename 方式导出
|
6 years ago |
zheng
|
ffe22570bc
|
Merge pull request #779 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '526ff727863bba596f3b0a26c7ea2972a9dfecfe':
大屏插件jartime更新 顺便解决之前的一些代码质量
|
6 years ago |
yaoh.wu
|
052f9357e2
|
REPORT-14624 Rename 方式导出
|
6 years ago |
Hades
|
bb5368869d
|
Merge pull request #777 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'dab09c83269a6e868b3a80af36510c4998f04eb0':
REPORT-14981 按钮控件自定义图标预览后无法显示
|
6 years ago |
plough
|
e658998118
|
Merge pull request #778 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit 'b28e268f04f0dbc6926ebfeb392c0720aa992c87':
REPORT-14526 【0123回归】文件控件,只支持单文件上传设置文字被遮挡
|
6 years ago |
zheng
|
526ff72786
|
大屏插件jartime更新 顺便解决之前的一些代码质量
|
6 years ago |
plough
|
b28e268f04
|
REPORT-14526 【0123回归】文件控件,只支持单文件上传设置文字被遮挡
|
6 years ago |
Hades
|
dab09c8326
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
86fa21168d
|
REPORT-14981 按钮控件自定义图标预览后无法显示
|
6 years ago |
Wim.Zhai
|
72b08e6665
|
Merge pull request #776 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit '7d02c52b583126106405a577b68519aef4da0b9a':
CHART-3865 '位置'改为显示'布局'
|
6 years ago |
Wim.Zhai
|
7d02c52b58
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into release/10.0
|
6 years ago |
plough
|
6098dacbc2
|
Merge pull request #775 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '5ea5f0e205b8cc6c46443b8c823510acf3caf1b8':
REPORT-14668 设计器语言切换成英文后的显示问题
|
6 years ago |
Hades
|
7d0f5df171
|
Merge pull request #774 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '33fc4b4c25bfe49cc9b51a742c8433b2762c976a':
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
|
6 years ago |
plough
|
5ea5f0e205
|
REPORT-14668 设计器语言切换成英文后的显示问题
|
6 years ago |
Hades
|
33fc4b4c25
|
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
|
6 years ago |
Hades
|
347ec07f7a
|
REPORT-14661 设计器界面 服务器-服务器数据集界面显示问题
|
6 years ago |
Hades
|
96c3862854
|
Merge pull request #772 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2c27a2a9873c71bee2bb31bec276aed8b85eb91b':
REPORT-14908 启动设计器后,非reportlets文件夹下的模板,无法双击打开
|
6 years ago |
Hades
|
2c27a2a987
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
e32a9067c3
|
REPORT-14908 启动设计器后,非reportlets文件夹下的模板,无法双击打开
|
6 years ago |
Wim.Zhai
|
d9707a67f5
|
CHART-3865 '位置'改为显示'布局'
|
6 years ago |
ju
|
5349cd7229
|
Merge pull request #770 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '804d2fcf684185bf9247682629ca585ce2dd44e8':
REPORT-14790 填报问题 1、修改算子关于当前格子位置的俩接口命名问题,提取出CalculatorLocator 2、不小心改大了,把所有的FRContext.getLogger都改了,赶紧传到release和feature。。
REPORT-14790 填报问题 先重构一下,删了一些没用的分支和逻辑,把代码弄清晰明天再继续定位bug原因- -
|
6 years ago |
ju
|
804d2fcf68
|
REPORT-14790 填报问题
1、修改算子关于当前格子位置的俩接口命名问题,提取出CalculatorLocator
2、不小心改大了,把所有的FRContext.getLogger都改了,赶紧传到release和feature。。
|
6 years ago |
ju
|
f16f521cb2
|
REPORT-14790 填报问题
先重构一下,删了一些没用的分支和逻辑,把代码弄清晰明天再继续定位bug原因- -
|
6 years ago |
Alex.Sung
|
fd2c37ad58
|
这里转OutputStream时,需要保留原文件,否则覆盖自身时会找不到文件
* commit 'cb112539ae7abdae84dde82a814fc251fa4b0ea5':
REPORT-14624【0123回归】输出内置数据集到设计器工作目录覆盖原文件,导出失败 这里转OutputStream时,需要保留原文件,否则覆盖自身时会找不到文件
|
6 years ago |
alex.sung
|
cb112539ae
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into release/10.0
|
6 years ago |
alex.sung
|
de315587e0
|
REPORT-14624【0123回归】输出内置数据集到设计器工作目录覆盖原文件,导出失败
这里转OutputStream时,需要保留原文件,否则覆盖自身时会找不到文件
|
6 years ago |
Wim.Zhai
|
e5d44d5d13
|
Merge pull request #767 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit '96e4fed723260d27ee71c02ee92f49a1b2dfcad7':
CHART-3017 为区域段图例面板指定Parent 传FR10
|
6 years ago |
Wim.Zhai
|
96e4fed723
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into release/10.0
|
6 years ago |
Wim.Zhai
|
d50f54a685
|
CHART-3017 为区域段图例面板指定Parent 传FR10
|
6 years ago |
Hades
|
0485e87386
|
Merge pull request #766 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '8c559657db27622d614e7cd3e6a758cb3e30df38':
REPORT-14465 【10.0冒烟】 数字控件“双精度型” 全部展开显示,最底端文字被遮挡
|
6 years ago |
Alex.Sung
|
e53afdaee3
|
REPORT-14569 10.0release的alphafine显示问题
* commit 'ad14f65c1ee47a6040ceefee23b444362279e580':
代码质量:从源头返回空list
REPORT-14569 10.0release的alphafine显示问题 定位到是多线程的bug,某些情况下list里放入了之前的线程搜索的结果。目前策略是各线程各自维护一个列表,获取结果后再赋给全局变量
|
6 years ago |
alex.sung
|
ad14f65c1e
|
代码质量:从源头返回空list
|
6 years ago |
Hades
|
8c559657db
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
7daa2f08ab
|
REPORT-14465 【10.0冒烟】 数字控件“双精度型” 全部展开显示,最底端文字被遮挡
|
6 years ago |
alex.sung
|
c631e21f13
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~alex.sung/design into release/10.0
|
6 years ago |
alex.sung
|
b2b2b66e51
|
REPORT-14569 10.0release的alphafine显示问题
定位到是多线程的bug,某些情况下list里放入了之前的线程搜索的结果。目前策略是各线程各自维护一个列表,获取结果后再赋给全局变量
|
6 years ago |
zheng
|
fca54f3d1c
|
Merge pull request #764 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '3531b07a5e65aa7bb815d4735f1aa520c9382708':
CHART-3856 自动播放界面问题
|
6 years ago |
zheng
|
3531b07a5e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
Hades
|
3ea18a275d
|
Merge pull request #763 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '602a4be22b148cf041d9d826e00b567b95613c4b':
REPORT-14103 单元格控件设置左父格自动消失 10.0 同步 & REPORT-14558 【回归测试】单元格属性--修改自动调整属性,控件会消失
|
6 years ago |
Hades
|
602a4be22b
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
0aba1309a2
|
REPORT-14103 单元格控件设置左父格自动消失 10.0 同步 & REPORT-14558 【回归测试】单元格属性--修改自动调整属性,控件会消失
|
6 years ago |