tuain-ng-forms-lib 12.0.11 → 12.0.15

package/fesm2015/tuain-ng-forms-lib.js

@@ -23,7 +23,7 @@ class ActionComponent {
             this.actionObject.notifyActivation();
         }
     }
-    get isVisible() {
+    visibleOnRestriction() {
         var _a, _b, _c, _d, _e;
         if (!((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.restrictedOnField)) {
             return true;
@@ -35,6 +35,14 @@ class ActionComponent {
             return true;
         }
     }
+    get visible() {
+        var _a;
+        return ((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.visibleOn(this.currentState)) && this.visibleOnRestriction();
+    }
+    get disabled() {
+        var _a;
+        return !((_a = this.actionObject) === null || _a === void 0 ? void 0 : _a.enabledOn(this.currentState));
+    }
 }
 ActionComponent.decorators = [
     { type: Component, args: [{
@@ -44,9 +52,9 @@ ActionComponent.decorators = [
 ];
 ActionComponent.propDecorators = {
     actionObject: [{ type: Input }],
-    disabled: [{ type: Input }],
-    formBusy: [{ type: Input }],
+    busy: [{ type: Input }],
     relatedField: [{ type: Input }],
+    currentState: [{ type: Input }],
     style: [{ type: Input }],
     showLabel: [{ type: Input }]
 };
@@ -60,8 +68,14 @@ class FieldComponent {
             // Inicialización
             const mapping = Object.entries(this.formConfig.componentFieldAttrMap);
             for (let index = 0; index < mapping.length; index++) {
-                const [fieldAttr, compAttr] = mapping[index];
-                this[compAttr.toString()] = (_b = this.fieldObject) === null || _b === void 0 ? void 0 : _b[fieldAttr.toString()];
+                const [fieldAttr, compAttr1] = mapping[index];
+                const compAttr = compAttr1.toString();
+                if (compAttr === VALUE) {
+                    this.updateValue();
+                }
+                else {
+                    this[compAttr] = (_b = this.fieldObject) === null || _b === void 0 ? void 0 : _b[fieldAttr.toString()];
+                }
             }
             // Subscripción a cambios en atributos
             this.fieldObject.attributeChange.subscribe(event => {
@@ -70,7 +84,7 @@ class FieldComponent {
                 if (compAttr === VALUE) {
                     this.updateValue();
                 }
-                else if (this.hasOwnProperty(compAttr)) {
+                else {
                     this[compAttr] = value;
                 }
             });
@@ -94,6 +108,14 @@ class FieldComponent {
         const k = event.charCode;
         return (k > 47 && k < 58);
     }
+    get visible() {
+        var _a;
+        return (_a = this.fieldObject) === null || _a === void 0 ? void 0 : _a.visibleOn(this.currentState);
+    }
+    get disabled() {
+        var _a;
+        return !((_a = this.fieldObject) === null || _a === void 0 ? void 0 : _a.enabledOn(this.currentState));
+    }
 }
 FieldComponent.decorators = [
     { type: Component, args: [{
@@ -103,7 +125,7 @@ FieldComponent.decorators = [
 ];
 FieldComponent.propDecorators = {
     fieldObject: [{ type: Input }],
-    disabled: [{ type: Input }]
+    currentState: [{ type: Input }]
 };
 
 class ElementComponent {
@@ -114,14 +136,12 @@ class ElementComponent {
     }
     start() { }
     get visible() {
-        var _a, _b, _c, _d;
-        const visible = (_b = (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.visible) !== null && _b !== void 0 ? _b : true;
-        return visible && ((_c = this.formElement) === null || _c === void 0 ? void 0 : _c.viewOnState((_d = this.formManager) === null || _d === void 0 ? void 0 : _d.currentState));
+        var _a, _b;
+        return (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.visibleOn((_b = this.formManager) === null || _b === void 0 ? void 0 : _b.currentState);
     }
     get disabled() {
-        var _a, _b, _c, _d;
-        const disabled = (_b = (_a = this.formElement) === null || _a === void 0 ? void 0 : _a.disabled) !== null && _b !== void 0 ? _b : false;
-        return disabled || !((_c = this.formElement) === null || _c === void 0 ? void 0 : _c.enabledOnState((_d = this.formManager) === null || _d === void 0 ? void 0 : _d.currentState));
+        var _a, _b;
+        return !((_a = this.formElement) === null || _a === void 0 ? void 0 : _a.enabledOn((_b = this.formManager) === null || _b === void 0 ? void 0 : _b.currentState));
     }
 }
 ElementComponent.decorators = [
@@ -283,6 +303,12 @@ class FormElement {
     supportMode(state) { return this.viewOnState(state); }
     get visible() { return (this._isForced) ? this._visibleForced : this._visible; }
     set visible(visible) { this.setVisibility(visible); }
+    visibleOn(state) {
+        return this.visible && this.viewOnState(state);
+    }
+    enabledOn(state) {
+        return !this.disabled && this.enabledOnState(state);
+    }
     setVisibility(visible, forced = null) {
         this._visible = visible && true;
         if (forced != null) {
@@ -1868,7 +1894,7 @@ class FormStructureAndData {
             ? this._sectionsObj[sectionCode] : null;
         return (section) ? section.getSubsection(subsectionCode) : null;
     }
-    get actions() { return this.getActions(); }
+    get actions() { return this._actionsObj; }
     getSection(sectionCode) {
         return (this._sectionsObj && this._sectionsObj[sectionCode])
             ? this._sectionsObj[sectionCode] : null;
@@ -2000,7 +2026,7 @@ class FormStructureAndData {
         const actionNames = (Array.isArray(actionArray)) ? actionArray : [actionArray];
         actionNames.forEach(actionCode => this.disableAction(actionCode));
     }
-    get fields() { return this.getFields(); }
+    get fields() { return this._fieldsObj; }
     enableField(fieldCode) {
         const fieldObject = this.getFieldObject(fieldCode);
         return (fieldObject) ? fieldObject.enable() : null;
@@ -2353,7 +2379,7 @@ class BasicFormComponent {
         this.extraData = {};
         this.definitionObtained = false;
         this.formVisible = false;
-        this.inServerProcess = false;
+        this.busy = false;
         this.formSectionsActivate = {};
         this.formSectionsInactivate = {};
         this.formActionsStart = {};
@@ -2372,6 +2398,7 @@ class BasicFormComponent {
         this.cleanStart();
         this.customPreProcessing();
     }
+    get inServerProcess() { return this.busy; }
     setConfig(formConfig) {
         this.formConfig = formConfig;
     }
@@ -2388,7 +2415,7 @@ class BasicFormComponent {
         this.definitionObtained = false;
         // Se limpian los manejadores de eventos
         this.formVisible = false;
-        this.inServerProcess = false;
+        this.busy = false;
         this.formSectionsActivate = {};
         this.formSectionsInactivate = {};
         this.formActionsStart = {};
@@ -2403,6 +2430,7 @@ class BasicFormComponent {
         this.tableGetDataStart = {};
         this.tableGetDataFinish = {};
     }
+    get form() { return this.formStructure; }
     get currentState() { return this.formStructure.state; }
     set currentState(state) { this.formStructure.changeState(state); }
     get currentMode() { return this.currentState; }
@@ -2644,9 +2672,9 @@ class BasicFormComponent {
                 return;
             }
             if (!this.definitionObtained) {
-                this.inServerProcess = true;
+                this.busy = true;
                 const formDefinition = yield this.formManagerService.getFormDefinition(this.name);
-                this.inServerProcess = false;
+                this.busy = false;
                 this.formStructure = new FormStructureAndData(formDefinition, this.formConfig);
                 this.fields = this.formStructure.fields;
                 this.actions = this.formStructure.actions;
@@ -2704,9 +2732,9 @@ class BasicFormComponent {
             this.errorCode = NO_ERROR;
             this.errorMessage = '';
             this.errorDetail = '';
-            this.inServerProcess = true;
+            this.busy = true;
             const formActionResponse = yield this.formManagerService.execServerAction(actionDetail);
-            this.inServerProcess = false;
+            this.busy = false;
             if (formActionResponse && formActionResponse.error.errorType) {
                 console.log('Excepción no soportada');
             }
@@ -2723,7 +2751,7 @@ class BasicFormComponent {
     }
     updateFormWithServerData(formContent) {
         const { currentMode, formSubject, actions, fields, recordTables, returnedFile, immutableData, extraInfo, } = formContent;
-        this.changeState(currentMode !== null && currentMode !== void 0 ? currentMode : this.formStructure.state);
+        currentMode && this.changeState(currentMode);
         if (formSubject) {
             this.formSubject = formSubject;
         }
@@ -2861,7 +2889,7 @@ class BasicFormComponent {
             }
             if (finish) {
                 yield this.finishAction(action, actionResult);
-                this.changeState(action.newState);
+                action.newState && this.changeState(action.newState);
             }
             else {
                 this.displayActionServerError();
@@ -3158,7 +3186,7 @@ class BasicFormComponent {
             }
             if (finish) {
                 yield this.finishTableGlobalAction(tableActionDetail, actionResult);
-                this.changeState(action.newState);
+                action.newState && this.changeState(action.newState);
             }
             else {
                 this.displayTableServerError();
@@ -3241,7 +3269,7 @@ class BasicFormComponent {
             }
             if (finish) {
                 this.finishTableAction(tableActionDetail, actionResult);
-                this.changeState(action.newState);
+                action.newState && this.changeState(action.newState);
             }
             else {
                 this.displayTableServerError();
@@ -3399,7 +3427,7 @@ class BasicFormComponent {
             }
             if (finish) {
                 this.finishTableSelectionAction(tableActionDetail, actionResult);
-                this.changeState(action.newState);
+                action.newState && this.changeState(action.newState);
             }
             else {
                 this.displayTableServerError();