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 |
superman
|
968caed926
|
Merge pull request #795 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a9855863fc572055a4691ea55cb21cbc2b3e1995':
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
|
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 |
superman
|
c63c8d0f91
|
Merge pull request #786 in BA/design from ~MANGO/design:dev to dev
* commit 'c3e8ef59f856ee702c91b98f464ffc600fc7fab0':
优化代码
修改国际化文件
修改国际化
修改国际化
修改国际化
增加国际化
修改国际化
地图添加缩放手势
还原修改部分design代码。
|
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 |
plough
|
a9855863fc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
plough
|
4b04b8e018
|
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
|
8 years ago |
yaoh.wu
|
af81d37d31
|
merge
|
8 years ago |
superman
|
8b580ae450
|
Merge pull request #794 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'ccc160a2d4fa02db7caf4537235b94e1f119d955':
编译等级为1.7 集合作为参数需指明类型
|
8 years ago |
yaoh.wu
|
ccc160a2d4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
|
8 years ago |
yaoh.wu
|
4d9a3f4d8e
|
编译等级为1.7 集合作为参数需指明类型
|
8 years ago |
superman
|
343d75729e
|
Merge pull request #793 in BA/design from ~PLOUGH/design:dev to dev
* commit 'c19c243a73470b5d3298e87f6b122e9fe13ec482':
REPORT-1916 模板耗时=》调整代码
|
8 years ago |
mengao
|
c3e8ef59f8
|
解决冲突代码
|
8 years ago |
Mango
|
a7b1716be9
|
Merging in latest from upstream (BA/design:refs/heads/master)
* commit '3082e43d1dcc9c1d146a38f33a739bc57410f184':
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
还原修改
使用aspectJ构建
REPORT-1858 frm组件隐藏
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
|
8 years ago |
superman
|
984d1f62b5
|
Merge pull request #792 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'ae78f289b6c4c4b23c590313e4b9785f77706707':
FRM组件复用自适应布局bug修复,不能粘贴时弹窗提示
report-1945 frm组件复用绝对布局bug处理
|
8 years ago |
mengao
|
d87f31dc18
|
优化代码
|
8 years ago |
mengao
|
4d7aa3fc4b
|
合并代码
|
8 years ago |
mengao
|
7d9891e357
|
修改国际化
|
8 years ago |
plough
|
c19c243a73
|
REPORT-1916 模板耗时=》调整代码
|
8 years ago |
mengao
|
fd561ac02b
|
修改国际化文件
|
8 years ago |
superman
|
3443df9a31
|
Merge pull request #789 in BA/design from ~GREY/design:release to release
* commit '756670a9c0d4b17c71faae4ccf682f54359edddf':
国际化翻译
|
8 years ago |
mengao
|
8d16643d87
|
修改国际化
|
8 years ago |
mengao
|
ae6c1291eb
|
修改国际化
|
8 years ago |
mengao
|
7660db78bb
|
修改国际化
|
8 years ago |
plough
|
139b3b89e2
|
调整代码
|
8 years ago |
mengao
|
c425cf94e5
|
增加国际化
|
8 years ago |
plough
|
88201d9d5c
|
REPORT-1916 模板耗时=》调整代码;发送数据失败时,输出日志
|
8 years ago |
yaoh.wu
|
ae78f289b6
|
FRM组件复用自适应布局bug修复,不能粘贴时弹窗提示
|
8 years ago |
plough
|
cebfc9ef10
|
REPORT-1916 模板耗时=》修改算法,将上传后的模板视为旧模板,不再收集数据
|
8 years ago |
mengao
|
db32155dad
|
修改国际化
|
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
|
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 |