From 4955a90f5518ee426e5aa6ba1aff2039d87fef59 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 31 Oct 2023 21:05:33 +0530 Subject: [PATCH] fix: click on + button to add field and press enter tab will be deleted --- frappe/public/js/form_builder/components/Tabs.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/form_builder/components/Tabs.vue b/frappe/public/js/form_builder/components/Tabs.vue index 00191a08b7..410c02b235 100644 --- a/frappe/public/js/form_builder/components/Tabs.vue +++ b/frappe/public/js/form_builder/components/Tabs.vue @@ -6,10 +6,11 @@ import { section_boilerplate, confirm_dialog } from "../utils"; import draggable from "vuedraggable"; import { ref, computed } from "vue"; -let store = useStore(); +const store = useStore(); -let dragged = ref(false); -let has_tabs = computed(() => store.form.layout.tabs.length > 1); +const remove_tab_btn = ref(null); +const dragged = ref(false); +const has_tabs = computed(() => store.form.layout.tabs.length > 1); store.form.active_tab = store.form.layout.tabs[0].df.name; function activate_tab(tab) { @@ -41,6 +42,9 @@ function is_current_tab_empty() { } function remove_tab(tab) { + // is remove_tab_btn is not visible then return + if (!remove_tab_btn.value?.offsetParent) return; + if (store.is_customize_form && store.current_tab.df.is_custom_field == 0) { frappe.msgprint(__("Cannot delete standard field. You can hide it if you want")); throw "cannot delete standard field"; @@ -124,6 +128,7 @@ function delete_tab(tab, with_children) { v-model="element.df.label" />