tnx-shared 5.3.323 → 5.3.325
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/tnx-shared.umd.js +18 -4
- package/bundles/tnx-shared.umd.js.map +1 -1
- package/bundles/tnx-shared.umd.min.js +1 -1
- package/bundles/tnx-shared.umd.min.js.map +1 -1
- package/classes/base/list-base.d.ts.map +1 -1
- package/classes/form-schema.d.ts +1 -0
- package/classes/form-schema.d.ts.map +1 -1
- package/components/dropdown/dropdown.component.d.ts.map +1 -1
- package/esm2015/classes/base/list-base.js +3 -2
- package/esm2015/classes/form-schema.js +2 -1
- package/esm2015/components/dropdown/dropdown.component.js +10 -2
- package/esm2015/services/export.service.js +6 -2
- package/fesm2015/tnx-shared.js +17 -3
- package/fesm2015/tnx-shared.js.map +1 -1
- package/package.json +2 -2
- package/services/export.service.d.ts.map +1 -1
- package/tnx-shared.metadata.json +1 -1
|
@@ -1383,6 +1383,7 @@
|
|
|
1383
1383
|
_this.isHorizontallyLabel = false;
|
|
1384
1384
|
_this.order = 0;
|
|
1385
1385
|
_this.showTooltip = true;
|
|
1386
|
+
_this.showTooltipOnly = false;
|
|
1386
1387
|
for (var key in init) {
|
|
1387
1388
|
_this[key] = init[key];
|
|
1388
1389
|
}
|
|
@@ -21256,8 +21257,12 @@
|
|
|
21256
21257
|
}
|
|
21257
21258
|
ExportService.prototype.objectToExcel = function (data, fileName, numOfHeaderRow) {
|
|
21258
21259
|
var _this = this;
|
|
21260
|
+
var model = {
|
|
21261
|
+
dataExport: data,
|
|
21262
|
+
pageTitle: fileName
|
|
21263
|
+
};
|
|
21259
21264
|
return this._http
|
|
21260
|
-
.post(this.serviceUri + "/ObjectToExcel?numOfHeaderRow=" + numOfHeaderRow,
|
|
21265
|
+
.post(this.serviceUri + "/ObjectToExcel?numOfHeaderRow=" + numOfHeaderRow, model, { responseType: 'blob' })
|
|
21261
21266
|
.pipe(operators.catchError(function (err) { return _this._commonService.handleError(err, _this._injector); }))
|
|
21262
21267
|
.subscribe(function (res) {
|
|
21263
21268
|
_this.saveAsExcelFile(res, fileName);
|
|
@@ -28227,12 +28232,13 @@
|
|
|
28227
28232
|
ListBase.prototype._exportAllData = function (event) {
|
|
28228
28233
|
var _a;
|
|
28229
28234
|
return __awaiter(this, void 0, void 0, function () {
|
|
28230
|
-
var lstData, lstVisibleField, lstHeader, fieldSchemaMap, printData;
|
|
28235
|
+
var lstData, fileName, lstVisibleField, lstHeader, fieldSchemaMap, printData;
|
|
28231
28236
|
return __generator(this, function (_b) {
|
|
28232
28237
|
switch (_b.label) {
|
|
28233
28238
|
case 0: return [4 /*yield*/, this.setting.baseService.getDataCustomRoute(this.plusUrl, this.currentGridInfo.filters, this.currentGridInfo.fields, this.currentGridInfo.sorts, -1, 1)];
|
|
28234
28239
|
case 1:
|
|
28235
28240
|
lstData = (_a = (_b.sent()).data) !== null && _a !== void 0 ? _a : [];
|
|
28241
|
+
fileName = this.setting.title ? this.setting.title : "Danh s\u00E1ch " + this.setting.objectName.toLocaleLowerCase();
|
|
28236
28242
|
lstVisibleField = this.setting.cols
|
|
28237
28243
|
.filter(function (item) { return item.visible && item.dataType !== 'trangThaiV5'; })
|
|
28238
28244
|
.map(function (item) { return item.field; });
|
|
@@ -28260,7 +28266,7 @@
|
|
|
28260
28266
|
});
|
|
28261
28267
|
return row;
|
|
28262
28268
|
})));
|
|
28263
|
-
this._exportService.objectToExcel(printData,
|
|
28269
|
+
this._exportService.objectToExcel(printData, fileName, 1);
|
|
28264
28270
|
return [2 /*return*/];
|
|
28265
28271
|
}
|
|
28266
28272
|
});
|
|
@@ -33423,6 +33429,9 @@
|
|
|
33423
33429
|
if (this.control.placeholder == null && this.control.multiple) {
|
|
33424
33430
|
this.control.placeholder = 'Chưa chọn bản ghi';
|
|
33425
33431
|
}
|
|
33432
|
+
if (this.control.tooltip && this.control.showTooltip) {
|
|
33433
|
+
this.tooltip = this.control.tooltip;
|
|
33434
|
+
}
|
|
33426
33435
|
this.setDefaultSetting();
|
|
33427
33436
|
if (this.control.baseService) {
|
|
33428
33437
|
if (this.control.isServerLoad) {
|
|
@@ -34040,7 +34049,12 @@
|
|
|
34040
34049
|
};
|
|
34041
34050
|
DropdownComponent.prototype.getValueReturn = function () {
|
|
34042
34051
|
this._returnValue = this.funcReturnValue(this._value);
|
|
34043
|
-
if (
|
|
34052
|
+
if (this.control.showTooltipOnly) {
|
|
34053
|
+
if (this.control.generateTooltip) {
|
|
34054
|
+
this.tooltip = this.control.generateTooltip(this._value);
|
|
34055
|
+
}
|
|
34056
|
+
}
|
|
34057
|
+
else if (!this.control.multiple) {
|
|
34044
34058
|
if (this.control.generateTooltip) {
|
|
34045
34059
|
if (this._value) {
|
|
34046
34060
|
this.tooltip = this.control.generateTooltip(this._value);
|