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 |
neil
|
94d186b494
|
无jira任务, 合代码冲突漏删
|
5 years ago |
neil
|
2bd3085d4c
|
Merge pull request #1261 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
* commit '11b33b9e10a6816cff0d9c43ed24ee2a009d964e': (95 commits)
.
.
.
ct
ct
ct
.
release/10.0
ct
REPORT-19946 Linux设计器
REPORT-19946 Linux设计器
REPORT-23486 修复bug以及更改文件夹
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
REPORT-23570 修改国际化名字
REPORT-23570 模版版本管理,gc为负数时应当提示“无可优化文件”
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
...
|
5 years ago |
neil
|
11b33b9e10
|
.
|
5 years ago |
neil
|
5cdc874789
|
.
|
5 years ago |
neil
|
911d8be9df
|
.
|
5 years ago |
neil
|
b37a17db94
|
Merge pull request #22 in ~NEIL/design from release/10.0 to feature/10.0
* commit 'ec7b6606ddf97181fb85d0192cfe802d956369c1': (92 commits)
ct
ct
ct
.
release/10.0
ct
REPORT-19946 Linux设计器
REPORT-19946 Linux设计器
REPORT-23486 修复bug以及更改文件夹
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
REPORT-23570 修改国际化名字
REPORT-23570 模版版本管理,gc为负数时应当提示“无可优化文件”
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
...
|
5 years ago |
neil
|
ec7b6606dd
|
ct
|
5 years ago |
neil
|
b3e41463d6
|
ct
|
5 years ago |
neil
|
3c0e846d7f
|
ct
|
5 years ago |
neil
|
5709374b34
|
.
|
5 years ago |
neil
|
936ae150d5
|
release/10.0
|
5 years ago |
neil
|
882d6219d4
|
ct
|
5 years ago |
Wim.Zhai
|
f6e7604f16
|
Merge pull request #1259 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '90ba97eed2668a192c652ab794be7b84ebdd5f92':
CHART-11231 refactor:fix 词云、框架图特效面板 有组件未初始化 NPE
|
5 years ago |
Wim.Zhai
|
90ba97eed2
|
CHART-11231 refactor:fix 词云、框架图特效面板 有组件未初始化 NPE
|
5 years ago |
Joe.Jiang
|
0b6c239eff
|
REPORT-23647 sonar问题修复
|
5 years ago |
pengda
|
12295716b0
|
Merge pull request #1256 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '8eac5482864d14c38731b412d9abb6ce3719a5aa':
REPORT-19946 Linux设计器
REPORT-19946 Linux设计器
|
5 years ago |
pengda
|
8eac548286
|
REPORT-19946 Linux设计器
|
5 years ago |
pengda
|
8541021b9d
|
REPORT-19946 Linux设计器
|
5 years ago |
Bryant
|
a8d2ee3f6c
|
Merge pull request #1254 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit '043a59e6d6f39bb96a5dc585ebb9f3232a20abfa':
REPORT-23486 修复bug以及更改文件夹
|
5 years ago |
Wim.Zhai
|
c6d7efe230
|
Merge pull request #1251 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit 'edae2bdcbf58abc88d3943320457c636b41e8158':
style 还需按图表类型切换数据面板 #CHART-4248
refactor:散点图气泡图数据面板 CHART-4248
CHART-4248 重命名非抽象类
|
5 years ago |
Bryant
|
043a59e6d6
|
REPORT-23486 修复bug以及更改文件夹
|
5 years ago |
Wim.Zhai
|
edae2bdcbf
|
style 还需按图表类型切换数据面板 #CHART-4248
|
5 years ago |
kerry
|
db5cd5b6e3
|
REPORT-22869 19fdc接口——预定义样式支持更多配置
|
5 years ago |
Wim.Zhai
|
c5926c4a0b
|
refactor:散点图气泡图数据面板 CHART-4248
|
5 years ago |
Lucian.Chen
|
15d533bed2
|
Merge pull request #1250 in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'ac0c319ae4ee360205e06168af8049cff0d35961':
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
|
5 years ago |
Wim.Zhai
|
51c0b98170
|
CHART-4248 重命名非抽象类
|
5 years ago |
Lucian
|
ac0c319ae4
|
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
|
5 years ago |