kerry
|
1ab7b82317
|
Merging in latest from upstream (BA/design:refs/heads/release/9.0)
* commit '65f3870e85aee0ba92b35688eea5bf0235b13e5b':
按照最新设计,处理连续弹窗问题
修改老图表部分面板问题 按照最新设计,处理连续弹窗问题 修改9.0新图表bug
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承 PMD
REPORT-4361 单元格元素 数据列 数据设置 分组 高级 自定义按钮问题
REPORT-4308 单元格属性-样式,修改文本自定义样式无法实时生效
REPORT-4363 表单工具栏图表和控件的扩展按钮,点击后,扩展的部分位置错乱
代码质量
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承
rollback UIToggleButton
rollback UIToggleButton
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承 去掉表单缩放条
rollback
提交
|
7 years ago |
superman
|
65f3870e85
|
Merge pull request #1180 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0
* commit 'b68082f4e4731a7661f497f307abe6146b3817cf':
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承 PMD
REPORT-4308 单元格属性-样式,修改文本自定义样式无法实时生效
代码质量
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承
rollback UIToggleButton
rollback UIToggleButton
REPORT-2897 9.0设计器修改 缩放条在不同的sheet切换不应该继承 去掉表单缩放条
rollback
提交
|
7 years ago |
superman
|
3468aad072
|
Merge pull request #1185 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0
* commit 'c6423031e6ae3aaf48faf3c40a35c46f84c87b78':
按照最新设计,处理连续弹窗问题
修改老图表部分面板问题 按照最新设计,处理连续弹窗问题 修改9.0新图表bug
|
7 years ago |
mengao
|
c6423031e6
|
按照最新设计,处理连续弹窗问题
|
7 years ago |
superman
|
d681ee5aa9
|
Merge pull request #1183 in BA/design from ~YAOH.WU/a_design_0811:release/9.0 to release/9.0
* commit '88b8591d034f3f4191a56c44b058be2f4b079e12':
REPORT-4361 单元格元素 数据列 数据设置 分组 高级 自定义按钮问题
|
7 years ago |
superman
|
f19cb443f4
|
Merge pull request #1181 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0
* commit '7dd22e518476b9816ae9b08c5eb22f12d9389b3e':
REPORT-4363 表单工具栏图表和控件的扩展按钮,点击后,扩展的部分位置错乱
|
7 years ago |
mengao
|
d9b2f1de7c
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
7 years ago |
mengao
|
59bd1b50ab
|
修改老图表部分面板问题
按照最新设计,处理连续弹窗问题
修改9.0新图表bug
|
7 years ago |
MoMeak
|
b68082f4e4
|
REPORT-2897 9.0设计器修改
缩放条在不同的sheet切换不应该继承
PMD
|
7 years ago |
yaoh.wu
|
88b8591d03
|
REPORT-4361 单元格元素 数据列 数据设置 分组 高级 自定义按钮问题
|
7 years ago |
MoMeak
|
5abfa98b1a
|
REPORT-4308 单元格属性-样式,修改文本自定义样式无法实时生效
|
7 years ago |
kerry
|
a995078bab
|
Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0
|
7 years ago |
kerry
|
2b1d0bb9f6
|
REPORT-3958 && REPORT-4374 [9.0一轮回归]按钮控件按钮类型设置无效 控件设置的标签名称,有的控件能保存有的不能
|
7 years ago |
plough
|
7dd22e5184
|
Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0
|
7 years ago |
plough
|
865d0adadc
|
REPORT-4363 表单工具栏图表和控件的扩展按钮,点击后,扩展的部分位置错乱
|
7 years ago |
MoMeak
|
e567760a28
|
代码质量
|
7 years ago |
MoMeak
|
b270670f27
|
REPORT-2897 9.0设计器修改
缩放条在不同的sheet切换不应该继承
|
7 years ago |
MoMeak
|
dcceb5a4e1
|
rollback UIToggleButton
|
7 years ago |
MoMeak
|
cf81ce1695
|
rollback UIToggleButton
|
7 years ago |
MoMeak
|
e0b77c0475
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
7 years ago |
MoMeak
|
97e07f2cd2
|
Merge branch 'newtemp' into release/9.0
# Conflicts:
# designer/src/com/fr/design/mainframe/ElementCasePane.java
# designer_form/src/com/fr/design/mainframe/FormArea.java
|
7 years ago |
MoMeak
|
d6e3c6045c
|
REPORT-2897 9.0设计器修改
缩放条在不同的sheet切换不应该继承
去掉表单缩放条
|
7 years ago |
superman
|
3124543e88
|
Merge pull request #1179 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0
* commit '83f12a44b27dd66cc8409574dbd745f40c92bc46':
REPORT-4364 条件属性>控件弹窗
REPORT-4364 条件属性>控件、超级链接弹窗=>界面调整,优化代码
REPORT-4364 条件属性>超级链接弹窗
|
7 years ago |
plough
|
83f12a44b2
|
REPORT-4364 条件属性>控件弹窗
|
7 years ago |
plough
|
afc0b3e421
|
Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0
|
7 years ago |
plough
|
44a4f91bb4
|
REPORT-4364 条件属性>控件、超级链接弹窗=>界面调整,优化代码
|
7 years ago |
plough
|
4afcb2bd89
|
REPORT-4364 条件属性>超级链接弹窗
|
7 years ago |
superman
|
8f4bdda3bc
|
Merge pull request #1178 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0
* commit '13f59af6f5f3396b463e9661764e6440f529a376':
REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态
|
7 years ago |
plough
|
13f59af6f5
|
Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~plough/design into release/9.0
|
7 years ago |
plough
|
baa1255697
|
REPORT-3837 [9.0一轮回归]新建单元格条件属性自动显示之前公式状态
|
7 years ago |
superman
|
b28b7510cf
|
Merge pull request #1176 in BA/design from ~KERRY/design:release/9.0 to release/9.0
* commit 'cf232827fbbe306d0e1e3aef66bf152c2611b005':
代码修改
代码修改
REPORT-4220 [9.0一轮回归]视图树、下拉树控件构建树确定按钮不可用
|
7 years ago |
kerry
|
cf232827fb
|
代码修改
|
7 years ago |
kerry
|
ec4f9fdbb1
|
代码修改
|
7 years ago |
superman
|
5e7db0b901
|
Merge pull request #1171 in BA/design from ~MANGO/m_design:release/9.0 to release/9.0
* commit '15128aa8fd73918cb889a85bbef1701fc502f956':
雷达图 轴线样式
修改范围图例显示不全
处理地图类型选择面板中,中心点设置bug
|
7 years ago |
superman
|
d4f63c780b
|
Merge pull request #1174 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0
* commit 'b27b8bd98d53aa218896be73d1c2a3b0e5f1abc9':
REPORT-3959 [9.0一轮回归]行(列)隐藏时行(列)号依然显示
|
7 years ago |
MoMeak
|
05d6daf799
|
rollback
|
7 years ago |
MoMeak
|
c5c982f7a5
|
提交
|
7 years ago |
kerry
|
7da6b06eac
|
Merge branch 'release/9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into release/9.0
|
7 years ago |
kerry
|
59cb498c5b
|
REPORT-4220 [9.0一轮回归]视图树、下拉树控件构建树确定按钮不可用
|
7 years ago |
MoMeak
|
b27b8bd98d
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
7 years ago |
MoMeak
|
3ea73837dc
|
REPORT-3959 [9.0一轮回归]行(列)隐藏时行(列)号依然显示
|
7 years ago |
mengao
|
15128aa8fd
|
雷达图 轴线样式
|
7 years ago |
mengao
|
f789fc0a8f
|
修改范围图例显示不全
|
7 years ago |
superman
|
c5d90ad7cf
|
Merge pull request #1170 in BA/design from ~MOMEAK/design9.0:release/9.0 to release/9.0
* commit '095722e69549d6e424263bd37871bf4acd46473d':
REPORT-3933 [9.0一轮回归]显示条形码的文本勾选异常
|
7 years ago |
mengao
|
17d7001247
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
7 years ago |
mengao
|
670e8f66ab
|
处理地图类型选择面板中,中心点设置bug
|
7 years ago |
superman
|
8488adcc43
|
Merge pull request #1169 in BA/design from ~KERRY/design:release/9.0 to release/9.0
* commit 'd0c317b32aac38f9d9392e5eeb5225adbe5af64d':
代码修改
REPORT-3735 [9.0一轮回归]文本控件中错误提示自动变为正则表达式内容
|
7 years ago |
kerry
|
d0c317b32a
|
代码修改
|
7 years ago |
MoMeak
|
095722e695
|
Merge remote-tracking branch 'origin/release/9.0' into release/9.0
|
7 years ago |
MoMeak
|
c5ecd86956
|
REPORT-3933 [9.0一轮回归]显示条形码的文本勾选异常
|
7 years ago |