eason-skx
|
6319309bcf
|
Merge branch 'master' into dev
|
8 years ago |
superman
|
19433affc9
|
Merge pull request #446 in BA/design from ~JU/master-design:master to master
* commit 'bc9e4fd235d715a035930cb3c5c1649a98250881':
回退主干上的下拉树极速构建
|
8 years ago |
juhaoyu
|
bc9e4fd235
|
回退主干上的下拉树极速构建
|
8 years ago |
|
superman
|
6495dadd03
|
Merge pull request #443 in BA/design from ~XIAOHU/design:dev to dev
* commit '08ba6060241ebb8ec41fbcee67d7ad7ee5005222':
图表优先级
update
update
设置图表顺序
update
|
8 years ago |
|
superman
|
6caa61bc54
|
Merge pull request #445 in BA/design from ~XIAOXIA/design:dev to dev
* commit '865d923177dbaed541f5c21a3815798920e4a20d':
rt
rt
rt
|
8 years ago |
xiaoxia
|
865d923177
|
rt
|
8 years ago |
|
xiaoxia
|
0998bf995e
|
rt
|
8 years ago |
Fangjie Hu
|
08ba606024
|
图表优先级
|
8 years ago |
|
superman
|
bfef7fe497
|
Merge pull request #444 in BA/design from ~ZHENG/design:dev to dev
* commit '2098db2594bc4bcabc1e66e6c837cb97fb9ccdae':
选中图表按id看是否相同，不按index。因为图表切换plotlist会变
|
8 years ago |
fr_shine
|
2098db2594
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
8 years ago |
|
fr_shine
|
dc464a7d67
|
选中图表按id看是否相同，不按index。因为图表切换plotlist会变
|
8 years ago |
|
Fangjie Hu
|
fadf534930
|
update
|
8 years ago |
|
Fangjie Hu
|
0f67a73d23
|
update
|
8 years ago |
|
Fangjie Hu
|
b05333e821
|
设置图表顺序
|
8 years ago |
|
xiaoxia
|
ba1bf9a83b
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into dev
|
8 years ago |
|
superman
|
366ba5536e
|
Merge pull request #442 in BA/design from ~ZACK/design:master to master
* commit '752e05ecd523d904393776f1ed92ea6d5a613045':
无JIRA任务 防止有npe
无JIRA任务 视图树是否去重设置无效
|
8 years ago |
|
xiaoxia
|
4b1e21f013
|
rt
|
8 years ago |
zack
|
752e05ecd5
|
无JIRA任务 防止有npe
|
8 years ago |
|
zack
|
0aa84fb9da
|
无JIRA任务 视图树是否去重设置无效
|
8 years ago |
|
superman
|
3a04eac77b
|
Merge pull request #440 in BA/design from ~ZHOUPING/design:master to master
* commit '52c256cbb2c3ff104b4e37efc3a17f81766e733f':
无JIRA任务 修复表单调整页面大小后tabpane中就不能拖入图表的问题
|
8 years ago |
|
superman
|
684f872298
|
Merge pull request #441 in BA/design from ~XIAOXIA/design:dev to dev
* commit '660e391aed9bbb13ae63e2974638d2c8e537d95e':
rt
|
8 years ago |
|
xiaoxia
|
660e391aed
|
rt
|
8 years ago |
lee
|
d9bf7d3f99
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '199bd0b3310dde7887bd9a988255ec476b8be14a': (31 commits)
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
标签右对齐
rt
REPORT-414 同步到dev上演示
rt
rt
rt
rt
rt
...
|
8 years ago |
|
superman
|
199bd0b331
|
Merge pull request #439 in BA/design from ~XIAOXIA/design:dev to dev
* commit '128d97ddf37786ecbc8924ecaa2fbd5693b756b1': (26 commits)
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
...
|
8 years ago |
|
xiaoxia
|
128d97ddf3
|
rt
|
8 years ago |
|
xiaoxia
|
083bcb003c
|
rt
|
8 years ago |
zhouping
|
52c256cbb2
|
无JIRA任务 修复表单调整页面大小后tabpane中就不能拖入图表的问题
|
8 years ago |
|
xiaoxia
|
7e6603a996
|
rt
|
8 years ago |
|
xiaoxia
|
d8a2f25048
|
rt
|
8 years ago |
|
xiaoxia
|
ac76c6839e
|
rt
|
8 years ago |
|
xiaoxia
|
a15aabfb62
|
rt
|
8 years ago |
|
superman
|
edcbe6b516
|
Merge pull request #438 in BA/design from ~ZHENG/design:dev to dev
* commit '62d6cbe6064d98e53e35b3cbf5b27198b28e443b':
标签右对齐
|
8 years ago |
|
xiaoxia
|
3b92a8d821
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into dev
|
8 years ago |
|
xiaoxia
|
8fddeec685
|
rt
|
8 years ago |
|
xiaoxia
|
3fba011137
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '04a5cfe32fde95f6415dee744be28bd56dadc229':
REPORT-414 同步到dev上演示
测试
显示依赖jar
1
REPORT-364 修改
异步请求图片
REPORT-415 填报提交提供多sheet配置
REPORT-364 之前的process加一下
REPORT-364 格式修改
REPORT-585 添加formletName变量说明
update
update
update
切换bug
REPORT-364 最初的接口 忘了删了
REPORT-364 和自适应用的同一个接口处理
REPORT-364 报表块刷新接口处理
|
8 years ago |
|
xiaoxia
|
ab3c192d76
|
rt
|
8 years ago |
|
xiaoxia
|
d8df4f920e
|
rt
|
8 years ago |
|
xiaoxia
|
c3cb42a58a
|
rt
|
8 years ago |
|
xiaoxia
|
9f3eaac8a3
|
rt
|
8 years ago |
|
xiaoxia
|
6c540eb1ed
|
rt
|
8 years ago |
|
fr_shine
|
62d6cbe606
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
8 years ago |
|
fr_shine
|
06f825b893
|
标签右对齐
|
8 years ago |
|
xiaoxia
|
3b96b135af
|
rt
|
8 years ago |
|
superman
|
04a5cfe32f
|
Merge pull request #437 in BA/design from ~ZACK/design:dev to dev
* commit '4c993c74eea0fcbb4103023e4e0e90a4946cced2':
REPORT-414 同步到dev上演示
|
8 years ago |
|
zack
|
4c993c74ee
|
REPORT-414 同步到dev上演示
|
8 years ago |
|
superman
|
f9eaf6708d
|
Merge pull request #436 in BA/design from ~KERRY/design:master to master
* commit '2c7281d4ba2eba565743a85c1d4148b764019cbd':
REPORT-419 dev里面这块代码好像没合
REPORT-419 dev里面这块代码好像没合
|
8 years ago |
|
xiaoxia
|
099e4e496b
|
rt
|
8 years ago |
|
xiaoxia
|
af38c88c95
|
rt
|
8 years ago |
|
xiaoxia
|
28a0fe2e13
|
rt
|
8 years ago |
|
xiaoxia
|
c3c2cf1280
|
rt
|
8 years ago |
