Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/8803a6cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/8803a6cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/8803a6cd Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 8803a6cd2a02dd810eb709f0bb526717f37e30d5 Parents: 150a13c f581db3 Author: Lionel Liu <bhlx3l...@163.com> Authored: Thu Jan 25 12:55:59 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Thu Jan 25 12:55:59 2018 +0800 ---------------------------------------------------------------------- ui/angular/package.json | 5 +- ui/angular/src/app/app.module.ts | 22 +- .../src/app/dataasset/dataasset.component.css | 2 +- .../src/app/dataasset/dataasset.component.ts | 18 +- ui/angular/src/app/health/health.component.ts | 92 +--- .../app/job/create-job/create-job.component.css | 16 + .../job/create-job/create-job.component.html | 149 +++--- .../app/job/create-job/create-job.component.ts | 484 +++++++++++++++---- ui/angular/src/app/job/job.component.html | 8 +- ui/angular/src/app/job/job.component.ts | 58 +-- .../measure/create-measure/ac/ac.component.html | 84 +++- .../measure/create-measure/ac/ac.component.ts | 269 ++++++++--- .../configuration/configuration.component.css | 18 + .../configuration/configuration.component.html | 61 +++ .../configuration.component.spec.ts | 44 ++ .../configuration/configuration.component.ts | 73 +++ .../create-measure.component.html | 18 + .../measure/create-measure/pr/pr.component.html | 82 +++- .../measure/create-measure/pr/pr.component.ts | 168 +++++-- .../measure-detail.component.html | 33 +- .../measure-detail/measure-detail.component.ts | 32 +- .../src/app/measure/measure.component.html | 15 +- ui/angular/src/app/measure/measure.component.ts | 26 +- .../detail-metric/detail-metric.component.ts | 23 +- ui/angular/src/app/metric/metric.component.html | 12 +- ui/angular/src/app/metric/metric.component.ts | 174 ++----- ui/angular/src/app/service/chart.service.ts | 31 +- ui/angular/src/app/service/service.service.ts | 23 +- .../src/app/sidebar/sidebar.component.html | 2 +- ui/angular/src/app/sidebar/sidebar.component.ts | 89 +--- ui/angular/src/main.ts | 2 - ui/angular/src/styles.css | 4 +- 32 files changed, 1420 insertions(+), 717 deletions(-) ----------------------------------------------------------------------
