Skip to content

Commit

Permalink
[#1249] Grid, TreeGrid > falsy 한 column 값은 검색 대상에서 제외는 이슈 (#1250)
Browse files Browse the repository at this point in the history
Co-authored-by: yell <yell@ex-em.com>
  • Loading branch information
kimyell and kimyell1023 authored Jul 26, 2022
1 parent 79903c1 commit e65faf0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "evui",
"version": "3.3.35",
"version": "3.3.36",
"description": "A EXEM Library project",
"author": "exem <dev_client@ex-em.com>",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions src/components/grid/uses.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/treeGrid/uses.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit e65faf0

Please sign in to comment.