jeo
|
e54eb9283a
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java
|
5 years ago |
zack
|
1bbdc336f8
|
Merge pull request #1330 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit '0ba1a4901ff1c03f5dee80a5a5a608e84876b625':
无JIRA任务 去掉冗余代码
|
5 years ago |
zheng
|
b8b23a0b87
|
Merge pull request #1338 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '676ce66802fa0da8c42e868f1812858755848d92':
国际化
tooltip
CHART-11779 远程设计 地图资源增加刷新按钮
|
5 years ago |
shine
|
676ce66802
|
国际化
|
5 years ago |
shine
|
c0f2fc6b88
|
tooltip
|
5 years ago |
shine
|
af082fd6d5
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
e69f6ecc6b
|
CHART-11779 远程设计 地图资源增加刷新按钮
|
5 years ago |
Joe.Jiang
|
3a8b21762d
|
REPORT-24478 预定义控件设置不可用不可见后预览无效
|
5 years ago |
白岳
|
35eadb071d
|
CHART-11446 没有选择值的时候,灰化汇总方式
|
5 years ago |
Bjorn
|
3ed2bff6d2
|
Merge pull request #1334 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'dae083df05923e34670ae74bdf4f0c92f560e9e4':
CHART-11265
CHART-11265
CHART-11265
CHART-11265 数据集配置多分类根据轴类型判断灰化 && CHART-11446 下拉框增加了默认无的选项,系列删除了对汇总方式和系列名使用的灰化
|
5 years ago |
pengda
|
602375cab4
|
Merge pull request #1335 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '28110a0d54c426b8f5a05833bbc5cbab7ade3f43':
REPORT-19946 linux设计器
|
5 years ago |
Joe.Jiang
|
78f3c06d3a
|
REPORT-24478 预定义控件设置不可用不可见后预览无效
|
5 years ago |
白岳
|
dae083df05
|
CHART-11265
|
5 years ago |
白岳
|
f1f33297f9
|
CHART-11265
|
5 years ago |
zheng
|
3e9116faeb
|
Merge pull request #1336 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '76b7e9882a208eb90bea9a43a93dbe347ad90ffa':
CHART-11852 CHART-11634改出来的问题,条件属性的标签没有parentPane
|
5 years ago |
shine
|
76b7e9882a
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
2059abaa7b
|
CHART-11852 CHART-11634改出来的问题,条件属性的标签没有parentPane
|
5 years ago |
pengda
|
28110a0d54
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
pengda
|
2d9bb546cc
|
REPORT-19946 linux设计器
|
5 years ago |
pengda
|
5001193af2
|
Merge pull request #1328 in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit 'ccd23246c6165def0a01cf15ea0a08b3e891a349':
sonar问题修复,无jira任务
|
5 years ago |
白岳
|
e57e783087
|
CHART-11265
|
5 years ago |
白岳
|
65b2c16358
|
CHART-11265 数据集配置多分类根据轴类型判断灰化 && CHART-11446 下拉框增加了默认无的选项,系列删除了对汇总方式和系列名使用的灰化
|
5 years ago |
zheng
|
3226f06e65
|
Merge pull request #1333 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '5a3fe79d16b06a837ad657a47a036505ac545dfe':
CHART-11634 bug退回:值标签没有位置 报npe
|
5 years ago |
Hades
|
125de3c8d6
|
Merge pull request #1331 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '9278f6e3b1bde55e9e16d4280e5341ba5cb31238':
MOBILE-24394 组件冻结选项操作后,进行保存失败
|
5 years ago |
shine
|
5a3fe79d16
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
f65f770a12
|
CHART-11634 bug退回:值标签没有位置 报npe
|
5 years ago |
Bjorn
|
11fb8c8461
|
Merge pull request #1327 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '7a0154ca9612b5d1d5aefcea3282708d9881b290':
CHART-11810
CHART-11810 类型切换时对数据配置的处理
|
5 years ago |
hades
|
9278f6e3b1
|
MOBILE-24394 组件冻结选项操作后,进行保存失败
|
5 years ago |
Lucian.Chen
|
7c7b3a9f0f
|
Merge pull request #1329 in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0
* commit '511cc0abf9d4b8b593a70393896db004db0a2004':
无jira任务,sonar问题修复
|
5 years ago |
zack
|
0ba1a4901f
|
无JIRA任务 去掉冗余代码
|
5 years ago |
lucian
|
511cc0abf9
|
无jira任务,sonar问题修复
|
5 years ago |
pengda
|
ccd23246c6
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
pengda
|
b06086abb5
|
sonar问题修复,无jira任务
|
5 years ago |
白岳
|
7a0154ca96
|
CHART-11810
|
5 years ago |
zheng
|
50d8549d64
|
Merge pull request #1323 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'f0d8bceacc666ab8d63d0fb6c5163b8e5d73a01a':
CHART-11610 组合图中的饼图 没有分类 直接用funnel的
CHART-11610 饼图、多指针仪表盘 在组合图中 没有分类配置项
|
5 years ago |
shine
|
f0d8bceacc
|
CHART-11610 组合图中的饼图 没有分类 直接用funnel的
|
5 years ago |
白岳
|
c9f5f9762a
|
CHART-11810 类型切换时对数据配置的处理
|
5 years ago |
zheng
|
4fe9bff622
|
Merge pull request #1326 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'fc20b97c2db2e6903085f07595f184c6730ac228':
CHART-11634 试管仪表盘从横向变成纵向 标签位置应该从上下变成左右
|
5 years ago |
shine
|
fc20b97c2d
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
72a50125db
|
CHART-11634 试管仪表盘从横向变成纵向 标签位置应该从上下变成左右
|
5 years ago |
Jinbokai
|
206afa9f9b
|
Merge pull request #1325 in DESIGN/design from ~JINBOKAI/design:release/10.0 to release/10.0
* commit 'b3f60132b9cc1fc29110c043f2faf8ff50c9ba73':
REPORT-20328 sonar问题修复
|
5 years ago |
Lucian.Chen
|
dbe7be9682
|
Merge pull request #1324 in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'c66568f7785e7cd02945c262d773c996466fd52d':
REPORT-24455 切换远程工作目录,新建模板保存,保存的特别慢
|
5 years ago |
jinbokai
|
b3f60132b9
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
jinbokai
|
8db3817862
|
REPORT-20328 sonar问题修复
|
5 years ago |
lucian
|
c66568f778
|
REPORT-24455 切换远程工作目录,新建模板保存,保存的特别慢
|
5 years ago |
Bjorn
|
744ea4dd5d
|
Merge pull request #1321 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '873170ffcf3cbc204a8273b4baa395b4ca848af4':
CHART-11286 数据筛选界面调整
|
5 years ago |
shine
|
dfaca0a21c
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
|
5 years ago |
shine
|
f8031e97cb
|
CHART-11610 饼图、多指针仪表盘 在组合图中 没有分类配置项
|
5 years ago |
Hades
|
66cdc4947b
|
Merge pull request #1320 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '867012b3b1c16abeb4d2641ed5968bd9cd837c6f':
REPORT-24085 稳定共创:在文件树二级目录下删除模板,会直接跳到上一级目录 by joe.jiang
|
5 years ago |
白岳
|
873170ffcf
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into feature/10.0
|
5 years ago |