tnx-shared 5.3.373 → 5.3.375

package/fesm2015/tnx-shared.js

@@ -649,6 +649,7 @@ class CrudListSetting {
         this.mdWidthCommonSearch = 3;
         this.useCommonSearch = false;
         this.useCommonFullTextSearch = true;
+        this.arrFullTextSearch = [];
         this.hiddenSearch = false;
         this.hiddenAuthorizeButton = false;
         this.suffixAuthorizeCode = ''; // thêm hậu tố mã code trong chức năng Phân quyền nút (phục vụ case crudList này nằm trong màn hình popup)
@@ -14628,6 +14629,30 @@ class CrudFormComponent extends ComponentBase {
             if (this.tableFormCurrentRow > -1) {
                 tableNode.model[this.tableFormCurrentRow] = Object.assign(Object.assign({}, tableNode.model[this.tableFormCurrentRow]), data);
                 this.fireModelChanged();
+                if (control.onChanged) {
+                    try {
+                        yield control.onChanged(new EventData({
+                            currentNode: tableNode,
+                            sourceNode: null,
+                            eventType: eventType || this.eventType.TABLE_CHANGED,
+                            crudForm: this
+                        }));
+                    }
+                    catch (_a) {
+                    }
+                }
+                if (control.onAfterChanged) {
+                    try {
+                        yield control.onAfterChanged(new EventData({
+                            currentNode: tableNode,
+                            sourceNode: null,
+                            eventType: eventType || this.eventType.TABLE_CHANGED,
+                            crudForm: this
+                        }));
+                    }
+                    catch (_b) {
+                    }
+                }
             }
             else {
                 const index = tableNode.childNodes.length;
@@ -14645,7 +14670,7 @@ class CrudFormComponent extends ComponentBase {
                             crudForm: this
                         }));
                     }
-                    catch (_a) {
+                    catch (_c) {
                         toAdd = false;
                     }
                 }
@@ -14665,7 +14690,7 @@ class CrudFormComponent extends ComponentBase {
                                 crudForm: this
                             }));
                         }
-                        catch (_b) {
+                        catch (_d) {
                         }
                     }
                     if (control.onAfterChanged) {
@@ -14677,7 +14702,7 @@ class CrudFormComponent extends ComponentBase {
                                 crudForm: this
                             }));
                         }
-                        catch (_c) {
+                        catch (_e) {
                         }
                     }
                     if (control.onAdded) {
@@ -14689,7 +14714,7 @@ class CrudFormComponent extends ComponentBase {
                                 crudForm: this
                             }));
                         }
-                        catch (_d) {
+                        catch (_f) {
                         }
                     }
                 }
@@ -22652,9 +22677,22 @@ class CommonSearchFormComponent extends DataFormBase {
             return 0;
         });
         if (this.parentSetting.useCommonFullTextSearch) {
+            const arrLabel = [];
             const lstTextSearchControl = columnFilters.filter(p => p.fullTextSearch);
-            this.lstTextControl = lstTextSearchControl.map(p => p.field);
-            this.searchBoxTooltip += `${(lstTextSearchControl.map(x => x.label)).join(', ')}`;
+            if (lstTextSearchControl.length) {
+                lstTextSearchControl.forEach(item => {
+                    arrLabel.push(item.label);
+                    this.lstTextControl.push(item.field);
+                });
+            }
+            // fullTextSearch custom
+            if (this.parentSetting.arrFullTextSearch.length) {
+                this.parentSetting.arrFullTextSearch.forEach(item => {
+                    arrLabel.push(item.name);
+                    this.lstTextControl.push(item.field);
+                });
+            }
+            this.searchBoxTooltip += arrLabel.join(', ');
             this._index = 2;
         }
         if (this.isCustomGenerateSearch) {