mengao
|
74c386e934
|
还原代码
|
8 years ago |
mengao
|
18c5708343
|
调整布局
|
8 years ago |
mengao
|
8a3e42ce1f
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
mengao
|
58152e2775
|
还原代码
|
8 years ago |
mengao
|
b7fea495cf
|
调整布局
|
8 years ago |
mengao
|
e60e6e46b3
|
还原代码,修改客户bug
|
8 years ago |
superman
|
664124fdb7
|
Merge pull request #774 in BA/design from ~ZHOUPING/design:release to release
* commit 'fc9adf928ebdd7a615cf21c29fca4c5545809646':
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
|
8 years ago |
zhouping
|
fc9adf928e
|
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
|
8 years ago |
superman
|
56d89bac74
|
Merge pull request #773 in BA/design from ~ZACK/design:release to release
* commit '7e0fae20f770d46f8f4d1dcd7f09f6c365a85bc7':
REPORT-2242 填报提交设置的若干问题修改
|
8 years ago |
zack
|
7e0fae20f7
|
REPORT-2242 填报提交设置的若干问题修改
|
8 years ago |
yaoh.wu
|
6bad68469e
|
FRM组件复用,文件间相互复制,遗留:自适应to绝对会因大小超出而不能复制
|
8 years ago |
yaoh.wu
|
d5bfb700b7
|
代码调整
|
8 years ago |
superman
|
513482fa04
|
Merge pull request #768 in BA/design from ~PLOUGH/design:dev to dev
* commit '47fe2434180fab8f939e05a140640bd21d2da0f1':
调整代码
调整代码
REPORT-1916 做模板的过程和耗时收集=》把统计格子数量的功能分离为单独的类;调整代码
REPORT-1916 做模板的过程和耗时收集=》若未加入产品改良计划,则不收集本地数据
REPORT-1916 做模板的过程和耗时收集=》把 reportletsid 改成 templateID
REPORT-1916 做模板的过程和耗时收集=》上传数据前,判断是否为测试模板
REPORT-1916 做模板的过程和耗时收集=》调整代码
REPORT-1916 做模板的过程和耗时收集=》上传模板数据前,判断模板是否完成
REPORT-1916 做模板的过程和耗时收集=》重构代码,将process和consuming分离,暂时不记录模板过程
REPORT-1916 做模板的过程和耗时收集=》修改获取单元格编辑信息的方式
REPORT-1916 做模板的过程和耗时收集=》完成所有信息的本地存取
REPORT-1916 做模板的过程和耗时收集=》完成基本信息的本地存取
|
8 years ago |
plough
|
47fe243418
|
调整代码
|
8 years ago |
yaoh.wu
|
0a76edfca6
|
rename
|
8 years ago |
yaoh.wu
|
583df09dee
|
mgerge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
合并
|
8 years ago |
yaoh.wu
|
5a9c222dc2
|
frm本地组件复用 绝对布局,遗留:重命名问题
|
8 years ago |
superman
|
24c383c92c
|
Merge pull request #771 in BA/design from ~MANGO/design:release to release
* commit '3517d4546fd28f761d2f06cd9b8b7ca733509f3f':
调整布局
调整布局
还原修改
|
8 years ago |
mengao
|
3517d4546f
|
调整布局
|
8 years ago |
mengao
|
74ba5ca9ab
|
调整布局
|
8 years ago |
superman
|
c7cea3fd82
|
Merge pull request #772 in BA/design from ~ZHENG/design:dev to dev
* commit '2afb21241badfe2295285ab7c59dd2a7147d8bb4':
大数据之前把apilevel等级提高了,产品不同意,先改回来,兼容问题再看看怎么处理
|
8 years ago |
fr_shine
|
2afb21241b
|
大数据之前把apilevel等级提高了,产品不同意,先改回来,兼容问题再看看怎么处理
|
8 years ago |
sunmondong
|
70c1e75644
|
更改为aspectJ构建
|
8 years ago |
superman
|
d0c5fc08d3
|
Merge pull request #764 in BA/design from ~KERRY/design:release to release
* commit 'bcc131ea7b46497194b5b97c130d258b62466f15':
REPORT-1858 frm组件隐藏
|
8 years ago |
mengao
|
080a72d1b3
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
mengao
|
ae1cdd7d65
|
还原修改
|
8 years ago |
sunmondong
|
04e2efaf47
|
构建使用AspectJ
|
8 years ago |
sunmondong
|
a9f5cfab07
|
使用aspectJ构建
|
8 years ago |
plough
|
587f6cf099
|
调整代码
|
8 years ago |
plough
|
7049c30a4e
|
REPORT-1916 做模板的过程和耗时收集=》把统计格子数量的功能分离为单独的类;调整代码
|
8 years ago |
superman
|
75697db914
|
Merge pull request #770 in BA/design from ~FANGLEI/design:master to master
* commit '65c3c951bc9c356a383400c9757db910e8d52054':
对import BoundsWidget进行修改以兼容老版本自适应插件和表单导出
|
8 years ago |
fanglei
|
65c3c951bc
|
对import BoundsWidget进行修改以兼容老版本自适应插件和表单导出
|
8 years ago |
plough
|
8943228883
|
REPORT-1916 做模板的过程和耗时收集=》若未加入产品改良计划,则不收集本地数据
|
8 years ago |
plough
|
ef7f1ea010
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
plough
|
b2f7c448f9
|
REPORT-1916 做模板的过程和耗时收集=》把 reportletsid 改成 templateID
|
8 years ago |
superman
|
0c65caf9df
|
Merge pull request #767 in BA/design from ~JU/ba-dev-design:dev to dev
* commit '2d53d781b620a0e0aaf867012adb1da7da621e14':
无JIRA任务 添加插件卸载前监听,性能插件以此进行额外的卸载任务
|
8 years ago |
juhaoyu
|
2d53d781b6
|
无JIRA任务 添加插件卸载前监听,性能插件以此进行额外的卸载任务
|
8 years ago |
kerry
|
bcc131ea7b
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release
|
8 years ago |
kerry
|
4fefd27c15
|
REPORT-1858 frm组件隐藏
|
8 years ago |
plough
|
9a738346ed
|
REPORT-1916 做模板的过程和耗时收集=》上传数据前,判断是否为测试模板
|
8 years ago |
plough
|
77e8710f6c
|
REPORT-1916 做模板的过程和耗时收集=》调整代码
|
8 years ago |
superman
|
2de61b6b57
|
Merge pull request #763 in BA/design from ~ZHENG/design:dev to dev
* commit '6b6c4c43e026728eb3cffb7e36ed56475b110e2f':
控件名称更改
|
8 years ago |
superman
|
fc01334239
|
Merge pull request #762 in BA/design from ~ZACK/design:release to release
* commit '3b81c50ed16efe8ba83e343a5acbe19f37beb544':
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
|
8 years ago |
zack
|
3b81c50ed1
|
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
|
8 years ago |
fr_shine
|
6b6c4c43e0
|
控件名称更改
|
8 years ago |
richie
|
3ac56bdd2a
|
Merge pull request #761 in BA/design from ~PAUL/design:master to master
* commit '59a0387289e5d1aed7b4d9a951df7bf0c04f2cf1': (127 commits)
无jira任务,屏蔽组件隐藏新功能
无JIRA任务, release设计器支持1.7jdk
REPORT-2052 漏传
超级链接中,图表链接正常显示。
无JIRA任务 国际化
无jira任务,提交国际化
分两行显示checkbox和输入框,适应国际化情况。
分两行显示checkbox和输入框,适应国际化情况。
8.0插件启用禁用重启设计器confirm对话框保留,在9.0删除
REPORT-1957,并且修改参数说明资源文件的编码方式为utf-8,加载资源时使用utf-8编码
REPORT-1858 frm组件隐藏
分两行显示checkbox和输入框,适应国际化情况。
REPORT-1980 换成listmap维持原有顺序
“REPORT-2030删除designer对话框”
无任务 调整代码
editlabel not append origin label
补上句号
国际化少了句号
无JIRA任务 tab布局字体、字号无法修改,release同步到dev
修改国际化文件
...
|
8 years ago |
plough
|
66f7e6fbcb
|
REPORT-1916 做模板的过程和耗时收集=》上传模板数据前,判断模板是否完成
|
8 years ago |
paul
|
59a0387289
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
# designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
# designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
|
8 years ago |
plough
|
f3f8b4563b
|
REPORT-1916 做模板的过程和耗时收集=》重构代码,将process和consuming分离,暂时不记录模板过程
|
8 years ago |
superman
|
18c485d193
|
Merge pull request #760 in BA/design from ~KERRY/design:release to release
* commit '708cd6e9c541a102cf5ec37a2de7b7c0bccdc344':
无jira任务,屏蔽组件隐藏新功能
|
8 years ago |