updatenew-code-new

assets/scss/common.scss

@@ -12,8 +12,7 @@
 
 html,
 body {
-  overflow: auto;
-
+  // overflow: auto;
 }
 
 a {
@@ -119,7 +118,7 @@ a {
 .v-main,
 .v-main__wrap,
 .container {
-  height: 100%;
+  // height: 100%;
 }
 
 .v-main__wrap>.container {
@@ -144,7 +143,9 @@ a {
   }
 
   & .router-tab__container {
-    min-height: calc(100% - 72px);
+    overflow-y: auto;
+    min-height: calc(100vh - 105px);
+    max-height: calc(100vh - 105px);
     padding: 20px;
   }
 
@@ -484,6 +485,10 @@ a {
 
     .container--fluid {
       background-color: map-deep-get($config, #{$theme}, "container-fluid");
+      .menu-container {
+        max-height:calc(100vh - 60px);
+        overflow-y: auto;
+      }
     }
 
     .v-icon {
@@ -529,8 +534,6 @@ a {
       }
     }
 
-
-
     .router-tab {
       .router-tab__header {
         background-color: map-deep-get($config, #{$theme}, "router-header");

assets/scss/common/button.scss

@@ -92,10 +92,13 @@
       background: map-deep-get($config, #{$theme}, "basic-button-background");
     }
 
-    .search-button {
-      color: map-deep-get($config, #{$theme}, "search-btn-color");
+    .searchFilter{
+      .search-button {
+        height: 40px;
+        color: map-deep-get($config, #{$theme}, "search-btn-color");
+      }
     }
-
+     
     .v-dialog {
       .ant-btn-icon-only {
         color: map-deep-get(
@@ -118,6 +121,9 @@
         background: map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         border-color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
         color:map-deep-get($config, #{$theme}, "ant-btn-primary-color");
+        &.ant-btn-background-ghost{
+          color:map-deep-get($config, #{$theme}, "ant-btn-primary-bg");
+        }
       }
 
       &.ant-btn-default {
@@ -132,6 +138,15 @@
           background: map-deep-get($config, #{$theme}, "ant-btn-danger-bg") !important;
         }
       }
+
+      &.expand-btn {
+        .v-icon {
+          color: map-deep-get($config, #{$theme}, "basic-button-color");
+          svg {
+            fill: map-deep-get($config, #{$theme}, "basic-button-color");
+          }
+        }
+      }
     }
   }
 }
@@ -158,4 +173,13 @@
     height: 16px;
     background:none;
   }
-}
+}
+.ant-btn  {
+  &.expand-btn {
+    .v-icon {
+      span {
+        margin-right: 8px;
+      }
+    }
+  }
+}

assets/scss/common/grid.scss

@@ -98,6 +98,17 @@
   @include theme($theme);
 
   .v-application.#{$theme}-mode {
+    .grid-title {
+      font-weight: 600;
+      font-size: 16px;
+      line-height: 24px;
+      letter-spacing: 0;
+      color: map-deep-get($config,
+        #{$theme},
+        "tui-grid-title-color"
+      );
+    }
+    
     .tui-grid {
       &-table {
         border: 1px solid;

assets/scss/var.scss

@@ -102,6 +102,7 @@ $config: (
     v-calendar-day-color: #fff,
     v-calendar-day-in-not-month-color: rgba(255, 255, 255, 0.05),
     v-calendar-is-today-background-color: #2d4571,
+    tui-grid-title-color: #FFFFFFD9,
     tui-grid-header-backgroundColor: #2a2b2d,
     tui-grid-header-color: #FFFFFFD9,
     tui-grid-border-horziontal-color: #212224,
@@ -239,6 +240,7 @@ $config: (
     v-calendar-day-color: #111,
     v-calendar-day-in-not-month-color: #f8f8f8,
     v-calendar-is-today-background-color: #e3eaf3,
+    tui-grid-title-color: #000000E0,
     tui-grid-header-backgroundColor: #fafafa, //#e0e0e0,
     tui-grid-header-color: rgba(0, 0, 0, 0.88),
     tui-grid-border-horziontal-color: #e0e0e0,