diff --git a/frappe-ui b/frappe-ui
index 0c0212cc..b5cc6c0c 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 0c0212cc5bbac151cffc6dc73dfbdf7b69d45ec2
+Subproject commit b5cc6c0cd36ee25e8e945e8c91d8b5c035fb5e44
diff --git a/frontend/package.json b/frontend/package.json
index 7a839c81..4f46436b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,7 @@
"@vueuse/core": "^10.3.0",
"@vueuse/integrations": "^10.3.0",
"feather-icons": "^4.28.0",
- "frappe-ui": "^0.1.61",
+ "frappe-ui": "^0.1.63",
"gemoji": "^8.1.0",
"lodash": "^4.17.21",
"mime": "^4.0.1",
diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue
index a67bf7c4..5a44c11c 100644
--- a/frontend/src/components/Filter.vue
+++ b/frontend/src/components/Filter.vue
@@ -67,7 +67,7 @@
updateValue(v, f)"
:placeholder="__('John Doe')"
@@ -100,7 +100,7 @@
updateValue(v, f)"
:placeholder="__('John Doe')"
@@ -242,7 +242,7 @@ function convertFilters(data, allFilters) {
let f = []
for (let [key, value] of Object.entries(allFilters)) {
let field = data.find((f) => f.fieldname === key)
- if (typeof value !== 'object') {
+ if (typeof value !== 'object' || !value) {
value = ['=', value]
if (field?.fieldtype === 'Check') {
value = ['equals', value[1] ? 'Yes' : 'No']
@@ -273,7 +273,7 @@ function getOperators(fieldtype, fieldname) {
{ label: __('In'), value: 'in' },
{ label: __('Not In'), value: 'not in' },
{ label: __('Is'), value: 'is' },
- ]
+ ],
)
}
if (fieldname === '_assign') {
@@ -298,7 +298,7 @@ function getOperators(fieldtype, fieldname) {
{ label: __('>'), value: '>' },
{ label: __('<='), value: '<=' },
{ label: __('>='), value: '>=' },
- ]
+ ],
)
}
if (typeSelect.includes(fieldtype)) {
@@ -309,7 +309,7 @@ function getOperators(fieldtype, fieldname) {
{ label: __('In'), value: 'in' },
{ label: __('Not In'), value: 'not in' },
{ label: __('Is'), value: 'is' },
- ]
+ ],
)
}
if (typeLink.includes(fieldtype)) {
@@ -322,7 +322,7 @@ function getOperators(fieldtype, fieldname) {
{ label: __('In'), value: 'in' },
{ label: __('Not In'), value: 'not in' },
{ label: __('Is'), value: 'is' },
- ]
+ ],
)
}
if (typeCheck.includes(fieldtype)) {
@@ -336,7 +336,7 @@ function getOperators(fieldtype, fieldname) {
{ label: __('In'), value: 'in' },
{ label: __('Not In'), value: 'not in' },
{ label: __('Is'), value: 'is' },
- ]
+ ],
)
}
if (typeDate.includes(fieldtype)) {
@@ -351,13 +351,13 @@ function getOperators(fieldtype, fieldname) {
{ label: __('<='), value: '<=' },
{ label: __('Between'), value: 'between' },
{ label: __('Timespan'), value: 'timespan' },
- ]
+ ],
)
}
return options
}
-function getValSelect(f) {
+function getValueControl(f) {
const { field, operator } = f
const { fieldtype, options } = field
if (operator == 'is') {