tuain-ng-forms-lib 14.5.37 → 15.0.10

package/fesm2020/tuain-ng-forms-lib.mjs

@@ -330,15 +330,18 @@ class LibTableRecordActionComponent extends PieceComponent {
     }
     start() {
         if (this.action && this.action.restrictedOnField && this.recordData) {
-            const relatedField = this.recordData[this.action.restrictedOnField];
+            const relatedField = this.action.restrictedOnField;
             if (relatedField) {
-                const fieldValue = relatedField;
+                const relatedFieldValue = this.recordData[relatedField];
                 const restrictionOper = this.action.restrictedOnOperator;
                 const restrictionValue = this.action.restrictedOnValue;
-                if ((restrictionOper === '==' && fieldValue !== restrictionValue)
-                    || (restrictionOper === '!=' && fieldValue === restrictionValue)) {
+                if ((restrictionOper === '==' && relatedFieldValue !== restrictionValue)
+                    || (restrictionOper === '!=' && relatedFieldValue === restrictionValue)) {
                     this.isVisible = false;
                 }
+                else {
+                    this.isVisible = true;
+                }
             }
         }
     }
@@ -1276,6 +1279,13 @@ class TableAction extends FormPiece {
             this.restrictedOnOperator = actionDefinition.operatorRestricted || null;
         }
     }
+    formStateChange(state) {
+        if (state) {
+            this._formState = state;
+            this._visible = this._absoluteVisible && this.viewOnState(state);
+            this._disabled = this._absoluteDisabled || !this.enabledOnState(state);
+        }
+    }
 }
 
 class TableRecordData {
@@ -2071,34 +2081,51 @@ const ENABLE = 'enable';
 const DISABLE = 'disable';
 const CLEAN = 'clean';
 class FormStructureAndData {
-    constructor(definitionReceived, formConfig) {
+    constructor() {
         this._stateChange = new Subject();
-        this._name = '';
-        this._title = '';
-        this._fields = {};
-        this._actions = {};
-        this._tables = {};
-        this._sections = {};
+        this.name = '';
+        this.title = '';
+        this.subject = null;
+        this.fields = {};
+        this.actions = {};
+        this.tables = {};
+        this.sections = {};
         this._immutableData = {};
         this._extraInfo = {};
         this._exclusiveSectionsByAttr = {};
-        this._formConfig = formConfig;
         this.state = '';
-        this._actionArray = [];
-        this._fieldArray = [];
-        this._tableArray = [];
-        this._sectionArray = [];
-        this._stateFlow = {
+        this.actionArray = [];
+        this.fieldArray = [];
+        this.tableArray = [];
+        this.sectionArray = [];
+        this.stateFlow = {
+            defaultState: '',
+            states: [],
+            transitions: [],
+        };
+    }
+    setConfig(formConfig) {
+        this.formConfig = formConfig;
+    }
+    cleanForm() {
+        this.actionArray = [];
+        this.fieldArray = [];
+        this.tableArray = [];
+        this.sectionArray = [];
+        this.stateFlow = {
             defaultState: '',
             states: [],
             transitions: [],
         };
+    }
+    loadDefinition(definitionReceived) {
+        this.state = '';
+        this.cleanForm();
         if (!definitionReceived) {
             return;
         }
-        this._name = (definitionReceived.form && definitionReceived.form.formCode)
-            ? definitionReceived.form.formCode : this._name;
-        this._title = (definitionReceived.form && definitionReceived.form.formTitle)
+        this.name = this.name ?? definitionReceived?.form?.formCode;
+        this.title = (definitionReceived.form && definitionReceived.form.formTitle)
             ? definitionReceived.form.formTitle : '';
         this.setStateFlow(definitionReceived?.states, definitionReceived?.transitions, definitionReceived?.defaultState);
         this.immutableData = definitionReceived.immutableData;
@@ -2116,11 +2143,11 @@ class FormStructureAndData {
                 return { ...objDef, visibleStates, enabledStates };
             });
             for (const actionReceived of formActions) {
-                const globalAction = new FormAction(actionReceived, this._formConfig);
+                const globalAction = new FormAction(actionReceived, this.formConfig);
                 const globalActionCode = globalAction.actionCode;
                 if (globalActionCode) {
-                    this._actionArray.push(globalAction);
-                    this._actions[globalActionCode] = globalAction;
+                    this.actionArray.push(globalAction);
+                    this.actions[globalActionCode] = globalAction;
                 }
             }
         }
@@ -2137,11 +2164,11 @@ class FormStructureAndData {
                 return { ...objDef, visibleStates, enabledStates };
             });
             for (const fieldReceived of formFields) {
-                const fieldToAdd = new FieldDescriptor(fieldReceived, this._formConfig);
+                const fieldToAdd = new FieldDescriptor(fieldReceived, this.formConfig);
                 const fieldCode = fieldToAdd.code;
                 if (fieldCode) {
-                    this._fieldArray.push(fieldToAdd);
-                    this._fields[fieldCode] = fieldToAdd;
+                    this.fieldArray.push(fieldToAdd);
+                    this.fields[fieldCode] = fieldToAdd;
                 }
             }
         }
@@ -2158,11 +2185,11 @@ class FormStructureAndData {
                 return { ...objDef, visibleStates, enabledStates };
             });
             for (const tableReceived of tables) {
-                const tableToAdd = new RecordTable(tableReceived, this._formConfig);
+                const tableToAdd = new RecordTable(tableReceived, this.formConfig);
                 const tableCode = tableToAdd.tableCode;
                 if (tableCode) {
-                    this._tableArray.push(tableToAdd);
-                    this._tables[tableCode] = tableToAdd;
+                    this.tableArray.push(tableToAdd);
+                    this.tables[tableCode] = tableToAdd;
                 }
             }
         }
