Starryi
|
58962a9cb7
|
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~starryi/design into release/10.0
|
5 years ago |
Starryi
|
ff7e4b8cc2
|
MOBILE-25437 添加移动端快速定位导航功能侧边栏样式
|
5 years ago |
Maksim
|
850115fe51
|
Merge pull request #1464 in DESIGN/design from ~MAKSIM/design:release/10.0 to release/10.0
* commit '3886e76bbd0c1653d7c085a20394dcd0a1e63090':
通过当前环境来处理不再依赖于传入对象
回滚
回滚
服务检测增加本月不再提醒
日志输出错误
return
建立socket增加重试机制
|
5 years ago |
Maksim
|
3886e76bbd
|
通过当前环境来处理不再依赖于传入对象
|
5 years ago |
zheng
|
5ca5b0e253
|
Merge pull request #1463 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '79c6aaf8a488a7286e7df2b8ea80490184295fe3':
CHART-12810 //删除的tab非选中状态, 原为选中状态的tab保持选中不变
|
5 years ago |
Maksim
|
feeb948ff3
|
回滚
|
5 years ago |
Maksim
|
ae73305f84
|
回滚
|
5 years ago |
Maksim
|
1838a00cd0
|
服务检测增加本月不再提醒
|
5 years ago |
shine
|
79c6aaf8a4
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
8b73024595
|
CHART-12810 //删除的tab非选中状态, 原为选中状态的tab保持选中不变
|
5 years ago |
白岳
|
e35e8f5e6d
|
CHART-11090 地图模糊匹配
|
5 years ago |
Maksim
|
7909aa2a74
|
Merge branch 'release/10.0' of https://code.fineres.com/scm/~maksim/design into release/10.0
Conflicts:
designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
|
5 years ago |
Maksim
|
528a850e3e
|
Merge pull request #1461 in DESIGN/design from ~MAKSIM/design:release/10.0 to release/10.0
* commit 'a11aa4822d5f4ca5e753ce021e52455721ae6c35':
设计器启动时,做一次服务检测
抽取方法并添加注释
|
5 years ago |
Maksim
|
a11aa4822d
|
设计器启动时,做一次服务检测
|
5 years ago |
Maksim
|
cf639760ed
|
抽取方法并添加注释
|
5 years ago |
zheng
|
1d9d145213
|
Merge pull request #1460 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '02c271ba2efff03f6926ddbff1c276312fcbf52d':
CHART-12794 图表切换
|
5 years ago |
shine
|
02c271ba2e
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
a353e2ceb9
|
CHART-12794 图表切换
|
5 years ago |
zheng
|
79a71760a7
|
Merge pull request #1456 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'a14592606fd3b3ba15e84db23091ecd5f6ebe8cc':
CHART-12801 多层饼图数据界面
CHART-12805 系列面板根据大数据组件判断是否开启大数据
|
5 years ago |
shine
|
a14592606f
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
Hades
|
a394f25801
|
Merge pull request #1454 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '18058f3964b0cb067f64db71f4f1af918b955acf':
MOBILE-25615 同步到release
|
5 years ago |
shine
|
02f8572ebd
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
hades
|
18058f3964
|
MOBILE-25615 同步到release
|
5 years ago |
Hades
|
042c0ad3ba
|
Merge pull request #1446 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '280a6dc426f5d7b970b72b3e014e0e334ceb6bb4':
fix 调整
fix
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
hades
|
280a6dc426
|
fix 调整
|
5 years ago |
hades
|
0f42ae623f
|
fix
|
5 years ago |
Harrison
|
ca4cc28276
|
Merge pull request #1451 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '0827cc922f28a53ade30ed771dd8b13f70949f0b':
REPORT-27280 程序数据集支持刷新出所需参数 支持在选中 class 后,刷新出参数
|
5 years ago |
yaoh.wu
|
a7a2c41275
|
Merge pull request #1452 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'acbcffd977362a37a673b56843bcf5120a87d13a':
无任务,编译失败
|
5 years ago |
yaohwu
|
acbcffd977
|
无任务,编译失败
|
5 years ago |
Alex.Sung
|
31a718131a
|
无jira任务,import需要依赖third
* commit '6adce1100d80527fb26ca299f0ac635783b78667':
无jira任务,import需要依赖third
|
5 years ago |
Harrison
|
0827cc922f
|
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
|
5 years ago |
Harrison
|
b558480135
|
REPORT-27280 程序数据集支持刷新出所需参数
支持在选中 class 后,刷新出参数
|
5 years ago |
alex.sung
|
6adce1100d
|
无jira任务,import需要依赖third
|
5 years ago |
shine
|
a8bc37b035
|
CHART-12801 多层饼图数据界面
|
5 years ago |
shine
|
8d6934d504
|
CHART-12805 系列面板根据大数据组件判断是否开启大数据
|
5 years ago |
Hugh.C
|
2e848812bb
|
Merge pull request #1449 in DESIGN/design from ~HUGH.C/design:release/10.0 to release/10.0
* commit 'ad37c78b5c2ba3b3c2ca79e7898ba187bf8f2f42':
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
|
5 years ago |
Hugh.C
|
ad37c78b5c
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into release/10.0
|
5 years ago |
Hugh.C
|
47ed0af3ca
|
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
|
5 years ago |
Hades
|
e6f5f06690
|
Merge pull request #23 in ~HADES/design from feature/10.0 to release/10.0
* commit 'b2498e18f8c095171a5bae0113db97c24ddff8be':
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
Hades
|
b2498e18f8
|
Merge pull request #1442 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'f8329a6aff5a80f88501def038de64315f3bd408':
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
Hades
|
50de08b80d
|
Merge pull request #1443 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a8f8977f9a0353881c5127abad715edabe14af73':
MOBILE-25614 && MOBILE-25605
|
5 years ago |
neil
|
74644f4c95
|
Merge pull request #1445 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '88ea59c3311d5c08db887a90b01267428a5e632e':
无jira任务, 冲突修复
|
5 years ago |
neil
|
88ea59c331
|
无jira任务, 冲突修复
|
5 years ago |
hades
|
a8f8977f9a
|
MOBILE-25614 && MOBILE-25605
|
5 years ago |
hades
|
f8329a6aff
|
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
neil
|
9806e23955
|
Merge pull request #1441 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '194810931f6510ffe7b45c20658a5d8c34f35eb9': (150 commits)
ct
ct
ct
ct
ct
ct
ct
ct
ct
ct
去掉是否连接弹出框
CHART-12733 图表数据结构 地图相关 回退
通过内部类来做异常处理
CHART-12733 线型支持虚线 补充网格线 警戒线 趋势线。 回退
RPC调用自定义异常处理方法做抽象
CHART-12733 图表数据结构 回退
CHART-12733 大数据模式 回退
CHART-12733 线型支持虚线 回退
CHART-12733 轴标签缩略间隔显示 回退
CHART-12733 标签的自动调整 回退
...
|
5 years ago |
neil
|
194810931f
|
Merge pull request #24 in ~NEIL/design from feature/10.0 to release/10.0
* commit 'a12b217ea3bdd27e7d89aac18170076cfa22b90a': (150 commits)
ct
ct
ct
ct
ct
ct
ct
ct
ct
ct
去掉是否连接弹出框
CHART-12733 图表数据结构 地图相关 回退
通过内部类来做异常处理
CHART-12733 线型支持虚线 补充网格线 警戒线 趋势线。 回退
RPC调用自定义异常处理方法做抽象
CHART-12733 图表数据结构 回退
CHART-12733 大数据模式 回退
CHART-12733 线型支持虚线 回退
CHART-12733 轴标签缩略间隔显示 回退
CHART-12733 标签的自动调整 回退
...
|
5 years ago |
neil
|
a12b217ea3
|
ct
|
5 years ago |
neil
|
84b2a7e819
|
ct
|
5 years ago |
neil
|
c508cb2a91
|
ct
|
5 years ago |