yaoh.wu
|
55bb2395ac
|
REPORT-23978 代码合并出错
|
5 years ago |
Harrison
|
af43464eca
|
Merge pull request #1296 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '8f5675a2679aede9cb909b8024cd65a19ba81052':
REPORT-20330 sonar问题修复 常量放最上面
REPORT-20330 sonar问题修复 修复 sonar 问题
|
5 years ago |
Harrison
|
8f5675a267
|
REPORT-20330 sonar问题修复
常量放最上面
|
5 years ago |
Harrison
|
770abaaba7
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into feature/10.0
|
5 years ago |
Harrison
|
b3e6da93c8
|
REPORT-20330 sonar问题修复
修复 sonar 问题
|
5 years ago |
zheng
|
2b3aa39eaf
|
Merge pull request #1294 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'bb72abe56cbed1ba4cf106177241d99c6a89afce':
CHART-10227 地图 钻取地图 热力地图 数据配置界面
|
5 years ago |
shine
|
bb72abe56c
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
|
5 years ago |
shine
|
1b5847da3d
|
CHART-10227 地图 钻取地图 热力地图 数据配置界面
|
5 years ago |
Wim.Zhai
|
d60148b07e
|
Merge pull request #1292 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '796e7be795ed89911b00ef8fe3a9afaaa90202b8':
CHART-11093 不实例化,类型不同就不populate 验证了没问题
CHART-11093 反射获取相应数据面板对应的数据类型
CHART-11321 fix 坐标轴显示策略面板checkUse
CHART-11093 refactor 数据面板切换
CHART-11093 按特定数据类型切换数据面板
|
5 years ago |
Wim.Zhai
|
796e7be795
|
CHART-11093 不实例化,类型不同就不populate 验证了没问题
|
5 years ago |
Wim.Zhai
|
32008dbdec
|
CHART-11093 反射获取相应数据面板对应的数据类型
|
5 years ago |
Wim.Zhai
|
de1574353b
|
CHART-11321 fix 坐标轴显示策略面板checkUse
|
5 years ago |
Wim.Zhai
|
e93938a18c
|
CHART-11093 refactor 数据面板切换
|
5 years ago |
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 |