2472 Commits (a28420f6a5b85b4af00643748d57f33473036666)
 

Author SHA1 Message Date
superman a28420f6a5 Merge pull request #827 in BA/design from ~YAOH.WU/design_0407:dev to dev 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
superman 5bf72652e4 Merge pull request #815 in BA/design from ~ZHENG/design:dev to dev 8 years ago
fr_shine 711ccb4b7f Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev 8 years ago
fr_shine 3471515bdd 一个小警告 8 years ago
superman da72d3d213 Merge pull request #813 in BA/design from ~MANGO/design:dev to dev 8 years ago
mengao 5f68195875 加上之前合并冲突被删掉的国际化 8 years ago
mengao 333fd83577 修改设计器最大最小值,与releas分支同步 8 years ago
superman cccc769692 Merge pull request #807 in BA/design from ~ZHENG/design:dev to dev 8 years ago
fr_shine 48723cc220 合并代码或者修改冲突时 merge错误 改回正确的 8 years ago
yaoh.wu b67778a4de 无任务 代码调整 8 years ago
superman e0849e8a22 Merge pull request #804 in BA/design from ~ZHENG/design:dev to dev 8 years ago
fr_shine 8500d81bb5 Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev 8 years ago
yaoh.wu c0b8ac950d Merging in latest from upstream (BA/design:refs/heads/dev) 8 years ago
superman 79ade6642c Merge pull request #803 in BA/design from ~NEIL/design:dev to dev 8 years ago
neil 9dd806a40f 无JIRA任务, 冲突修正 8 years ago
yaoh.wu 380465ed6c Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev 8 years ago
yaoh.wu 40dbc0272f report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题 8 years ago
superman 75a3186262 Merge pull request #802 in BA/design from ~NEIL/design:master to dev 8 years ago
neil d8daeae404 ct 8 years ago
neil df4d2f6786 ct 8 years ago
fr_shine d9379875b3 font==null 也要注册监听器 8 years ago
superman 968caed926 Merge pull request #795 in BA/design from ~PLOUGH/design:dev to dev 8 years ago
superman c63c8d0f91 Merge pull request #786 in BA/design from ~MANGO/design:dev to dev 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
superman 8b580ae450 Merge pull request #794 in BA/design from ~YAOH.WU/design:dev to dev 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 8 years ago
mengao c3e8ef59f8 解决冲突代码 8 years ago
superman 984d1f62b5 Merge pull request #792 in BA/design from ~YAOH.WU/design:dev to dev 8 years ago
mengao d87f31dc18 优化代码 8 years ago
plough c19c243a73 REPORT-1916 模板耗时=》调整代码 8 years ago
mengao fd561ac02b 修改国际化文件 8 years ago
mengao 8d16643d87 修改国际化 8 years ago
mengao ae6c1291eb 修改国际化 8 years ago
mengao 7660db78bb 修改国际化 8 years ago
mengao c425cf94e5 增加国际化 8 years ago
yaoh.wu ae78f289b6 FRM组件复用自适应布局bug修复,不能粘贴时弹窗提示 8 years ago
mengao db32155dad 修改国际化 8 years ago
mengao fcf2f0884e 地图添加缩放手势 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 a4504225a9 Merge pull request #784 in BA/design from ~PLOUGH/design:dev to dev 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