Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-15 16:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quick backup before crash

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-06-13 18:55:52 +00:00
parent f56259e181
commit fb1ae16215
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
UI/Component/Form.js
View File

@ -193,7 +193,7 @@ export class Form
} }
}; };
formActionRemove(self, event, id, elementIndex) formActionRemove (self, event, id, elementIndex)
{ {
jsOMS.preventAll(event); jsOMS.preventAll(event);
@ -237,7 +237,7 @@ export class Form
} }
} }
formActionAdd(self, event, id, elementIndex) formActionAdd (self, event, id, elementIndex)
{ {
jsOMS.preventAll(event); jsOMS.preventAll(event);
@ -252,7 +252,7 @@ export class Form
} }
} }
formActionAddInline(self, event, id, elementIndex) formActionAddInline (self, event, id, elementIndex)
{ {
// Since the add is inline no form exists which the user can use, hence it must be created // Since the add is inline no form exists which the user can use, hence it must be created
/** @var {HTMLElement} formElement */ /** @var {HTMLElement} formElement */
@ -277,7 +277,7 @@ export class Form
} }
} }
formActionAddExternal(self, event, id, elementIndex) formActionAddExternal (self, event, id, elementIndex)
{ {
/** @var {HTMLElement} formElement External form */ /** @var {HTMLElement} formElement External form */
const formElement = self.forms[id].getFormElement(); const formElement = self.forms[id].getFormElement();
@ -374,18 +374,18 @@ export class Form
self.forms[id].resetValues(); self.forms[id].resetValues();
} }
formActionSave(self, event, id, elementIndex) formActionSave (self, event, id, elementIndex)
{ {
jsOMS.preventAll(event); jsOMS.preventAll(event);
if (document.querySelector('[data-update-form="' + id + '"') === null) { if (document.querySelector('[data-update-form="' + id + '"') === null) {
this.formActionSaveInline(self, event, id, elementIndex) this.formActionSaveInline(self, event, id, elementIndex);
} else { } else {
this.formActionSaveExternal(self, event, id, elementIndex) this.formActionSaveExternal(self, event, id, elementIndex);
} }
} }
formActionSaveInline(self, event, id, elementIndex) formActionSaveInline (self, event, id, elementIndex)
{ {
if (!self.forms[id].isValid()) { if (!self.forms[id].isValid()) {
return; return;
@ -565,7 +565,7 @@ export class Form
} }
} }
formActionSaveExternal(self, event, id, elementIndex) formActionSaveExternal (self, event, id, elementIndex)
{ {
const mainForm = document.querySelector('[data-update-form="' + id + '"'); const mainForm = document.querySelector('[data-update-form="' + id + '"');
const externalFormId = id; const externalFormId = id;
@ -684,7 +684,7 @@ export class Form
} }
} }
formActionCancel(self, event, id, elementIndex) formActionCancel (self, event, id, elementIndex)
{ {
jsOMS.preventAll(event); jsOMS.preventAll(event);
@ -696,7 +696,7 @@ export class Form
} }
} }
formActionCancelInline(self, event, id, elementIndex) formActionCancelInline (self, event, id, elementIndex)
{ {
/** @var {HTMLElement} formElement Form */ /** @var {HTMLElement} formElement Form */
const formElement = self.forms[id].getFormElement(); const formElement = self.forms[id].getFormElement();
@ -720,7 +720,7 @@ export class Form
elementContainer.parentNode.removeChild(elementContainer); elementContainer.parentNode.removeChild(elementContainer);
} }
formActionCancelExternal(self, event, id, elementIndex) formActionCancelExternal (self, event, id, elementIndex)
{ {
// reset form values to default values // reset form values to default values
self.forms[id].resetValues(); self.forms[id].resetValues();
@ -750,7 +750,7 @@ export class Form
} }
} }
formActionUpdate(self, event, id, elementIndex) formActionUpdate (self, event, id, elementIndex)
{ {
// this doesn't handle setting new values but populating the update form // this doesn't handle setting new values but populating the update form
jsOMS.preventAll(event); jsOMS.preventAll(event);
@ -762,7 +762,7 @@ export class Form
} }
} }
formActionUpdateInline(self, event, id, elementIndex) formActionUpdateInline (self, event, id, elementIndex)
{ {
/** @var {HTMLElement} formElement Form */ /** @var {HTMLElement} formElement Form */
const formElement = self.forms[id].getFormElement(); const formElement = self.forms[id].getFormElement();
@ -832,7 +832,7 @@ export class Form
} }
} }
formActionUpdateExternal(self, event, id, elementIndex) formActionUpdateExternal (self, event, id, elementIndex)
{ {
/** @var {HTMLElement} formElement */ /** @var {HTMLElement} formElement */
const formElement = self.forms[id].getFormElement(); const formElement = self.forms[id].getFormElement();
@ -934,6 +934,8 @@ export class Form
// Consider: It might make sense to do this in the Table.js??? Kinda depends on additional functionality together with the form probably. // Consider: It might make sense to do this in the Table.js??? Kinda depends on additional functionality together with the form probably.
} }
// @todo: if input change check if iframe needs to be reloaded (if there is a iframe that is attached/part of the form e.g. media renderer based on currently selected element)
// remote actions (maybe solvable with callbacks?): // remote actions (maybe solvable with callbacks?):
// filter // filter
// sort // sort

7
Uri/UriFactory.js
View File

@ -192,9 +192,10 @@ export class UriFactory
* . = DOM class * . = DOM class
* / = Current path * / = Current path
* ? = Current query * ? = Current query
* @ = * @ = Name attribute
* $ = Other data * $ =
* % = Current url * % = Current url
* ! = Query selector
* *
* @param {string} uri Raw uri * @param {string} uri Raw uri
* @param {null|Object} [toMatch] Key/value pair to replace in raw * @param {null|Object} [toMatch] Key/value pair to replace in raw
@ -214,7 +215,7 @@ export class UriFactory
} }
} }
let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!][a-zA-Z0-9_\\-#\.]*\}', 'g'), function (match) { let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$\!].*?\}', 'g'), function (match) {
match = match.substring(1, match.length - 1); match = match.substring(1, match.length - 1);
if (toMatch !== null && Object.prototype.hasOwnProperty.call(toMatch, match)) { if (toMatch !== null && Object.prototype.hasOwnProperty.call(toMatch, match)) {

2
Views/FormView.js
View File

@ -638,7 +638,7 @@ export class FormView
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
if (!elements[i].required && elements[i].value === '') { if (!elements[i].required && elements[i].value === '') {
continue; continue;
}else if ((elements[i].required && elements[i].value === '') } else if ((elements[i].required && elements[i].value === '')
|| (typeof elements[i].pattern !== 'undefined' || (typeof elements[i].pattern !== 'undefined'
&& elements[i].pattern !== '' && elements[i].pattern !== ''
&& !(new RegExp(elements[i].pattern)).test(elements[i].value)) && !(new RegExp(elements[i].pattern)).test(elements[i].value))