This commit is contained in:
2020-10-07 17:33:37 +00:00
parent 0185b6941c
commit 2a2bcc5f7f
7 changed files with 80 additions and 39 deletions

View File

@@ -506,11 +506,13 @@ export default {
//See if control formCustomTemplateFieldName is in server required fields collection
//this is a collection of both custom field definitions and standard form fields that are required
//since all names are unique can just filter out the one we need by name which will inherently ignore custom fields by default
//_https://lodash.com/docs#find
let templateItem = window.$gz._.find(template, [
"fld",
formCustomTemplateFieldName
]);
//de-lodash
// let templateItem = window.$gz. _.find(template, [
// "fld",
// formCustomTemplateFieldName
// ]);
let templateItem = template.find(z => z.fld == formCustomTemplateFieldName);
//templateItem.required
if (templateItem === undefined || templateItem.required !== true) {
@@ -590,21 +592,21 @@ export default {
//CHECK PREREQUISITES IN DEV MODE TO ENSURE FORM ISN"T MISSING NEEDED DATA ATTRIBUTES ETC
if (vm.$ay.dev) {
//make sure formState.serverErrors is defined on data
if (!window.$gz._.has(vm, "formState.serverError")) {
if (!window.$gz.util.has(vm, "formState.serverError")) {
throw new Error(
"DEV ERROR gzform::formState.serverErrors -> formState.serverError seems to be missing from form's vue data object"
);
}
//make sure formState.appError is defined on data
if (!window.$gz._.has(vm, "formState.appError")) {
if (!window.$gz.util.has(vm, "formState.appError")) {
throw new Error(
"DEV ERROR gzform::formState.serverErrors -> formState.appError seems to be missing from form's vue data object"
);
}
//make sure formState.errorBoxMessage is defined on data
if (!window.$gz._.has(vm, "formState.errorBoxMessage")) {
if (!window.$gz.util.has(vm, "formState.errorBoxMessage")) {
throw new Error(
"DEV ERROR gzform::formState.serverErrors -> formState.errorBoxMessage seems to be missing from form's vue data object"
);
@@ -726,11 +728,13 @@ export default {
//See if control templateFieldName is in server required fields collection
//this is a collection of both custom field definitions and standard form fields that are required
//since all names are unique can just filter out the one we need by name which will inherently ignore custom fields by default
//_https://lodash.com/docs#find
let templateItem = window.$gz._.find(template, [
"fld",
formCustomTemplateFieldName
]);
//de-lodash
// let templateItem = window.$gz. _.find(template, [
// "fld",
// formCustomTemplateFieldName
// ]);
let templateItem = template.find(z => z.fld == formCustomTemplateFieldName);
if (templateItem === undefined || templateItem.hide !== true) {
return true;