superman
|
2b2175563a
|
Merge pull request #575 in BA/design from ~ZHOUPING/design:master to master
* commit 'c371f4ca32f9b0af79d213b00d931baaf4821f00':
REPORT-1092 两个一样的表单demo,预览的效果不一样 pmd
REPORT-1092 两个一样的表单demo,预览的效果不一样 dev上测试验收过了,同步到master
|
8 years ago |
zhouping
|
c371f4ca32
|
REPORT-1092 两个一样的表单demo,预览的效果不一样
pmd
|
8 years ago |
superman
|
aabccdadb4
|
Merge pull request #574 in BA/design from ~NEIL/design:master to master
* commit '4b9f8760b2af7ca98aaec50ba9f1d1e726ed20dd':
无JIRA任务, 国际化
pmd
无JIRA任务, 冲突修正
|
8 years ago |
neil
|
4b9f8760b2
|
无JIRA任务, 国际化
|
8 years ago |
neil
|
36b6bc4ea5
|
pmd
|
8 years ago |
zhouping
|
d3e9ff80ab
|
REPORT-1092 两个一样的表单demo,预览的效果不一样
dev上测试验收过了,同步到master
|
8 years ago |
neil
|
3282a9d70e
|
无JIRA任务, 冲突修正
|
8 years ago |
superman
|
d371ca2498
|
Merge pull request #573 in BA/design from ~NEIL/design:release to master
* commit '1c86462eb8938d68c9ddc1c4aea10b67c4ff69bf': (86 commits)
冲突
REPORT-677 删除回调部分的方法
REPORT-849 存储过程窗口也需要支持拖拽
REPORT-875 修复立即重启时,没有正常保存xml文件的问题
1
1
无JIRA任务, build failed
改下名字
pmd魔术数
REPORT-916 [插件管理]提示下载,点取消就弹出一个空白的窗口
修改ReportWebAttrPane中用到的部分国际化key值
REPORT-748 修改国际化的key值
REPORT-875 修改显示对话框的方式,去掉拷贝过来的重复代码
REPORT-748 模板>模板Web属性点进去之后弹出窗口名称不同
REPORT-875。将setBasicDialogSize方法的访问权限改回protected
REPORT-875 修改国际化文件,加入FR-Designer-Language_Change_Successful
rt
自定义SQL获取数据集总行数
REPORT-747 之前没考虑不同模板之间复制
REPORT-875 设计器切换语言后, 应该给个提示, 是否重启, 就跟装完插件一样.
...
|
8 years ago |
neil
|
1c86462eb8
|
冲突
|
8 years ago |
superman
|
5f0e0632bc
|
Merge pull request #568 in BA/design from ~LEE/design_master:release to release
* commit 'eba088f61b55608f69b6c05ca8f24ea4526fb464':
REPORT-677 删除回调部分的方法
|
8 years ago |
superman
|
024b00879d
|
Merge pull request #567 in BA/design from ~LEE/design_master:master to master
* commit '62993e80bbf1368262dd5f5a4fc2356a51324d20':
REPORT-677 删除回调部分的方法
|
8 years ago |
PanLi320
|
eba088f61b
|
REPORT-677 删除回调部分的方法
原因:1.因为和之前的js那边的方法名一致,参数不同,经常会出现方法名那边找错了,导致登陆触发不完善。
2.主要是方法名和参数的问题,js那边虽然写死了带回调的,但是java这边感觉像是bug,走不到应该回调的地方。
|
8 years ago |
PanLi320
|
62993e80bb
|
REPORT-677 删除回调部分的方法
原因:1.因为和之前的js那边的方法名一致,参数不同,经常会出现方法名那边找错了,导致登陆触发不完善。
2.主要是方法名和参数的问题,js那边虽然写死了带回调的,但是java这边感觉像是bug,走不到应该回调的地方。
|
8 years ago |
superman
|
153837d0af
|
Merge pull request #564 in BA/design from ~PLOUGH/design:release to release
* commit '65f79d656478327be5542307ff5950f334f3fbea':
REPORT-875 修复立即重启时,没有正常保存xml文件的问题
|
8 years ago |
superman
|
2edd877322
|
Merge pull request #565 in BA/design from ~KERRY/design:release to release
* commit 'b194ae08d806940fff6d83444c10367f33fcbfda':
REPORT-849 存储过程窗口也需要支持拖拽
|
8 years ago |
kerry
|
b194ae08d8
|
REPORT-849 存储过程窗口也需要支持拖拽
|
8 years ago |
plough
|
65f79d6564
|
REPORT-875 修复立即重启时,没有正常保存xml文件的问题
|
8 years ago |
superman
|
26f0205ee6
|
Merge pull request #557 in BA/design from ~NEIL/design:release to release
* commit 'e6cb548be4081d17ac7db45f73002cd7912affc6':
1
1
无JIRA任务, build failed
|
8 years ago |
neil
|
e6cb548be4
|
1
|
8 years ago |
neil
|
e5dd930136
|
1
|
8 years ago |
neil
|
085f2e57eb
|
无JIRA任务, build failed
|
8 years ago |
superman
|
0948187611
|
Merge pull request #556 in BA/design from ~VITO/design:dev to dev
* commit '5e68b887b18fabaff35843288b465a61098b2286':
改下名字
pmd魔术数
REPORT-916 [插件管理]提示下载,点取消就弹出一个空白的窗口
|
8 years ago |
vito
|
5e68b887b1
|
改下名字
|
8 years ago |
vito
|
c88683ca6e
|
pmd魔术数
|
8 years ago |
vito
|
b7550cfb6d
|
REPORT-916 [插件管理]提示下载,点取消就弹出一个空白的窗口
|
8 years ago |
neil
|
6a19c9c381
|
Merge pull request #555 in BA/design from ~PLOUGH/design:dev to dev
* commit '2f92f8ef0a6457bf41d8561ed3bdad050604ef9e':
修改ReportWebAttrPane中用到的部分国际化key值
REPORT-748 修改国际化的key值
REPORT-875 修改显示对话框的方式,去掉拷贝过来的重复代码
REPORT-748 模板>模板Web属性点进去之后弹出窗口名称不同
REPORT-875。将setBasicDialogSize方法的访问权限改回protected
REPORT-875 修改国际化文件,加入FR-Designer-Language_Change_Successful
REPORT-875 设计器切换语言后, 应该给个提示, 是否重启, 就跟装完插件一样.
|
8 years ago |
plough
|
2f92f8ef0a
|
修改ReportWebAttrPane中用到的部分国际化key值
|
8 years ago |
plough
|
01f2ddcbe3
|
REPORT-748 修改国际化的key值
|
8 years ago |
plough
|
72337a2dbe
|
REPORT-875 修改显示对话框的方式,去掉拷贝过来的重复代码
|
8 years ago |
plough
|
894d5bdb18
|
REPORT-748 模板>模板Web属性点进去之后弹出窗口名称不同
|
8 years ago |
plough
|
c0892fd1f7
|
REPORT-875。将setBasicDialogSize方法的访问权限改回protected
|
8 years ago |
superman
|
9b6a9e7eb5
|
Merge pull request #553 in BA/design from ~KERRY/design:dev to dev
* commit '6a99e92200bfe44b17ed5a9c95abb574ca8bc11c':
REPORT-747 之前没考虑不同模板之间复制
|
8 years ago |
plough
|
fe2996616e
|
REPORT-875 修改国际化文件,加入FR-Designer-Language_Change_Successful
|
8 years ago |
superman
|
6f8a961f64
|
Merge pull request #554 in BA/design from ~XIAOXIA/design:dev to dev
* commit 'a72ce46cc96155e22026e056b11c961eba86fcbf':
rt
自定义SQL获取数据集总行数
|
8 years ago |
xiaoxia
|
a72ce46cc9
|
rt
|
8 years ago |
xiaoxia
|
176b9752aa
|
自定义SQL获取数据集总行数
|
8 years ago |
kerry
|
6a99e92200
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev
|
8 years ago |
kerry
|
5c9c82c4f6
|
REPORT-747 之前没考虑不同模板之间复制
|
8 years ago |
plough
|
2829bd754b
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
plough
|
602dfc2de1
|
REPORT-875 设计器切换语言后, 应该给个提示, 是否重启, 就跟装完插件一样.
|
8 years ago |
superman
|
0a82cbe1c6
|
Merge pull request #551 in BA/design from ~PLOUGH/design:master to master
* commit 'e76d3c8a75a66a52a12c43a944512a8153529cda':
REPORT-881 远程设计,非管理员连接,不应该看到菜单栏的“服务器”选项
|
8 years ago |
superman
|
d60e3bb9c5
|
Merge pull request #550 in BA/design from ~KERRY/design:dev to dev
* commit 'cfb08a1d0a28a89ae5e48046531b43b6ce49bc7d':
将原先的是否圆角属性换成圆角半径
REPORT-842 报表快组件支持圆角边框
REPORT-842 报表块组件支持圆角边框
REPORT-842 报表块组件支持圆角边框
|
8 years ago |
kerry
|
cfb08a1d0a
|
将原先的是否圆角属性换成圆角半径
|
8 years ago |
plough
|
e76d3c8a75
|
REPORT-881 远程设计,非管理员连接,不应该看到菜单栏的“服务器”选项
|
8 years ago |
kerry
|
5ca2af057f
|
REPORT-842 报表快组件支持圆角边框
|
8 years ago |
kerry
|
bb622b1fd7
|
REPORT-842 报表块组件支持圆角边框
|
8 years ago |
kerry
|
9ff8e8c4a4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev
|
8 years ago |
kerry
|
7a1a7f9926
|
REPORT-842 报表块组件支持圆角边框
|
8 years ago |
superman
|
e62d8a4b9f
|
Merge pull request #549 in BA/design from ~FANGLEI/design:dev to dev
* commit '340a45c0b7ac616bc5080a469ff6c0754b1d416d':
字母拼错了,解决国际化找不到的bug
|
8 years ago |
fanglei
|
340a45c0b7
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~fanglei/design into dev
|
8 years ago |