evui 3.4.16 → 3.4.18

package/src/components/grid/style/grid.scss

@@ -83,9 +83,6 @@
     .column-sort__icon--basic {
       visibility: visible;
     }
-    .column-sort__icon--asc, .column-sort__icon--desc {
-      visibility: hidden;
-    }
   }
 }
 
@@ -254,26 +251,62 @@
   text-align: center;
 }
 
+.filtering {
+  position: relative;
+}
+
 .filtering-items {
   display: flex;
+  position: absolute;
+  width: inherit;
   flex-flow: row wrap;
   gap: 10px;
-  position: absolute;
   padding: 8px;
   flex-direction: row;
   align-items: center;
   z-index: 1;
   border-radius: 4px;
+  max-height: 120px;
+  background: none;
+
+  &__hidden-items {
+    max-height: 106px;
+    overflow-y: auto;
+
+    @include evThemify() {
+      border: 1px solid evThemed('grid-bottom-border');
+      background: evThemed('grid-background');
+    }
+  }
   &-expand {
     &:hover {
       cursor: pointer;
       color: #0077FF;
     }
   }
-  &__item {
+  &--count {
+    position: absolute;
+    top: 10px;
+    right: 0;
     padding: 4px;
     border-radius: 4px;
     background: #EAF2FA;
+    &:hover {
+      cursor: pointer;
+      padding: 3.5px;
+      border: 1px solid #198FFF !important;
+      box-sizing: border-box;
+    }
+  }
+  &__item {
+    height: 26px;
+    line-height: 26px;
+    padding: 0 10px;
+    border: 1px solid #CED4DA;
+    border-radius: 4px;
+    background: #EAF2FA;
+    font-size: 13px;
+    text-align: center;
     &:hover {
       cursor: pointer;
       border: 1px solid #198FFF;
@@ -281,31 +314,44 @@
     &--filter {
       font-weight: bold;
       border: 1px solid #198FFF;
+      color: #198FFF;
       i {
-        color: #0077FF;
         vertical-align: middle;
       }
     }
     &--title {
-      color: #0077FF;
       margin-right: 6px;
       vertical-align: middle;
     }
     &--value {
       display: inline-block;
       max-width: 80px;
+      color: #198FFF;
       text-overflow: ellipsis;
       overflow: hidden;
       vertical-align: middle;
       white-space: nowrap;
     }
     &--remove {
+      color: initial;
       vertical-align: middle;
       margin-left: 6px;
       &:hover {
         opacity: 0.6;
       }
     }
+    &--operator {
+      width: 80px;
+      height: 26px !important;
+      .ev-input {
+        height: 26px !important;
+      }
+      &:hover {
+        cursor: initial;
+        margin: inherit;
+        border: none;
+      }
+    }
     &.non-display {
       display: none;
     }

package/src/components/grid/uses.js

@@ -711,7 +711,7 @@ export const filterEvent = (params) => {
    */
   const numberFilter = (item, condition, columnType) => {
     const comparison = condition.comparison;
-    const conditionValue = Number(condition.value);
+    const conditionValue = Number(condition.value.replace(/,/g, '')); // 콤마 제거
     let value = Number(item[ROW_DATA_INDEX][condition.index]);
     let result;
     if (columnType === 'float') {
@@ -958,6 +958,10 @@ export const contextMenuEvent = (params) => {
       const sortable = column.sortable === undefined ? true : column.sortable;
       const filterable = filterInfo.isFiltering
       && column.filterable === undefined ? true : column.filterable;
+      if (!sortable && !filterable) {
+        contextInfo.columnMenuItems = [];
+        return;
+      }
       contextInfo.columnMenuItems = [
         {
           text: 'Ascending',