tnx-shared 5.1.402 → 5.1.403

package/bundles/tnx-shared.umd.js

@@ -9189,8 +9189,8 @@
         });
         ;
         /**
-        * On destroy
-        */
+         * On destroy
+         */
         ComponentBase.prototype.ngOnDestroy = function () {
             var e_1, _a;
             // Unsubscribe from all subscriptions
@@ -9613,10 +9613,12 @@
                                                 value_2 = this_1._getValueFromDatasource(itemSelected, schema.multiple, tmpSchema.funcGetLabel);
                                             }
                                             else if (schema instanceof CheckboxControlSchema || schema instanceof SwitchControlSchema) {
-                                                if (!value_2)
+                                                if (!value_2) {
                                                     value_2 = 'Không';
-                                                else
+                                                }
+                                                else {
                                                     value_2 = 'Có';
+                                                }
                                             }
                                             _b.label = 19;
                                         case 19:
@@ -13036,7 +13038,7 @@
             _this.eventType = exports.EventType;
             // Doc tu cau hinh tham so he thong
             _this.limitSize = 0;
-            _this.formControls = [];
+            _this.formControls = {};
             _this.funcCheckUniqueField = {};
             _this.beforeData = {};
             _this.cachedValues = {};
@@ -14262,18 +14264,22 @@
             for (var field in model) {
                 if (field != '_errors' && field != '_status' && field != '_source') {
                     var subUniqueKeyControl = void 0;
-                    if (uniqueKeyControl != null && uniqueKeyControl !== '')
+                    if (uniqueKeyControl != null && uniqueKeyControl !== '') {
                         subUniqueKeyControl = uniqueKeyControl + '.' + field;
-                    else
+                    }
+                    else {
                         subUniqueKeyControl = field;
+                    }
                     var control = this.formControls[subUniqueKeyControl];
                     if (!control)
                         continue;
                     var subPath = void 0;
-                    if (path != null && path !== '')
+                    if (path != null && path !== '') {
                         subPath = path + '.' + field;
-                    else
+                    }
+                    else {
                         subPath = field;
+                    }
                     var subModel = model[field];
                     if (subModel instanceof Array) {
                         var index = 0;
@@ -15882,32 +15888,40 @@
         });
         Object.defineProperty(ControlTreeNode.prototype, "model", {
             get: function () {
-                if (this.parentNode)
+                if (this.parentNode) {
                     return this.parentNode.data[this.field];
-                else
+                }
+                else {
                     return this.data;
+                }
             },
             set: function (val) {
-                if (this.parentNode)
+                if (this.parentNode) {
                     this.parentNode.data[this.field] = val;
-                else
+                }
+                else {
                     this.data = val;
+                }
             },
             enumerable: false,
             configurable: true
         });
         Object.defineProperty(ControlTreeNode.prototype, "value", {
             get: function () {
-                if (this.parentNode)
+                if (this.parentNode) {
                     return this.parentNode.data[this.field];
-                else
+                }
+                else {
                     return this.data;
+                }
             },
             set: function (val) {
-                if (this.parentNode)
+                if (this.parentNode) {
                     this.parentNode.data[this.field] = val;
-                else
+                }
+                else {
                     this.data = val;
+                }
             },
             enumerable: false,
             configurable: true
@@ -15974,8 +15988,9 @@
         };
         ControlTreeNode.prototype.findInTree = function (node, modelPath) {
             var e_33, _d;
-            if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase())
+            if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase()) {
                 return node;
+            }
             else {
                 try {
                     for (var _e = __values(node.childNodes), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -15999,8 +16014,9 @@
         };
         ControlTreeNode.prototype.findSchemaInTree = function (node, schemaPath) {
             var e_34, _d;
-            if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase())
+            if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase()) {
                 return node;
+            }
             else {
                 try {
                     for (var _e = __values(node.childNodes), _f = _e.next(); !_f.done; _f = _e.next()) {
@@ -44774,11 +44790,6 @@
             this.fieldValue = this.control.valueField;
             if (this.control.dataSource == null || this.control.dataSource.length == 0) {
                 this.bindDataSource(this.control.serviceUri, this.control.baseService);
-                // if (this.control.serviceUri) {
-                // }
-                // else if(this.control.baseService) {
-                //
-                // }
             }
             else {
                 this.dataSourceInternal = this.control.dataSource;
@@ -44801,11 +44812,11 @@
             var _this = this;
             var _a, _b;
             if (baseService) {
+                var dropdownOptions = new DropdownOptions({
+                    displayField: (_a = this.control.displayField) !== null && _a !== void 0 ? _a : 'ten',
+                    valueField: (_b = this.control.valueField) !== null && _b !== void 0 ? _b : 'id',
+                });
                 if (baseService instanceof BaseService) {
-                    var dropdownOptions = new DropdownOptions({
-                        displayField: (_a = this.control.displayField) !== null && _a !== void 0 ? _a : 'ten',
-                        valueField: (_b = this.control.valueField) !== null && _b !== void 0 ? _b : 'id',
-                    });
                     baseService.getDataDropdown(dropdownOptions).then(function (res) {
                         _this.dataSourceInternal = res;
                         _this.gotData = true;
@@ -44817,13 +44828,9 @@
                         console.log(err);
                     });
                 }
-                else if (baseService instanceof MasterDataService) {
-                    baseService.getDropdown(this.control.groupCode).then(function (res) {
-                        // const displayField = this.control.displayField ?? 'id';
-                        // const valueField = this.control.valueField ?? 'code';
-                        _this.dataSourceInternal = res.map(function (item) {
-                            return { id: item.value, ten: item.label };
-                        });
+                if (baseService instanceof MasterDataService) {
+                    baseService.getDataDropdown(this.control.groupCode, null, dropdownOptions).then(function (res) {
+                        _this.dataSourceInternal = res;
                         if (_this.wroteValue)
                             _this.fixValue();
                         _this.onReady.emit(_this.control.field);
@@ -44832,14 +44839,19 @@
                         _this.onReady.emit(_this.control.field);
                     });
                 }
+                return;
             }
-            else if (serviceUri) {
+            if (serviceUri) {
                 this._dropDownService.getDataSource(serviceUri).then(function (rs) {
                     var arr = [];
-                    // for (let i = 0; i < rs.data.length; i++) {
-                    //     arr.push({ label: rs.data[i][this.control.displayField], title: rs.data[i][this.control.displayField], value: rs.data[i][this.control.valueField] });
-                    // }
-                    _this.dataSourceInternal = rs.data;
+                    for (var i = 0; i < rs.data.length; i++) {
+                        arr.push({
+                            label: rs.data[i][_this.control.displayField],
+                            title: rs.data[i][_this.control.displayField],
+                            value: rs.data[i][_this.control.valueField]
+                        });
+                    }
+                    _this.dataSourceInternal = arr;
                     _this.gotData = true;
                     if (_this.wroteValue) {
                         _this.fixValue();