From f07abce4897166af07b84abda29a406dc6e4495b Mon Sep 17 00:00:00 2001 From: Saeid Date: Wed, 9 Dec 2020 09:12:02 +0330 Subject: [PATCH] feat: part 2/3 modal --- .../Global/components/Modals/BasicModal.vue | 34 +++++++++++++++---- resources/js/Global/mixins/global.js | 9 ++++- .../js/Global/store/modules/modal/actions.js | 6 ++-- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/resources/js/Global/components/Modals/BasicModal.vue b/resources/js/Global/components/Modals/BasicModal.vue index b4f41c6..df1e237 100644 --- a/resources/js/Global/components/Modals/BasicModal.vue +++ b/resources/js/Global/components/Modals/BasicModal.vue @@ -1,24 +1,30 @@ diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js index e88f415..9421c0c 100644 --- a/resources/js/Global/mixins/global.js +++ b/resources/js/Global/mixins/global.js @@ -21,11 +21,18 @@ const global = { ...mapActions("modal", [ "$_dialog", "$_helper", - "$_openModal", + "openModal", "$_closeModal" ]), + $_openModal(name, data) { + if (typeof name == 'object') { + this.openModal(name) + } else { + this.openModal({...data, ...{name}}) + } + }, $_can, $_name, $_color, diff --git a/resources/js/Global/store/modules/modal/actions.js b/resources/js/Global/store/modules/modal/actions.js index 9fb9d15..5498111 100644 --- a/resources/js/Global/store/modules/modal/actions.js +++ b/resources/js/Global/store/modules/modal/actions.js @@ -2,7 +2,7 @@ import $_can from "@Global/policy/can"; export default { - $_openModal({ state, rootState }, data) { // data: {name, rel, model, form_data, data, modal_pop_data, type} + openModal({ state, rootState }, data) { // data: {name, rel, model, form_data, data, modal_pop_data, type} let can = true; if (data.can) { can = $_can(data.can); @@ -57,7 +57,7 @@ export default { $_dialog:({commit, dispatch}, properties) => { properties['name'] = 'modal_dialog'; - dispatch('$_openModal', properties); + dispatch('openModal', properties); commit('SET_DIALOG_TYPE', properties.type); commit('SET_DIALOG_PROPERTIES', properties); @@ -67,6 +67,6 @@ export default { let data = {}; data['name'] = 'modal_helper'; data['slug'] = slug; - dispatch('$_openModal', data); + dispatch('openModal', data); }, };