fix: send default_filter separately
This commit is contained in:
parent
7b3dd34b7b
commit
e3c95f63cf
@ -56,9 +56,22 @@ def get_filterable_fields(doctype: str):
|
|||||||
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def get_list_data(doctype: str, filters: dict, order_by: str, columns=None , rows=None, custom_view_name=None):
|
def get_list_data(
|
||||||
|
doctype: str,
|
||||||
|
filters: dict,
|
||||||
|
order_by: str,
|
||||||
|
columns=None,
|
||||||
|
rows=None,
|
||||||
|
custom_view_name=None,
|
||||||
|
default_filters=None,
|
||||||
|
):
|
||||||
custom_view = False
|
custom_view = False
|
||||||
filters = frappe._dict(filters)
|
filters = frappe._dict(filters)
|
||||||
|
|
||||||
|
if default_filters:
|
||||||
|
default_filters = frappe.parse_json(default_filters)
|
||||||
|
filters.update(default_filters)
|
||||||
|
|
||||||
is_default = True
|
is_default = True
|
||||||
if columns or rows:
|
if columns or rows:
|
||||||
custom_view = True
|
custom_view = True
|
||||||
|
|||||||
@ -116,7 +116,7 @@ const currentView = computed(() => {
|
|||||||
const view = ref({
|
const view = ref({
|
||||||
name: '',
|
name: '',
|
||||||
label: '',
|
label: '',
|
||||||
filters: props.filters,
|
filters: {},
|
||||||
order_by: 'modified desc',
|
order_by: 'modified desc',
|
||||||
columns: '',
|
columns: '',
|
||||||
rows: '',
|
rows: '',
|
||||||
@ -126,7 +126,7 @@ const view = ref({
|
|||||||
|
|
||||||
function getParams() {
|
function getParams() {
|
||||||
let _view = getView(route.query.view)
|
let _view = getView(route.query.view)
|
||||||
const filters = (_view?.filters && JSON.parse(_view.filters)) || props.filters
|
const filters = (_view?.filters && JSON.parse(_view.filters)) || {}
|
||||||
const order_by = _view?.order_by || 'modified desc'
|
const order_by = _view?.order_by || 'modified desc'
|
||||||
const columns = _view?.columns || ''
|
const columns = _view?.columns || ''
|
||||||
const rows = _view?.rows || ''
|
const rows = _view?.rows || ''
|
||||||
@ -147,7 +147,7 @@ function getParams() {
|
|||||||
view.value = {
|
view.value = {
|
||||||
name: '',
|
name: '',
|
||||||
label: '',
|
label: '',
|
||||||
filters: props.filters,
|
filters: {},
|
||||||
order_by: 'modified desc',
|
order_by: 'modified desc',
|
||||||
columns: '',
|
columns: '',
|
||||||
rows: '',
|
rows: '',
|
||||||
@ -164,6 +164,7 @@ function getParams() {
|
|||||||
columns: columns,
|
columns: columns,
|
||||||
rows: rows,
|
rows: rows,
|
||||||
custom_view_name: _view?.name || '',
|
custom_view_name: _view?.name || '',
|
||||||
|
default_filters: props.filters,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -181,6 +182,7 @@ list.value = createResource({
|
|||||||
columns: data.columns,
|
columns: data.columns,
|
||||||
rows: data.rows,
|
rows: data.rows,
|
||||||
custom_view_name: cv?.name || '',
|
custom_view_name: cv?.name || '',
|
||||||
|
default_filters: props.filters,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user