dtable-utils
Advanced tools
Comparing version 4.4.5-beta.2 to 4.4.5-beta.3
@@ -561,3 +561,3 @@ import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray'; | ||
}; | ||
var arrayColumnCondition = function arrayColumnCondition(column, filterItem) { | ||
var arrayColumnCondition = function arrayColumnCondition(column, filterItem, userDepartmentIdsMap) { | ||
var name = column.name; | ||
@@ -606,3 +606,3 @@ var filter_predicate = filterItem.filter_predicate; | ||
if (array_type === CellType.DEPARTMENT_SINGLE_SELECT) { | ||
return departmentMultipleSelectSqlCondition(linkedColumn, filterItem); | ||
return departmentMultipleSelectSqlCondition(linkedColumn, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -618,8 +618,8 @@ if ([CellType.CREATOR, CellType.LAST_MODIFIER].includes(array_type)) { | ||
// LINK | ||
var linkSqlCondition = function linkSqlCondition(column, filterItem) { | ||
return arrayColumnCondition(column, filterItem); | ||
var linkSqlCondition = function linkSqlCondition(column, filterItem, userDepartmentIdsMap) { | ||
return arrayColumnCondition(column, filterItem, userDepartmentIdsMap); | ||
}; | ||
// FORMULA | LINK-FORMULA | ||
var formulaSqlCondition = function formulaSqlCondition(column, filterItem) { | ||
var formulaSqlCondition = function formulaSqlCondition(column, filterItem, userDepartmentIdsMap) { | ||
var _ref4 = column.data || {}, | ||
@@ -645,3 +645,3 @@ result_type = _ref4.result_type; | ||
if (result_type === FORMULA_RESULT_TYPE.ARRAY) { | ||
return arrayColumnCondition(column, filterItem); | ||
return arrayColumnCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -692,6 +692,6 @@ return ''; | ||
if (type === CellType.LINK) { | ||
return linkSqlCondition(column, filterItem); | ||
return linkSqlCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
if (type === CellType.FORMULA || type === CellType.LINK_FORMULA) { | ||
return formulaSqlCondition(column, filterItem); | ||
return formulaSqlCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -698,0 +698,0 @@ return ''; |
@@ -571,3 +571,3 @@ 'use strict'; | ||
}; | ||
var arrayColumnCondition = function arrayColumnCondition(column, filterItem) { | ||
var arrayColumnCondition = function arrayColumnCondition(column, filterItem, userDepartmentIdsMap) { | ||
var name = column.name; | ||
@@ -616,3 +616,3 @@ var filter_predicate = filterItem.filter_predicate; | ||
if (array_type === cellType.CellType.DEPARTMENT_SINGLE_SELECT) { | ||
return departmentMultipleSelectSqlCondition(linkedColumn, filterItem); | ||
return departmentMultipleSelectSqlCondition(linkedColumn, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -628,8 +628,8 @@ if ([cellType.CellType.CREATOR, cellType.CellType.LAST_MODIFIER].includes(array_type)) { | ||
// LINK | ||
var linkSqlCondition = function linkSqlCondition(column, filterItem) { | ||
return arrayColumnCondition(column, filterItem); | ||
var linkSqlCondition = function linkSqlCondition(column, filterItem, userDepartmentIdsMap) { | ||
return arrayColumnCondition(column, filterItem, userDepartmentIdsMap); | ||
}; | ||
// FORMULA | LINK-FORMULA | ||
var formulaSqlCondition = function formulaSqlCondition(column, filterItem) { | ||
var formulaSqlCondition = function formulaSqlCondition(column, filterItem, userDepartmentIdsMap) { | ||
var _ref4 = column.data || {}, | ||
@@ -655,3 +655,3 @@ result_type = _ref4.result_type; | ||
if (result_type === formula.FORMULA_RESULT_TYPE.ARRAY) { | ||
return arrayColumnCondition(column, filterItem); | ||
return arrayColumnCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -702,6 +702,6 @@ return ''; | ||
if (type === cellType.CellType.LINK) { | ||
return linkSqlCondition(column, filterItem); | ||
return linkSqlCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
if (type === cellType.CellType.FORMULA || type === cellType.CellType.LINK_FORMULA) { | ||
return formulaSqlCondition(column, filterItem); | ||
return formulaSqlCondition(column, filterItem, userDepartmentIdsMap); | ||
} | ||
@@ -708,0 +708,0 @@ return ''; |
{ | ||
"name": "dtable-utils", | ||
"version": "4.4.5-beta.2", | ||
"version": "4.4.5-beta.3", | ||
"description": "dtable common utils", | ||
@@ -5,0 +5,0 @@ "main": "./lib/index.js", |
Sorry, the diff of this file is too big to display
897178