From 8da41608fd4cb306e535914e756e794d3e74fe28 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 26 Feb 2025 19:31:12 +0530 Subject: [PATCH 1/3] fix: restrict Table Multiselect in sidebar panel --- frontend/src/components/SidePanelLayoutEditor.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/components/SidePanelLayoutEditor.vue b/frontend/src/components/SidePanelLayoutEditor.vue index 7b277db7..3b7ab0a3 100644 --- a/frontend/src/components/SidePanelLayoutEditor.vue +++ b/frontend/src/components/SidePanelLayoutEditor.vue @@ -158,6 +158,7 @@ const props = defineProps({ const restrictedFieldTypes = [ 'Table', + 'Table MultiSelect', 'Geolocation', 'Attach', 'Attach Image', From d64c77aef0ecb7c5327d5b9062dedf3bac536deb Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 26 Feb 2025 19:31:59 +0530 Subject: [PATCH 2/3] feat: added Table MultiSelect Control --- .../Controls/TableMultiselectInput.vue | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 frontend/src/components/Controls/TableMultiselectInput.vue diff --git a/frontend/src/components/Controls/TableMultiselectInput.vue b/frontend/src/components/Controls/TableMultiselectInput.vue new file mode 100644 index 00000000..683a2cd0 --- /dev/null +++ b/frontend/src/components/Controls/TableMultiselectInput.vue @@ -0,0 +1,140 @@ + + + From aee5048cae993ef7eb33fdc46034c5d77cde83b1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 26 Feb 2025 19:32:32 +0530 Subject: [PATCH 3/3] fix: added Table multiselect control in Field layout --- frontend/src/components/Controls/Link.vue | 4 ++-- frontend/src/components/Controls/MultiValueInput.vue | 1 - frontend/src/components/FieldLayout/Field.vue | 7 +++++++ 3 files changed, 9 insertions(+), 3 deletions(-) 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 @@