superman
|
f7010cceb6
|
Merge pull request #594 in BA/design from ~ZHENG/design:master to master
* commit '4491ba813d030f06ad52c17d1403503d92c29372':
国际化
|
8 years ago |
superman
|
fd71b753ae
|
Merge pull request #593 in BA/design from ~NEIL/design:master to master
* commit '2c371d74c40cf79e6ab2bd308ff7067a9ee9d9c5':
无JIRA任务, 不兼容的API
|
8 years ago |
fr_shine
|
4491ba813d
|
国际化
|
8 years ago |
neil
|
2c371d74c4
|
无JIRA任务, 不兼容的API
|
8 years ago |
superman
|
99e0497e43
|
Merge pull request #589 in BA/design from ~NEIL/design:master to master
* commit '805fe40f14451f4d5d1b6ed7943cc55ce61bd098':
无JIRA任务, 修复合并冲突
|
8 years ago |
neil
|
805fe40f14
|
无JIRA任务, 修复合并冲突
|
8 years ago |
superman
|
2d164d9a82
|
Merge pull request #587 in BA/design from ~VITO/design:master to master
* commit '86bea80f192d53f286b25b423a78d8c350a72565':
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
|
8 years ago |
vito
|
86bea80f19
|
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
|
8 years ago |
superman
|
a29d48940a
|
Merge pull request #585 in BA/design from ~XIAOXIA/design:master to master
* commit '043fa45d59115656a4615ed1babbd096c4491577':
rt
rt
rt
|
8 years ago |
xiaoxia
|
043fa45d59
|
rt
|
8 years ago |
xiaoxia
|
806642fddb
|
rt
|
8 years ago |
xiaoxia
|
29043be8ee
|
rt
|
8 years ago |
superman
|
d78ac7f529
|
Merge pull request #579 in BA/design from ~LEE/design_master:master to master
* commit '38a3b913430d64358c9e55e5cded3132debaee5c':
1
REPORT-1147 脚本更新问题
|
8 years ago |
PanLi320
|
38a3b91343
|
1
1
|
8 years ago |
PanLi320
|
9d239159e9
|
REPORT-1147 脚本更新问题
最初是为了解决,插件更新和安装下会出现plugin的数组读取两遍的问题,所以在哪个地方加个强制的判断,当时的解决方案是可为两个,还有一个是在脚本
中加入sort处理。后来vito那边找到出现问题的核心点,在于pane部分加载两次,导致脚本数组加载两次,那这边的就去掉这边的判断,因为会导致脚
本更新问题。
|
8 years ago |
sunmondong
|
b0791ddf83
|
test
|
8 years ago |
sunmondong
|
9a5fdfcfb6
|
测试
|
8 years ago |
sunmondong
|
7dc4888d11
|
调试
|
8 years ago |
sunmondong
|
0dec03fb65
|
调试
|
8 years ago |
superman
|
4a072c3e7e
|
Merge pull request #577 in BA/design from ~NEIL/design:master to master
* commit '2c96734c35c3ec6174a7f4e959e59a40997c1a82':
1
无JIRA任务, build failed
|
8 years ago |
neil
|
2c96734c35
|
1
|
8 years ago |
neil
|
77f07e99c9
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
neil
|
68a3ecdfa9
|
无JIRA任务, build failed
|
8 years ago |
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 |