mengao
|
fed1ceaeea
|
面板中增加一些接口方法(Vancharts新插件发布需要,eason与FR商讨确认,可以直接修改master)
|
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
|
3082e43d1d
|
Merge pull request #782 in BA/design from ~PAUL/design:master to master
* commit 'e9bace2d13081c63930369c00b240843a3e51fac':
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
还原修改
使用aspectJ构建
REPORT-1858 frm组件隐藏
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
|
8 years ago |
paul
|
e9bace2d13
|
Merge branch 'release'
# Conflicts:
# designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
|
8 years ago |
superman
|
2445d2dfcc
|
Merge pull request #781 in BA/design from ~FANGLEI/design:release to release
* commit '0d69862fabc66b19f8792decfd384b74a711fcf1':
修复不能自定义参数面板控件标签的bug
|
8 years ago |
fanglei
|
0d69862fab
|
修复不能自定义参数面板控件标签的bug
|
8 years ago |
superman
|
e14b66efaf
|
Merge pull request #776 in BA/design from ~MANGO/design:release to release
* commit 'e53ae9b10785e226cca6c59b59df01f9cded3b22':
调整布局
还原代码
调整布局
还原代码
|
8 years ago |
mengao
|
e53ae9b107
|
调整布局
|
8 years ago |
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 |
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 |
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
|
a9f5cfab07
|
使用aspectJ构建
|
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 |
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 |
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 |
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 |
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 |
superman
|
18c485d193
|
Merge pull request #760 in BA/design from ~KERRY/design:release to release
* commit '708cd6e9c541a102cf5ec37a2de7b7c0bccdc344':
无jira任务,屏蔽组件隐藏新功能
|
8 years ago |
superman
|
e1d830b773
|
Merge pull request #759 in BA/design from ~NEIL/design:release to release
* commit 'e422507fa15afb161e2d343ce0c655ae8f889b42':
无JIRA任务, release设计器支持1.7jdk
|
8 years ago |
kerry
|
708cd6e9c5
|
无jira任务,屏蔽组件隐藏新功能
|
8 years ago |
neil
|
e422507fa1
|
无JIRA任务, release设计器支持1.7jdk
|
8 years ago |
superman
|
e16cf25b7a
|
Merge pull request #758 in BA/design from ~ZACK/design:release to release
* commit '688237c397bcb1530097b1786fbd7ae128af2c67':
REPORT-2052 漏传
|
8 years ago |
zack
|
688237c397
|
REPORT-2052 漏传
|
8 years ago |
superman
|
68995ed003
|
Merge pull request #757 in BA/design from ~MANGO/design:release to release
* commit '1717e7ef30fd33808c6d585a39b7f5e69ca795f5':
超级链接中,图表链接正常显示。
|
8 years ago |
mengao
|
1717e7ef30
|
超级链接中,图表链接正常显示。
|
8 years ago |
superman
|
2a8f3192d2
|
Merge pull request #755 in BA/design from ~ZHOUPING/design:release to release
* commit 'a5c34f032c77e0f128fdc53a6c42e09f05a94cd0':
无JIRA任务 国际化
|
8 years ago |
zhouping
|
a5c34f032c
|
无JIRA任务 国际化
|
8 years ago |
superman
|
d429c76ce9
|
Merge pull request #749 in BA/design from ~KERRY/design:release to release
* commit 'd7dfacd2f630cf4cd927b21ce97ae06b4a577ec2':
无jira任务,提交国际化
|
8 years ago |
kerry
|
d7dfacd2f6
|
无jira任务,提交国际化
|
8 years ago |
superman
|
b869f46a6e
|
Merge pull request #748 in BA/design from ~PAUL/design:master to master
* commit '65c89cccdd239e4713ecb52bf2038c43417c6a0d':
REPORT-1835 sap插件导致管理系统下的定时调度没了
增加一个句号
REPORT-2021 tab布局字体、字号无法修改
同步国际化
同步在release中的国际化修改
无JIRA任务,国际化
无JIRA任务 locale同步到release
REPORT-1967 国际化
REPORT-1898 设计器单元格属性表-其他属性 设置显示内容为下载链接显示二进制的时候,下面的文件名输入框输入一个字符就失焦
pmd
单元格数据系列值配置
|
8 years ago |
superman
|
06a14a9863
|
Merge pull request #746 in BA/design from ~MANGO/design:dev to dev
* commit '9536b70257d75451f5b0d031b47c87d8636c5044':
分两行显示checkbox和输入框,适应国际化情况。
分两行显示checkbox和输入框,适应国际化情况。
分两行显示checkbox和输入框,适应国际化情况。
|
8 years ago |
paul
|
65c89cccdd
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
|
8 years ago |
superman
|
a459246578
|
Merge pull request #747 in BA/design from ~JU/1-ba-design:release to release
* commit '1a7eebe0867cae4494096e810b49a20805bca163':
REPORT-1835 sap插件导致管理系统下的定时调度没了
|
8 years ago |