espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix filters enum

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-06-16 10:15:22 +03:00
parent fea9837f30
commit a86ea5d12f
2 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/fields/array.js
+32
View File
@@ -549,6 +549,38 @@ define('views/fields/array', ['views/fields/base', 'lib!Selectize'], function (D
if (valueList.length === 1 && valueList[0] === '') {
valueList = [];
}
if (valueList.length === 0) {
if (type === 'anyOf') {
return {
type: 'any',
data: {
type: type,
valueList: valueList,
},
};
}
if (type === 'noneOf') {
return {
type: 'any',
data: {
type: type,
valueList: valueList,
},
};
}
if (type === 'allOf') {
return {
type: 'any',
data: {
type: type,
valueList: valueList,
},
};
}
}
}
if (type === 'anyOf') {
client/src/views/fields/enum.js
+23 -12
View File
@@ -333,40 +333,47 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
var type = this.fetchSearchType();
var list = this.$element.val().split(':,:');
if (list.length === 1 && list[0] == '') {
if (list.length === 1 && list[0] === '') {
list = [];
}
list.forEach(function (item, i) {
list.forEach((item, i) => {
list[i] = this.parseItemForSearch(item);
}, this);
});
if (type === 'anyOf') {
if (list.length === 0) {
return {
type: 'any',
data: {
type: 'anyOf',
valueList: list
}
},
};
}
return {
type: 'in',
value: list,
data: {
type: 'anyOf',
valueList: list
}
},
};
} else if (type === 'noneOf') {
}
if (type === 'noneOf') {
if (list.length === 0) {
return {
type: 'any',
data: {
type: 'noneOf',
valueList: list
}
},
};
}
return {
type: 'or',
value: [
@@ -383,9 +390,11 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
data: {
type: 'noneOf',
valueList: list
}
},
};
} else if (type === 'isEmpty') {
}
if (type === 'isEmpty') {
return {
type: 'or',
value: [
@@ -401,9 +410,11 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
],
data: {
type: 'isEmpty'
}
},
};
} else if (type === 'isNotEmpty') {
}
if (type === 'isNotEmpty') {
return {
type: 'and',
value: [
@@ -419,7 +430,7 @@ define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (De
],
data: {
type: 'isNotEmpty'
}
},
};
}
},