superman
|
f575784236
|
Merge pull request #777 in BA/design from ~PLOUGH/design:dev to dev
* commit '7a026b4b11cf43fd1e123ed568eccfbdfaa4e9c1':
无JIRA任务，国际化
|
7 years ago |
 yaoh.wu
|
98d9e39fe2
|
无任务，调整代码
|
7 years ago |
|
yaoh.wu
|
68c5cc1e52
|
无任务，调整代码
|
7 years ago |
|
yaoh.wu
|
abfaad3b71
|
无任务，调整代码
|
7 years ago |
|
yaoh.wu
|
6a1e4bcca7
|
无任务 调整代码
|
7 years ago |
|
yaoh.wu
|
c9e58b9284
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '513482fa04ffb7007b5ca4d419364787c69afa28':
调整代码
调整代码
REPORT-1916 做模板的过程和耗时收集=》把统计格子数量的功能分离为单独的类；调整代码
REPORT-1916 做模板的过程和耗时收集=》若未加入产品改良计划，则不收集本地数据
REPORT-1916 做模板的过程和耗时收集=》把 reportletsid 改成 templateID
REPORT-1916 做模板的过程和耗时收集=》上传数据前，判断是否为测试模板
REPORT-1916 做模板的过程和耗时收集=》调整代码
REPORT-1916 做模板的过程和耗时收集=》上传模板数据前，判断模板是否完成
REPORT-1916 做模板的过程和耗时收集=》重构代码，将process和consuming分离，暂时不记录模板过程
REPORT-1916 做模板的过程和耗时收集=》修改获取单元格编辑信息的方式
REPORT-1916 做模板的过程和耗时收集=》完成所有信息的本地存取
REPORT-1916 做模板的过程和耗时收集=》完成基本信息的本地存取
|
7 years ago |
plough
|
7a026b4b11
|
无JIRA任务，国际化
|
7 years ago |
|
yaoh.wu
|
e82c0f921a
|
无任务代码调整
|
7 years ago |
|
yaoh.wu
|
3fcec33cc9
|
tab 间组件复用
|
7 years ago |
|
yaoh.wu
|
31e9e165bb
|
tab 文件间复用
|
7 years ago |
|
superman
|
e14b66efaf
|
Merge pull request #776 in BA/design from ~MANGO/design:release to release
* commit 'e53ae9b10785e226cca6c59b59df01f9cded3b22':
调整布局
还原代码
调整布局
还原代码
|
7 years ago |
mengao
|
e53ae9b107
|
调整布局
|
7 years ago |
|
mengao
|
74c386e934
|
还原代码
|
7 years ago |
|
mengao
|
18c5708343
|
调整布局
|
7 years ago |
|
mengao
|
8a3e42ce1f
|
Merge remote-tracking branch 'origin/release' into release
|
7 years ago |
|
mengao
|
58152e2775
|
还原代码
|
7 years ago |
|
mengao
|
b7fea495cf
|
调整布局
|
7 years ago |
|
mengao
|
e60e6e46b3
|
还原代码，修改客户bug
|
7 years ago |
|
superman
|
664124fdb7
|
Merge pull request #774 in BA/design from ~ZHOUPING/design:release to release
* commit 'fc9adf928ebdd7a615cf21c29fca4c5545809646':
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
|
7 years ago |
zhouping
|
fc9adf928e
|
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
|
7 years ago |
|
superman
|
56d89bac74
|
Merge pull request #773 in BA/design from ~ZACK/design:release to release
* commit '7e0fae20f770d46f8f4d1dcd7f09f6c365a85bc7':
REPORT-2242 填报提交设置的若干问题修改
|
7 years ago |
zack
|
7e0fae20f7
|
REPORT-2242 填报提交设置的若干问题修改
|
7 years ago |
|
yaoh.wu
|
6bad68469e
|
FRM组件复用，文件间相互复制，遗留：自适应to绝对会因大小超出而不能复制
|
7 years ago |
|
yaoh.wu
|
d5bfb700b7
|
代码调整
|
7 years ago |
|
superman
|
513482fa04
|
Merge pull request #768 in BA/design from ~PLOUGH/design:dev to dev
* commit '47fe2434180fab8f939e05a140640bd21d2da0f1':
调整代码
调整代码
REPORT-1916 做模板的过程和耗时收集=》把统计格子数量的功能分离为单独的类；调整代码
REPORT-1916 做模板的过程和耗时收集=》若未加入产品改良计划，则不收集本地数据
REPORT-1916 做模板的过程和耗时收集=》把 reportletsid 改成 templateID
REPORT-1916 做模板的过程和耗时收集=》上传数据前，判断是否为测试模板
REPORT-1916 做模板的过程和耗时收集=》调整代码
REPORT-1916 做模板的过程和耗时收集=》上传模板数据前，判断模板是否完成
REPORT-1916 做模板的过程和耗时收集=》重构代码，将process和consuming分离，暂时不记录模板过程
REPORT-1916 做模板的过程和耗时收集=》修改获取单元格编辑信息的方式
REPORT-1916 做模板的过程和耗时收集=》完成所有信息的本地存取
REPORT-1916 做模板的过程和耗时收集=》完成基本信息的本地存取
|
7 years ago |
|
plough
|
47fe243418
|
调整代码
|
7 years ago |
|
yaoh.wu
|
0a76edfca6
|
rename
|
7 years ago |
|
yaoh.wu
|
583df09dee
|
mgerge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
合并
|
7 years ago |
|
yaoh.wu
|
5a9c222dc2
|
frm本地组件复用 绝对布局，遗留：重命名问题
|
7 years ago |
|
superman
|
24c383c92c
|
Merge pull request #771 in BA/design from ~MANGO/design:release to release
* commit '3517d4546fd28f761d2f06cd9b8b7ca733509f3f':
调整布局
调整布局
还原修改
|
7 years ago |
|
mengao
|
3517d4546f
|
调整布局
|
7 years ago |
|
mengao
|
74ba5ca9ab
|
调整布局
|
7 years ago |
|
superman
|
c7cea3fd82
|
Merge pull request #772 in BA/design from ~ZHENG/design:dev to dev
* commit '2afb21241badfe2295285ab7c59dd2a7147d8bb4':
大数据之前把apilevel等级提高了，产品不同意，先改回来，兼容问题再看看怎么处理
|
7 years ago |
fr_shine
|
2afb21241b
|
大数据之前把apilevel等级提高了，产品不同意，先改回来，兼容问题再看看怎么处理
|
7 years ago |
sunmondong
|
70c1e75644
|
更改为aspectJ构建
|
7 years ago |
|
superman
|
d0c5fc08d3
|
Merge pull request #764 in BA/design from ~KERRY/design:release to release
* commit 'bcc131ea7b46497194b5b97c130d258b62466f15':
REPORT-1858 frm组件隐藏
|
7 years ago |
|
mengao
|
080a72d1b3
|
Merge remote-tracking branch 'origin/release' into release
|
7 years ago |
|
mengao
|
ae1cdd7d65
|
还原修改
|
7 years ago |
|
sunmondong
|
04e2efaf47
|
构建使用AspectJ
|
7 years ago |
|
sunmondong
|
a9f5cfab07
|
使用aspectJ构建
|
7 years ago |
|
plough
|
587f6cf099
|
调整代码
|
7 years ago |
|
plough
|
7049c30a4e
|
REPORT-1916 做模板的过程和耗时收集=》把统计格子数量的功能分离为单独的类；调整代码
|
7 years ago |
|
superman
|
75697db914
|
Merge pull request #770 in BA/design from ~FANGLEI/design:master to master
* commit '65c3c951bc9c356a383400c9757db910e8d52054':
对import BoundsWidget进行修改以兼容老版本自适应插件和表单导出
|
7 years ago |
fanglei
|
65c3c951bc
|
对import BoundsWidget进行修改以兼容老版本自适应插件和表单导出
|
7 years ago |
|
plough
|
8943228883
|
REPORT-1916 做模板的过程和耗时收集=》若未加入产品改良计划，则不收集本地数据
|
7 years ago |
|
plough
|
ef7f1ea010
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
7 years ago |
|
plough
|
b2f7c448f9
|
REPORT-1916 做模板的过程和耗时收集=》把 reportletsid 改成 templateID
|
7 years ago |
|
superman
|
0c65caf9df
|
Merge pull request #767 in BA/design from ~JU/ba-dev-design:dev to dev
* commit '2d53d781b620a0e0aaf867012adb1da7da621e14':
无JIRA任务 添加插件卸载前监听，性能插件以此进行额外的卸载任务
|
7 years ago |
juhaoyu
|
2d53d781b6
|
无JIRA任务 添加插件卸载前监听，性能插件以此进行额外的卸载任务
|
7 years ago |
kerry
|
bcc131ea7b
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release
|
7 years ago |
