This commit is contained in:
2020-09-14 14:03:27 +00:00
parent 4ba6b25792
commit 14adc5284f

View File

@@ -126,7 +126,6 @@ import * as monaco from "monaco-editor";
//Monaco editor info page with links //Monaco editor info page with links
//https://microsoft.github.io/monaco-editor/ //https://microsoft.github.io/monaco-editor/
const FORM_KEY = "ay-report-edit"; const FORM_KEY = "ay-report-edit";
let JUST_DELETED = false; let JUST_DELETED = false;
let editor = null; let editor = null;
@@ -153,7 +152,7 @@ export default {
vm.obj = vm.$route.params.obj; vm.obj = vm.$route.params.obj;
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} else { } else {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
@@ -163,7 +162,7 @@ export default {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} }
@@ -196,13 +195,13 @@ export default {
//Create the editor itself //Create the editor itself
editor = monaco.editor.create(document.getElementById("editContainer"), { editor = monaco.editor.create(document.getElementById("editContainer"), {
model: vm.editData.template.model model: vm.editData.template.model,
}); });
//save the initial state because we're going to move away from it immediately //save the initial state because we're going to move away from it immediately
vm.editData.template.state = editor.saveViewState(); vm.editData.template.state = editor.saveViewState();
//change subscription //change subscription
editor.onDidChangeModelContent(event => { editor.onDidChangeModelContent((event) => {
const editorValue = editor.getValue(); const editorValue = editor.getValue();
// console.log("editorchange active tab=", vm.activeTab); // console.log("editorchange active tab=", vm.activeTab);
// console.log("editorchange, value of editor is", editorValue); // console.log("editorchange, value of editor is", editorValue);
@@ -234,7 +233,7 @@ export default {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
dirty: false, dirty: false,
valid: true valid: true,
}); });
generateMenu(vm); generateMenu(vm);
@@ -271,24 +270,24 @@ export default {
editData: { editData: {
template: { template: {
model: null, model: null,
state: null state: null,
}, },
style: { style: {
model: null, model: null,
state: null state: null,
}, },
jsPrerender: { jsPrerender: {
model: null, model: null,
state: null state: null,
}, },
jsHelpers: { jsHelpers: {
model: null, model: null,
state: null state: null,
}, },
rawData: { rawData: {
model: null, model: null,
state: null state: null,
} },
}, },
obj: { obj: {
id: 0, id: 0,
@@ -323,7 +322,7 @@ export default {
Handlebars.registerHelper('loud', function (aString) { Handlebars.registerHelper('loud', function (aString) {
return aString.toUpperCase() return aString.toUpperCase()
})`, })`,
renderType: 0 renderType: 0,
}, },
formState: { formState: {
ready: false, ready: false,
@@ -333,16 +332,16 @@ Handlebars.registerHelper('loud', function (aString) {
loading: true, loading: true,
errorBoxMessage: null, errorBoxMessage: null,
appError: null, appError: null,
serverError: {} serverError: {},
}, },
rights: window.$gz.role.defaultRightsObject(), rights: window.$gz.role.defaultRightsObject(),
ayaType: window.$gz.type.Report ayaType: window.$gz.type.Report,
}; };
}, },
//WATCHERS //WATCHERS
watch: { watch: {
formState: { formState: {
handler: function(val) { handler: function (val) {
//,oldval is available here too if necessary //,oldval is available here too if necessary
if (this.formState.loading) { if (this.formState.loading) {
return; return;
@@ -382,8 +381,8 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new"); window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
} }
}, },
deep: true deep: true,
} },
}, },
methods: { methods: {
//alternate method, one editor with tabs example //alternate method, one editor with tabs example
@@ -475,13 +474,13 @@ Handlebars.registerHelper('loud', function (aString) {
} }
}); });
}, },
canSave: function() { canSave: function () {
return this.formState.valid && this.formState.dirty; return this.formState.valid && this.formState.dirty;
}, },
canDuplicate: function() { canDuplicate: function () {
return this.formState.valid && !this.formState.dirty; return this.formState.valid && !this.formState.dirty;
}, },
ayaTypes: function() { ayaTypes: function () {
return window.$gz.type; return window.$gz.type;
}, },
form() { form() {
@@ -500,7 +499,7 @@ Handlebars.registerHelper('loud', function (aString) {
let vm = this; let vm = this;
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: true loading: true,
}); });
if (!recordId) { if (!recordId) {
throw FORM_KEY + "::getDataFromApi -> Missing recordID!"; throw FORM_KEY + "::getDataFromApi -> Missing recordID!";
@@ -517,7 +516,7 @@ Handlebars.registerHelper('loud', function (aString) {
//notify not found error then navigate backwards //notify not found error then navigate backwards
window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010")); window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
// navigate backwards // navigate backwards
window.$gz._.delay(function() { window.$gz._.delay(function () {
vm.$router.go(-1); vm.$router.go(-1);
}, 2000); }, 2000);
} }
@@ -532,7 +531,7 @@ Handlebars.registerHelper('loud', function (aString) {
vm: vm, vm: vm,
dirty: false, dirty: false,
valid: true, valid: true,
loading: false loading: false,
}); });
} }
} catch (error) { } catch (error) {
@@ -540,7 +539,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally { } finally {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} }
}, },
@@ -559,7 +558,7 @@ Handlebars.registerHelper('loud', function (aString) {
try { try {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: true loading: true,
}); });
let url = "report/"; // + vm.$route.params.recordid; let url = "report/"; // + vm.$route.params.recordid;
//clear any errors vm might be around from previous submit //clear any errors vm might be around from previous submit
@@ -583,8 +582,8 @@ Handlebars.registerHelper('loud', function (aString) {
params: { params: {
recordid: res.data.id, recordid: res.data.id,
obj: res.data, // Pass data object to new form obj: res.data, // Pass data object to new form
reportDataOptions: vm.$route.params.reportDataOptions reportDataOptions: vm.$route.params.reportDataOptions,
} },
}); });
} else { } else {
//PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**) //PUT - only concurrency token is returned (**warning, if server changes object other fields then this needs to act more like POST above but is more efficient this way**)
@@ -595,7 +594,7 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
dirty: false, dirty: false,
valid: true valid: true,
}); });
} }
} catch (ex) { } catch (ex) {
@@ -603,7 +602,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally { } finally {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} }
}, },
@@ -618,7 +617,7 @@ Handlebars.registerHelper('loud', function (aString) {
//do the delete //do the delete
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: true loading: true,
}); });
//No need to delete a new record, just abandon it... //No need to delete a new record, just abandon it...
if (vm.$route.params.recordid == 0) { if (vm.$route.params.recordid == 0) {
@@ -646,7 +645,7 @@ Handlebars.registerHelper('loud', function (aString) {
//Update the form status //Update the form status
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
window.$gz.errorHandler.handleFormError(error, vm); window.$gz.errorHandler.handleFormError(error, vm);
} }
@@ -658,7 +657,7 @@ Handlebars.registerHelper('loud', function (aString) {
} }
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: true loading: true,
}); });
let url = "report/duplicate/" + vm.$route.params.recordid; let url = "report/duplicate/" + vm.$route.params.recordid;
@@ -674,8 +673,8 @@ Handlebars.registerHelper('loud', function (aString) {
name: "ay-report-edit", name: "ay-report-edit",
params: { params: {
recordid: res.data.id, recordid: res.data.id,
obj: res.data // Pass data object to new form obj: res.data, // Pass data object to new form
} },
}); });
} }
} catch (ex) { } catch (ex) {
@@ -683,7 +682,7 @@ Handlebars.registerHelper('loud', function (aString) {
} finally { } finally {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} }
}, },
@@ -726,7 +725,7 @@ Handlebars.registerHelper('loud', function (aString) {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: true loading: true,
}); });
let url = "report/render"; let url = "report/render";
@@ -750,11 +749,11 @@ Handlebars.registerHelper('loud', function (aString) {
} finally { } finally {
window.$gz.form.setFormState({ window.$gz.form.setFormState({
vm: vm, vm: vm,
loading: false loading: false,
}); });
} }
} },
} },
}; };
//end of vue object //end of vue object
@@ -780,7 +779,7 @@ async function clickHandler(menuItem) {
case "new": case "new":
m.vm.$router.push({ m.vm.$router.push({
name: "ay-report-edit", name: "ay-report-edit",
params: { recordid: 0, new: true } params: { recordid: 0, new: true },
}); });
break; break;
case "duplicate": case "duplicate":
@@ -810,9 +809,9 @@ function generateMenu(vm) {
helpUrl: "form-ay-report-edit", helpUrl: "form-ay-report-edit",
formData: { formData: {
ayaType: window.$gz.type.Report, ayaType: window.$gz.type.Report,
recordId: vm.$route.params.recordid recordId: vm.$route.params.recordid,
}, },
menuItems: [] menuItems: [],
}; };
if (vm.rights.change) { if (vm.rights.change) {
@@ -821,7 +820,7 @@ function generateMenu(vm) {
icon: "fa-save", icon: "fa-save",
surface: true, surface: true,
key: FORM_KEY + ":save", key: FORM_KEY + ":save",
vm: vm vm: vm,
}); });
} }
if (vm.reportData != null) { if (vm.reportData != null) {
@@ -830,7 +829,7 @@ function generateMenu(vm) {
icon: "fa-print", icon: "fa-print",
key: FORM_KEY + ":render", key: FORM_KEY + ":render",
surface: true, surface: true,
vm: vm vm: vm,
}); });
} }
@@ -840,7 +839,7 @@ function generateMenu(vm) {
icon: "fa-trash-alt", icon: "fa-trash-alt",
surface: false, surface: false,
key: FORM_KEY + ":delete", key: FORM_KEY + ":delete",
vm: vm vm: vm,
}); });
} }
@@ -869,7 +868,7 @@ function generateMenu(vm) {
title: "New", title: "New",
icon: "fa-plus", icon: "fa-plus",
key: FORM_KEY + ":new", key: FORM_KEY + ":new",
vm: vm vm: vm,
}); });
} }
@@ -878,7 +877,7 @@ function generateMenu(vm) {
title: "Duplicate", title: "Duplicate",
icon: "fa-clone", icon: "fa-clone",
key: FORM_KEY + ":duplicate", key: FORM_KEY + ":duplicate",
vm: vm vm: vm,
}); });
} }
@@ -894,7 +893,7 @@ function generateMenu(vm) {
href: href, href: href,
target: "_blank", target: "_blank",
key: FORM_KEY + ":export", key: FORM_KEY + ":export",
vm: vm vm: vm,
}); });
} }
@@ -921,7 +920,7 @@ async function fetchTranslatedText(vm) {
"ReportEditorMobileWarning", "ReportEditorMobileWarning",
"ReportNotes", "ReportNotes",
"ReportTemplate", "ReportTemplate",
"AuthorizationRoles" "AuthorizationRoles",
]); ]);
} }