tnx-shared 5.1.420 → 5.1.422

package/bundles/tnx-shared.umd.js

@@ -7479,10 +7479,10 @@
                         result.push(data);
                         continue;
                     }
-                    data._level = ++dataParent._level;
+                    data._level = dataParent._level + 1;
                     data._prefix = dataParent._root === true
                         ? '|--'
-                        : dataParent.data._prefix + '---';
+                        : dataParent._prefix + '---';
                     dataMap.set(nodeKey, data);
                     result.push(data);
                 }
@@ -7599,7 +7599,7 @@
                 var e_5, _a;
                 // count++;
                 node.data._prefix = prefix;
-                node.data._level = ++parentNode.data._level;
+                node.data._level = parentNode.data._level + 1;
                 result.push(node.data);
                 if (node.children == null || node.children.length == 0) {
                     return;
@@ -7679,17 +7679,46 @@
                 options = new DropdownOptions();
             this.setDefaultOptionsTree(options, fieldParent);
             return new Promise(function (resolve, reject) {
-                _this._getDataDropdownByFilter(filters, options)
-                    .then(function (res) {
-                    var treeData = options.isTreeBaseModel === true
-                        ? _this.getTreeModelBase(res.data, fieldParent, options.fieldParentTreeItem)
-                        : _this.getTreeData(res.data, fieldParent, options.fieldParentTreeItem);
-                    res.data = treeData;
-                    resolve(res);
-                })
-                    .catch(function (err) { return reject(err); });
+                if (options.isTreeBaseModel) {
+                    var gridInfo = _this.generateGridInfoDropdown(filters, options);
+                    _this.baseGetTreeData(gridInfo)
+                        .then(function (res) {
+                        var treeData = _this.getTreeModelBase(res.data, fieldParent, options.fieldParentTreeItem);
+                        res.data = treeData;
+                        resolve(res);
+                    })
+                        .catch(function (err) { return reject(err); });
+                }
+                else {
+                    _this._getDataDropdownByFilter(filters, options)
+                        .then(function (res) {
+                        var treeData = _this.getTreeData(res.data, fieldParent, options.fieldParentTreeItem);
+                        res.data = treeData;
+                        resolve(res);
+                    })
+                        .catch(function (err) { return reject(err); });
+                }
             });
         };
+        BaseService.prototype.getFieldsFromDropdownOptions = function (options) {
+            var fields = [];
+            if (options.valueField && options.valueField !== '') {
+                fields.push(options.valueField);
+            }
+            if (options.displayField && options.displayField !== '') {
+                fields.push(options.displayField);
+            }
+            if (options.fieldParentTreeItem && options.fieldParentTreeItem !== '') {
+                fields.push(options.fieldParentTreeItem);
+            }
+            if (options.fieldTree && options.fieldTree !== '') {
+                fields.push(options.fieldTree);
+            }
+            if (options.fieldPlus && options.fieldPlus !== '') {
+                fields.push.apply(fields, __spread(options.fieldPlus.split(',').filter(function (x) { return x !== ''; })));
+            }
+            return Array.from(new Set(fields)).join(',');
+        };
         /**
          * get detail với api do Dev tự viết, mặc định url 'Custom/{id}'
          * @param id - id bản ghi
@@ -11236,6 +11265,14 @@
                 });
             }
         };
+        UserService.prototype.removeUser = function (id) {
+            var url = this.serviceUri + "/RemoveUser/" + id;
+            return this.defaultDelete(url);
+        };
+        UserService.prototype.modifyUserInfo = function (id, userInfo) {
+            var url = this.serviceUri + "/ModifyUserInfo/" + id;
+            return this.defaultPut(url, userInfo);
+        };
         return UserService;
     }(BaseService));
     UserService.ɵprov = i0.ɵɵdefineInjectable({ factory: function UserService_Factory() { return new UserService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(AuthenService), i0.ɵɵinject(i4.OAuthService), i0.ɵɵinject(SignalRService), i0.ɵɵinject(ExceptionHandlerService), i0.ɵɵinject(ApplicationContextService)); }, token: UserService, providedIn: "root" });
@@ -32394,7 +32431,7 @@
         };
         DropdownComponent.prototype.setDefaultSetting = function () {
             var _this = this;
-            if (this.control.isTree) {
+            if (this.control.isTree || this.control.isTreeBaseModel) {
                 this.delayFilter = 200;
                 if (!this.control.funcGetLabel) {
                     this.control.funcGetLabel = function (item) {