tnx-shared 5.1.432 → 5.1.434

package/bundles/tnx-shared.umd.js

@@ -7079,10 +7079,7 @@
                     if (subField == null)
                         return value;
                     if (isArray(value)) {
-                        if (isNaN(subField)) {
-                            return value.map(function (x) { return x.subField; });
-                        }
-                        return value[subField];
+                        return value.map(function (x) { return x[subField]; });
                     }
                     if (isLiteralObject(value))
                         return value[subField];
@@ -9284,18 +9281,21 @@
         { type: NotifierService }
     ]; };
 
-    var TemplateInstanceService = /** @class */ (function () {
-        function TemplateInstanceService(_moduleConfigService, _httpClient, _printService, _fileService, _notifierService, _crudService, _commonService, _downloadLinkService) {
-            this._httpClient = _httpClient;
-            this._printService = _printService;
-            this._fileService = _fileService;
-            this._notifierService = _notifierService;
-            this._crudService = _crudService;
-            this._commonService = _commonService;
-            this._downloadLinkService = _downloadLinkService;
-            this._moduleConfig = _moduleConfigService.getConfig();
-            this.environment = this._moduleConfig.environment;
-            this.serviceUri = this._moduleConfig.environment.apiDomain.templateEndpoint + "/" + this._moduleConfig.environment.apiVersion + "/TemplateInstance";
+    var TemplateInstanceService = /** @class */ (function (_super) {
+        __extends(TemplateInstanceService, _super);
+        function TemplateInstanceService(_moduleConfigService, _httpClient, _printService, _fileService, _notifierService, _crudService, _commonService, _downloadLinkService, injector) {
+            var _this = _super.call(this, _httpClient, injector, _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/TemplateInstance") || this;
+            _this._httpClient = _httpClient;
+            _this._printService = _printService;
+            _this._fileService = _fileService;
+            _this._notifierService = _notifierService;
+            _this._crudService = _crudService;
+            _this._commonService = _commonService;
+            _this._downloadLinkService = _downloadLinkService;
+            _this._moduleConfig = _moduleConfigService.getConfig();
+            _this.environment = _this._moduleConfig.environment;
+            _this.serviceUri = _this._moduleConfig.environment.apiDomain.templateEndpoint + "/" + _this._moduleConfig.environment.apiVersion + "/TemplateInstance";
+            return _this;
         }
         TemplateInstanceService.prototype.useV4 = function () {
             this.serviceUri = this._moduleConfig.environment.apiDomain.templateV4Endpoint + "/Template";
@@ -9641,8 +9641,8 @@
             });
         };
         return TemplateInstanceService;
-    }());
-    TemplateInstanceService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TemplateInstanceService_Factory() { return new TemplateInstanceService(i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(PrintService), i0.ɵɵinject(FileExplorerService), i0.ɵɵinject(NotifierService), i0.ɵɵinject(CrudService), i0.ɵɵinject(CommonService), i0.ɵɵinject(DownloadLinkService)); }, token: TemplateInstanceService, providedIn: "root" });
+    }(BaseService));
+    TemplateInstanceService.ɵprov = i0.ɵɵdefineInjectable({ factory: function TemplateInstanceService_Factory() { return new TemplateInstanceService(i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(PrintService), i0.ɵɵinject(FileExplorerService), i0.ɵɵinject(NotifierService), i0.ɵɵinject(CrudService), i0.ɵɵinject(CommonService), i0.ɵɵinject(DownloadLinkService), i0.ɵɵinject(i0.INJECTOR)); }, token: TemplateInstanceService, providedIn: "root" });
     TemplateInstanceService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
@@ -9656,7 +9656,8 @@
         { type: NotifierService },
         { type: CrudService },
         { type: CommonService },
-        { type: DownloadLinkService }
+        { type: DownloadLinkService },
+        { type: i0.Injector }
     ]; };
 
     var EXPORT_VERSION_V4 = 4;
