kerry
|
dbdb442cb7
|
无
|
6 years ago |
MrAngryRookie
|
cc7a0c32d3
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
|
6 years ago |
Kara
|
ee06bb537b
|
Merge pull request #944 in DESIGN/design from ~NEIL/design:final/10.0 to final/10.0
* commit 'ac18f87d4f82c19c3a2da05cc7309308eb9a5456':
无JIRA任务,屏蔽debug选项和新数据连接界面
|
6 years ago |
neil
|
ac18f87d4f
|
无JIRA任务,屏蔽debug选项和新数据连接界面
|
6 years ago |
Kara
|
331684d799
|
Merge pull request #943 in DESIGN/design from ~NEIL/design:final/10.0 to final/10.0
* commit '78bea7a321343d9ced3f4ec1d7275ba497bce6ad': (48 commits)
ct
update
REPORT-17908 启动动画“初始化”的国际化问题
REPORT-17887 数字控件最大值最小值部分场景保存失败
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
CHART-9401 fix list
fix list
CHART-3647 删除多余代码
update
REPORT-17656 决策报表报表块复制后值被清空
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
update
REPORT-17527 推送远程设计触发的报表预览日志
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
REPORT-17494 模板版本管理,选项灰化问题
REPORT-17730 控件名无法保存
REPORT-15183 有一个改远程url的接口补一下10.0
update
REPORT-17186 【决策报表】条件属性添加超链,会自动在超级链接里生成一条
删除无用import
...
|
6 years ago |
neil
|
78bea7a321
|
Merge pull request #19 in ~NEIL/design from release/10.0 to final/10.0
* commit 'fb6780bdf31bd97286601272d3bcb0b0ab56fb8e': (47 commits)
update
REPORT-17908 启动动画“初始化”的国际化问题
REPORT-17887 数字控件最大值最小值部分场景保存失败
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
CHART-9401 fix list
fix list
CHART-3647 删除多余代码
update
REPORT-17656 决策报表报表块复制后值被清空
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
update
REPORT-17527 推送远程设计触发的报表预览日志
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
REPORT-17494 模板版本管理,选项灰化问题
REPORT-17730 控件名无法保存
REPORT-15183 有一个改远程url的接口补一下10.0
update
REPORT-17186 【决策报表】条件属性添加超链,会自动在超级链接里生成一条
删除无用import
REPORT-17500 设计器无法跳转到帮助文档
...
|
6 years ago |
neil
|
57034b54a0
|
ct
|
6 years ago |
Hades
|
fb6780bdf3
|
Merge pull request #941 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '7d57de3d84bd3c97c2febae68a881e154d93a900':
update
REPORT-17908 启动动画“初始化”的国际化问题
|
6 years ago |
Hades
|
7d57de3d84
|
update
|
6 years ago |
Hades
|
6a7d8824b2
|
REPORT-17908 启动动画“初始化”的国际化问题
|
6 years ago |
yaoh.wu
|
dd03377bb5
|
Merge pull request #939 in DESIGN/design from ~YAOH.WU/design:bugfix-17887 to release/10.0
* commit 'd2d97234a366a5fd37b95cca0dd1075f1ddbd248':
REPORT-17887 数字控件最大值最小值部分场景保存失败
|
6 years ago |
yaoh.wu
|
d2d97234a3
|
REPORT-17887 数字控件最大值最小值部分场景保存失败
|
6 years ago |
ju
|
60bd1a11e8
|
Merge pull request #938 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2a9fcf77e653c8cf87f87ce262e020b6f4a099fd':
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
|
6 years ago |
Hades
|
2a9fcf77e6
|
REPORT-17277 frm的body点击事件不见了 && REPORT-17897 设计器文件-选项显示不完整 && REPORT-17873 模板-报表填报属性-刷新按钮提示框的国际化问题
|
6 years ago |
Wim.Zhai
|
9a142f8a35
|
Merge pull request #937 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit 'd69ecae6f14c228ac49181a61ae9cab68d662c0d':
CHART-9401 fix list
|
6 years ago |
Wim.Zhai
|
d69ecae6f1
|
CHART-9401 fix list
|
6 years ago |
Hades
|
573f2efde8
|
Merge pull request #934 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '7d209fba578597d85cd0e2709a1e73ebf62cf85a':
update
REPORT-17656 决策报表报表块复制后值被清空
update
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
|
6 years ago |
yaoh.wu
|
0dbfce6c0e
|
Merge pull request #931 in DESIGN/design from ~YAOH.WU/design:feature-17527 to release/10.0
* commit '4418950c11964bca1176e13b6e2de882f8922220':
REPORT-17527 推送远程设计触发的报表预览日志
|
6 years ago |
zack
|
d658d7f19c
|
Merge pull request #933 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit 'f9fb1389e67f6b10aa7378203fb98ca97d9e2fa0':
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
|
6 years ago |
Wim.Zhai
|
37e4ce17a8
|
Merge pull request #935 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit '7fdcce6b04a20781f68c682668e89d7dd1f075f3':
fix list
CHART-3647 删除多余代码
|
6 years ago |
Wim.Zhai
|
7fdcce6b04
|
fix list
|
6 years ago |
Wim.Zhai
|
045dcec050
|
CHART-3647 删除多余代码
|
6 years ago |
Hades
|
7d209fba57
|
update
|
6 years ago |
Hades
|
63cf9064fe
|
REPORT-17656 决策报表报表块复制后值被清空
|
6 years ago |
zack
|
f9fb1389e6
|
MOBILE-21196 【性能】移动端》报表》打开少数单元格插入图片的模板,出现加载缓慢,时间在5s以上不等 设计器部分
|
6 years ago |
Hades
|
bfc341f3b0
|
update
|
6 years ago |
yaoh.wu
|
4418950c11
|
REPORT-17527 推送远程设计触发的报表预览日志
|
6 years ago |
xiaoxia
|
2dfa63476a
|
Merge pull request #929 in DESIGN/design from ~XIAOXIA/design:release/10.0 to release/10.0
* commit '10c9240e087cedd1d30a9ec15a07b667f6c53f43':
REPORT-17494 模板版本管理,选项灰化问题
|
6 years ago |
Hades
|
c1346fd57d
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
f04c4cfdf9
|
KERNEL-582 国际化定制的地方会越来越多,想办法去掉这种if else写法
|
6 years ago |
Hades
|
12902dfc88
|
Merge pull request #928 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '8c66faed3f84e953006435ea21c0656d735affee':
REPORT-17730 控件名无法保存
|
6 years ago |
XiaXiang
|
10c9240e08
|
REPORT-17494
模板版本管理,选项灰化问题
|
6 years ago |
Hades
|
8c66faed3f
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
4aad0cc62d
|
REPORT-17730 控件名无法保存
|
6 years ago |
zack
|
0959c1dbe9
|
Merge pull request #927 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '77b716bb89cc8c8881f836c90d684d2283306810':
REPORT-15183 有一个改远程url的接口补一下10.0
|
6 years ago |
zack
|
77b716bb89
|
REPORT-15183 有一个改远程url的接口补一下10.0
|
6 years ago |
Hades
|
a3b635a882
|
Merge pull request #925 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '8d7ff550dbb15fe949c2494e8285c4b122919ee0':
update
REPORT-17186 【决策报表】条件属性添加超链,会自动在超级链接里生成一条
|
6 years ago |
Hades
|
8d7ff550db
|
update
|
6 years ago |
Hades
|
d2b067cf17
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
678c9124ce
|
REPORT-17186 【决策报表】条件属性添加超链,会自动在超级链接里生成一条
|
6 years ago |
Kara
|
4b6c186813
|
Merge pull request #923 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c0df7fb2b6a5e759d51b2d5f0ceffb1724567703':
update
REPORT-17451 && REPORT-17460 同步到final
|
6 years ago |
Hades
|
a03b44601d
|
Merge pull request #922 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '35007b79d0191d82c5f4634a6d1e8526834cac56':
删除无用import
REPORT-17500 设计器无法跳转到帮助文档
REPORT-17500 设计器无法跳转到帮助文档
|
6 years ago |
Hades
|
c0df7fb2b6
|
update
|
6 years ago |
Hades
|
7a8f51e2cf
|
REPORT-17451 && REPORT-17460 同步到final
|
6 years ago |
Hades
|
35007b79d0
|
删除无用import
|
6 years ago |
Hades
|
cdcc17cefc
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
6 years ago |
Hades
|
45881aaa87
|
REPORT-17500 设计器无法跳转到帮助文档
|
6 years ago |
Hades
|
db20d7ffcf
|
REPORT-17500 设计器无法跳转到帮助文档
|
6 years ago |
Hades
|
6be32d27ea
|
Merge pull request #921 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2d61504e945ae61d4fc4904263d488a0a261d13e':
REPORT-16650 设计器权限编辑 多角色树多选无效
|
6 years ago |
Hades
|
2d61504e94
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
6 years ago |