tnx-shared 5.3.325 → 5.3.327

package/bundles/tnx-shared.umd.js

@@ -1691,6 +1691,7 @@
             _this.isCaching = false; // dùng riêng cho canBoPicker
             _this.limitRowItem = false;
             _this.maxRowItem = 2;
+            _this.isOverrideColumns = false;
             for (var key in init) {
                 _this[key] = init[key];
             }
@@ -4979,6 +4980,13 @@
             }
             return str;
         };
+        CommonService.prototype.transformLocalDate = function (value, format) {
+            if (format === void 0) { format = 'dd/MM/yyyy'; }
+            if (!value)
+                return '';
+            var datePipe = new i3.DatePipe('vi-VN');
+            return datePipe.transform(value, format);
+        };
         return CommonService;
     }());
     CommonService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function CommonService_Factory() { return new CommonService(i0__namespace.ɵɵinject(ModuleConfigService)); }, token: CommonService, providedIn: "root" });
@@ -20799,7 +20807,10 @@
             if (enumCanBo === void 0) { enumCanBo = exports.EnumCanBo.TRONG_DON_VI; }
             var _a;
             var columns = __spreadArray([], __read(this.lstEntityPickerColumn));
-            if (((_a = control.columns) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            if (control.isOverrideColumns) {
+                columns = __spreadArray([], __read(control.columns));
+            }
+            else if (((_a = control.columns) === null || _a === void 0 ? void 0 : _a.length) > 0) {
                 columns.push.apply(columns, __spreadArray([], __read(control.columns)));
             }
             var result = new AutoCompletePickerControlSchema(Object.assign(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, plusUrl: 'WithChucDanhChucVu', displayField: 'hoVaTen', fieldPlus: 'code', fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
@@ -20868,9 +20879,8 @@
                 }
             }
             else {
-                result.fieldPlus = 'idNgachVienChuc';
+                result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
             }
-            result.fieldPlus += ',ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
             return result;
         };
         CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
@@ -28229,16 +28239,18 @@
         ListBase.prototype.deepClone = function (data) {
             return JSON.parse(JSON.stringify(data));
         };
-        ListBase.prototype._exportAllData = function (event) {
+        ListBase.prototype._exportAllData = function (event, fileName) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var lstData, fileName, lstVisibleField, lstHeader, fieldSchemaMap, printData;
+                var lstData, lstVisibleField, lstHeader, fieldSchemaMap, printData;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
                         case 0: return [4 /*yield*/, this.setting.baseService.getDataCustomRoute(this.plusUrl, this.currentGridInfo.filters, this.currentGridInfo.fields, this.currentGridInfo.sorts, -1, 1)];
                         case 1:
                             lstData = (_a = (_b.sent()).data) !== null && _a !== void 0 ? _a : [];
-                            fileName = this.setting.title ? this.setting.title : "Danh s\u00E1ch " + this.setting.objectName.toLocaleLowerCase();
+                            if (!fileName) {
+                                fileName = this.setting.title ? this.setting.title : "Danh s\u00E1ch " + this.setting.objectName.toLocaleLowerCase();
+                            }
                             lstVisibleField = this.setting.cols
                                 .filter(function (item) { return item.visible && item.dataType !== 'trangThaiV5'; })
                                 .map(function (item) { return item.field; });
@@ -44405,7 +44417,8 @@
                 valueField: this.control.valueField,
                 fieldPlus: this.control.fieldPlus,
                 funcGetLabel: this.control.funcGetLabel,
-                plusUrl: this.control.plusUrl
+                plusUrl: this.control.plusUrl,
+                sorts: this.control.sorts,
             });
             if (pageSize) {
                 result.pageSize = pageSize;
@@ -56338,6 +56351,7 @@
                 },] }
     ];
 
+    // 1
     function coreDeclaration() {
         return [
             AddressComponent,