evui 3.4.8 → 3.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/grid/grid.filterSetting.vue

@@ -36,7 +36,14 @@
               :items="items2"
               @change="changeComparison(item.comparison, idx)"
             />
+            <ev-select
+              v-if="$props.column.type === 'boolean'"
+              v-model="item.value"
+              class="ev-grid-filter-setting__row--comparison"
+              :items="booleanItems"
+            />
             <ev-text-field
+              v-else
               v-model="item.value"
               class="ev-grid-filter-setting__row--value"
               :disabled="item.comparison === 'isEmpty' || item.comparison === 'isNotEmpty'"
@@ -115,6 +122,10 @@ export default {
       { name: 'AND', value: 'and' },
       { name: 'OR', value: 'or' },
     ];
+    const booleanItems = [
+      { name: 'true', value: 'true' },
+      { name: 'false', value: 'false' },
+    ];
     const numberItems = [
       { name: '=', value: '=' },
       { name: '!=', value: '!=' },
@@ -142,7 +153,7 @@ export default {
         return [...numberItems, ...commonItems];
       } else if (columnType === 'boolean') {
         return [
-          { name: 'Is', value: 'is' },
+          { name: '=', value: '=' },
         ];
       }
       return [];
@@ -153,7 +164,7 @@ export default {
       set: val => emit('update:isShow', val),
     });
     const addRow = () => {
-      const operator = filteringItems.value.length > 2 ? filteringItems.value[2].operator : 'and';
+      const operator = filteringItems.value.length >= 2 ? filteringItems.value[1].operator : 'and';
       filteringItems.value.push({
         comparison: '=',
         operator,
@@ -226,6 +237,7 @@ export default {
       isShowFilterSetting,
       items1,
       items2,
+      booleanItems,
       addRow,
       removeRow,
       changeOperator,

package/src/components/grid/uses.js

@@ -671,7 +671,10 @@ export const filterEvent = (params) => {
   const stringFilter = (item, condition) => {
     const comparison = condition.comparison;
     const conditionValue = condition.value;
-    const value = `${item[ROW_DATA_INDEX][condition.index]}`;
+    let value = item[ROW_DATA_INDEX][condition.index];
+    if (value || value === 0) {
+      value = `${item[ROW_DATA_INDEX][condition.index]}`;
+    }
     let result;
     if (comparison === '=') {
       result = conditionValue.toLowerCase() === value.toLowerCase();
@@ -723,13 +726,25 @@ export const filterEvent = (params) => {
     } else if (comparison === '!=') {
       result = value !== conditionValue;
     } else if (comparison === 'isEmpty') {
-      result = value === undefined || value === null;
+      result = value === undefined || value === null || isNaN(value);
     } else if (comparison === 'isNotEmpty') {
       result = !!value;
     }
 
     return result;
   };
+  const booleanFilter = (item, condition) => {
+    const comparison = condition.comparison;
+    const conditionValue = condition.value;
+    const value = `${item[ROW_DATA_INDEX][condition.index]}`;
+    let result;
+
+    if (comparison === '=') {
+      result = value === conditionValue;
+    }
+
+    return result;
+  };
   /**
    * 필터 조건이 적용된 데이터를 반환한다.
    *
@@ -739,8 +754,11 @@ export const filterEvent = (params) => {
    * @returns {boolean} 확인 결과
    */
   const getFilteringData = (data, columnType, condition) => {
-    const filterFn = columnType === 'string' || columnType === 'stringNumber'
+    let filterFn = columnType === 'string' || columnType === 'stringNumber'
       ? stringFilter : numberFilter;
+    if (columnType === 'boolean') {
+      filterFn = booleanFilter;
+    }
     return data.filter(row => filterFn(row, condition, columnType)) || [];
   };
   /**
@@ -753,7 +771,7 @@ export const filterEvent = (params) => {
     const filteringItemsByColumn = filterInfo.filteringItemsByColumn;
     const fields = Object.keys(filteringItemsByColumn);
     const originStore = stores.originStore;
-
+    let filteredOnce = false;
     fields.forEach((field) => {
       const filters = filteringItemsByColumn[field];
       const index = getColumnIndex(field);
@@ -761,7 +779,7 @@ export const filterEvent = (params) => {
 
       filters.forEach((filterItem) => {
         isApply = true;
-        if (!filterStore.length && Object.keys(filteringItemsByColumn).length < 2) {
+        if (!filterStore.length && !filteredOnce) {
           filterStore = getFilteringData(originStore, columnType, {
             ...filterItem,
             index,
@@ -777,6 +795,7 @@ export const filterEvent = (params) => {
             index,
           });
         }
+        filteredOnce = true;
       });
     });