plough
|
ec04ff7291
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
8 years ago |
|
plough
|
ab1d6e5cc7
|
REPORT-1916 模板耗时=》远程设计时不收集模板数据
|
8 years ago |
superman
|
597f84f5f5
|
Merge pull request #787 in BA/design from ~PLOUGH/design:release to release
* commit '28443f0c163bc298d006015392f62a2f810764ab':
REPORT-1916 模板耗时=》防止重复收集模板数据
REPORT-1916 模板耗时=》解决另存为不产生新数据的bug；当id为null时（旧模板），不搜集数据；调整日志打印内容
REPORT-1916 模板耗时=》调整代码，让designer_base不依赖engine和designer_form
|
8 years ago |
mengao
|
fcf2f0884e
|
地图添加缩放手势
|
8 years ago |
|
mengao
|
f7d68b85c4
|
修改国际化
|
8 years ago |
|
plough
|
28443f0c16
|
REPORT-1916 模板耗时=》防止重复收集模板数据
|
8 years ago |
|
superman
|
1209fe5766
|
Merge pull request #788 in BA/design from ~LILY/design:release to release
* commit 'c6c5eb3f4ab49d27e2300d1f4c450f5172e39075':
国际化翻译
|
8 years ago |
|
mengao
|
a1a277ff65
|
还原冲突代码
|
8 years ago |
wanling wang
|
756670a9c0
|
国际化翻译
|
8 years ago |
unknown
|
c6c5eb3f4a
|
国际化翻译
|
8 years ago |
|
plough
|
ec76806d47
|
REPORT-1916 模板耗时=》解决另存为不产生新数据的bug；当id为null时（旧模板），不搜集数据；调整日志打印内容
|
8 years ago |
|
plough
|
51f1caa26a
|
REPORT-1916 模板耗时=》调整代码，让designer_base不依赖engine和designer_form
|
8 years ago |
|
mengao
|
552720bc96
|
还原修改部分design代码。
|
8 years ago |
 yaoh.wu
|
34d9144001
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
|
8 years ago |
|
yaoh.wu
|
7d57afb46e
|
report-1945 frm组件复用绝对布局bug处理
|
8 years ago |
|
superman
|
a339197f00
|
Merge pull request #783 in BA/design from ~ZHENG/design:release to release
* commit '2e01132b6ac761728d302236dfdef2c0d041e81c':
当前表单对象 删除最后一个参数
|
8 years ago |
|
superman
|
a4504225a9
|
Merge pull request #784 in BA/design from ~PLOUGH/design:dev to dev
* commit '78fc5760fdc97de6c35c7ced9a3e3f8640035f80':
调整代码
REPORT-1916 模板耗时=》解决带参数表单无法保存的bug
|
8 years ago |
|
superman
|
3d2bcf370f
|
Merge pull request #785 in BA/design from ~PLOUGH/design:release to release
* commit '9014f648299a8d25be5ae9a9c7ab65848f73f843':
REPORT-1916 模板耗时=》解决带参数表单无法保存的bug
|
8 years ago |
|
plough
|
9014f64829
|
REPORT-1916 模板耗时=》解决带参数表单无法保存的bug
|
8 years ago |
|
plough
|
78fc5760fd
|
调整代码
|
8 years ago |
|
plough
|
945b6fabf2
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
|
plough
|
1fac2c6a37
|
REPORT-1916 模板耗时=》解决带参数表单无法保存的bug
|
8 years ago |
fr_shine
|
2e01132b6a
|
当前表单对象 删除最后一个参数
|
8 years ago |
|
superman
|
3082e43d1d
|
Merge pull request #782 in BA/design from ~PAUL/design:master to master
* commit 'e9bace2d13081c63930369c00b240843a3e51fac':
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
还原修改
使用aspectJ构建
REPORT-1858 frm组件隐藏
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
|
8 years ago |
paul
|
e9bace2d13
|
Merge branch 'release'
# Conflicts:
# designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
|
8 years ago |
|
superman
|
2445d2dfcc
|
Merge pull request #781 in BA/design from ~FANGLEI/design:release to release
* commit '0d69862fabc66b19f8792decfd384b74a711fcf1':
修复不能自定义参数面板控件标签的bug
|
8 years ago |
fanglei
|
0d69862fab
|
修复不能自定义参数面板控件标签的bug
|
8 years ago |
|
superman
|
3c879afc39
|
Merge pull request #780 in BA/design from ~YAOH.WU/design:dev to dev
* commit '46ff930d4b659a768a8043f00ac4676b3a521df3':
无任务 调整代码通过pmd
无任务 调整代码
无任务 代码调整
无任务，调整代码
无任务，调整代码
无任务，调整代码
无任务 调整代码
无任务代码调整
tab 间组件复用
tab 文件间复用
FRM组件复用，文件间相互复制，遗留：自适应to绝对会因大小超出而不能复制
代码调整
rename
frm本地组件复用 绝对布局，遗留：重命名问题
|
8 years ago |
|
yaoh.wu
|
46ff930d4b
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'f57578423642f61e70216256fe50404b033d114e':
无JIRA任务，国际化
|
8 years ago |
|
yaoh.wu
|
d6047fbd86
|
无任务 调整代码通过pmd
|
8 years ago |
|
yaoh.wu
|
32ea80b862
|
无任务 调整代码
|
8 years ago |
|
yaoh.wu
|
2715c3c598
|
无任务 代码调整
|
8 years ago |
|
superman
|
f575784236
|
Merge pull request #777 in BA/design from ~PLOUGH/design:dev to dev
* commit '7a026b4b11cf43fd1e123ed568eccfbdfaa4e9c1':
无JIRA任务，国际化
|
8 years ago |
|
yaoh.wu
|
98d9e39fe2
|
无任务，调整代码
|
8 years ago |
|
yaoh.wu
|
68c5cc1e52
|
无任务，调整代码
|
8 years ago |
|
yaoh.wu
|
abfaad3b71
|
无任务，调整代码
|
8 years ago |
|
yaoh.wu
|
6a1e4bcca7
|
无任务 调整代码
|
8 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 做模板的过程和耗时收集=》完成基本信息的本地存取
|
8 years ago |
|
plough
|
7a026b4b11
|
无JIRA任务，国际化
|
8 years ago |
|
yaoh.wu
|
e82c0f921a
|
无任务代码调整
|
8 years ago |
|
yaoh.wu
|
3fcec33cc9
|
tab 间组件复用
|
8 years ago |
|
yaoh.wu
|
31e9e165bb
|
tab 文件间复用
|
8 years ago |
|
superman
|
e14b66efaf
|
Merge pull request #776 in BA/design from ~MANGO/design:release to release
* commit 'e53ae9b10785e226cca6c59b59df01f9cded3b22':
调整布局
还原代码
调整布局
还原代码
|
8 years ago |
mengao
|
e53ae9b107
|
调整布局
|
8 years ago |
|
mengao
|
74c386e934
|
还原代码
|
8 years ago |
|
mengao
|
18c5708343
|
调整布局
|
8 years ago |
|
mengao
|
8a3e42ce1f
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
|
mengao
|
58152e2775
|
还原代码
|
8 years ago |
|
mengao
|
b7fea495cf
|
调整布局
|
8 years ago |
|
mengao
|
e60e6e46b3
|
还原代码，修改客户bug
|
8 years ago |
