diff --git a/ayanova/src/api/gzmenu.js b/ayanova/src/api/gzmenu.js index 5af3748c..ad4d3901 100644 --- a/ayanova/src/api/gzmenu.js +++ b/ayanova/src/api/gzmenu.js @@ -280,13 +280,17 @@ export default { //format is "AREA:KEY:UNIQUEID" //and data is in data portion let keyparts = menuItem.key.split(":"); - return { + let ret = { owner: keyparts[0], key: keyparts[1], data: menuItem.data, disabled: menuItem.disabled, vm: menuItem.vm ? menuItem.vm : null }; + if (keyparts.length > 2) { + ret.id = keyparts[2]; + } + return ret; }, /////////////////////////////////// // WIRE UP MENU EVENTS diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue index 8334bf54..05ee017f 100644 --- a/ayanova/src/views/widget.vue +++ b/ayanova/src/views/widget.vue @@ -573,25 +573,27 @@ function clickHandler(menuItem) { m.vm.duplicate(); break; case "report": - //todo: code the rest of this block - //update generateMenu to put in last report choice from vuex //update enable / disable menu item code to make reports disabled when dirty like save and duplicate + if (m.id != null) { + //last report selected + alert("STUB: last report selected for " + m.id); + } else { + //finally, make a fake report viewer view to go to with choices set + m.vm.$refs.reportSelector.open().then(res => { + //if null for no selection + //just bail out + if (res == null) { + return; + } - //finally, make a fake report viewer view to go to with choices set + //persist last report selected + window.$gz.form.setLastReport(FORM_KEY, res); - m.vm.$refs.reportSelector.open().then(res => { - //if null for no selection - //just bail out - if (res == null) { - return; - } + //Now open the report viewer... + alert("STUB: view report " + res.name); + }); + } - //persist last report selected - window.$gz.form.setLastReport(FORM_KEY, res); - - //Now open the report viewer... - alert("STUB: view report " + res.name); - }); break; default: window.$gz.eventBus.$emit(