Wim.Zhai
|
857da582c5
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
dc7a1d2be8
|
CHART-11093 按特定数据类型切换数据面板
|
5 years ago |
Bjorn
|
2d63c51c0a
|
Merge pull request #1290 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'ae7d051489da2ec27165db125018bad6288960e3':
无JIRA任务 组合图使用新的数据面板
|
5 years ago |
白岳
|
ae7d051489
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into feature/10.0
|
5 years ago |
白岳
|
69656c4e61
|
无JIRA任务 组合图使用新的数据面板
|
5 years ago |
Wim.Zhai
|
6d0dbef6a8
|
Merge pull request #1289 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit 'c34b063a3e3a3f9fcc1b6f52e4a7f2af7d98806a':
CHART-11322 refactor 散点图值字段用size表示
|
5 years ago |
Wim.Zhai
|
c34b063a3e
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
7ffbb8db17
|
CHART-11322 refactor 散点图值字段用size表示
|
5 years ago |
Wim.Zhai
|
a0de59df93
|
Merge pull request #1284 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '8ece872553c6ca5a96a205d8e2e191a449c9de1a':
CHART-11232 refactor 图表数据面板按对应类型populate
|
5 years ago |
kerry
|
5e62378cbc
|
Merge pull request #1252 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '696ed56e0041d4da33a1d5e63324342ad5a48e65':
添加继承
修改命名
REPORT-22869 19fdc接口——预定义样式支持更多配置
REPORT-22869 19fdc接口——预定义样式支持更多配置
|
5 years ago |
Wim.Zhai
|
8ece872553
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
db7cc6befb
|
CHART-11232 refactor 图表数据面板按对应类型populate
|
5 years ago |
kerry
|
696ed56e00
|
添加继承
|
5 years ago |
Lanlan
|
077dddaf93
|
Merge pull request #1281 in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit '9f97d3691968fe68bcdb97dd2fa52387fc1f20a6':
无JIRA任务 sonar问题修复
|
5 years ago |
kerry
|
6b626aaa3c
|
修改命名
|
5 years ago |
kerry
|
f0e1d1255f
|
REPORT-22869 19fdc接口——预定义样式支持更多配置
|
5 years ago |
Lanlan
|
9f97d36919
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~lanlan/design into feature/10.0
|
5 years ago |
Lanlan
|
33c8fb8e9a
|
无JIRA任务 sonar问题修复
|
5 years ago |
Wim.Zhai
|
c330ba0787
|
Merge pull request #1278 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '4e6bf8becd48a633d9579657e646b2a825dffeed':
CHART-10961 线型样式面板迭代 加组件&事件
CHART-4248 refactor:分类-值仪表盘的数据面板
|
5 years ago |
Hades
|
04db42bb41
|
Merge pull request #1280 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '4a64105783241c37c0b30d0a54bcdfd744b4112c':
REPORT-20503 【10.30feature】新建模板点击单元格无法展示为选中的效果
|
5 years ago |
Hugh.C
|
6d7116c90f
|
Merge pull request #1276 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0
* commit '7ea70d0a8fd80c8d192df1e24a3c37f2c6f2cdcd':
REPORT-20329 sonar问题修复
|
5 years ago |
Lucian.Chen
|
3b0e5736dd
|
Merge pull request #1277 in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0
* commit 'b6306175c6ee607c5e4dc34b51ee2eb613a6ad67':
无JIRA任务,sonar问题修复
|
5 years ago |
Jinbokai
|
13eae7a02a
|
Merge pull request #1275 in DESIGN/design from ~JINBOKAI/design:feature/10.0 to feature/10.0
* commit '95ba244443d5347e7720fb6035a9dfee87b8396a':
REPORT-20328 sonar问题修复
|
5 years ago |
vito
|
4b8f62050d
|
Merge pull request #1279 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'c8149fecfb4cf2e7a79361b01a44fcb7ba63cc1f':
无jira任务 设置一个指定目录方式用于调试
|
5 years ago |
hades
|
4a64105783
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hades/design into feature/10.0
|
5 years ago |
hades
|
7b4204206e
|
REPORT-20503 【10.30feature】新建模板点击单元格无法展示为选中的效果
|
5 years ago |
vito
|
c8149fecfb
|
无jira任务 设置一个指定目录方式用于调试
|
5 years ago |
Wim.Zhai
|
4e6bf8becd
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '34951296336cf60b2e156bc19dbe3fa0e034405f':
无jira任务,sonar问题修复
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
9218230e79
|
CHART-10961 线型样式面板迭代 加组件&事件
|
5 years ago |
Lucian
|
b6306175c6
|
无JIRA任务,sonar问题修复
|
5 years ago |
Hugh.C
|
7ea70d0a8f
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into feature/10.0
|
5 years ago |
Hugh.C
|
5b772ce849
|
REPORT-20329 sonar问题修复
|
5 years ago |
jinbokai
|
95ba244443
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
# Conflicts:
# designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
|
5 years ago |
jinbokai
|
1236223619
|
REPORT-20328 sonar问题修复
|
5 years ago |
Bruce.Deng
|
3495129633
|
Merge pull request #1270 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '07e47c3a6cee3ae513717211c5a638c8a459a48d':
无jira任务,sonar问题修复
无jira任务,sonar问题修复
|
5 years ago |
Bruce.Deng
|
07e47c3a6c
|
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
720b9a7eba
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
zack
|
e5d27ba365
|
Merge pull request #1268 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit '3d84de17da0b7a21808568ab046198925d70738a':
REPORT-20318 sonar问题修复
|
5 years ago |
Wim.Zhai
|
310ff924e1
|
CHART-4248 refactor:分类-值仪表盘的数据面板
|
5 years ago |
Wim.Zhai
|
f3de98da44
|
Merge pull request #1269 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '47be036bd639601d8a6299e3b653b65056566a0d':
CHART-4248 refactor 多层饼图数据面板补系列名字段
|
5 years ago |
Bruce.Deng
|
9dba941e91
|
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
47be036bd6
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
e01bd63bdf
|
CHART-4248 refactor 多层饼图数据面板补系列名字段
|
5 years ago |
zack
|
3d84de17da
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~zack/design
|
5 years ago |
zack
|
6de343d39d
|
REPORT-20318 sonar问题修复
|
5 years ago |
Hades
|
b36f2f4f0c
|
Merge pull request #1266 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '5a78cd4b6f99b8ff30ad89d09444d2094f53b0df':
REPORT-23647 sonar问题修复
|
5 years ago |
Hades
|
5a78cd4b6f
|
Merge pull request #8 in ~HADES/design from ~JOE.JIANG/design:REPORT-23647 to feature/10.0
* commit '0b6c239eff1fc37e786e5fa494fac13f7fbdaf24':
REPORT-23647 sonar问题修复
|
5 years ago |
Wim.Zhai
|
401a11649c
|
Merge pull request #1264 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '457c6e5e52b200e41898a9d698d6a86a054d227c':
CHART-11151 fix 范围图例面板
|
5 years ago |
Wim.Zhai
|
457c6e5e52
|
CHART-11151 fix 范围图例面板
|
5 years ago |
neil
|
e4e4eef72c
|
Merge pull request #1262 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
* commit '94d186b494cef06ddbc53c84986daf5105c8b7df':
无jira任务, 合代码冲突漏删
|
5 years ago |