plough
|
92d1f8209c
|
REPORT-2368 预定义控件设置了不可见,在参数面板上还是可见的
|
8 years ago |
superman
|
dbd4173dca
|
Merge pull request #823 in BA/design from ~PLOUGH/design:release to release
* commit '23566ed6ba492fa846b83bd88241474317186e6c':
无JIRA任务,截获模板信息收集初始化时,可能导致模板打不开的异常
|
8 years ago |
plough
|
23566ed6ba
|
无JIRA任务,截获模板信息收集初始化时,可能导致模板打不开的异常
|
8 years ago |
superman
|
29e3a29168
|
Merge pull request #819 in BA/design from ~PLOUGH/design:release to release
* commit '935b4fcca69eb3f0e5d792fccc596e45b1f23f03':
无JIRA任务;去掉调试信息
|
8 years ago |
plough
|
935b4fcca6
|
无JIRA任务;去掉调试信息
|
8 years ago |
superman
|
789f00bbb6
|
Merge pull request #816 in BA/design from ~ZACK/design:release to release
* commit 'c247eeac6a60cd0468fb78e451fe307a2feaef50':
无JIRA任务 屏蔽新翻页
|
8 years ago |
zack
|
c247eeac6a
|
无JIRA任务 屏蔽新翻页
|
8 years ago |
superman
|
6a81ab2bfe
|
Merge pull request #814 in BA/design from ~KERRY/design:release to release
* commit 'eb1e45d12a80607f26384b9c11f89e6ec245b461':
REPORT-2220 数据连接用户名和密码可以传参
|
8 years ago |
kerry
|
eb1e45d12a
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release
|
8 years ago |
kerry
|
be48bf4b29
|
REPORT-2220
数据连接用户名和密码可以传参
|
8 years ago |
superman
|
264f742f47
|
Merge pull request #811 in BA/design from ~SYOKI/design:release to release
* commit '55ddfd87dcf16703d8326d4ade2a15509f075889':
国际化修改 部分未翻译字段翻译 庄奇 201704130221
|
8 years ago |
superman
|
631c3c8e81
|
Merge pull request #812 in BA/design from ~MANGO/design:release to release
* commit '814bea2e11f20cb32f895aa3d9792684fcaf8045':
修改
修改代码
修改最大最小值值定义,兼容vancharts插件
|
8 years ago |
mengao
|
814bea2e11
|
修改
|
8 years ago |
mengao
|
469bcc513d
|
修改代码
|
8 years ago |
mengao
|
3a0894ea9e
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
mengao
|
cc43c53143
|
修改最大最小值值定义,兼容vancharts插件
|
8 years ago |
syoki
|
55ddfd87dc
|
国际化修改 部分未翻译字段翻译 庄奇 201704130221
|
8 years ago |
superman
|
04f0fb00f2
|
Merge pull request #810 in BA/design from ~PLOUGH/design:release to release
* commit '50dd30c362cd0804b5af586cd8e0362e50980c3a':
REPORT-2344 国际化——繁体设计器少了key
|
8 years ago |
plough
|
50dd30c362
|
REPORT-2344 国际化——繁体设计器少了key
|
8 years ago |
superman
|
88bd7eeae5
|
Merge pull request #809 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '76d1d2fc4a7cd5f92868dcd1bbb301aafb30bf6e':
report-1945,tab|自适应,无组件时粘贴问题
|
8 years ago |
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 |