This commit is contained in:
2020-04-07 14:14:02 +00:00
parent 45ce2be3d8
commit fafb523630
2 changed files with 22 additions and 16 deletions

View File

@@ -280,13 +280,17 @@ export default {
//format is "AREA:KEY:UNIQUEID" //format is "AREA:KEY:UNIQUEID"
//and data is in data portion //and data is in data portion
let keyparts = menuItem.key.split(":"); let keyparts = menuItem.key.split(":");
return { let ret = {
owner: keyparts[0], owner: keyparts[0],
key: keyparts[1], key: keyparts[1],
data: menuItem.data, data: menuItem.data,
disabled: menuItem.disabled, disabled: menuItem.disabled,
vm: menuItem.vm ? menuItem.vm : null vm: menuItem.vm ? menuItem.vm : null
}; };
if (keyparts.length > 2) {
ret.id = keyparts[2];
}
return ret;
}, },
/////////////////////////////////// ///////////////////////////////////
// WIRE UP MENU EVENTS // WIRE UP MENU EVENTS

View File

@@ -573,25 +573,27 @@ function clickHandler(menuItem) {
m.vm.duplicate(); m.vm.duplicate();
break; break;
case "report": 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 //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 => { //Now open the report viewer...
//if null for no selection alert("STUB: view report " + res.name);
//just bail out });
if (res == null) { }
return;
}
//persist last report selected
window.$gz.form.setLastReport(FORM_KEY, res);
//Now open the report viewer...
alert("STUB: view report " + res.name);
});
break; break;
default: default:
window.$gz.eventBus.$emit( window.$gz.eventBus.$emit(