This commit is contained in:
2019-07-19 19:13:06 +00:00
parent 1714c64467
commit 5ed7fa8f0e
3 changed files with 10 additions and 11 deletions

View File

@@ -137,7 +137,7 @@ export default {
// //
// //
window.$gz.menu.wireUpEventHandlers(this); window.$gz.menu.wireUpEventHandlers(this);
this.$gzdialog.wireUpEventHandlers(this); window.$gz.dialog.wireUpEventHandlers(this);
}, },
beforeDestroy() { beforeDestroy() {
//UNWIRE ALL EVENT HANDLERS FROM GZEVENTBUS //UNWIRE ALL EVENT HANDLERS FROM GZEVENTBUS
@@ -173,8 +173,8 @@ export default {
afterLeave() { afterLeave() {
this.$root.$emit("triggerScroll"); this.$root.$emit("triggerScroll");
}, },
clickMenuItem(item){ clickMenuItem(item) {
window.$gz.eventbus.$emit('menu-click', item) window.$gz.eventbus.$emit("menu-click", item);
} }
} }
}; };

View File

@@ -59,13 +59,12 @@ window.$gz = {
report: gzreport, report: gzreport,
errorHandler: errorhandler errorHandler: errorhandler
}; };
window.$gzlocale = locale;
window.$gzformcustomtemplate = gzformcustomtemplate;
//Object.defineProperty(Vue.prototype, "$gztype", { value: gztype }); //Object.defineProperty(Vue.prototype, "$gztype", { value: gztype });
//Object.defineProperty(Vue.prototype, "$gzrole", { value: roles }); //Object.defineProperty(Vue.prototype, "$gzrole", { value: roles });
//Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus }); //Object.defineProperty(Vue.prototype, "$gzevent", { value: gzeventbus });
Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu }); //Object.defineProperty(Vue.prototype, "$gzmenu", { value: gzmenu });
Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog }); //Object.defineProperty(Vue.prototype, "$gzdialog", { value: gzdialog });
Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil }); Object.defineProperty(Vue.prototype, "$gzutil", { value: gzutil });
Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs }); Object.defineProperty(Vue.prototype, "$dayjs", { value: dayjs });
Object.defineProperty(Vue.prototype, "$_", { value: lodash }); Object.defineProperty(Vue.prototype, "$_", { value: lodash });

View File

@@ -297,7 +297,7 @@ export default {
beforeRouteLeave(to, from, next) { beforeRouteLeave(to, from, next) {
var vm = this; var vm = this;
if (this.formState.dirty && !JUST_DELETED) { if (this.formState.dirty && !JUST_DELETED) {
vm.$gzdialog.confirmLeaveUnsaved(vm).then(dialogResult => { window.$gz.dialog.confirmLeaveUnsaved(vm).then(dialogResult => {
if (dialogResult == true) { if (dialogResult == true) {
next(); next();
} else { } else {
@@ -410,7 +410,7 @@ export default {
//Not found? //Not found?
if (res.error.code == "2010") { if (res.error.code == "2010") {
//notify not found error then navigate backwards //notify not found error then navigate backwards
vm.$gzdialog window.$gz.dialog
.displayLTErrorMessage(vm, "ErrorAPI2010") .displayLTErrorMessage(vm, "ErrorAPI2010")
.then(() => { .then(() => {
// navigate backwards // navigate backwards
@@ -490,7 +490,7 @@ export default {
}, },
remove() { remove() {
var vm = this; var vm = this;
vm.$gzdialog.confirmDelete(vm).then(dialogResult => { window.$gz.dialog.confirmDelete(vm).then(dialogResult => {
if (dialogResult == true) { if (dialogResult == true) {
//do the delete //do the delete
vm.formState.loading = true; vm.formState.loading = true;
@@ -584,7 +584,7 @@ function clickHandler(menuItem) {
case "report": case "report":
var reportList = m.vm.$gzreport.availableReports("WIDGET"); var reportList = m.vm.$gzreport.availableReports("WIDGET");
var selectedItem = reportList[0].value; var selectedItem = reportList[0].value;
m.vm.$gzdialog window.$gz.dialog
.getReportChoice(m.vm, reportList, selectedItem) .getReportChoice(m.vm, reportList, selectedItem)
.then(res => { .then(res => {
if (res) { if (res) {