From e65faf0dfd7c27b00e419d79a784c093bf476b20 Mon Sep 17 00:00:00 2001 From: kimyell <61657275+kimyell@users.noreply.github.com> Date: Tue, 26 Jul 2022 12:03:41 +0900 Subject: [PATCH] =?UTF-8?q?[#1249]=20Grid,=20TreeGrid=20>=20falsy=20?= =?UTF-8?q?=ED=95=9C=20column=20=EA=B0=92=EC=9D=80=20=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=EB=8C=80=EC=83=81=EC=97=90=EC=84=9C=20=EC=A0=9C=EC=99=B8?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88=20(#1250)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: yell --- package.json | 2 +- src/components/grid/uses.js | 4 ++-- src/components/treeGrid/uses.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index cd185c6cb..f5ba55f8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "evui", - "version": "3.3.35", + "version": "3.3.36", "description": "A EXEM Library project", "author": "exem ", "license": "MIT", diff --git a/src/components/grid/uses.js b/src/components/grid/uses.js index 4b87dbd23..7725c6370 100644 --- a/src/components/grid/uses.js +++ b/src/components/grid/uses.js @@ -781,9 +781,9 @@ export const filterEvent = (params) => { let isShow = false; for (let ix = 0; ix < stores.orderedColumns.length; ix++) { const column = stores.orderedColumns[ix] || {}; - let columnValue = row[ROW_DATA_INDEX][ix]; + let columnValue = row[ROW_DATA_INDEX][ix] ?? null; column.type = column.type || 'string'; - if (columnValue) { + if (columnValue !== null) { if (typeof columnValue === 'object') { columnValue = columnValue[column.field]; } diff --git a/src/components/treeGrid/uses.js b/src/components/treeGrid/uses.js index 1c85788bb..5e8d54e2f 100644 --- a/src/components/treeGrid/uses.js +++ b/src/components/treeGrid/uses.js @@ -764,9 +764,9 @@ export const filterEvent = (params) => { let isSameWord = false; for (let ix = 0; ix < stores.orderedColumns.length; ix++) { const column = stores.orderedColumns[ix] || {}; - let columnValue = row[column.field]; + let columnValue = row[column.field] ?? null; column.type = column.type || 'string'; - if (columnValue) { + if (columnValue !== null) { if (!column.hide && (column?.searchable === undefined || column?.searchable)) { columnValue = getConvertValue(column, columnValue).toString(); isSameWord = columnValue.toLowerCase()