diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js index 9421c0c..e47ca5d 100644 --- a/resources/js/Global/mixins/global.js +++ b/resources/js/Global/mixins/global.js @@ -21,17 +21,16 @@ const global = { ...mapActions("modal", [ "$_dialog", "$_helper", - "openModal", + "__openModal", "$_closeModal" ]), - $_openModal(name, data) { + $_openModal(name, data = {}) { if (typeof name == 'object') { - this.openModal(name) + this.__openModal(name) } else { - this.openModal({...data, ...{name}}) + this.__openModal({...data, ...{name}}) } - }, $_can, $_name, diff --git a/resources/js/Global/store/modules/modal/actions.js b/resources/js/Global/store/modules/modal/actions.js index 5498111..0e42618 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); }, };