diff --git a/crm/api/doc.py b/crm/api/doc.py index 8caf0d04..175bccb9 100644 --- a/crm/api/doc.py +++ b/crm/api/doc.py @@ -379,9 +379,11 @@ def get_data( new_filters = filters.copy() new_filters.update({column_field: kc.get("name")}) - all_count = len( - frappe.get_list(doctype, filters=convert_filter_to_tuple(doctype, new_filters)) - ) + all_count = frappe.get_list( + doctype, + filters=convert_filter_to_tuple(doctype, new_filters), + fields="count(*) as total_count" + )[0].total_count kc["all_count"] = all_count kc["count"] = len(column_data) @@ -483,7 +485,9 @@ def get_data( "page_length_count": page_length_count, "is_default": is_default, "views": get_views(doctype), - "total_count": len(frappe.get_list(doctype, filters=filters)), + "total_count": frappe.get_list( + doctype, filters=filters, fields="count(*) as total_count" + )[0].total_count, "row_count": len(data), "form_script": get_form_script(doctype), "list_script": get_form_script(doctype, "List"), diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue index e6cb4356..89a92cce 100644 --- a/frontend/src/components/Controls/Link.vue +++ b/frontend/src/components/Controls/Link.vue @@ -82,7 +82,7 @@ const props = defineProps({ required: true, }, filters: { - type: [Array, String], + type: [Array, Object, String], default: [], }, modelValue: { @@ -133,7 +133,7 @@ watchDebounced( const options = createResource({ url: 'frappe.desk.search.search_link', - cache: [props.doctype, text.value, props.hideMe], + cache: [props.doctype, text.value, props.hideMe, props.filters], method: 'POST', params: { txt: text.value, diff --git a/frontend/src/components/Controls/MultiValueInput.vue b/frontend/src/components/Controls/MultiValueInput.vue index 9574c378..43e3e11a 100644 --- a/frontend/src/components/Controls/MultiValueInput.vue +++ b/frontend/src/components/Controls/MultiValueInput.vue @@ -39,7 +39,6 @@ diff --git a/frontend/src/components/FieldLayout/Field.vue b/frontend/src/components/FieldLayout/Field.vue index 19dc5ae2..dc46b365 100644 --- a/frontend/src/components/FieldLayout/Field.vue +++ b/frontend/src/components/FieldLayout/Field.vue @@ -81,6 +81,12 @@ + +