tnx-shared 5.3.337 → 5.3.339

package/bundles/tnx-shared.umd.js

@@ -2313,6 +2313,7 @@
             // Nếu có value nghĩa là những cột này cần phải lấy dữ liệu xong rồi mới đến cột khác
             _this.order = 1;
             _this.mdWidthInSearch = 12;
+            _this.showExtendContent = false;
             _this.min = 0;
             _this.max = 99999999999;
             _this.isForeignField = false;
@@ -19680,7 +19681,7 @@
                                     });
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    this.handleInsertError();
+                                    this.handleInsertError(response);
                                     _e.label = 3;
                                 case 3: return [2 /*return*/];
                             }
@@ -19700,7 +19701,7 @@
         DataFormBase.prototype.getPromiseActionInsert = function () {
             return this.setting.baseService.post(this.model.data, this.insertPlusUrl);
         };
-        DataFormBase.prototype.handleInsertError = function () {
+        DataFormBase.prototype.handleInsertError = function (response) {
         };
         DataFormBase.prototype.onUpdate = function () {
             return __awaiter(this, void 0, void 0, function () {
@@ -19725,7 +19726,7 @@
                                     });
                                     return [3 /*break*/, 3];
                                 case 2:
-                                    this.handleUpdateError();
+                                    this.handleUpdateError(response);
                                     _e.label = 3;
                                 case 3: return [2 /*return*/];
                             }
@@ -19745,7 +19746,7 @@
                 });
             });
         };
-        DataFormBase.prototype.handleUpdateError = function () {
+        DataFormBase.prototype.handleUpdateError = function (response) {
         };
         DataFormBase.prototype.getPromiseActionUpdate = function () {
             return this.setting.baseService.put(this.model.data.id.toString(), this.model.data, this.updatePlusUrl);
@@ -20838,7 +20839,7 @@
                     width: '200px',
                 }));
             }
-            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) {
+            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: control.fieldPlus, fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
                     var result = item.hoVaTen;
                     if (item.code) {
                         result = item.code + " - " + result + " ";
@@ -20926,8 +20927,26 @@
                     result.fieldPlus += ',idNgachVienChuc';
                 }
             }
-            if (!result.isOverrideColumns)
-                result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code';
+            if (!result.isOverrideColumns && !result.fieldPlus) {
+                result.fieldPlus = 'idNgachVienChuc,ngaySinh,ngaySinh2,chucDanhs,idHocHam,idHocVi,dienThoaiDiDong,code,email';
+            }
+            else {
+                result.fieldPlus += result.fieldPlus ? ',code' : 'code';
+            }
+            return result;
+        };
+        CanBoHoSoService.prototype.generatePickerControlSchemaSimple = function (control) {
+            var columns = __spreadArray([], __read(this.lstEntityPickerColumn));
+            var result = new AutoCompletePickerControlSchema(Object.assign({ field: 'idCanBo', label: 'Cán bộ', title: 'Chọn cán bộ', multiple: false, baseService: this, displayField: 'hoVaTen', fieldPlus: 'code', fieldSearchText: ['email', 'code'], funcGetLabel: function (item) {
+                    var result = item.hoVaTen;
+                    if (item.code) {
+                        result = item.code + " - " + result + " ";
+                    }
+                    if (item.lstTenDonVi) {
+                        result += "- " + item.lstTenDonVi;
+                    }
+                    return result;
+                }, required: true, columns: columns }, control));
             return result;
         };
         CanBoHoSoService.prototype.getTenDonVi = function (dataSource) {
@@ -46689,7 +46708,10 @@
                         dataSource: column.dataSource,
                         groupCode: column.groupCode,
                         isOverrideFilter: column.isOverrideFilter,
-                        order: column.order
+                        order: column.order,
+                        isTree: column.isTree,
+                        fieldTree: column.fieldTree,
+                        valueParentRoot: column.valueParentRoot,
                     });
                     if (column.dataType == 'custom') {
                         newCol.dataType = column.code;
@@ -46961,7 +46983,10 @@
                         dataSource: column.dataSource,
                         groupCode: column.groupCode,
                         isOverrideFilter: column.isOverrideFilter,
-                        order: column.order
+                        order: column.order,
+                        isTree: column.isTree,
+                        fieldTree: column.fieldTree,
+                        valueParentRoot: column.valueParentRoot,
                     });
                     if (column.dataType == 'custom') {
                         newCol.dataType = column.code;