Browse Source

报表表格边框样式微调

zhuth 7 years ago
parent
commit
51826bd0b4

+ 1 - 1
frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -321,7 +321,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 me.initSummaryType(c);
                 summarys.push({
                     field: c.dataIndex,
-                    operation: c._summaryType == 'last' ? 'sum' : c._summaryType,
+                    operation: c._summaryType == 'last' ? 'customize_last' : c._summaryType,
                 });
             }
         })

+ 6 - 17
frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -31,22 +31,6 @@ $border-color: #999;
                         border-right: 1px solid $border-color;
                         border-bottom: 1px solid $border-color;
                     }
-
-                    .x-grid-cell {
-                        &:last-child {
-                            .x-grid-cell-inner {
-                                border-right: none;
-                            }
-                        }
-                    }
-                }
-
-                .x-grid-item {
-                    &:first-child {
-                        .x-grid-group-hd {
-                            border-top: none;
-                        }
-                    }
                 }
             }
 
@@ -63,13 +47,18 @@ $border-color: #999;
         }
 
         .x-grid-group-hd {
-            border-top: 1px solid $border-color;
+            border-top: none;
             border-bottom: 1px solid $border-color;
+            border-right: 1px solid $border-color;
         }
 
         .x-grid-row-summary {
             .x-grid-cell {
                 border-top: none;
+                border-bottom: 1px solid $border-color;
+                &:last-child {
+                    border-right: 1px solid $border-color;
+                }
             }
         }
     }