yaoh.wu
|
76d1d2fc4a
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release
|
8 years ago |
yaoh.wu
|
25116d6466
|
report-1945,tab|自适应,无组件时粘贴问题
|
8 years ago |
superman
|
ff07cc70aa
|
Merge pull request #808 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '03ae87935a5ce59af7fc70aee38b21d88821ed91':
report-1945 自适应无组件是粘贴失败修复
|
8 years ago |
yaoh.wu
|
03ae87935a
|
report-1945 自适应无组件是粘贴失败修复
|
8 years ago |
superman
|
455c766b18
|
Merge pull request #806 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '228d8bb8e8865d78257a6aa825529ce26bdb4fc3':
组件复用层叠顺序新添加的组件在上方
无任务代码调整
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
|
8 years ago |
yaoh.wu
|
228d8bb8e8
|
组件复用层叠顺序新添加的组件在上方
|
8 years ago |
yaoh.wu
|
cc99e7d54f
|
无任务代码调整
|
8 years ago |
yaoh.wu
|
6a9cec9bb3
|
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
|
8 years ago |
superman
|
6190eb5ca7
|
Merge pull request #805 in BA/design from ~SYOKI/design:release to release
* commit '9d5bdf6f595604b4ad0e39772736b1e733b1f313':
国际化修改 design部分 庄奇 201704110018
|
8 years ago |
syoki
|
9d5bdf6f59
|
国际化修改 design部分 庄奇 201704110018
|
8 years ago |
superman
|
55dc340af3
|
Merge pull request #801 in BA/design from ~ZHOUPING/design:release to release
* commit '5c1674ce9e38bfbe79442cffc4560c62607bab52':
REPORT-2334 表单tab布局中图表放大缩小会明显
|
8 years ago |
zhouping
|
5c1674ce9e
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release
|
8 years ago |
zhouping
|
5eeeaa37e7
|
REPORT-2334 表单tab布局中图表放大缩小会明显
|
8 years ago |
superman
|
8c3e82689e
|
Merge pull request #790 in BA/design from ~MANGO/design:release to release
* commit '5719ba6531eada343b5a51540971e4d47c0137b2':
修改国际化
修改国际化
还原冲突代码
|
8 years ago |
superman
|
e4a8cb1d0c
|
Merge pull request #797 in BA/design from ~PLOUGH/design:release to release
* commit '19df32d4b03f0e8fb935f9f2116364e1c6f8a7cb':
REPORT-1916 模板耗时=》修复初次保存模板时,没有保存ID的bug
|
8 years ago |
plough
|
19df32d4b0
|
REPORT-1916 模板耗时=》修复初次保存模板时,没有保存ID的bug
|
8 years ago |
mengao
|
5719ba6531
|
解决冲突
|
8 years ago |
superman
|
daa3e2fd4d
|
Merge pull request #796 in BA/design from ~YAOH.WU/design:release to release
* commit '58fbac4e191af1d56f843ac75f020eba3f405c1c':
report-1945组件复用bug
无jira任务,提交国际化
|
8 years ago |
yaoh.wu
|
58fbac4e19
|
report-1945组件复用bug
|
8 years ago |
yaoh.wu
|
ede5a64246
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit '44aa95bd8fd4e68081b65380bf65199d0f7762b2':
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
调整代码
REPORT-1916 模板耗时=》调整代码;发送数据失败时,输出日志
REPORT-1916 模板耗时=》修改算法,将上传后的模板视为旧模板,不再收集数据
REPORT-1916 模板耗时=》如果 TemplateInfoCollecor 类结构有改动,则放弃之前收集的数据,保证正常启动设计器
REPORT-1916 模板耗时=》远程设计时不收集模板数据
|
8 years ago |
superman
|
44aa95bd8f
|
Merge pull request #791 in BA/design from ~PLOUGH/design:release to release
* commit 'eb465d65f5fefd70787773ced1a97eecada6476d':
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
调整代码
REPORT-1916 模板耗时=》调整代码;发送数据失败时,输出日志
REPORT-1916 模板耗时=》修改算法,将上传后的模板视为旧模板,不再收集数据
REPORT-1916 模板耗时=》如果 TemplateInfoCollecor 类结构有改动,则放弃之前收集的数据,保证正常启动设计器
REPORT-1916 模板耗时=》远程设计时不收集模板数据
|
8 years ago |
plough
|
eb465d65f5
|
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
|
8 years ago |
yaoh.wu
|
af81d37d31
|
merge
|
8 years ago |
mengao
|
4d7aa3fc4b
|
合并代码
|
8 years ago |
mengao
|
7d9891e357
|
修改国际化
|
8 years ago |
superman
|
3443df9a31
|
Merge pull request #789 in BA/design from ~GREY/design:release to release
* commit '756670a9c0d4b17c71faae4ccf682f54359edddf':
国际化翻译
|
8 years ago |
plough
|
139b3b89e2
|
调整代码
|
8 years ago |
plough
|
88201d9d5c
|
REPORT-1916 模板耗时=》调整代码;发送数据失败时,输出日志
|
8 years ago |
plough
|
cebfc9ef10
|
REPORT-1916 模板耗时=》修改算法,将上传后的模板视为旧模板,不再收集数据
|
8 years ago |
plough
|
4cd9b17bfc
|
REPORT-1916 模板耗时=》如果 TemplateInfoCollecor 类结构有改动,则放弃之前收集的数据,保证正常启动设计器
|
8 years ago |
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
|
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 |
superman
|
a339197f00
|
Merge pull request #783 in BA/design from ~ZHENG/design:release to release
* commit '2e01132b6ac761728d302236dfdef2c0d041e81c':
当前表单对象 删除最后一个参数
|
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 |
fr_shine
|
2e01132b6a
|
当前表单对象 删除最后一个参数
|
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 |