tnx-shared 5.3.379 → 5.3.381

package/fesm2015/tnx-shared.js

@@ -621,6 +621,7 @@ class CrudListSetting {
         this.entityKey = 'id';
         this.modelSchemas = [];
         this.cols = [];
+        this.rawCols = [];
         this.commonSchemas = [];
         this.columnSetting = new ColumnSetting();
         this.pageSetting = new PageSetting();
@@ -4132,6 +4133,17 @@ class CommonService {
         const temp = s.normalize('NFD');
         return temp.replace(regex, '').replace('\u0111', 'd').replace('\u0110', 'D');
     }
+    extractInnerText(htmlString) {
+        if (!htmlString)
+            return '';
+        const withoutComments = htmlString.replace(/<!--[\s\S]*?-->/g, '');
+        // Tạo một DOM element từ chuỗi HTML đã loại bỏ comment
+        const parser = new DOMParser();
+        let doc = parser.parseFromString(withoutComments, 'text/html');
+        const 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;
+    }
 }
 CommonService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CommonService_Factory() { return new CommonService(i0.ɵɵinject(ModuleConfigService)); }, token: CommonService, providedIn: "root" });
 CommonService.decorators = [
@@ -22667,7 +22679,7 @@ class CommonSearchFormComponent extends DataFormBase {
         this.mdWidth = this.parentSetting.mdWidthCommonSearch;
         this.setting.baseService = this.parentSetting.baseService;
         this.isCustomGenerateSearch = this.parentSetting.commonSchemas.length > 0;
-        const columnFilters = this.parentSetting.cols.filter(p => p.allowFilter && !p.field.startsWith('str')).sort((a, b) => {
+        const columnFilters = this.parentSetting.rawCols.filter(p => p.allowFilter && !p.field.startsWith('str')).sort((a, b) => {
             if (a.order < b.order) {
                 return -1;
             }
@@ -22894,7 +22906,7 @@ class CommonSearchFormComponent extends DataFormBase {
                 var _a;
                 if (!data.hasOwnProperty(item) || (!data[item] || data[item].length < 1))
                     return;
-                const valueField = ((_a = this.parentSetting.cols.find(p => p.field === item)) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
+                const valueField = ((_a = this.parentSetting.rawCols.find(p => p.field === item)) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
                 if (data[item].length) {
                     data[item] = data[item].map(p => p[valueField]);
                 }
@@ -23508,6 +23520,7 @@ class ListBase extends ComponentBaseWithButton {
         this.model.baseReady = false;
         if (this.setting.cols) {
             this.setting.cols = this.setting.cols.filter(q => !q.removeOnInit);
+            Object.assign(this.setting.rawCols, this.setting.cols);
         }
         this.setting.customGetData = this.customGetData;
         this.mergeInfoToColumnSchema();