plough
|
b5024a0547
|
REPORT-2368 修改控件设置界面对“基本属性”面板的初始化
|
7 years ago |
plough
|
92d1f8209c
|
REPORT-2368 预定义控件设置了不可见,在参数面板上还是可见的
|
7 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布局(有无参数面板)粘贴位置问题
|
7 years ago |
yaoh.wu
|
5f9cf7bb3f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev
|
7 years ago |
yaoh.wu
|
6e352e28f6
|
无JIRA任务 组件复用之前master合到dev时丢失的代码以及组件复用近期bug修复
|
7 years ago |
zack
|
46b6f5c880
|
REPORT-1344 命名规范
|
7 years ago |
superman
|
1970af755f
|
Merge pull request #826 in BA/design from ~KERRY/design:master to master
* commit 'e0ef93351d77af6a18ec1e05655c9cb56e074cfe':
无jira任务,代码被误杀了
|
7 years ago |
kerry
|
e0ef93351d
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~kerry/design
|
7 years ago |
kerry
|
ffab31c3d9
|
无jira任务,代码被误杀了
|
7 years ago |
superman
|
4352649f10
|
Merge pull request #825 in BA/design from ~YAOH.WU/design_0407:master to master
* commit 'e35d5ee8f7a04fd4a449af136bcbeaca286a2aac':
report-1945 frm本地组件复用
|
7 years ago |
yaoh.wu
|
e35d5ee8f7
|
report-1945 frm本地组件复用
|
7 years ago |
zack
|
ffc2a088ef
|
REPORT-1344 表单翻页改良重新提交release
|
7 years ago |
superman
|
dbd4173dca
|
Merge pull request #823 in BA/design from ~PLOUGH/design:release to release
* commit '23566ed6ba492fa846b83bd88241474317186e6c':
无JIRA任务,截获模板信息收集初始化时,可能导致模板打不开的异常
|
7 years ago |
plough
|
23566ed6ba
|
无JIRA任务,截获模板信息收集初始化时,可能导致模板打不开的异常
|
7 years ago |
superman
|
25c4fa32ff
|
Merge pull request #822 in BA/design from ~MANGO/design:master to master
* commit 'fed1ceaeea3185789c5a78b17671d7f29afe7850':
面板中增加一些接口方法(Vancharts新插件发布需要,eason与FR商讨确认,可以直接修改master)
调整布局
还原代码,修改客户bug
|
7 years ago |
mengao
|
fed1ceaeea
|
面板中增加一些接口方法(Vancharts新插件发布需要,eason与FR商讨确认,可以直接修改master)
|
7 years ago |
superman
|
59c046f5be
|
Merge pull request #821 in BA/design from ~PLOUGH/design:master to master
* commit '0593924ef3d8c3289bee1b779997312a9908c387':
REPORT-2430 master收集的模板信息日志显示删掉
|
7 years ago |
plough
|
0593924ef3
|
REPORT-2430 master收集的模板信息日志显示删掉
|
7 years ago |
superman
|
29e3a29168
|
Merge pull request #819 in BA/design from ~PLOUGH/design:release to release
* commit '935b4fcca69eb3f0e5d792fccc596e45b1f23f03':
无JIRA任务;去掉调试信息
|
7 years ago |
plough
|
935b4fcca6
|
无JIRA任务;去掉调试信息
|
7 years ago |
superman
|
8c5e96aaa3
|
Merge pull request #818 in BA/design from ~ZACK/design:master to master
* commit '08069fbfe0b9d75a73bc51eb4557246368826851':
无JIRA任务 解决代码冲突
|
7 years ago |
zack
|
08069fbfe0
|
无JIRA任务 解决代码冲突
|
7 years ago |
superman
|
f981f8f59a
|
Merge pull request #817 in BA/design from ~PAUL/design:master to master
* commit '81e1e4ea8fb8f0444c69e188c17e906406e97572': (80 commits)
无JIRA任务 屏蔽新翻页
REPORT-2220 数据连接用户名和密码可以传参
修改
修改代码
修改最大最小值值定义,兼容vancharts插件
国际化修改 部分未翻译字段翻译 庄奇 201704130221
REPORT-2344 国际化——繁体设计器少了key
report-1945,tab|自适应,无组件时粘贴问题
report-1945 自适应无组件是粘贴失败修复
组件复用层叠顺序新添加的组件在上方
无任务代码调整
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
国际化修改 design部分 庄奇 201704110018
REPORT-2334 表单tab布局中图表放大缩小会明显
REPORT-1916 模板耗时=》修复初次保存模板时,没有保存ID的bug
report-1945组件复用bug
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
修改国际化
调整代码
REPORT-1916 模板耗时=》调整代码;发送数据失败时,输出日志
...
|
7 years ago |
paul
|
81e1e4ea8f
|
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_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java
# designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
# designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java
# designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java
# designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java
# designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java
|
7 years ago |
superman
|
789f00bbb6
|
Merge pull request #816 in BA/design from ~ZACK/design:release to release
* commit 'c247eeac6a60cd0468fb78e451fe307a2feaef50':
无JIRA任务 屏蔽新翻页
|
7 years ago |
zack
|
c247eeac6a
|
无JIRA任务 屏蔽新翻页
|
7 years ago |
superman
|
5bf72652e4
|
Merge pull request #815 in BA/design from ~ZHENG/design:dev to dev
* commit '711ccb4b7fe483b95424fcee58b5712103094255':
一个小警告
|
7 years ago |
fr_shine
|
711ccb4b7f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
7 years ago |
fr_shine
|
3471515bdd
|
一个小警告
|
7 years ago |
superman
|
6a81ab2bfe
|
Merge pull request #814 in BA/design from ~KERRY/design:release to release
* commit 'eb1e45d12a80607f26384b9c11f89e6ec245b461':
REPORT-2220 数据连接用户名和密码可以传参
|
7 years ago |
kerry
|
eb1e45d12a
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release
|
7 years ago |
kerry
|
be48bf4b29
|
REPORT-2220
数据连接用户名和密码可以传参
|
7 years ago |
superman
|
da72d3d213
|
Merge pull request #813 in BA/design from ~MANGO/design:dev to dev
* commit '5f68195875d229f011c065c416d618243e60ea41':
加上之前合并冲突被删掉的国际化
修改设计器最大最小值,与releas分支同步
|
7 years ago |
superman
|
264f742f47
|
Merge pull request #811 in BA/design from ~SYOKI/design:release to release
* commit '55ddfd87dcf16703d8326d4ade2a15509f075889':
国际化修改 部分未翻译字段翻译 庄奇 201704130221
|
7 years ago |
mengao
|
5f68195875
|
加上之前合并冲突被删掉的国际化
|
7 years ago |
mengao
|
333fd83577
|
修改设计器最大最小值,与releas分支同步
|
7 years ago |
superman
|
631c3c8e81
|
Merge pull request #812 in BA/design from ~MANGO/design:release to release
* commit '814bea2e11f20cb32f895aa3d9792684fcaf8045':
修改
修改代码
修改最大最小值值定义,兼容vancharts插件
|
7 years ago |
mengao
|
814bea2e11
|
修改
|
7 years ago |
mengao
|
469bcc513d
|
修改代码
|
7 years ago |
mengao
|
3a0894ea9e
|
Merge remote-tracking branch 'origin/release' into release
|
7 years ago |
mengao
|
cc43c53143
|
修改最大最小值值定义,兼容vancharts插件
|
7 years ago |
syoki
|
55ddfd87dc
|
国际化修改 部分未翻译字段翻译 庄奇 201704130221
|
7 years ago |
superman
|
04f0fb00f2
|
Merge pull request #810 in BA/design from ~PLOUGH/design:release to release
* commit '50dd30c362cd0804b5af586cd8e0362e50980c3a':
REPORT-2344 国际化——繁体设计器少了key
|
7 years ago |
plough
|
50dd30c362
|
REPORT-2344 国际化——繁体设计器少了key
|
7 years ago |
superman
|
88bd7eeae5
|
Merge pull request #809 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '76d1d2fc4a7cd5f92868dcd1bbb301aafb30bf6e':
report-1945,tab|自适应,无组件时粘贴问题
|
7 years ago |
yaoh.wu
|
76d1d2fc4a
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release
|
7 years ago |
yaoh.wu
|
25116d6466
|
report-1945,tab|自适应,无组件时粘贴问题
|
7 years ago |
superman
|
ff07cc70aa
|
Merge pull request #808 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '03ae87935a5ce59af7fc70aee38b21d88821ed91':
report-1945 自适应无组件是粘贴失败修复
|
7 years ago |
yaoh.wu
|
03ae87935a
|
report-1945 自适应无组件是粘贴失败修复
|
7 years ago |
superman
|
cccc769692
|
Merge pull request #807 in BA/design from ~ZHENG/design:dev to dev
* commit '48723cc22006085f1b100318eeebb1e91f1fd4a4':
合并代码或者修改冲突时 merge错误 改回正确的
|
7 years ago |