tnx-shared 5.3.379 → 5.3.381

package/bundles/tnx-shared.umd.js

@@ -1106,6 +1106,7 @@
             this.entityKey = 'id';
             this.modelSchemas = [];
             this.cols = [];
+            this.rawCols = [];
             this.commonSchemas = [];
             this.columnSetting = new ColumnSetting();
             this.pageSetting = new PageSetting();
@@ -5080,6 +5081,17 @@
             var temp = s.normalize('NFD');
             return temp.replace(regex, '').replace('\u0111', 'd').replace('\u0110', 'D');
         };
+        CommonService.prototype.extractInnerText = function (htmlString) {
+            if (!htmlString)
+                return '';
+            var withoutComments = htmlString.replace(/<!--[\s\S]*?-->/g, '');
+            // Tạo một DOM element từ chuỗi HTML đã loại bỏ comment
+            var parser = new DOMParser();
+            var doc = parser.parseFromString(withoutComments, 'text/html');
+            var result = doc.body.innerText.trim();
+            doc = null; // Dọn dẹp tham chiếu (không cần thiết nếu scope kết thúc)
+            return result;
+        };
         return CommonService;
     }());
     CommonService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function CommonService_Factory() { return new CommonService(i0__namespace.ɵɵinject(ModuleConfigService)); }, token: CommonService, providedIn: "root" });
@@ -27376,6 +27388,7 @@
             this.model.baseReady = false;
             if (this.setting.cols) {
                 this.setting.cols = this.setting.cols.filter(function (q) { return !q.removeOnInit; });
+                Object.assign(this.setting.rawCols, this.setting.cols);
             }
             this.setting.customGetData = this.customGetData;
             this.mergeInfoToColumnSchema();
@@ -33399,7 +33412,7 @@
             this.mdWidth = this.parentSetting.mdWidthCommonSearch;
             this.setting.baseService = this.parentSetting.baseService;
             this.isCustomGenerateSearch = this.parentSetting.commonSchemas.length > 0;
-            var columnFilters = this.parentSetting.cols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
+            var columnFilters = this.parentSetting.rawCols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
                 if (a.order < b.order) {
                     return -1;
                 }
@@ -33626,7 +33639,7 @@
                     var _a;
                     if (!data.hasOwnProperty(item) || (!data[item] || data[item].length < 1))
                         return;
-                    var valueField = ((_a = _this.parentSetting.cols.find(function (p) { return p.field === item; })) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
+                    var valueField = ((_a = _this.parentSetting.rawCols.find(function (p) { return p.field === item; })) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
                     if (data[item].length) {
                         data[item] = data[item].map(function (p) { return p[valueField]; });
                     }