tnx-shared 5.3.340 → 5.3.342

package/bundles/tnx-shared.umd.js

@@ -20380,12 +20380,12 @@
         __extends(HoSoDoiTacService, _super);
         function HoSoDoiTacService(http, injector, _moduleConfigService) {
             var _this = _super.call(this, http, injector, _moduleConfigService.getConfig().environment.apiDomain
-                .doitacEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/HoSoDoiTac") || this;
+                .canboEndpoint + "/" + _moduleConfigService.getConfig().environment.apiVersion + "/HoSoDoiTac") || this;
             _this._moduleConfigService = _moduleConfigService;
             _this.entityName = 'HoSoDoiTac';
-            _this.serviceCode = 'doitac';
+            _this.serviceCode = 'canbo';
             _this.endPoint
-                = _moduleConfigService.getConfig().environment.apiDomain.doitacEndpoint;
+                = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
             return _this;
         }
         HoSoDoiTacService.prototype.genDropDownSchema = function (required, multiple, field, label, mdWidth, funcModifySchema) {
@@ -44545,6 +44545,7 @@
             this.setting.hiddenSettingPermission = true;
             this.setting.fieldSearchText = this.control.fieldSearchText;
             this.setting.columnSetting.sortField = this.control.sortField;
+            this.setting.columnSetting.sortDir = this.control.sortDir;
             this.control.columns.forEach(function (column) {
                 if (column.isDisplay) {
                     var col = new ColumnSchemaBase(Object.assign(Object.assign({}, column), { visible: true, field: column.code || column.field, label: _this._translateService.instant(column.label) }));
@@ -45389,7 +45390,7 @@
         }
         CoCauToChucPickerListComponent.prototype.ngOnInit = function () {
             this.control._component = this;
-            this.controlPicker = new AutoCompletePickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Đơn vị', title: 'Chọn đơn vị', baseService: this._coCauToChucService, multiple: this.control.multiple, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, sortField: 'idDuongDan', required: true, columns: [
+            this.controlPicker = new AutoCompletePickerControlSchema(Object.assign(Object.assign({}, this.control), { field: 'arrIdNguoiDung', label: 'Đơn vị', title: 'Chọn đơn vị', baseService: this._coCauToChucService, multiple: this.control.multiple, valueField: this.control.valueField, defaultFilters: this.control.defaultFilters, sortField: 'idDuongDan', sortDir: 1, required: true, columns: [
                     new EntityPickerColumn({
                         label: 'Tên đơn vị',
                         code: this.control.displayField,
@@ -47963,7 +47964,10 @@
             if (this.control.useDefaultPluslUrlInList) {
                 this.plusUrl = this.control.plusUrl;
             }
-            if (this.control.pageSize) {
+            if (this.control.pageSizeOfList) {
+                this.setting.pageSetting.pageSize = this.control.pageSizeOfList;
+            }
+            else if (this.control.pageSize) {
                 this.setting.pageSetting.pageSize = this.control.pageSize;
             }
             this.setting.cols = [];