neil
|
7801180007
|
Merge pull request #1 in ~NEIL/design from master to release
* commit '89240801d5b1d94e66d95824c6d4499c8143e8fe': (39 commits)
ct
无jira任务,代码被误杀了
report-1945 frm本地组件复用
面板中增加一些接口方法(Vancharts新插件发布需要,eason与FR商讨确认,可以直接修改master)
REPORT-2430 master收集的模板信息日志显示删掉
无JIRA任务 解决代码冲突
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
调整布局
还原代码,修改客户bug
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
更改为aspectJ构建
还原修改
使用aspectJ构建
...
|
8 years ago |
neil
|
b828924647
|
ct
|
8 years ago |
neil
|
89240801d5
|
ct
|
8 years ago |
neil
|
22aa93fff2
|
1
|
8 years ago |
neil
|
a4788f9f94
|
ct
|
8 years ago |
mengao
|
e1ecd551b5
|
继承接口。
|
8 years ago |
superman
|
acc9e2f3e9
|
Merge pull request #840 in BA/design from ~ZHOUPING/design:release to release
* commit '589725a8dd2b624c33cd78fa0fe93c65aab3ede5':
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
|
8 years ago |
zhouping
|
589725a8dd
|
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
|
8 years ago |
plough
|
a574cb0b6d
|
REPORT-2343 [代码质量]=>去掉多余代码
|
8 years ago |
plough
|
ef7543f1f8
|
REPORT-2343 [代码质量]=>多次出现的字符串改为常量;统一命名
|
8 years ago |
superman
|
b92e73fab5
|
Merge pull request #839 in BA/design from ~XIAOXIA/design:release to release
* commit 'ba60f5ad9a0efa80d8e2d5201ddedd8f634620fd':
框选改错啦。
|
8 years ago |
XiaXiang
|
ba60f5ad9a
|
框选改错啦。
|
8 years ago |
superman
|
164ab84a63
|
Merge pull request #838 in BA/design from ~ZACK/design:release to release
* commit 'f7b05c896eaae670a010e1a471b755d25ad4ef66':
无JIRA任务 master的boundsWidget到release
|
8 years ago |
plough
|
aa379c8994
|
REPORT-2343 [代码质量]=>去掉无用代码
|
8 years ago |
plough
|
4700b3dc89
|
REPORT-2343 [代码质量]=>兼容之前的对象流读写
|
8 years ago |
zack
|
f7b05c896e
|
无JIRA任务 master的boundsWidget到release
|
8 years ago |
plough
|
8cafb6397b
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取
|
8 years ago |
mengao
|
065f3d54ed
|
第三方图表,接口添加。
|
8 years ago |
superman
|
68e161a02d
|
Merge pull request #836 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit 'cf4578290587ce36978d813593879f1ba1f4eb7c':
pmd
启动时会将初始化的颜色添加到历史颜色中,不需要这样做
|
8 years ago |
yaoh.wu
|
cf45782905
|
pmd
|
8 years ago |
yaoh.wu
|
37b19cce1d
|
启动时会将初始化的颜色添加到历史颜色中,不需要这样做
|
8 years ago |
superman
|
b4ee0ddb04
|
Merge pull request #835 in BA/design from ~XIAOXIA/design:release to release
* commit 'c96943543ece4080e6294d7847a7c5e325075a2e':
控件的框选问题
|
8 years ago |
XiaXiang
|
c96943543e
|
控件的框选问题
|
8 years ago |
superman
|
248ce0345a
|
Merge pull request #834 in BA/design from ~YAOH.WU/design_0407:release to release
* commit 'c0c2ed2f6033a68d233b0cf4c538a9536396ba17':
REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
|
8 years ago |
yaoh.wu
|
c0c2ed2f60
|
REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
|
8 years ago |
plough
|
5a05c497c7
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取, 直接readObject不太好.
|
8 years ago |
superman
|
a67717a1ae
|
Merge pull request #832 in BA/design from ~SYOKI/design:release to release
* commit '9a6bc3f93dd325e7c3c46581983f742f26aef02a':
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
|
8 years ago |
mengao
|
3d78a5a8aa
|
继承接口。
|
8 years ago |
syoki
|
9a6bc3f93d
|
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
|
8 years ago |
mengao
|
62d3287e90
|
继承接口。
|
8 years ago |
superman
|
a41dcf7bee
|
Merge pull request #831 in BA/design from ~YAOH.WU/design_0407:release to release
* commit 'c72bb1de5577f4dc1ba591fed5238d69778e76b6':
组件复用边界粘贴,之前考虑的片面了,修改下
|
8 years ago |
yaoh.wu
|
c72bb1de55
|
组件复用边界粘贴,之前考虑的片面了,修改下
|
8 years ago |
superman
|
ce255bccc8
|
Merge pull request #830 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit 'a5769fe4679a35212ac3235fa8f823bac87a753a':
REPORT-934颜色记住正确但是显示错误修复和部分代码调整
|
8 years ago |
yaoh.wu
|
a5769fe467
|
REPORT-934颜色记住正确但是显示错误修复和部分代码调整
|
8 years ago |
superman
|
2babd72f99
|
Merge pull request #829 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '049e74143bdceb0424daacca62891c528922d085':
组件复用边界复制
REPORT-2273 远程设计数据库连接成功,预览报错,datasourcexml保存失败问题修复
|
8 years ago |
yaoh.wu
|
049e74143b
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release
|
8 years ago |
yaoh.wu
|
c86cfd1c1b
|
组件复用边界复制
|
8 years ago |
yaoh.wu
|
c93986c397
|
REPORT-2273 远程设计数据库连接成功,预览报错,datasourcexml保存失败问题修复
|
8 years ago |
superman
|
d82a174a82
|
Merge pull request #824 in BA/design from ~ZACK/design:release to release
* commit '46b6f5c880e62de970c46ba14de3b0a90b7f098f':
REPORT-1344 命名规范
REPORT-1344 表单翻页改良重新提交release
|
8 years ago |
superman
|
9b99863008
|
Merge pull request #828 in BA/design from ~PLOUGH/design:release to release
* commit 'b5024a0547fc23b908a7a645a6eee15cd4bb6f28':
REPORT-2368 修改控件设置界面对“基本属性”面板的初始化
REPORT-2368 预定义控件设置了不可见,在参数面板上还是可见的
|
8 years ago |
plough
|
b5024a0547
|
REPORT-2368 修改控件设置界面对“基本属性”面板的初始化
|
8 years ago |
plough
|
92d1f8209c
|
REPORT-2368 预定义控件设置了不可见,在参数面板上还是可见的
|
8 years ago |
superman
|
a28420f6a5
|
Merge pull request #827 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '5f9cf7bb3f52d5c077f8ed48f006a12103e7346e':
无JIRA任务 组件复用之前master合到dev时丢失的代码以及组件复用近期bug修复
无任务 代码调整
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
|
8 years ago |
yaoh.wu
|
5f9cf7bb3f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev
|
8 years ago |
yaoh.wu
|
6e352e28f6
|
无JIRA任务 组件复用之前master合到dev时丢失的代码以及组件复用近期bug修复
|
8 years ago |
zack
|
46b6f5c880
|
REPORT-1344 命名规范
|
8 years ago |
superman
|
1970af755f
|
Merge pull request #826 in BA/design from ~KERRY/design:master to master
* commit 'e0ef93351d77af6a18ec1e05655c9cb56e074cfe':
无jira任务,代码被误杀了
|
8 years ago |
kerry
|
e0ef93351d
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~kerry/design
|
8 years ago |
kerry
|
ffab31c3d9
|
无jira任务,代码被误杀了
|
8 years ago |
superman
|
4352649f10
|
Merge pull request #825 in BA/design from ~YAOH.WU/design_0407:master to master
* commit 'e35d5ee8f7a04fd4a449af136bcbeaca286a2aac':
report-1945 frm本地组件复用
|
8 years ago |