Merge branch 'feature-0.24.0.0908' into 'master-0.24.0'

Feature 0.24.0.0908-拆分统计图 See merge request hzero-agile/agile-service!1025
xianglujun · Sep 14, 2020 · 8fc6bfa · 8fc6bfa
2 parents a050122 + 0bf89a3
commit 8fc6bfa
Show file tree

Hide file tree

Showing 10 changed files with 785 additions and 285 deletions.
diff --git a/react/api/Report.ts b/react/api/Report.ts
@@ -189,7 +189,7 @@ class ReportApi {
    * @param versionId
    * @param type
    */
-  loadPie(fieldName: string, sprintId: number, versionId: number, startDate: string, endDate: string) {
+  loadPie(fieldName: string, sprintId?: string, versionId?: string, startDate?: string, endDate?: string) {
     const organizationId = getOrganizationId();
     return axios({
       method: 'get',

diff --git a/react/common/types.ts b/react/common/types.ts
@@ -16,6 +16,11 @@ export interface ISprint {
   endDate: string
 }
 
+export interface IVersion {
+  versionId: string,
+  name: string,
+}
+
 export interface PI {
   code: string
   name: string

diff --git a/react/components/charts/pie-chart/index.less b/react/components/charts/pie-chart/index.less
@@ -0,0 +1,96 @@
+.c7n_pieChart_filter {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  justify-content: flex-start;
+  width: 67%;
+  align-items: flex-end;
+
+  .c7n_pieChart_filter_item {
+    flex-grow: 1;
+    max-width: 2.45rem;
+  }
+
+  .c7n_pieChart_filter_item:not(:last-child) {
+    margin-right: 0.1rem;
+  }
+}
+.pie_chart {
+  .pie_otherTooltip {
+    position: absolute;
+    bottom: -0.18rem;
+    left: 0;
+    .pie_otherTooltip_wrap {
+      width: 100%;
+      height: 0.2rem;
+      border: 0.02rem solid #f7ca34;
+      border-bottom: 0;
+      margin-bottom: 0.13rem;
+    }
+
+    .pie_otherTooltip_item_wrap {
+      display: flex;
+      p {
+        min-width: 0.8rem;
+        max-width: 1rem;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        margin-bottom: 0;
+        margin-left: 0.01rem;
+        padding-left: 0.02rem;
+        padding-right: 0.02rem;
+        font-size: 0.13rem;
+        text-align: center;
+        color: rgba(0, 0, 0, 0.65);
+      }
+    }
+
+    .pie_otherTooltip_item_ignore {
+      display: inline-block;
+      padding: 0.05rem 0.12rem;
+    }
+  }
+
+  .pie_legend {
+    background: #fff;
+    box-shadow: 0 0.03rem 0.01rem -0.02rem rgba(0, 0, 0, 0.2), 0 0.02rem 0.02rem 0 rgba(0, 0, 0, 0.14), 0 0.01rem 0.05rem 0 rgba(0, 0, 0, 0.12);
+    margin-top: 30px;
+    padding: 0.24rem;
+    padding-right: 0.1rem;
+    width: 60%;
+    .pie_legend_title {
+      font-size: 0.18rem;
+      margin-bottom: 0.2rem;
+    }
+
+    .pie_legend_tbody {
+      display: block;
+    }
+
+    .pie_legend_icon {
+      float: left;
+      border-radius: 0.02rem;
+      width: 0.14rem;
+      min-height: 0.14rem;
+      display: inline-block;
+      margin-right: 0.08rem;
+    }
+
+    .pie_legend_text {
+      display: inline-block;
+      float: left;
+      line-height: 0.15rem;
+      max-width: 220px;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    td {
+      padding-bottom: 0.12rem;
+      padding-right: 0.35rem;
+      white-space: nowrap;
+    }
+  }
+}