@@ -2177,34 +2204,29 @@ class FormStructureAndData {
                 return { ...objDef, visibleStates };
             });
             for (const sectionReceived of formSections) {
-                const sectionToAdd = new RecordFormSection(sectionReceived, this, this._formConfig);
+                const sectionToAdd = new RecordFormSection(sectionReceived, this, this.formConfig);
                 const sectionCode = sectionToAdd.sectionCode;
                 if (sectionCode) {
-                    this._sectionArray.push(sectionToAdd);
-                    this._sections[sectionCode] = sectionToAdd;
+                    this.sectionArray.push(sectionToAdd);
+                    this.sections[sectionCode] = sectionToAdd;
                 }
             }
         }
     }
-    getTitle() { return this._title; }
-    setTitle(title) { this._title = title; }
-    get name() { return this._name; }
-    set name(name) { this._name = name; }
     // Estados
-    get defaultState() { return this._stateFlow.defaultState; }
-    supportState(state) { return this._stateFlow.states?.includes(state); }
-    supportMode(state) { return this.supportState(state); }
-    get states() { return this._stateFlow.states; }
-    getCurrentState() { return this.state; }
+    get defaultState() { return this.stateFlow.defaultState; }
+    get states() { return this.stateFlow.states; }
+    supportState(state = '') { return (!!state && this.stateFlow.states?.includes(state)); }
     changeState(newState) {
-        if (!newState || !this.supportState(newState)) {
+        const currentState = this.state;
+        if (!newState || !this.supportState(newState) || currentState === newState) {
             return false;
         }
         if (!this.state) {
             this.state = newState;
         }
         else {
-            const transitionToChange = this._stateFlow.transitions.find(trns => trns.source === this.state && trns.destination === newState);
+            const transitionToChange = this.stateFlow.transitions.find(trns => trns.source === this.state && trns.destination === newState);
             if (transitionToChange) {
                 this.state = newState;
             }
@@ -2214,12 +2236,12 @@ class FormStructureAndData {
     }
     get stateChange() { return this._stateChange; }
     setStateFlow(states, transitions, defaultState) {
-        this._stateFlow.states = states;
-        this._stateFlow.defaultState = defaultState || this._stateFlow.states[0];
-        this._stateFlow.transitions = transitions.map(transition => {
+        this.stateFlow.states = states;
+        this.stateFlow.defaultState = defaultState || this.stateFlow.states[0];
+        this.stateFlow.transitions = transitions.map(transition => {
             const name = transition.name;
-            const source = (this._stateFlow.states.includes(transition.source)) ? transition.source : '';
-            const destination = (this._stateFlow.states.includes(transition.destination)) ? transition.destination : '';
+            const source = (this.stateFlow.states.includes(transition.source)) ? transition.source : '';
+            const destination = (this.stateFlow.states.includes(transition.destination)) ? transition.destination : '';
             return { name, source, destination };
         }).filter(item => item.name && item.source && item.destination);
     }
@@ -2232,11 +2254,10 @@ class FormStructureAndData {
     set extraInfo(extraInfo) { Object.assign(this._extraInfo, extraInfo); }
     get extraInfo() { return JSON.parse(JSON.stringify(this._extraInfo)); }
     // Fields
-    get fields() { return this._fields; }
     get fieldNames() { return this.getFieldNames(); }
-    getFields() { return this._fieldArray; }
-    getFieldNames() { return this._fieldArray.map(field => field.code); }
-    getField(code) { return (code && this._fields?.[code]) ? this._fields[code] : null; }
+    getFields() { return this.fieldArray; }
+    getFieldNames() { return this.fieldArray.map(field => field.code); }
+    getField(code) { return (code && this.fields?.[code]) ? this.fields[code] : null; }
     enableField(code) { this.getField(code)?.enable(); }
     disableField(code) { this.getField(code)?.disable(); }
     getFieldValue(code) { return this.getField(code)?.value; }
@@ -2309,6 +2330,9 @@ class FormStructureAndData {
         }
         return processedFields;
     }
+    applyProcessToAllFields(processFunc) {
+        return this.applyOnFields(processFunc);
+    }
     enableFields(codes, secCode, subCode) {
         return this.applyOnFields(fld => fld?.enable(), codes, secCode, subCode);
     }
@@ -2363,20 +2387,26 @@ class FormStructureAndData {
         for (let index = 0; index < codes.length; index++) {
             const code = codes[index];
             if (code) {
-                resultObject[code] = this._fields?.[code]?.getValue() ?? null;
+                resultObject[code] = this.fields?.[code]?.getValue() ?? null;
             }
         }
         return resultObject;
     }
     // Acciones
-    get actions() { return this._actions; }
-    getActionsByAttribute(name, value) { return this._actionArray.filter(actionItem => actionItem.matchAttribute(name, value)); }
-    getActions() { return this._actionArray; }
-    getAction(code) { return (code && this._actions?.[code]) ? this._actions[code] : null; }
+    getActions() { return this.actionArray; }
+    getAction(code) { return (code && this.actions?.[code]) ? this.actions[code] : null; }
     showActions(codes) { return this.execOnActions(codes, SHOW); }
     hideActions(codes) { return this.execOnActions(codes, HIDE); }
     enableActions(codes) { return this.execOnActions(codes, ENABLE); }
     disableActions(codes) { return this.execOnActions(codes, DISABLE); }
+    enableAction(code) { return this.enableActions(code); }
+    disableAction(code) { return this.disableActions(code); }
+    showAction(code) { return this.showActions(code); }
+    hideAction(code) { return this.hideActions(code); }
+    getHeaderActions() { return this.getActionsByAttribute('location', HEADER$1); }
+    getActionsByAttribute(name, value) {
+        return this.actionArray.filter(actionItem => actionItem.matchAttribute(name, value));
+    }
     execOnActions(codes, functionName) {
         const actionCodes = (Array.isArray(codes)) ? codes : (codes ? [codes] : []);
         if (!functionName || actionCodes.length === 0) {
@@ -2388,15 +2418,17 @@ class FormStructureAndData {
         });
     }
     // Tablas
-    get tables() { return this.tables; }
-    getTables() { return this._tableArray; }
-    getTable(code) { return (code && this._tables?.[code]) ? this._tables[code] : null; }
+    getTables() { return this.tableArray; }
+    getTable(code) { return (code && this.tables?.[code]) ? this.tables[code] : null; }
     getTableRecord(code, id) { return this.getTable(code)?.getTableRecord(id); }
     enableTables(codes) { return this.execOnTables(codes, ENABLE); }
     disableTables(codes) { return this.execOnTables(codes, DISABLE); }
     showTables(codes) { return this.execOnTables(codes, SHOW); }
     hideTables(codes) { return this.execOnTables(codes, HIDE); }
     cleanTables(codes) { return this.execOnTables(codes, CLEAN); }
+    showTable(code) { return this.showTables(code); }
+    hideTable(code) { return this.hideTables(code); }
+    cleanTable(code) { return this.getTable(code)?.clean(); }
     execOnTables(codes, functionName) {
         const tableCodes = (Array.isArray(codes)) ? codes : (codes ? [codes] : []);
         if (!functionName || tableCodes.length === 0) {
@@ -2408,17 +2440,22 @@ class FormStructureAndData {
         });
     }
     // Secciones
-    get sections() { return this._sections; }
-    getSections() { return this._sectionArray; }
-    getSectionsByAttribute(name, value) { return this._sectionArray.filter(item => item.matchAttribute(name, value)); }
-    get sectionTitles() { return this._sectionArray.map(formSection => formSection.sectionTitle); }
-    get visibleSections() { return this._sectionArray.filter(sec => sec.absoluteVisible); }
-    getSection(code) { return (code && this._sections?.[code]) ? this._sections[code] : null; }
+    getSections() { return this.sectionArray; }
+    getSectionsTitles() { return this.getSections()?.filter(sec => sec?.title).map(sec => sec?.title ?? ''); }
+    numSections() { return this.sectionArray.length; }
+    getSectionsByAttribute(name, value) { return this.sectionArray.filter(item => item.matchAttribute(name, value)); }
+    get sectionTitles() { return this.getSectionsTitles(); }
+    get visibleSections() { return this.sectionArray.filter(sec => sec.absoluteVisible); }
+    getSection(code) { return (code && this.sections?.[code]) ? this.sections[code] : null; }
     showSections(codes) { this.execOnSections(codes, SHOW); }
     hideSections(codes) { this.execOnSections(codes, HIDE); }
+    showSection(code) { return this.showSections(code); }
+    hideSection(code) { return this.hideSections(code); }
     activeSection() { return this._exclusiveSectionsByAttr[ACTIVE]; }
     getSubSection(code, subCode) { return this.getSection(code)?.getSubsection(subCode) ?? null; }
     showSubSections(code, subCodes) { return this.execOnSubSections(code, subCodes, SHOW); }
+    showSubSection(code, subCode) { return this.showSubSections(code, subCode); }
+    hideSubSection(code, subCode) { return this.hideSubSections(code, subCode); }
     hideSubSections(code, subCodes) { return this.execOnSubSections(code, subCodes, HIDE); }
     getSectionActions(code) { return this.getSection(code)?.getActions() ?? null; }
     getSectionActionNames(code) { return this.getSection(code)?.getActionNames() ?? null; }
@@ -2455,18 +2492,15 @@ class FormStructureAndData {
      * Métodos propios de gestión del formulario
      */
     cleanData() {
-        for (const field of this._fieldArray) {
+        for (const field of this.fieldArray) {
             field.setValue(field.defaultValue);
         }
-        for (const table of this._tableArray) {
+        for (const table of this.tableArray) {
             table.clean();
         }
     }
     getPayload() {
-        const formData = {
-            fields: [],
-            tables: [],
-        };
+        const formData = { fields: [], tables: [] };
         formData.fields = this.getFields().filter(fld => !fld?.outputOnly)
             .map(fld => {
             const fieldPayload = {
@@ -2494,6 +2528,78 @@ class FormStructureAndData {
         });
         return formData;
     }
+    /**
+     * @deprecated Use subject
+     */
+    get formSubject() { return this.subject; }
+    /**
+     * @deprecated Use subject
+     */
+    set formSubject(subject) { this.subject = subject; }
+    /**
+     * @deprecated Use states
+     */
+    getStates() { return this.states; }
+    /**
+     * @deprecated Use state
+     */
+    getCurrentState() { return this.state; }
+    /**
+     * @deprecated Use title
+     */
+    getTitle() { return this.title; }
+    /**
+     * @deprecated Use title
+     */
+    setTitle(title) { this.title = title; }
+    /**
+     * @deprecated Use supportState
+     */
+    supportMode(state) { return this.supportState(state); }
+    /**
+     * @deprecated Use enableFields
+     */
+    enableEditFields(codes, secCode, subCode) {
+        return this.enableFields(codes, secCode, subCode);
+    }
+    /**
+     * @deprecated Use disableFields
+     */
+    disableEditFields(codes, secCode, subCode) {
+        return this.disableFields(codes, secCode, subCode);
+    }
+    /**
+     * @deprecated Use getField
+     */
+    getFieldObject(code) { return this.getField(code); }
+    /**
+     * @deprecated Use getAction
+     */
+    getActionObject(code) { return this.getAction(code); }
+    /**
+     * @deprecated Use getTable
+     */
+    getTableObject(code) { return this.getTable(code); }
+    /**
+     * @deprecated Use getSection
+     */
+    getSectionObject(code) { return this.getSection(code); }
+    /**
+     * @deprecated Use changeState
+     */
+    changeFormMode(state) { return this.changeState(state); }
+    /**
+     * @deprecated Use subject
+     */
+    getFormSubject() { return this.subject; }
+    /**
+     * @deprecated Use subject
+     */
+    getSubject() { return this.subject ?? ''; }
+    /**
+     * @deprecated Use subject
+     */
+    getformSubject() { return this.subject ?? ''; }
 }
 
 class LibFormManagerService {
@@ -2605,12 +2711,12 @@ const GLOBAL_ACTION = 'GLOBAL';
 const GET_DATA_ACTION = 'GETDATA';
 const SUBJECT = 'subject';
 const TOKEN = 'token';
-class BasicFormComponent {
+class BasicFormComponent extends FormStructureAndData {
     constructor(formManagerService, _eventManager, fileMgmtServices) {
+        super();
         this.formManagerService = formManagerService;
         this._eventManager = _eventManager;
         this.fileMgmtServices = fileMgmtServices;
-        this._formStructure = null;
         this._controlToken = null;
         this._originToken = null;
         this._formRoute = null;
@@ -2632,226 +2738,28 @@ class BasicFormComponent {
         this._tableActionsFinish = {};
         this._tableGetDataStart = {};
         this._tableGetDataFinish = {};
+        // Errores en procesos
         this._actionServerError = [];
         this._fieldServerError = [];
         this._tableServerError = [];
+        // Datos complementarios del formulario
         this.inputDataFields = {};
         this.extraData = {};
         this.enabledSections = [];
-        this.name = null;
-        this.formSubject = null;
+        // Gestión de error
         this._errorType = '';
         this.errorCode = '';
         this.errorFullCode = '';
         this.errorName = '';
         this.errorMessage = '';
         this.errorDetail = '';
+        // Control de estado
         this.visible = false;
-        this.fieldsArray = null;
-        this.actionsArray = null;
-        this.sectionsArray = null;
         this.busy = false;
         this._eventEmiter = this._eventManager;
         this.cleanStart();
         this.customPreProcessing();
     }
-    get title() { return this.getTitle() ?? ''; }
-    set title(title) { this.setTitle(title); }
-    getTitle() { return this._formStructure?.getTitle(); }
-    setTitle(title) { return this._formStructure?.setTitle(title); }
-    cleanData() { return this._formStructure?.cleanData(); }
-    getCurrentState() { return this._formStructure?.getCurrentState(); }
-    supportState(state) { return this._formStructure?.supportState(state ?? '') ?? false; }
-    getStates() { return this._formStructure?.states; }
-    getImmutableElement(name) { return this._formStructure?.getImmutableElement(name); }
-    getExtraInfo(name) { return this._formStructure?.getExtraInfo(name); }
-    getFields() { return this._formStructure?.getFields() ?? null; }
-    getFieldNames() { return this._formStructure?.getFieldNames() ?? null; }
-    getField(code) { return this._formStructure?.getField(code) ?? null; }
-    enableField(code) { return this._formStructure?.enableField(code); }
-    disableField(code) { return this._formStructure?.disableField(code); }
-    getFieldValue(code) { return this._formStructure?.getFieldValue(code) ?? null; }
-    getFieldOptionText(code) { return this._formStructure?.getFieldOptionText(code); }
-    getFieldsValues(codes) { return this._formStructure?.getFieldsValues(codes) ?? null; }
-    getFieldOptions(code) { return this._formStructure?.getFieldOptions(code) ?? null; }
-    setFieldValue(code, value) { return this._formStructure?.setFieldValue(code, value); }
-    setFieldRequired(inputCodes, required) { return this._formStructure?.setFieldRequired(inputCodes, required); }
-    setFieldErrorMessage(code, errorMessage) { return this._formStructure?.setFieldErrorMessage(code, errorMessage); }
-    setFieldError(code, errorCode, message, type) { return this._formStructure?.setFieldError(code, errorCode, message, type); }
-    setFieldIntrinsicErrorMessage(code, message) {
-        return this._formStructure?.setFieldIntrinsicErrorMessage(code, message);
-    }
-    setFieldOptions(code, optionsArray, idAttribute, nameAttribute) {
-        return this._formStructure?.setFieldOptions(code, optionsArray, idAttribute, nameAttribute);
-    }
-    getFieldSet(filterFunc, codes, secCode, subCode) {
-        return this._formStructure?.getFieldSet(filterFunc, codes ?? null, secCode ?? null, subCode ?? null);
-    }
-    applyOnFields(processFunc, codes, secCode, subCode) {
-        return this._formStructure?.applyOnFields(processFunc, codes, secCode, subCode);
-    }
-    applyProcessToAllFields(processFunc) {
-        return this._formStructure?.applyOnFields(processFunc);
-    }
-    cleanFields(codes, secCode, subCode) {
-        return this._formStructure?.cleanFields(codes, secCode, subCode);
-    }
-    getRequiredFields(codes, secCode, subCode) {
-        return this._formStructure?.getRequiredFields(codes, secCode, subCode);
-    }
-    getRequiredEmptyFields(codes, secCode, subCode, onlyVisible) {
-        return this._formStructure?.getRequiredEmptyFields(codes, secCode, subCode, onlyVisible) ?? null;
-    }
-    getChangedFields(codes, secCode, subCode) {
-        return this._formStructure?.getChangedFields(codes, secCode, subCode);
-    }
-    getFieldsWithValidationIssues(codes, secCode, subCode, onlyVisible) {
-        return this._formStructure?.getFieldsWithValidationIssues(codes, secCode, subCode, onlyVisible);
-    }
-    tagFieldsWithError(errorMessage, codes, secCode, subCode) {
-        return this._formStructure?.tagFieldsWithError(errorMessage, codes, secCode, subCode);
-    }
-    cleanErrorFields(codes, secCode, subCode) {
-        return this._formStructure?.cleanErrorFields(codes, secCode, subCode);
-    }
-    showLabelFields(codes, secCode, subCode) {
-        return this._formStructure?.showLabelFields(codes, secCode, subCode);
-    }
-    hideLabelFields(codes, secCode, subCode) {
-        return this._formStructure?.hideLabelFields(codes, secCode, subCode);
-    }
-    enableFields(codes, secCode, subCode) {
-        return this._formStructure?.enableFields(codes, secCode, subCode);
-    }
-    disableFields(codes, secCode, subCode) {
-        return this._formStructure?.disableFields(codes, secCode, subCode);
-    }
-    /**
-     * @deprecated Use enableFields
-     */
-    enableEditFields(codes, secCode, subCode) {
-        return this.enableFields(codes, secCode, subCode);
-    }
-    /**
-     * @deprecated Use disableFields
-     */
-    disableEditFields(codes, secCode, subCode) {
-        return this.disableFields(codes, secCode, subCode);
-    }
-    showFields(codes, secCode, subCode) {
-        return this._formStructure?.showFields(codes, secCode, subCode);
-    }
-    hideFields(codes, secCode, subCode) {
-        return this._formStructure?.hideFields(codes, secCode, subCode);
-    }
-    getActionsByAttribute(name, value) {
-        return this._formStructure?.getActionsByAttribute(name, value);
-    }
-    getHeaderActions() {
-        return this._formStructure?.getActionsByAttribute('location', HEADER$1);
-    }
-    getAction(actionCode) {
-        return this._formStructure?.getAction(actionCode) ?? null;
-    }
-    showActions(actionArray) {
-        return this._formStructure?.showActions(actionArray);
-    }
-    hideActions(actionArray) {
-        return this._formStructure?.hideActions(actionArray);
-    }
-    enableActions(actionArray) {
-        return this._formStructure?.enableActions(actionArray);
-    }
-    disableActions(actionArray) {
-        return this._formStructure?.disableActions(actionArray);
-    }
-    showAction(code) {
-        return this._formStructure?.showActions(code);
-    }
-    hideAction(code) {
-        return this._formStructure?.hideActions(code);
-    }
-    enableAction(code) {
-        return this._formStructure?.enableActions(code);
-    }
-    disableAction(code) {
-        return this._formStructure?.disableActions(code);
-    }
-    getSections() {
-        return this._formStructure?.getSections() ?? null;
-    }
-    activateSection(code) {
-        return this._formStructure?.activateSection(code);
-    }
-    getSectionsTitles() {
-        return this._formStructure?.getSections().map(sec => sec.title) ?? null;
-    }
-    getSection(code) {
-        return this._formStructure?.getSection(code) ?? null;
-    }
-    showSection(code) {
-        return this._formStructure?.showSections(code);
-    }
-    hideSection(code) {
-        return this._formStructure?.hideSections(code);
-    }
-    showSections(codes) {
-        return this._formStructure?.showSections(codes);
-    }
-    hideSections(codes) {
-        return this._formStructure?.hideSections(codes);
-    }
-    getSubSection(code, subCode) {
-        return this._formStructure?.getSubSection(code, subCode) ?? null;
-    }
-    showSubSection(code, subCode) {
-        return this._formStructure?.showSubSections(code, subCode);
-    }
-    hideSubSection(code, subCode) {
-        return this._formStructure?.hideSubSections(code, subCode);
-    }
-    showSubSections(code, subCodes) {
-        return this._formStructure?.showSubSections(code, subCodes);
-    }
-    hideSubSections(code, subCodes) {
-        return this._formStructure?.hideSubSections(code, subCodes);
-    }
-    getSectionActions(code) {
-        return this._formStructure?.getSectionActions(code) ?? null;
-    }
-    getSectionActionNames(code) {
-        return this._formStructure?.getSectionActionNames(code) ?? null;
-    }
-    getTables() {
-        return this._formStructure?.getTables();
-    }
-    showTables(codes) {
-        return this._formStructure?.showTables(codes);
-    }
-    hideTables(codes) {
-        return this._formStructure?.hideTables(codes);
-    }
-    cleanTables(codes) {
-        return this._formStructure?.cleanTables(codes);
-    }
-    getTable(code) {
-        return this._formStructure?.getTable(code) ?? null;
-    }
-    showTable(code) {
-        return this._formStructure?.showTables(code);
-    }
-    hideTable(code) {
-        return this._formStructure?.hideTables(code);
-    }
-    cleanTable(code) {
-        return this._formStructure?.getTable(code)?.clean();
-    }
-    getTableRecord(code, recordId) {
-        return this._formStructure?.getTableRecord(code, recordId);
-    }
-    setConfig(formConfig) {
-        this.formConfig = formConfig;
-    }
     cleanStart() {
         this._errorType = '';
         this.errorCode = '';
@@ -2859,10 +2767,7 @@ class BasicFormComponent {
         this.errorName = '';
         this.errorMessage = '';
         this.errorDetail = '';
-        this._formStructure = null;
-        this.fields = null;
-        this.actions = null;
-        this.sections = null;
+        this.cleanForm();
         this._controlToken = null;
         this.inputDataFields = {};
         this._definitionObtained = false;
@@ -2893,19 +2798,6 @@ class BasicFormComponent {
     }
     get formVisible() { return this.visible; }
     get form() { return this; }
-    get formCode() { return this.name ?? ''; }
-    set formCode(name) { this.name = name; }
-    get inServerProcess() { return this.busy; }
-    get formStructure() { return this._formStructure; }
-    get state() { return this._formStructure?.state ?? null; }
-    get currentState() { return this._formStructure?.state ?? ''; }
-    set currentState(state) { this?.changeState(state); }
-    get immutableData() { return this._formStructure?.immutableData; }
-    get extraInfo() { return this._formStructure?.extraInfo; }
-    get visibleSections() { return this._formStructure?.visibleSections ?? null; }
-    get formRoute() { return this._formRoute ?? ''; }
-    set formRoute(route) { this._formRoute = route; }
-    get subject() { return this.formSubject ?? ''; }
     // Métodos virtuales
     customPreProcessing() { }
     start() { }
@@ -2916,43 +2808,6 @@ class BasicFormComponent {
     showFieldInfo(code, detail) { }
     showModalDialog(title, body, options, callback, params) { }
     openUploadDialog(title, body, options, callback, params) { }
-    /**
-     * @deprecated Use supportState
-     */
-    supportMode(state) { return this.supportState(state); }
-    /**
-     * @deprecated Use getField
-     */
-    getFieldObject(code) { return this.getField(code); }
-    /**
-     * @deprecated Use getAction
-     */
-    getActionObject(code) { return this.getAction(code); }
-    /**
-     * @deprecated Use getTable
-     */
-    getTableObject(code) { return this.getTable(code); }
-    /**
-     * @deprecated Use getSection
-     */
-    getSectionObject(code) { return this.getSection(code); }
-    /**
-     * @deprecated Use changeState
-     */
-    changeFormMode(state) { return this.changeState(state); }
-    /**
-     * @deprecated Use subject
-     */
-    getFormSubject() { return this.subject; }
-    /**
-     * @deprecated Use subject
-     */
-    getSubject() { return this.formSubject ?? ''; }
-    /**
-     * @deprecated Use subject
-     */
-    getformSubject() { return this.formSubject ?? ''; }
-    numSections() { return this._formStructure?.sections.length; }
     subscribeAppEvent(eventName, callback) {
         this._eventEmiter.subscribe(eventName, callback);
     }
@@ -2960,7 +2815,7 @@ class BasicFormComponent {
         let origin = null;
         if (!cleanStack) {
             origin = { ...backData, name: this.name, url: this._formRoute, token: this._controlToken };
-            origin.subject = origin?.subject ?? this.formSubject;
+            origin.subject = origin?.subject ?? this.subject;
             origin.state = origin?.state ?? this.state;
             origin.fields = origin?.fields ?? {};
             origin.extra = origin?.extra ?? {};
@@ -2999,11 +2854,11 @@ class BasicFormComponent {
     }
     preocessInputParams(params) {
         this._controlToken = params?.[TOKEN] ?? null;
-        this.formSubject = params?.[SUBJECT] ?? null;
+        this.subject = params?.[SUBJECT] ?? null;
         const tokenInfo = (this._controlToken) ? this.formManagerService.getFormInfo(this._controlToken) : {};
         const { token, subject, state, fields, extra, originToken } = tokenInfo;
         if (token && this._controlToken === token) {
-            this.formSubject = this.formSubject ?? subject ?? null;
+            this.subject = this.subject ?? subject ?? null;
             this.inputDataFields = fields;
             this.extraData = extra;
             this._originToken = originToken;
@@ -3012,7 +2867,7 @@ class BasicFormComponent {
         return null;
     }
     subscribeSectionActivation() {
-        const formSections = this._formStructure?.sections;
+        const formSections = this.sections;
         const sectionNames = Object.keys(formSections);
         for (let index = 0; index < sectionNames.length; index++) {
             const sectionName = sectionNames[index];
@@ -3020,11 +2875,11 @@ class BasicFormComponent {
             section.activation.subscribe((code) => this.launchSectionActivation(code));
             section.inactivation.subscribe((code) => this.launchSectionInactivation(code));
             // Adicionalmente se le pide a la sección se subscriba al cambio de estado del formulario
-            section.connectWithParentForm(this, this._formStructure?.stateChange);
+            section.connectWithParentForm(this, this.stateChange);
         }
     }
     subscribeFieldsSubjects() {
-        const formFields = this._formStructure?.getFields();
+        const formFields = this.getFields();
         if (Array.isArray(formFields)) {
             formFields.forEach(field => {
                 field.editionFinish.subscribe(event => {
@@ -3037,22 +2892,22 @@ class BasicFormComponent {
                 });
                 field.detailRequest.subscribe(event => this.showFieldInfo(event.code, event.detail));
                 // Adicionalmente se le pide al campo se subscriba al cambio de estado del formulario
-                field.connectWithParentForm(this, this._formStructure?.stateChange);
+                field.connectWithParentForm(this, this.stateChange);
             });
         }
     }
     subscribeActionSubjects() {
-        const formActions = this._formStructure?.getActions();
+        const formActions = this.getActions();
         if (Array.isArray(formActions)) {
             formActions.forEach(action => {
                 action.actionActivated.subscribe(code => this.startAction(code));
                 // Adicionalmente se le pide a la acción se subscriba al cambio de estado del formulario
-                action.connectWithParentForm(this, this._formStructure?.stateChange);
+                action.connectWithParentForm(this, this.stateChange);
             });
         }
     }
     subscribeTableSubjects() {
-        const formTables = this._formStructure?.getTables();
+        const formTables = this.getTables();
         if (Array.isArray(formTables)) {
             formTables.forEach(table => {
                 table.inlineActionTrigger.subscribe(event => this.startTableAction(event));
@@ -3061,7 +2916,7 @@ class BasicFormComponent {
                 table.selectionActionTrigger.subscribe(event => this.startTableSelectionAction(event));
                 table.getDataTrigger.subscribe(event => this.startTableGetData(event));
                 // Adicionalmente se le pide a la tabla se subscriba al cambio de estado del formulario
-                table.connectWithParentForm(this, this._formStructure?.stateChange);
+                table.connectWithParentForm(this, this.stateChange);
             });
         }
     }
@@ -3074,23 +2929,14 @@ class BasicFormComponent {
             this.busy = true;
             const formDefinition = await this.formManagerService.getFormDefinition(this.name);
             this.busy = false;
-            this._formStructure = new FormStructureAndData(formDefinition, this.formConfig);
-            this.fields = this._formStructure?.fields;
-            this.actions = this._formStructure?.actions;
-            this.sections = this._formStructure?.sections;
-            this.fieldsArray = Object.keys(this.fields)
-                .reduce((accumulator, value) => accumulator.concat(this.fields[value]), []);
-            this.actionsArray = Object.keys(this.actions)
-                .reduce((accumulator, value) => accumulator.concat(this.actions[value]), []);
-            this.sectionsArray = Object.keys(this.sections)
-                .reduce((accumulator, value) => accumulator.concat(this.sections[value]), []);
+            this.loadDefinition(formDefinition);
             this._definitionObtained = true;
         }
         else {
             this.cleanData();
         }
-        if (!this.supportState(initialState)) {
-            initialState = this._formStructure?.defaultState ?? null;
+        if (!this.supportState(initialState ?? '')) {
+            initialState = this.defaultState ?? null;
         }
         const inputFieldNames = Object.keys(this.inputDataFields);
         for (let index = 0; index < inputFieldNames.length; index++) {
@@ -3103,16 +2949,16 @@ class BasicFormComponent {
         this.subscribeActionSubjects();
         this.subscribeTableSubjects();
         // Se define el estado inicial y se solicita la acción inicial
-        this.changeState(initialState || this._formStructure?.defaultState);
+        this.changeState(initialState || this.defaultState);
         const recordResponse = await this.requestFormAction(formActions.getData);
         this.checkErrorRecordReceived(recordResponse);
         this.visible = true;
-        this.enabledSections = this._formStructure?.visibleSections ?? [];
+        this.enabledSections = this.visibleSections ?? [];
         this.start();
         this.customFormStart();
     }
     changeState(state) {
-        const stateChanged = this._formStructure?.changeState(state ?? '') ?? false;
+        const stateChanged = super.changeState(state ?? '') ?? false;
         if (stateChanged) {
             const clientActionMethods = this._formChangeState;
             if (clientActionMethods && clientActionMethods.length > 0) {
@@ -3144,13 +2990,13 @@ class BasicFormComponent {
     async requestFormAction(actionCode, actionSubject = {}) {
         const actionDetail = {
             formCode: this.name,
-            formSubject: this.formSubject,
-            currentMode: this._formStructure?.state,
+            formSubject: this.subject,
+            currentMode: this.state,
             actionCode,
             actionSubject,
             version: PAYLOAD_VERSION,
-            formData: this._formStructure?.getPayload(),
-            immutableData: this._formStructure?.immutableData,
+            formData: this.getPayload(),
+            immutableData: this.immutableData,
         };
         this.errorCode = NO_ERROR;
         this.errorFullCode = '';
@@ -3176,7 +3022,7 @@ class BasicFormComponent {
         const { currentMode, formSubject, actions, fields, recordTables, returnedFile, immutableData, extraInfo, } = formContent;
         currentMode && this.changeState(currentMode);
         if (formSubject) {
-            this.formSubject = formSubject;
+            this.subject = formSubject;
         }
         if (actions && actions.length > 0) {
             for (const changedAction of actions) {
@@ -3205,32 +3051,18 @@ class BasicFormComponent {
         if (returnedFile && returnedFile.file) {
             this.fileMgmtServices.saveFile(returnedFile.file, returnedFile.name, returnedFile.type);
         }
-        if (this._formStructure) {
-            this._formStructure.immutableData = immutableData;
-            this._formStructure.extraInfo = extraInfo;
-        }
+        this.immutableData = immutableData;
+        this.extraInfo = extraInfo;
     }
     /**
      * Manejo de event handlers para errores Server del formulario
      */
-    cleanActionServerError() {
-        this._actionServerError = [];
-    }
-    cleanFieldServerError() {
-        this._fieldServerError = [];
-    }
-    cleanTableServerError() {
-        this._tableServerError = [];
-    }
-    onActionServerError(callback, properties = null) {
-        this._actionServerError.push({ callback, properties });
-    }
-    onValidationServerError(callback, properties = null) {
-        this._fieldServerError.push({ callback, properties });
-    }
-    onTableServerError(callback, properties = null) {
-        this._tableServerError.push({ callback, properties });
-    }
+    cleanActionServerError() { this._actionServerError = []; }
+    cleanFieldServerError() { this._fieldServerError = []; }
+    cleanTableServerError() { this._tableServerError = []; }
+    onActionServerError(callback, properties = null) { this._actionServerError.push({ callback, properties }); }
+    onValidationServerError(callback, properties = null) { this._fieldServerError.push({ callback, properties }); }
+    onTableServerError(callback, properties = null) { this._tableServerError.push({ callback, properties }); }
     /**
      * Manejo de event handlers para acciones sobre el formulario
      */
@@ -3283,7 +3115,7 @@ class BasicFormComponent {
         });
     }
     async verifySectionActivation(code) {
-        const sectionObject = this._formStructure?.getSection(code);
+        const sectionObject = this.getSection(code);
         if (!sectionObject) {
             return false;
         }
@@ -3301,7 +3133,7 @@ class BasicFormComponent {
     }
     async launchSectionActivation(code) {
         this.notifyFormActivity();
-        const sectionObject = this._formStructure?.getSection(code);
+        const sectionObject = this.getSection(code);
         if (!sectionObject) {
             return;
         }
@@ -3315,7 +3147,7 @@ class BasicFormComponent {
     }
     async launchSectionInactivation(code) {
         this.notifyFormActivity();
-        const sectionObject = this._formStructure?.getSection(code);
+        const sectionObject = this.getSection(code);
         if (!sectionObject) {
             return;
         }
@@ -3359,9 +3191,9 @@ class BasicFormComponent {
         let actionResult = null;
         if (action.backend) {
             actionResult = await this.requestFormAction(action.actionCode);
-            serverError = !!this.errorOccured();
         }
         await this.finishAction(action, actionResult, serverError);
+        serverError = !!this.errorOccured();
         if (!serverError) {
             action.newState && this.changeState(action.newState);
         }
@@ -4048,8 +3880,36 @@ class BasicFormComponent {
      * Métodos Legacy de compatibilidad hacia atrás
      */
     /**
-   * @deprecated Use onSectionActivation
-   */
+     * @deprecated Use name
+     */
+    get formCode() { return this.name ?? ''; }
+    /**
+     * @deprecated Use name
+     */
+    set formCode(name) { this.name = name; }
+    /**
+     * @deprecated Use busy
+     */
+    get inServerProcess() { return this.busy; }
+    /**
+     * @deprecated Use state
+     */
+    get currentState() { return this.state ?? ''; }
+    /**
+     * @deprecated Use changeState
+     */
+    set currentState(state) { this?.changeState(state); }
+    /**
+     * @deprecated Use onSectionActivation
+     */
+    get formRoute() { return this._formRoute ?? ''; }
+    /**
+     * @deprecated Use onSectionActivation
+     */
+    set formRoute(route) { this._formRoute = route; }
+    /**
+     * @deprecated Use onSectionActivation
+     */
     addSectionActivation(codes, callback, properties = null) {
         return this.onSectionActivation(codes, callback, properties);
     }
@@ -4127,7 +3987,7 @@ class BasicFormComponent {
     }
 }
 BasicFormComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: BasicFormComponent, deps: [{ token: LibFormManagerService }, { token: LibEventManagerService }, { token: LibFileManagementService }], target: i0.ɵɵFactoryTarget.Component });
-BasicFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.6", type: BasicFormComponent, selector: "ng-component", ngImport: i0, template: `<ng-content></ng-content>`, isInline: true });
+BasicFormComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.6", type: BasicFormComponent, selector: "ng-component", usesInheritance: true, ngImport: i0, template: `<ng-content></ng-content>`, isInline: true });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: BasicFormComponent, decorators: [{
             type: Component,
             args: [{