richie
|
448827b14a
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '50d9d36180a069769470b1fe9cbedfb7b68ff631':
无jira 同步到feature
REPORT-27647 模板组件的安装下载-模板组件复用插件 处理下可能的 npe
REPORT-27647 模板组件的安装下载-模板组件复用插件 修复部分监听上的问题
|
5 years ago |
richie
|
50d9d36180
|
Merge pull request #1532 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '2379bd527e5778ac60b58ceefdc0f07aebf6e236':
无jira 同步到feature
|
5 years ago |
hades
|
2379bd527e
|
无jira 同步到feature
|
5 years ago |
Harrison
|
e59463f6ad
|
Merge pull request #1530 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '8e3adfb68f7930be3605f528313e8b3dcbdf4adc':
REPORT-27647 模板组件的安装下载-模板组件复用插件 处理下可能的 npe
REPORT-27647 模板组件的安装下载-模板组件复用插件 修复部分监听上的问题
|
5 years ago |
Harrison
|
8e3adfb68f
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
处理下可能的 npe
|
5 years ago |
Harrison
|
9573f4d080
|
Merge branch 'feature/10.0' of http://code.fineres.com/scm/~harrison/design into feature/10.0
|
5 years ago |
Harrison
|
11d99d7f22
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
修复部分监听上的问题
|
5 years ago |
richie
|
9a99ccdbb8
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit 'bebd51531702a1ba8b915e8b1b57fde24709946c': (261 commits)
REPORT-27647 模板组件的安装下载-模板组件复用插件 调整暴露的接口,返回合适的接口
去掉多余接口
REPORT-27647 模板组件的安装下载-模板组件复用插件 删掉多余的设计
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、抽出一个更通用的接口来添加面板 2、为共享加载器添加插件实现
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、空字符串 2、判空 3、接口 xml
去掉 main 函数
REPORT-27647 模板组件的安装下载-模板组件复用插件 ui 界面 1、 本地组件库界面 2、 小圆点设计
方法名修改
设计器启动后,对初始环境做一次检测
无任务,编译失败
REPORT-27280 程序数据集支持刷新出所需参数 支持在选中 class 后,刷新出参数
无jira任务,import需要依赖third
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
无jira任务, 冲突修复
MOBILE-25614 && MOBILE-25605
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
ct
ct
ct
ct
...
|
5 years ago |
Harrison
|
bebd515317
|
Merge pull request #1524 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '713b72cded5d886b417e5d696f1fe3c3c24aeb6f':
REPORT-27647 模板组件的安装下载-模板组件复用插件 调整暴露的接口,返回合适的接口
去掉多余接口
REPORT-27647 模板组件的安装下载-模板组件复用插件 删掉多余的设计
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、抽出一个更通用的接口来添加面板 2、为共享加载器添加插件实现
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、空字符串 2、判空 3、接口 xml
去掉 main 函数
REPORT-27647 模板组件的安装下载-模板组件复用插件 ui 界面 1、 本地组件库界面 2、 小圆点设计
|
5 years ago |
Harrison
|
713b72cded
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
调整暴露的接口,返回合适的接口
|
5 years ago |
Harrison
|
2a0bbc69bc
|
去掉多余接口
|
5 years ago |
Harrison
|
f89a5d3171
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
删掉多余的设计
|
5 years ago |
Harrison
|
5b0c5dc299
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
1、抽出一个更通用的接口来添加面板
2、为共享加载器添加插件实现
|
5 years ago |
Harrison
|
f279194bba
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
1、空字符串
2、判空
3、接口 xml
|
5 years ago |
Harrison
|
1807f814ef
|
去掉 main 函数
|
5 years ago |
Harrison
|
b1a3ee6f1f
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
ui 界面
1、 本地组件库界面
2、 小圆点设计
|
5 years ago |
Maksim
|
ce07f5e805
|
Merge pull request #1458 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0
* commit 'f7a37afe40caba55bf2f005fc05fa3328461e9fb':
方法名修改
设计器启动后,对初始环境做一次检测
|
5 years ago |
Maksim
|
f7a37afe40
|
方法名修改
|
5 years ago |
Maksim
|
c93febc584
|
设计器启动后,对初始环境做一次检测
|
5 years ago |
ju.ju
|
a3c2d73bfd
|
Merge pull request #1453 in DESIGN/design from release/10.0 to feature/10.0
* commit 'ca4cc282763d1a6b4d604dbb1a6213f739e6de26':
无任务,编译失败
REPORT-27280 程序数据集支持刷新出所需参数 支持在选中 class 后,刷新出参数
无jira任务,import需要依赖third
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
|
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 |
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 |
neil
|
35d92628db
|
Merge pull request #1447 in DESIGN/design from release/10.0 to feature/10.0
* commit '50de08b80dab6a7cbc6f69fcd228a47e0de869a0': (155 commits)
无jira任务, 冲突修复
MOBILE-25614 && MOBILE-25605
ct
ct
ct
ct
ct
ct
ct
ct
ct
ct
代码合并冲突
CHART-12814 悬浮图表去掉clone
CHART-12814 悬浮图表数据问题
CHART-12815 天数不增加的问题
MOBILE-25493 && MOBILE-25540 交互调整
CHART-12746 埋点接口
CHART-12746
CHART-12746
...
|
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 |
neil
|
997a4e3b5d
|
ct
|
5 years ago |
neil
|
251728f08a
|
ct
|
5 years ago |
neil
|
07e7c2aec3
|
ct
|
5 years ago |
neil
|
3cad18d7c5
|
ct
|
5 years ago |
neil
|
e26b97cdc4
|
ct
|
5 years ago |
neil
|
bead3c635b
|
ct
|
5 years ago |
neil
|
4fb73f1d25
|
ct
|
5 years ago |
ju.ju
|
5952b630ff
|
Merge pull request #1440 in DESIGN/design from ~EASON/design:release/10.0 to release/10.0
* commit '1810907a62e25e978c8ffb8bc10fe5a9ccd6349e':
代码合并冲突
|
5 years ago |