@@ -49165,6 +49166,7 @@
             configurable: true
         });
         EntityPickerDataComponent.prototype.ngOnInit = function () {
+            var _this = this;
             var _a;
             this.loadDetailFromQueryParam = true;
             this.plusUrl = this.control.plusUrl;
@@ -49178,10 +49180,35 @@
             this.setting.hiddenSettingWorkflow = true;
             this.setting.hiddenSettingPermission = true;
             this.setting.title = 'Danh sách các mục chưa chọn';
-            this.setting.cols = __spread(this.parentSetting.cols.map(function (p) { return (Object.assign({}, p)); }));
+            // this.setting.cols = [...this.parentSetting.cols.map(p => ({ ...p }))];
             this.setting.columnSetting = this.parentSetting.columnSetting;
             this.setting.fieldSearchText = this.parentSetting.fieldSearchText;
             this.setting.multipleCheckWhenClickRow = !this.isSingleSelection;
+            // Todo: HieuND
+            this.control.columns.forEach(function (column) {
+                if (column.isDisplay) {
+                    var newCol = new ColumnSchemaBase({
+                        field: column.code,
+                        label: _this._translateService.instant(column.label),
+                        visible: true,
+                        baseService: column.baseService,
+                        valueField: column.valueField,
+                        displayField: column.displayField,
+                        fieldPlus: column.fieldPlus,
+                        sortField: column.sortField,
+                        sortDir: column.sortDir,
+                        funcGetLabel: column.funcGetLabel,
+                        funcSetValueRow: column.funcSetValueRow,
+                        dataSource: column.dataSource,
+                        groupCode: column.groupCode,
+                        order: column.order
+                    });
+                    if (column.dataType == 'custom') {
+                        newCol.dataType = column.code;
+                    }
+                    _this.setting.cols.push(newCol);
+                }
+            });
             _super.prototype.ngOnInit.call(this);
         };
         EntityPickerDataComponent.prototype.setValue = function () {
@@ -49355,6 +49382,7 @@
             configurable: true
         });
         EntityPickerSelectedComponent.prototype.ngOnInit = function () {
+            var _this = this;
             var _a;
             this.loadDetailFromQueryParam = true;
             this.plusUrl = this.control.plusUrl;
@@ -49368,9 +49396,34 @@
             this.setting.hiddenSettingWorkflow = true;
             this.setting.hiddenSettingPermission = true;
             this.setting.title = 'Danh sách các mục đã chọn';
-            this.setting.cols = __spread(this.parentSetting.cols.map(function (p) { return (Object.assign({}, p)); }));
+            // this.setting.cols = [...this.parentSetting.cols.map(p => ({ ...p }))];
             this.setting.columnSetting = this.parentSetting.columnSetting;
             this.setting.fieldSearchText = this.parentSetting.fieldSearchText;
+            // Todo: HieuND
+            this.control.columns.forEach(function (column) {
+                if (column.isDisplay) {
+                    var newCol = new ColumnSchemaBase({
+                        field: column.code,
+                        label: _this._translateService.instant(column.label),
+                        visible: true,
+                        baseService: column.baseService,
+                        valueField: column.valueField,
+                        displayField: column.displayField,
+                        fieldPlus: column.fieldPlus,
+                        sortField: column.sortField,
+                        sortDir: column.sortDir,
+                        funcGetLabel: column.funcGetLabel,
+                        funcSetValueRow: column.funcSetValueRow,
+                        dataSource: column.dataSource,
+                        groupCode: column.groupCode,
+                        order: column.order
+                    });
+                    if (column.dataType == 'custom') {
+                        newCol.dataType = column.code;
+                    }
+                    _this.setting.cols.push(newCol);
+                }
+            });
             this.updateFuncCheckReadOnlyItem();
             _super.prototype.ngOnInit.call(this);
         };
@@ -50223,28 +50276,29 @@
             this.setting.hiddenSettingWorkflow = true;
             this.setting.hiddenSettingPermission = true;
             this.setting.fieldSearchText = this.control.fieldSearchText;
+            // Todo: HieuND
             this.control.columns.forEach(function (column) {
                 if (column.isDisplay) {
+                    var newCol = new ColumnSchemaBase({
+                        field: column.code,
+                        label: _this._translateService.instant(column.label),
+                        visible: true,
+                        baseService: column.baseService,
+                        valueField: column.valueField,
+                        displayField: column.displayField,
+                        fieldPlus: column.fieldPlus,
+                        sortField: column.sortField,
+                        sortDir: column.sortDir,
+                        funcGetLabel: column.funcGetLabel,
+                        funcSetValueRow: column.funcSetValueRow,
+                        dataSource: column.dataSource,
+                        groupCode: column.groupCode,
+                        order: column.order
+                    });
                     if (column.dataType == 'custom') {
-                        _this.setting.cols.push({
-                            field: column.code,
-                            dataType: column.code,
-                            label: _this._translateService.instant(column.label),
-                            visible: true,
-                            baseService: column.baseService,
-                            valueField: column.valueField,
-                            displayField: column.displayField,
-                            fieldPlus: column.fieldPlus,
-                            sortField: column.sortField,
-                            sortDir: column.sortDir,
-                            funcGetLabel: column.funcGetLabel,
-                            dataSource: column.dataSource,
-                            groupCode: column.groupCode
-                        });
-                    }
-                    else {
-                        _this.setting.cols.push(Object.assign(Object.assign({}, column), { field: column.code, label: _this._translateService.instant(column.label), visible: true }));
+                        newCol.dataType = column.code;
                     }
+                    _this.setting.cols.push(newCol);
                 }
             });
             this.advanceData.fields = this.getFields();