tnx-shared 5.1.444 → 5.1.446

package/bundles/tnx-shared.umd.js

@@ -3692,6 +3692,17 @@
             var d = new Date(year, month, 0);
             return d.getDate();
         };
+        CommonService.prototype.getDatasourceRangeYear = function (rangeYear) {
+            if (rangeYear === void 0) { rangeYear = 5; }
+            var dataSourceYear = [];
+            var i = 1;
+            var currentYear = new Date().getFullYear();
+            for (var year = currentYear - rangeYear; year <= currentYear; year++) {
+                dataSourceYear.push({ id: year, ten: year }, { id: currentYear + i, ten: currentYear + i });
+                i++;
+            }
+            return dataSourceYear.sort(function (a, b) { return b.id - a.id; });
+        };
         CommonService.prototype.getCurrentYear = function () {
             return new Date().getFullYear();
         };
@@ -21182,6 +21193,7 @@
             _this._moduleConfigService = _this._injector.get(ModuleConfigService);
             _this._permissionService = _this._injector.get(PermissionService);
             _this._templateInstanceService = _this._injector.get(TemplateInstanceService);
+            _this._printService = _this._injector.get(PrintService);
             _this.handleCheckAll = _this.handleCheckAll.bind(_this);
             _this.handleCheckAll_Group = _this.handleCheckAll_Group.bind(_this);
             _this.environment = _this._moduleConfigService.getConfig().environment;
@@ -21927,11 +21939,7 @@
             var strBodyEle = this.rowDataHtmlToString(arrRowData);
             var css = '<style type="text/css">table th, table td {border:1px solid #000;} table th {text-align: center;} table {width: 100%;border-collapse: collapse;} table td:first-child {text-align: center;}</style>';
             var table = css + "<table>" + strHeadEle + strBodyEle + "</table>";
-            var dataExport = {
-                header: header.toUpperCase(),
-                tableEle: table
-            };
-            this._templateInstanceService.fillTemplateByCode('ExportWordCommon', dataExport, header);
+            this._printService.printHtmlContent(table, header.toUpperCase());
         };
         ListComponentBase.prototype.exportAll = function () {
             this.exportByReadingHtml(true);
@@ -21975,7 +21983,7 @@
                 rowData += '</tr>';
                 arrRowData.push(rowData);
             });
-            return arrRowData.toString();
+            return arrRowData.join(' ');
         };
         ListComponentBase.prototype.getArrHeadByHtml = function (header) {
             var firstRow = header.querySelector('tr');