tnx-shared 5.3.373 → 5.3.375

package/bundles/tnx-shared.umd.js

@@ -1134,6 +1134,7 @@
             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)
@@ -14868,15 +14869,15 @@
         return PasswordValidator;
     }());
 
-    var _e;
+    var _g;
     // fix for build prod
     var jQuery$1 = jQuery___default["default"];
-    var operatorContrast = (_e = {},
-        _e[exports.Operator.greater] = exports.Operator.lower,
-        _e[exports.Operator.greaterThanEqual] = exports.Operator.lowerThanEqual,
-        _e[exports.Operator.lower] = exports.Operator.greater,
-        _e[exports.Operator.lowerThanEqual] = exports.Operator.greaterThanEqual,
-        _e);
+    var operatorContrast = (_g = {},
+        _g[exports.Operator.greater] = exports.Operator.lower,
+        _g[exports.Operator.greaterThanEqual] = exports.Operator.lowerThanEqual,
+        _g[exports.Operator.lower] = exports.Operator.greater,
+        _g[exports.Operator.lowerThanEqual] = exports.Operator.greaterThanEqual,
+        _g);
     var CrudFormComponent = /** @class */ (function (_super) {
         __extends(CrudFormComponent, _super);
         function CrudFormComponent(_injector, _commonService, _crudService, _deviceDetectorService, _dropdownService, _sanitizer, _entityPickerService, _moduleConfig) {
@@ -14938,8 +14939,8 @@
             _this.fieldParentField = 'parentField';
             _this.handleKeyUp = function (control, event, eventType, parentModel, parentPath, sourceNode) { return __awaiter(_this, void 0, void 0, function () {
                 var parentNode, currentNode, value, eventData, _a_1;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = this._rootNode.getNodeByPath(parentPath);
                             // row in table
@@ -14960,7 +14961,7 @@
                             return [4 /*yield*/, this.validate(currentNode)];
                         case 1:
                             // validate value
-                            _e.sent();
+                            _g.sent();
                             eventData = new EventData({
                                 currentNode: currentNode,
                                 sourceEvent: event,
@@ -14969,15 +14970,15 @@
                                 crudForm: this
                             });
                             if (!control.onKeyUp) return [3 /*break*/, 5];
-                            _e.label = 2;
+                            _g.label = 2;
                         case 2:
-                            _e.trys.push([2, 4, , 5]);
+                            _g.trys.push([2, 4, , 5]);
                             return [4 /*yield*/, control.onKeyUp(eventData)];
                         case 3:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 5];
                         case 4:
-                            _a_1 = _e.sent();
+                            _a_1 = _g.sent();
                             return [3 /*break*/, 5];
                         case 5: return [2 /*return*/];
                     }
@@ -14989,8 +14990,8 @@
             _this.handleFieldValueChange = function (control, event, eventType, parentModel, parentPath, sourceNode, bubble) { return __awaiter(_this, void 0, void 0, function () {
                 var parentNode, currentNode, value, eventData, _b_1, _c_1;
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = this._rootNode.getNodeByPath(parentPath);
                             // row in table
@@ -15011,7 +15012,7 @@
                             return [4 /*yield*/, this.validate(currentNode)];
                         case 1:
                             // validate value
-                            _e.sent();
+                            _g.sent();
                             if (!bubble) {
                                 this.fireModelChanged();
                             }
@@ -15023,15 +15024,15 @@
                                 crudForm: this
                             });
                             if (!control.onChanged) return [3 /*break*/, 5];
-                            _e.label = 2;
+                            _g.label = 2;
                         case 2:
-                            _e.trys.push([2, 4, , 5]);
+                            _g.trys.push([2, 4, , 5]);
                             return [4 /*yield*/, control.onChanged(eventData)];
                         case 3:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 5];
                         case 4:
-                            _b_1 = _e.sent();
+                            _b_1 = _g.sent();
                             return [3 /*break*/, 5];
                         case 5:
                             if (!bubble) {
@@ -15046,15 +15047,15 @@
                                 });
                             }
                             if (!control.onAfterChanged) return [3 /*break*/, 9];
-                            _e.label = 6;
+                            _g.label = 6;
                         case 6:
-                            _e.trys.push([6, 8, , 9]);
+                            _g.trys.push([6, 8, , 9]);
                             return [4 /*yield*/, control.onAfterChanged(eventData)];
                         case 7:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 9];
                         case 8:
-                            _c_1 = _e.sent();
+                            _c_1 = _g.sent();
                             return [3 /*break*/, 9];
                         case 9:
                             this.onChange.emit(eventData);
@@ -15063,17 +15064,17 @@
                 });
             }); };
             _this.updateModelFromExternal = function () {
-                var e_1, _e;
+                var e_1, _g;
                 try {
-                    for (var _f = __values(_this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                        var control = _g.value;
+                    for (var _h = __values(_this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                        var control = _j.value;
                         _this.initControlModel(_this._modelData, control);
                     }
                 }
                 catch (e_1_1) { e_1 = { error: e_1_1 }; }
                 finally {
                     try {
-                        if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                        if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                     }
                     finally { if (e_1) throw e_1.error; }
                 }
@@ -15141,25 +15142,25 @@
             this.initLoad();
         };
         CrudFormComponent.prototype.switchViewMode = function (readonlyView) {
-            var e_2, _e;
+            var e_2, _g;
             if (readonlyView === void 0) { readonlyView = true; }
             this.isViewMode = readonlyView;
             try {
-                for (var _f = __values(this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var control = _g.value;
+                for (var _h = __values(this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var control = _j.value;
                     this.disableControlSchema(control, this.isViewMode);
                 }
             }
             catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_2) throw e_2.error; }
             }
         };
         CrudFormComponent.prototype.switchFormStateForUserpicker = function (isFormAddNew) {
-            var e_3, _e;
+            var e_3, _g;
             if (isFormAddNew === void 0) { isFormAddNew = false; }
             var keys = Object.keys(this.formControls);
             if (keys.length == 0)
@@ -15176,7 +15177,7 @@
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (keys_1_1 && !keys_1_1.done && (_e = keys_1.return)) _e.call(keys_1);
+                    if (keys_1_1 && !keys_1_1.done && (_g = keys_1.return)) _g.call(keys_1);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -15188,7 +15189,7 @@
             this.cleanModel(this._modelData);
         };
         CrudFormComponent.prototype.cleanModel = function (model) {
-            var e_4, _e;
+            var e_4, _g;
             if (isLiteralObject(model)) {
                 for (var key in model) {
                     if (key == '_status') {
@@ -15216,25 +15217,25 @@
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }
                 finally {
                     try {
-                        if (model_1_1 && !model_1_1.done && (_e = model_1.return)) _e.call(model_1);
+                        if (model_1_1 && !model_1_1.done && (_g = model_1.return)) _g.call(model_1);
                     }
                     finally { if (e_4) throw e_4.error; }
                 }
             }
         };
         CrudFormComponent.prototype.reInitControlModelAndRootNode = function () {
-            var e_5, _e;
+            var e_5, _g;
             var _this = this;
             try {
-                for (var _f = __values(this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var control = _g.value;
+                for (var _h = __values(this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var control = _j.value;
                     this.initControlModel(this._modelData, control);
                 }
             }
             catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_5) throw e_5.error; }
             }
@@ -15257,7 +15258,7 @@
             this.onModelChanged.emit(event);
         };
         CrudFormComponent.prototype.getMinimizeData = function (model) {
-            var e_6, _e;
+            var e_6, _g;
             if (isLiteralObject(model)) {
                 if (model._dropdownvalue != null && model._dropdownvalue !== '') {
                     return model[model._dropdownvalue] == null ? model['value'] : model[model._dropdownvalue];
@@ -15285,7 +15286,7 @@
                 catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
-                        if (model_2_1 && !model_2_1.done && (_e = model_2.return)) _e.call(model_2);
+                        if (model_2_1 && !model_2_1.done && (_g = model_2.return)) _g.call(model_2);
                     }
                     finally { if (e_6) throw e_6.error; }
                 }
@@ -15327,23 +15328,23 @@
             });
         };
         CrudFormComponent.prototype.initSchema = function () {
-            var e_7, _e, e_8, _f;
+            var e_7, _g, e_8, _h;
             try {
-                for (var _g = __values(this.setting.schema), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var control = _h.value;
+                for (var _j = __values(this.setting.schema), _k = _j.next(); !_k.done; _k = _j.next()) {
+                    var control = _k.value;
                     this.initControlSchema(control);
                 }
             }
             catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                    if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                 }
                 finally { if (e_7) throw e_7.error; }
             }
             try {
-                for (var _j = __values(this.setting.schema), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var control = _k.value;
+                for (var _l = __values(this.setting.schema), _m = _l.next(); !_m.done; _m = _l.next()) {
+                    var control = _m.value;
                     this.initControlModel(this._modelData, control);
                     this.initValidatorAndCorrector(control);
                     this.initBindingControlSchema(control);
@@ -15352,7 +15353,7 @@
             catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
-                    if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                    if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                 }
                 finally { if (e_8) throw e_8.error; }
             }
@@ -15360,7 +15361,7 @@
             this._rootNode.setCrudForm(this);
         };
         CrudFormComponent.prototype.initControlModel = function (parentModel, control, parentPath) {
-            var e_9, _e, e_10, _f, e_11, _g;
+            var e_9, _g, e_10, _h, e_11, _j;
             var _this = this;
             this.initPrivateData(parentModel, control.field);
             var _parentPath = control.field;
@@ -15382,18 +15383,18 @@
                 }
                 var i = 0;
                 try {
-                    for (var _h = __values(parentModel[control.field]), _j = _h.next(); !_j.done; _j = _h.next()) {
-                        var item = _j.value;
+                    for (var _k = __values(parentModel[control.field]), _l = _k.next(); !_l.done; _l = _k.next()) {
+                        var item = _l.value;
                         try {
-                            for (var _k = (e_10 = void 0, __values(control.rowTemplate)), _l = _k.next(); !_l.done; _l = _k.next()) {
-                                var subControl = _l.value;
+                            for (var _m = (e_10 = void 0, __values(control.rowTemplate)), _o = _m.next(); !_o.done; _o = _m.next()) {
+                                var subControl = _o.value;
                                 this.initControlModel(item, subControl, _parentPath + '[' + i + ']');
                             }
                         }
                         catch (e_10_1) { e_10 = { error: e_10_1 }; }
                         finally {
                             try {
-                                if (_l && !_l.done && (_f = _k.return)) _f.call(_k);
+                                if (_o && !_o.done && (_h = _m.return)) _h.call(_m);
                             }
                             finally { if (e_10) throw e_10.error; }
                         }
@@ -15403,7 +15404,7 @@
                 catch (e_9_1) { e_9 = { error: e_9_1 }; }
                 finally {
                     try {
-                        if (_j && !_j.done && (_e = _h.return)) _e.call(_h);
+                        if (_l && !_l.done && (_g = _k.return)) _g.call(_k);
                     }
                     finally { if (e_9) throw e_9.error; }
                 }
@@ -15413,15 +15414,15 @@
                     parentModel[control.field] = {};
                 }
                 try {
-                    for (var _m = __values(control.controls), _o = _m.next(); !_o.done; _o = _m.next()) {
-                        var subControl = _o.value;
+                    for (var _p = __values(control.controls), _q = _p.next(); !_q.done; _q = _p.next()) {
+                        var subControl = _q.value;
                         this.initControlModel(parentModel[control.field], subControl, _parentPath);
                     }
                 }
                 catch (e_11_1) { e_11 = { error: e_11_1 }; }
                 finally {
                     try {
-                        if (_o && !_o.done && (_g = _m.return)) _g.call(_m);
+                        if (_q && !_q.done && (_j = _p.return)) _j.call(_p);
                     }
                     finally { if (e_11) throw e_11.error; }
                 }
@@ -15433,11 +15434,11 @@
             // }
         };
         CrudFormComponent.prototype.initControlDefaultValueFromExternal = function () {
-            var e_12, _e;
+            var e_12, _g;
             try {
                 // const schemaDynamics = [];
-                for (var _f = __values(this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var control = _g.value;
+                for (var _h = __values(this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var control = _j.value;
                     this.initControlDefaultValue(this._modelData, control);
                     // if (control instanceof CustomControlSchema
                     //     && this.checkIsDynamicControl(control)
@@ -15449,7 +15450,7 @@
             catch (e_12_1) { e_12 = { error: e_12_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_12) throw e_12.error; }
             }
@@ -15460,10 +15461,10 @@
         };
         CrudFormComponent.prototype.initControlDefaultValue = function (parentModel, control, parentPath) {
             return __awaiter(this, void 0, void 0, function () {
-                var _parentPath, addMore, i, _e, _f, item, _g, _h, subControl, _j, _k, subControl, _l;
-                var e_13, _m, e_14, _o, e_15, _p;
-                return __generator(this, function (_q) {
-                    switch (_q.label) {
+                var _parentPath, addMore, i, _g, _h, item, _j, _k, subControl, _l, _m, subControl, _o;
+                var e_13, _p, e_14, _q, e_15, _r;
+                return __generator(this, function (_s) {
+                    switch (_s.label) {
                         case 0:
                             this.initPrivateData(parentModel, control.field);
                             _parentPath = control.field;
@@ -15479,18 +15480,18 @@
                             }
                             i = 0;
                             try {
-                                for (_e = __values(parentModel[control.field]), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                    item = _f.value;
+                                for (_g = __values(parentModel[control.field]), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                    item = _h.value;
                                     try {
-                                        for (_g = (e_14 = void 0, __values(control.rowTemplate)), _h = _g.next(); !_h.done; _h = _g.next()) {
-                                            subControl = _h.value;
+                                        for (_j = (e_14 = void 0, __values(control.rowTemplate)), _k = _j.next(); !_k.done; _k = _j.next()) {
+                                            subControl = _k.value;
                                             this.initControlDefaultValue(item, subControl, _parentPath + '[' + i + ']');
                                         }
                                     }
                                     catch (e_14_1) { e_14 = { error: e_14_1 }; }
                                     finally {
                                         try {
-                                            if (_h && !_h.done && (_o = _g.return)) _o.call(_g);
+                                            if (_k && !_k.done && (_q = _j.return)) _q.call(_j);
                                         }
                                         finally { if (e_14) throw e_14.error; }
                                     }
@@ -15500,7 +15501,7 @@
                             catch (e_13_1) { e_13 = { error: e_13_1 }; }
                             finally {
                                 try {
-                                    if (_f && !_f.done && (_m = _e.return)) _m.call(_e);
+                                    if (_h && !_h.done && (_p = _g.return)) _p.call(_g);
                                 }
                                 finally { if (e_13) throw e_13.error; }
                             }
@@ -15511,26 +15512,26 @@
                                 parentModel[control.field] = {};
                             }
                             try {
-                                for (_j = __values(control.controls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                                    subControl = _k.value;
+                                for (_l = __values(control.controls), _m = _l.next(); !_m.done; _m = _l.next()) {
+                                    subControl = _m.value;
                                     this.initControlDefaultValue(parentModel[control.field], subControl, _parentPath);
                                 }
                             }
                             catch (e_15_1) { e_15 = { error: e_15_1 }; }
                             finally {
                                 try {
-                                    if (_k && !_k.done && (_p = _j.return)) _p.call(_j);
+                                    if (_m && !_m.done && (_r = _l.return)) _r.call(_l);
                                 }
                                 finally { if (e_15) throw e_15.error; }
                             }
                             return [3 /*break*/, 5];
                         case 2:
                             if (!control.funcSetDefaultValue) return [3 /*break*/, 4];
-                            _l = control;
+                            _o = control;
                             return [4 /*yield*/, control.funcSetDefaultValue()];
                         case 3:
-                            _l.defaultValue = _q.sent();
-                            _q.label = 4;
+                            _o.defaultValue = _s.sent();
+                            _s.label = 4;
                         case 4:
                             if (!parentModel.hasOwnProperty(control.field) && control.field != null) {
                                 if (control.defaultValue !== null && control.defaultValue !== undefined) {
@@ -15545,7 +15546,7 @@
                                     }
                                 }
                             }
-                            _q.label = 5;
+                            _s.label = 5;
                         case 5: return [2 /*return*/];
                     }
                 });
@@ -15564,18 +15565,18 @@
                 parentModel._errors[field] = [];
         };
         CrudFormComponent.prototype.reInitControlSchema = function () {
-            var e_16, _e;
+            var e_16, _g;
             var _this = this;
             try {
-                for (var _f = __values(this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var control = _g.value;
+                for (var _h = __values(this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var control = _j.value;
                     this.initControlSchema(control);
                 }
             }
             catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_16) throw e_16.error; }
             }
@@ -15591,7 +15592,7 @@
             });
         };
         CrudFormComponent.prototype.initControlSchema = function (schema, parentId) {
-            var e_17, _e, e_18, _f;
+            var e_17, _g, e_18, _h;
             var _this = this;
             if (schema.disabled != true) {
                 schema.disabled = null;
@@ -15650,8 +15651,8 @@
                     }
                 }
                 try {
-                    for (var _g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var subControl = _h.value;
+                    for (var _j = __values(control.rowTemplate), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        var subControl = _k.value;
                         subControl[this.fieldParentField] = control.uniqueField;
                         this.initControlSchema(subControl, schema.uniqueField);
                     }
@@ -15659,7 +15660,7 @@
                 catch (e_17_1) { e_17 = { error: e_17_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                        if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                     }
                     finally { if (e_17) throw e_17.error; }
                 }
@@ -15697,8 +15698,8 @@
             else if (schema instanceof ContainerSchema) {
                 var control = schema;
                 try {
-                    for (var _j = __values(control.controls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                        var subControl = _k.value;
+                    for (var _l = __values(control.controls), _m = _l.next(); !_m.done; _m = _l.next()) {
+                        var subControl = _m.value;
                         subControl[this.fieldParentField] = control.uniqueField;
                         this.initControlSchema(subControl, control.uniqueField);
                     }
@@ -15706,7 +15707,7 @@
                 catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
-                        if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                        if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                     }
                     finally { if (e_18) throw e_18.error; }
                 }
@@ -15740,7 +15741,7 @@
             }
         };
         CrudFormComponent.prototype.disableControlSchema = function (schema, disabled) {
-            var e_19, _e, e_20, _f;
+            var e_19, _g, e_20, _h;
             if (disabled === void 0) { disabled = true; }
             if (!schema.disabled) {
                 schema.disabled = disabled;
@@ -15748,15 +15749,15 @@
             if (schema instanceof TableSchema) {
                 var control = schema;
                 try {
-                    for (var _g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var subControl = _h.value;
+                    for (var _j = __values(control.rowTemplate), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        var subControl = _k.value;
                         this.disableControlSchema(subControl, disabled);
                     }
                 }
                 catch (e_19_1) { e_19 = { error: e_19_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                        if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                     }
                     finally { if (e_19) throw e_19.error; }
                 }
@@ -15764,15 +15765,15 @@
             else if (schema instanceof ContainerSchema) {
                 var control = schema;
                 try {
-                    for (var _j = __values(control.controls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                        var subControl = _k.value;
+                    for (var _l = __values(control.controls), _m = _l.next(); !_m.done; _m = _l.next()) {
+                        var subControl = _m.value;
                         this.disableControlSchema(subControl, disabled);
                     }
                 }
                 catch (e_20_1) { e_20 = { error: e_20_1 }; }
                 finally {
                     try {
-                        if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                        if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                     }
                     finally { if (e_20) throw e_20.error; }
                 }
@@ -15791,19 +15792,19 @@
             schema.data.tenCongViec = templateText;
         };
         CrudFormComponent.prototype.initBindingControlSchema = function (schema) {
-            var e_21, _e, e_22, _f;
+            var e_21, _g, e_22, _h;
             if (schema instanceof TableSchema) {
                 var control = schema;
                 try {
-                    for (var _g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var subControl = _h.value;
+                    for (var _j = __values(control.rowTemplate), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        var subControl = _k.value;
                         this.initBindingControlSchema(subControl);
                     }
                 }
                 catch (e_21_1) { e_21 = { error: e_21_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                        if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                     }
                     finally { if (e_21) throw e_21.error; }
                 }
@@ -15823,15 +15824,15 @@
             else if (schema instanceof ContainerSchema) {
                 var control = schema;
                 try {
-                    for (var _j = __values(control.controls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                        var subControl = _k.value;
+                    for (var _l = __values(control.controls), _m = _l.next(); !_m.done; _m = _l.next()) {
+                        var subControl = _m.value;
                         this.initBindingControlSchema(subControl);
                     }
                 }
                 catch (e_22_1) { e_22 = { error: e_22_1 }; }
                 finally {
                     try {
-                        if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                        if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                     }
                     finally { if (e_22) throw e_22.error; }
                 }
@@ -15841,7 +15842,7 @@
             return __awaiter(this, void 0, void 0, function () {
                 var markedControl;
                 var _this = this;
-                return __generator(this, function (_e) {
+                return __generator(this, function (_g) {
                     dropdownControlSchema.bindingFilters.forEach(function (filter) {
                         var sourceField = filter.sourceField;
                         var schema = _this.setting.schema.find(function (q) { return q.field == sourceField; });
@@ -15857,7 +15858,7 @@
             });
         };
         CrudFormComponent.prototype.bindOnChangeToDropdownRecursive = function (childDropdown, tmpFilters, markedControl) {
-            var e_23, _e;
+            var e_23, _g;
             var _this = this;
             if (tmpFilters instanceof Array) {
                 var _loop_1 = function (filter) {
@@ -15919,7 +15920,7 @@
                 catch (e_23_1) { e_23 = { error: e_23_1 }; }
                 finally {
                     try {
-                        if (tmpFilters_1_1 && !tmpFilters_1_1.done && (_e = tmpFilters_1.return)) _e.call(tmpFilters_1);
+                        if (tmpFilters_1_1 && !tmpFilters_1_1.done && (_g = tmpFilters_1.return)) _g.call(tmpFilters_1);
                     }
                     finally { if (e_23) throw e_23.error; }
                 }
@@ -15930,14 +15931,14 @@
             if (control.triggerLoadChild) {
                 var oldTriggerLoadChild_1 = control.triggerLoadChild;
                 control.triggerLoadChild = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_e) {
-                        switch (_e.label) {
+                    return __generator(this, function (_g) {
+                        switch (_g.label) {
                             case 0: return [4 /*yield*/, oldTriggerLoadChild_1(event)];
                             case 1:
-                                _e.sent();
+                                _g.sent();
                                 return [4 /*yield*/, newOnChange(event)];
                             case 2:
-                                _e.sent();
+                                _g.sent();
                                 return [2 /*return*/];
                         }
                     });
@@ -15945,11 +15946,11 @@
             }
             else {
                 control.triggerLoadChild = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                    return __generator(this, function (_e) {
-                        switch (_e.label) {
+                    return __generator(this, function (_g) {
+                        switch (_g.label) {
                             case 0: return [4 /*yield*/, newOnChange(event)];
                             case 1:
-                                _e.sent();
+                                _g.sent();
                                 return [2 /*return*/];
                         }
                     });
@@ -15961,14 +15962,14 @@
                     var oldOnChange_1 = control.onChanged;
                     control[tmpFieldOldOnChange] = oldOnChange_1;
                     control.onChanged = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
                                 case 0: return [4 /*yield*/, oldOnChange_1(event)];
                                 case 1:
-                                    _e.sent();
+                                    _g.sent();
                                     return [4 /*yield*/, control.triggerLoadChild(event)];
                                 case 2:
-                                    _e.sent();
+                                    _g.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -15983,14 +15984,14 @@
                 if (control[tmpFieldOldOnChange]) {
                     var oldOnChange_2 = control[tmpFieldOldOnChange];
                     control.onChanged = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
                                 case 0: return [4 /*yield*/, oldOnChange_2(event)];
                                 case 1:
-                                    _e.sent();
+                                    _g.sent();
                                     return [4 /*yield*/, control.triggerLoadChild(event)];
                                 case 2:
-                                    _e.sent();
+                                    _g.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -16004,14 +16005,14 @@
                 if (control.onAdjustedValue) {
                     var oldEvent_1 = control.onAdjustedValue;
                     control.onAdjustedValue = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
                                 case 0: return [4 /*yield*/, oldEvent_1(event)];
                                 case 1:
-                                    _e.sent();
+                                    _g.sent();
                                     return [4 /*yield*/, newOnChange(event)];
                                 case 2:
-                                    _e.sent();
+                                    _g.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -16019,11 +16020,11 @@
                 }
                 else {
                     control.onAdjustedValue = function (event) { return __awaiter(_this, void 0, void 0, function () {
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
+                        return __generator(this, function (_g) {
+                            switch (_g.label) {
                                 case 0: return [4 /*yield*/, newOnChange(event)];
                                 case 1:
-                                    _e.sent();
+                                    _g.sent();
                                     return [2 /*return*/];
                             }
                         });
@@ -16032,7 +16033,7 @@
             }
         };
         CrudFormComponent.prototype.initValidatorAndCorrector = function (schema) {
-            var e_24, _e, e_25, _f;
+            var e_24, _g, e_25, _h;
             var _this = this;
             if (!schema.correctors)
                 schema.correctors = [];
@@ -16078,15 +16079,15 @@
             else if (schema instanceof TableSchema) {
                 var control = schema;
                 try {
-                    for (var _g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
-                        var subControl = _h.value;
+                    for (var _j = __values(control.rowTemplate), _k = _j.next(); !_k.done; _k = _j.next()) {
+                        var subControl = _k.value;
                         this.initValidatorAndCorrector(subControl);
                     }
                 }
                 catch (e_24_1) { e_24 = { error: e_24_1 }; }
                 finally {
                     try {
-                        if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                        if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                     }
                     finally { if (e_24) throw e_24.error; }
                 }
@@ -16104,15 +16105,15 @@
             else if (schema instanceof ContainerSchema) {
                 var control = schema;
                 try {
-                    for (var _j = __values(control.controls), _k = _j.next(); !_k.done; _k = _j.next()) {
-                        var subControl = _k.value;
+                    for (var _l = __values(control.controls), _m = _l.next(); !_m.done; _m = _l.next()) {
+                        var subControl = _m.value;
                         this.initValidatorAndCorrector(subControl);
                     }
                 }
                 catch (e_25_1) { e_25 = { error: e_25_1 }; }
                 finally {
                     try {
-                        if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                        if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                     }
                     finally { if (e_25) throw e_25.error; }
                 }
@@ -16219,14 +16220,14 @@
             }
         };
         CrudFormComponent.prototype.setDataDefault = function () {
-            var e_26, _e;
+            var e_26, _g;
             var stringDataDefault = localStorage.getItem(ComCtxConstants.LOCALSTORAGE_KEY.DEFAULT_DATA);
             var getSettingDataDefault = this._moduleConfig.getConfig().environment.settingDataDefault;
             if (stringDataDefault && (this._modelData && !this._modelData.id)) {
                 var dataCache = JSON.parse(stringDataDefault);
                 try {
-                    for (var _f = __values(this.setting.schema), _g = _f.next(); !_g.done; _g = _f.next()) {
-                        var item = _g.value;
+                    for (var _h = __values(this.setting.schema), _j = _h.next(); !_j.done; _j = _h.next()) {
+                        var item = _j.value;
                         if (item instanceof DropdownControlSchema) {
                             var control = item;
                             var key = (control.field + (control.valueField == 'id' ? '' : control.valueField));
@@ -16256,7 +16257,7 @@
                 catch (e_26_1) { e_26 = { error: e_26_1 }; }
                 finally {
                     try {
-                        if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                        if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                     }
                     finally { if (e_26) throw e_26.error; }
                 }
@@ -16270,7 +16271,7 @@
             this.setCachedValueToModel(this._modelData);
         };
         CrudFormComponent.prototype.setCachedValueToModel = function (model, uniqueKeyControl, path) {
-            var e_27, _e;
+            var e_27, _g;
             for (var field in model) {
                 if (field != '_errors' && field != '_status' && field != '_source') {
                     var subUniqueKeyControl = void 0;
@@ -16303,7 +16304,7 @@
                         catch (e_27_1) { e_27 = { error: e_27_1 }; }
                         finally {
                             try {
-                                if (subModel_1_1 && !subModel_1_1.done && (_e = subModel_1.return)) _e.call(subModel_1);
+                                if (subModel_1_1 && !subModel_1_1.done && (_g = subModel_1.return)) _g.call(subModel_1);
                             }
                             finally { if (e_27) throw e_27.error; }
                         }
@@ -16560,14 +16561,14 @@
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (!(setValidateForm || ((_a = this.setting.arrFieldMustValidate) === null || _a === void 0 ? void 0 : _a.length))) return [3 /*break*/, 2];
                             this._inValidForm = false;
                             return [4 /*yield*/, this.validateModel(this._rootNode, setValidateForm)];
                         case 1:
-                            _e.sent();
+                            _g.sent();
                             if (this._inValidForm) {
                                 setTimeout(function () {
                                     _this.focusToFirstErrorControl();
@@ -16577,7 +16578,7 @@
                             return [3 /*break*/, 3];
                         case 2:
                             this.removeAllError();
-                            _e.label = 3;
+                            _g.label = 3;
                         case 3: return [2 /*return*/, true];
                     }
                 });
@@ -16587,17 +16588,17 @@
             if (setValidateForm === void 0) { setValidateForm = true; }
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var _e, _f, childNode, e_28_1;
-                var e_28, _g;
-                return __generator(this, function (_h) {
-                    switch (_h.label) {
+                var _g, _h, childNode, e_28_1;
+                var e_28, _j;
+                return __generator(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
-                            _h.trys.push([0, 6, 7, 8]);
-                            _e = __values(currentNode.childNodes), _f = _e.next();
-                            _h.label = 1;
+                            _k.trys.push([0, 6, 7, 8]);
+                            _g = __values(currentNode.childNodes), _h = _g.next();
+                            _k.label = 1;
                         case 1:
-                            if (!!_f.done) return [3 /*break*/, 5];
-                            childNode = _f.value;
+                            if (!!_h.done) return [3 /*break*/, 5];
+                            childNode = _h.value;
                             if (!setValidateForm && ((_a = this.setting.arrFieldMustValidate) === null || _a === void 0 ? void 0 : _a.length)) {
                                 if (!this.setting.arrFieldMustValidate.includes(childNode.field)) {
                                     this.removeAllErrorByNodes(childNode);
@@ -16615,24 +16616,24 @@
                             }
                             return [4 /*yield*/, this.validate(childNode, true)];
                         case 2:
-                            if (!(_h.sent())) {
+                            if (!(_k.sent())) {
                                 this._inValidForm = true;
                             }
                             return [4 /*yield*/, this.validateModel(childNode)];
                         case 3:
-                            _h.sent();
-                            _h.label = 4;
+                            _k.sent();
+                            _k.label = 4;
                         case 4:
-                            _f = _e.next();
+                            _h = _g.next();
                             return [3 /*break*/, 1];
                         case 5: return [3 /*break*/, 8];
                         case 6:
-                            e_28_1 = _h.sent();
+                            e_28_1 = _k.sent();
                             e_28 = { error: e_28_1 };
                             return [3 /*break*/, 8];
                         case 7:
                             try {
-                                if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
+                                if (_h && !_h.done && (_j = _g.return)) _j.call(_g);
                             }
                             finally { if (e_28) throw e_28.error; }
                             return [7 /*endfinally*/];
@@ -16644,17 +16645,17 @@
         CrudFormComponent.prototype.validateFormControl = function (fieldPath) {
             return __awaiter(this, void 0, void 0, function () {
                 var controlNode;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             controlNode = this._rootNode.getNodeByPath(fieldPath);
                             if (!controlNode) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.validate(controlNode)];
                         case 1:
-                            if (!(_e.sent())) {
+                            if (!(_g.sent())) {
                                 return [2 /*return*/, false];
                             }
-                            _e.label = 2;
+                            _g.label = 2;
                         case 2: return [2 /*return*/, true];
                     }
                 });
@@ -16662,20 +16663,20 @@
         };
         CrudFormComponent.prototype.handleChangeDropdown = function (control, event, eventType, parentModel, parentPath, sourceNode, bubble) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (!control.multiple) return [3 /*break*/, 3];
                             if (!(eventType == this.eventType.HIDE)) return [3 /*break*/, 2];
                             return [4 /*yield*/, this.handleFieldValueChange(control, event, this.eventType.CHANGE, parentModel, parentPath, sourceNode, bubble)];
                         case 1:
-                            _e.sent();
-                            _e.label = 2;
+                            _g.sent();
+                            _g.label = 2;
                         case 2: return [3 /*break*/, 5];
                         case 3: return [4 /*yield*/, this.handleFieldValueChange(control, event, eventType, parentModel, parentPath, sourceNode, bubble)];
                         case 4:
-                            _e.sent();
-                            _e.label = 5;
+                            _g.sent();
+                            _g.label = 5;
                         case 5: return [2 /*return*/];
                     }
                 });
@@ -16689,8 +16690,8 @@
         CrudFormComponent.prototype.handleAdjustValueDropdownEvent = function (control, parentPath) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode, currentNode, eventData, _a_2;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = this._rootNode.getNodeByPath(parentPath);
                             currentNode = parentNode.getChildNode(control.field);
@@ -16700,15 +16701,15 @@
                                 crudForm: this
                             });
                             if (!control.onAdjustedValue) return [3 /*break*/, 4];
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _g.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, control.onAdjustedValue(eventData)];
                         case 2:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _a_2 = _e.sent();
+                            _a_2 = _g.sent();
                             return [3 /*break*/, 4];
                         case 4: return [2 /*return*/];
                     }
@@ -16717,7 +16718,7 @@
         };
         CrudFormComponent.prototype.handleDataSourceLoadComplete = function (control, parentPath, dataSource) {
             return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_e) {
+                return __generator(this, function (_g) {
                     return [2 /*return*/];
                 });
             });
@@ -16725,8 +16726,8 @@
         CrudFormComponent.prototype.handleDataSourceLoaded = function (control, parentPath, dataFromDropdown) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode, currentNode, eventData, _a_3;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = this._rootNode.getNodeByPath(parentPath);
                             currentNode = parentNode.getChildNode(control.field);
@@ -16752,15 +16753,15 @@
                                 }
                             }
                             if (!control.callbackDataFinish) return [3 /*break*/, 4];
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _g.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, control.callbackDataFinish(eventData)];
                         case 2:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _a_3 = _e.sent();
+                            _a_3 = _g.sent();
                             return [3 /*break*/, 4];
                         case 4:
                             this.fireModelChanged();
@@ -16772,8 +16773,8 @@
         CrudFormComponent.prototype.handleReadyControlPicker = function (control, parentPath) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode, currentNode, eventData, _a_4;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             this.handleControlReadyEvent(control, parentPath);
                             parentNode = this._rootNode.getNodeByPath(parentPath);
@@ -16784,15 +16785,15 @@
                                 crudForm: this
                             });
                             if (!control.onReady) return [3 /*break*/, 4];
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _g.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, control.onReady(eventData)];
                         case 2:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _a_4 = _e.sent();
+                            _a_4 = _g.sent();
                             return [3 /*break*/, 4];
                         case 4: return [2 /*return*/];
                     }
@@ -16810,7 +16811,7 @@
         CrudFormComponent.prototype.handleControlReadyEvent = function (control, parentPath) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode;
-                return __generator(this, function (_e) {
+                return __generator(this, function (_g) {
                     parentNode = this._rootNode.getNodeByPath(parentPath);
                     parentNode.model._status[control.field].ready = true;
                     this.onControlReady.emit(control.field);
@@ -16866,10 +16867,10 @@
             return this._modelData[controlTable.field];
         };
         CrudFormComponent.prototype.checkReadyAll = function () {
-            var e_29, _e;
+            var e_29, _g;
             try {
-                for (var _f = __values(this.controlNeedCheckReady), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var control = _g.value;
+                for (var _h = __values(this.controlNeedCheckReady), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var control = _j.value;
                     if (control.hidden || !this._modelData[control.field]) {
                         continue;
                     }
@@ -16893,7 +16894,7 @@
             catch (e_29_1) { e_29 = { error: e_29_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_29) throw e_29.error; }
             }
@@ -16938,8 +16939,8 @@
             if (force === void 0) { force = false; }
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode, control, errors, i, validator, eventData, err, _a_5;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = currentNode.parentNode;
                             control = currentNode.control;
@@ -16958,7 +16959,7 @@
                             errors.splice(0, errors.length);
                             if (!(control.validators && control.validators.length > 0)) return [3 /*break*/, 7];
                             i = 0;
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
                             if (!(i < control.validators.length)) return [3 /*break*/, 6];
                             validator = control.validators[i];
@@ -16967,12 +16968,12 @@
                                 eventType: this.eventType.VALIDATE,
                                 crudForm: this
                             });
-                            _e.label = 2;
+                            _g.label = 2;
                         case 2:
-                            _e.trys.push([2, 4, , 5]);
+                            _g.trys.push([2, 4, , 5]);
                             return [4 /*yield*/, validator.validate(eventData)];
                         case 3:
-                            if ((_e.sent()) === false) {
+                            if ((_g.sent()) === false) {
                                 err = validator.getError();
                                 if (errors.indexOf(err) == -1) {
                                     errors.push(err);
@@ -16980,7 +16981,7 @@
                             }
                             return [3 /*break*/, 5];
                         case 4:
-                            _a_5 = _e.sent();
+                            _a_5 = _g.sent();
                             return [3 /*break*/, 5];
                         case 5:
                             i++;
@@ -16989,7 +16990,7 @@
                             if (errors.length > 0) {
                                 return [2 /*return*/, false];
                             }
-                            _e.label = 7;
+                            _g.label = 7;
                         case 7: return [2 /*return*/, true];
                     }
                 });
@@ -17031,23 +17032,23 @@
             }
         };
         CrudFormComponent.prototype.removeAllError = function () {
-            var e_30, _e;
+            var e_30, _g;
             try {
-                for (var _f = __values(this._rootNode.childNodes), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var childNode = _g.value;
+                for (var _h = __values(this._rootNode.childNodes), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var childNode = _j.value;
                     this.removeAllErrorByNodes(childNode);
                 }
             }
             catch (e_30_1) { e_30 = { error: e_30_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                    if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                 }
                 finally { if (e_30) throw e_30.error; }
             }
         };
         CrudFormComponent.prototype.removeAllErrorByNodes = function (currentNode) {
-            var e_31, _e, e_32, _f;
+            var e_31, _g, e_32, _h;
             var _a, _b;
             if (!currentNode.parentNode.model._errors) {
                 currentNode.parentNode.model._errors = {};
@@ -17057,22 +17058,22 @@
                 return;
             }
             try {
-                for (var _g = __values(currentNode.childNodes), _h = _g.next(); !_h.done; _h = _g.next()) {
-                    var childNode = _h.value;
+                for (var _j = __values(currentNode.childNodes), _k = _j.next(); !_k.done; _k = _j.next()) {
+                    var childNode = _k.value;
                     if (!((_b = childNode.childNodes) === null || _b === void 0 ? void 0 : _b.length)) {
                         this.removeAllErrorByNodes(childNode);
                         continue;
                     }
                     try {
-                        for (var _j = (e_32 = void 0, __values(childNode.childNodes)), _k = _j.next(); !_k.done; _k = _j.next()) {
-                            var node = _k.value;
+                        for (var _l = (e_32 = void 0, __values(childNode.childNodes)), _m = _l.next(); !_m.done; _m = _l.next()) {
+                            var node = _m.value;
                             this.removeAllErrorByNodes(node);
                         }
                     }
                     catch (e_32_1) { e_32 = { error: e_32_1 }; }
                     finally {
                         try {
-                            if (_k && !_k.done && (_f = _j.return)) _f.call(_j);
+                            if (_m && !_m.done && (_h = _l.return)) _h.call(_l);
                         }
                         finally { if (e_32) throw e_32.error; }
                     }
@@ -17081,7 +17082,7 @@
             catch (e_31_1) { e_31 = { error: e_31_1 }; }
             finally {
                 try {
-                    if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                    if (_k && !_k.done && (_g = _j.return)) _g.call(_j);
                 }
                 finally { if (e_31) throw e_31.error; }
             }
@@ -17165,7 +17166,7 @@
          * @param options
          */
         CrudFormComponent.prototype.focusFirstControl = function () {
-            var e_33, _e;
+            var e_33, _g;
             var formElement = this.formElement.nativeElement;
             var divs = formElement.querySelectorAll('div.crud-form-control');
             if (divs) {
@@ -17203,7 +17204,7 @@
                 catch (e_33_1) { e_33 = { error: e_33_1 }; }
                 finally {
                     try {
-                        if (divs_1_1 && !divs_1_1.done && (_e = divs_1.return)) _e.call(divs_1);
+                        if (divs_1_1 && !divs_1_1.done && (_g = divs_1.return)) _g.call(divs_1);
                     }
                     finally { if (e_33) throw e_33.error; }
                 }
@@ -17288,8 +17289,8 @@
             var _this = this;
             this._notifierService.showDeleteConfirm().then(function (rs) { return __awaiter(_this, void 0, void 0, function () {
                 var tableNode, toDeleteRowNode, toDelete, _a_6, _b_2, _c_2;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             if (!rs)
                                 return [2 /*return*/];
@@ -17309,9 +17310,9 @@
                             tableNode.reinitChildNodes();
                             this.fireModelChanged();
                             if (!control.onChanged) return [3 /*break*/, 4];
-                            _e.label = 1;
+                            _g.label = 1;
                         case 1:
-                            _e.trys.push([1, 3, , 4]);
+                            _g.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, control.onChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: toDeleteRowNode,
@@ -17319,16 +17320,16 @@
                                     crudForm: this
                                 }))];
                         case 2:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _a_6 = _e.sent();
+                            _a_6 = _g.sent();
                             return [3 /*break*/, 4];
                         case 4:
                             if (!control.onAfterChanged) return [3 /*break*/, 8];
-                            _e.label = 5;
+                            _g.label = 5;
                         case 5:
-                            _e.trys.push([5, 7, , 8]);
+                            _g.trys.push([5, 7, , 8]);
                             return [4 /*yield*/, control.onAfterChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: toDeleteRowNode,
@@ -17336,16 +17337,16 @@
                                     crudForm: this
                                 }))];
                         case 6:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 8];
                         case 7:
-                            _b_2 = _e.sent();
+                            _b_2 = _g.sent();
                             return [3 /*break*/, 8];
                         case 8:
                             if (!control.onDeleted) return [3 /*break*/, 12];
-                            _e.label = 9;
+                            _g.label = 9;
                         case 9:
-                            _e.trys.push([9, 11, , 12]);
+                            _g.trys.push([9, 11, , 12]);
                             return [4 /*yield*/, control.onDeleted(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: toDeleteRowNode,
@@ -17353,10 +17354,10 @@
                                     crudForm: this
                                 }))];
                         case 10:
-                            _e.sent();
+                            _g.sent();
                             return [3 /*break*/, 12];
                         case 11:
-                            _c_2 = _e.sent();
+                            _c_2 = _g.sent();
                             return [3 /*break*/, 12];
                         case 12: return [2 /*return*/];
                     }
@@ -17387,10 +17388,10 @@
             if (initData === void 0) { initData = {}; }
             if (fireEventFinish === void 0) { fireEventFinish = true; }
             return __awaiter(this, void 0, void 0, function () {
-                var tableNode, index, parentPath, data, _e, _f, subControl, toAdd, dicComponent, newRowNode, _b_3, _c_3, _d_1;
-                var e_34, _g;
-                return __generator(this, function (_h) {
-                    switch (_h.label) {
+                var tableNode, index, parentPath, data, _g, _h, subControl, toAdd, dicComponent, newRowNode, _b_3, _c_3, _d_1;
+                var e_34, _j;
+                return __generator(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
                             if (control.showEdit && !disableOpenDialog) {
                                 this.tableFormDialogModel.header = "Th\u00EAm m\u1EDBi " + control.label;
@@ -17415,15 +17416,15 @@
                                 data.id = this._commonService.guid();
                             }
                             try {
-                                for (_e = __values(control.rowTemplate), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                    subControl = _f.value;
+                                for (_g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                    subControl = _h.value;
                                     this.initControlDefaultValue(data, subControl, parentPath);
                                 }
                             }
                             catch (e_34_1) { e_34 = { error: e_34_1 }; }
                             finally {
                                 try {
-                                    if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
+                                    if (_h && !_h.done && (_j = _g.return)) _j.call(_g);
                                 }
                                 finally { if (e_34) throw e_34.error; }
                             }
@@ -17451,9 +17452,9 @@
                             }
                             newRowNode = this._rootNode.getNodeByPath(parentPath);
                             if (!control.onChanged) return [3 /*break*/, 4];
-                            _h.label = 1;
+                            _k.label = 1;
                         case 1:
-                            _h.trys.push([1, 3, , 4]);
+                            _k.trys.push([1, 3, , 4]);
                             return [4 /*yield*/, control.onChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
@@ -17461,16 +17462,16 @@
                                     crudForm: this
                                 }))];
                         case 2:
-                            _h.sent();
+                            _k.sent();
                             return [3 /*break*/, 4];
                         case 3:
-                            _b_3 = _h.sent();
+                            _b_3 = _k.sent();
                             return [3 /*break*/, 4];
                         case 4:
                             if (!control.onAfterChanged) return [3 /*break*/, 8];
-                            _h.label = 5;
+                            _k.label = 5;
                         case 5:
-                            _h.trys.push([5, 7, , 8]);
+                            _k.trys.push([5, 7, , 8]);
                             return [4 /*yield*/, control.onAfterChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
@@ -17478,16 +17479,16 @@
                                     crudForm: this
                                 }))];
                         case 6:
-                            _h.sent();
+                            _k.sent();
                             return [3 /*break*/, 8];
                         case 7:
-                            _c_3 = _h.sent();
+                            _c_3 = _k.sent();
                             return [3 /*break*/, 8];
                         case 8:
                             if (!control.onAdded) return [3 /*break*/, 12];
-                            _h.label = 9;
+                            _k.label = 9;
                         case 9:
-                            _h.trys.push([9, 11, , 12]);
+                            _k.trys.push([9, 11, , 12]);
                             return [4 /*yield*/, control.onAdded(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
@@ -17495,10 +17496,10 @@
                                     crudForm: this
                                 }))];
                         case 10:
-                            _h.sent();
+                            _k.sent();
                             return [3 /*break*/, 12];
                         case 11:
-                            _d_1 = _h.sent();
+                            _d_1 = _k.sent();
                             return [3 /*break*/, 12];
                         case 12: return [2 /*return*/];
                     }
@@ -17532,33 +17533,66 @@
         };
         CrudFormComponent.prototype.handleSavedTableRow = function (data) {
             return __awaiter(this, void 0, void 0, function () {
-                var control, tablePath, eventType, tableNode, index, parentPath, _e, _f, subControl, toAdd, newRowNode, _b_4, _c_4, _d_2;
-                var e_35, _g;
-                return __generator(this, function (_h) {
-                    switch (_h.label) {
+                var control, tablePath, eventType, tableNode, _a_7, _b_4, index, parentPath, _g, _h, subControl, toAdd, newRowNode, _d_2, _e_1, _f_1;
+                var e_35, _j;
+                return __generator(this, function (_k) {
+                    switch (_k.label) {
                         case 0:
                             this.tableFormDialogModel.showEditForm = false;
                             control = this.tableFormCurrentInfo.control;
                             tablePath = this.tableFormCurrentInfo.tablePath;
                             eventType = this.tableFormCurrentInfo.eventType;
                             tableNode = this._rootNode.getNodeByPath(tablePath);
-                            if (!(this.tableFormCurrentRow > -1)) return [3 /*break*/, 1];
+                            if (!(this.tableFormCurrentRow > -1)) return [3 /*break*/, 9];
                             tableNode.model[this.tableFormCurrentRow] = Object.assign(Object.assign({}, tableNode.model[this.tableFormCurrentRow]), data);
                             this.fireModelChanged();
-                            return [3 /*break*/, 13];
+                            if (!control.onChanged) return [3 /*break*/, 4];
+                            _k.label = 1;
                         case 1:
+                            _k.trys.push([1, 3, , 4]);
+                            return [4 /*yield*/, control.onChanged(new EventData({
+                                    currentNode: tableNode,
+                                    sourceNode: null,
+                                    eventType: eventType || this.eventType.TABLE_CHANGED,
+                                    crudForm: this
+                                }))];
+                        case 2:
+                            _k.sent();
+                            return [3 /*break*/, 4];
+                        case 3:
+                            _a_7 = _k.sent();
+                            return [3 /*break*/, 4];
+                        case 4:
+                            if (!control.onAfterChanged) return [3 /*break*/, 8];
+                            _k.label = 5;
+                        case 5:
+                            _k.trys.push([5, 7, , 8]);
+                            return [4 /*yield*/, control.onAfterChanged(new EventData({
+                                    currentNode: tableNode,
+                                    sourceNode: null,
+                                    eventType: eventType || this.eventType.TABLE_CHANGED,
+                                    crudForm: this
+                                }))];
+                        case 6:
+                            _k.sent();
+                            return [3 /*break*/, 8];
+                        case 7:
+                            _b_4 = _k.sent();
+                            return [3 /*break*/, 8];
+                        case 8: return [3 /*break*/, 21];
+                        case 9:
                             index = tableNode.childNodes.length;
                             parentPath = tablePath + '[' + index + ']';
                             try {
-                                for (_e = __values(control.rowTemplate), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                    subControl = _f.value;
+                                for (_g = __values(control.rowTemplate), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                    subControl = _h.value;
                                     this.initControlModel(data, subControl, parentPath);
                                 }
                             }
                             catch (e_35_1) { e_35 = { error: e_35_1 }; }
                             finally {
                                 try {
-                                    if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
+                                    if (_h && !_h.done && (_j = _g.return)) _j.call(_g);
                                 }
                                 finally { if (e_35) throw e_35.error; }
                             }
@@ -17572,68 +17606,68 @@
                                         crudForm: this
                                     }));
                                 }
-                                catch (_a) {
+                                catch (_c) {
                                     toAdd = false;
                                 }
                             }
-                            if (!(toAdd !== false)) return [3 /*break*/, 13];
+                            if (!(toAdd !== false)) return [3 /*break*/, 21];
                             tableNode.model.push(data);
                             tableNode.reinitChildNodes();
                             if (eventType != this.eventType.INIT) {
                                 this.fireModelChanged();
                             }
                             newRowNode = this._rootNode.getNodeByPath(parentPath);
-                            if (!control.onChanged) return [3 /*break*/, 5];
-                            _h.label = 2;
-                        case 2:
-                            _h.trys.push([2, 4, , 5]);
+                            if (!control.onChanged) return [3 /*break*/, 13];
+                            _k.label = 10;
+                        case 10:
+                            _k.trys.push([10, 12, , 13]);
                             return [4 /*yield*/, control.onChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
                                     eventType: eventType || this.eventType.TABLE_CHANGED,
                                     crudForm: this
                                 }))];
-                        case 3:
-                            _h.sent();
-                            return [3 /*break*/, 5];
-                        case 4:
-                            _b_4 = _h.sent();
-                            return [3 /*break*/, 5];
-                        case 5:
-                            if (!control.onAfterChanged) return [3 /*break*/, 9];
-                            _h.label = 6;
-                        case 6:
-                            _h.trys.push([6, 8, , 9]);
+                        case 11:
+                            _k.sent();
+                            return [3 /*break*/, 13];
+                        case 12:
+                            _d_2 = _k.sent();
+                            return [3 /*break*/, 13];
+                        case 13:
+                            if (!control.onAfterChanged) return [3 /*break*/, 17];
+                            _k.label = 14;
+                        case 14:
+                            _k.trys.push([14, 16, , 17]);
                             return [4 /*yield*/, control.onAfterChanged(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
                                     eventType: eventType || this.eventType.TABLE_CHANGED,
                                     crudForm: this
                                 }))];
-                        case 7:
-                            _h.sent();
-                            return [3 /*break*/, 9];
-                        case 8:
-                            _c_4 = _h.sent();
-                            return [3 /*break*/, 9];
-                        case 9:
-                            if (!control.onAdded) return [3 /*break*/, 13];
-                            _h.label = 10;
-                        case 10:
-                            _h.trys.push([10, 12, , 13]);
+                        case 15:
+                            _k.sent();
+                            return [3 /*break*/, 17];
+                        case 16:
+                            _e_1 = _k.sent();
+                            return [3 /*break*/, 17];
+                        case 17:
+                            if (!control.onAdded) return [3 /*break*/, 21];
+                            _k.label = 18;
+                        case 18:
+                            _k.trys.push([18, 20, , 21]);
                             return [4 /*yield*/, control.onAdded(new EventData({
                                     currentNode: tableNode,
                                     sourceNode: newRowNode,
                                     eventType: eventType || this.eventType.ADDED,
                                     crudForm: this
                                 }))];
-                        case 11:
-                            _h.sent();
-                            return [3 /*break*/, 13];
-                        case 12:
-                            _d_2 = _h.sent();
-                            return [3 /*break*/, 13];
-                        case 13: return [2 /*return*/];
+                        case 19:
+                            _k.sent();
+                            return [3 /*break*/, 21];
+                        case 20:
+                            _f_1 = _k.sent();
+                            return [3 /*break*/, 21];
+                        case 21: return [2 /*return*/];
                     }
                 });
             });
@@ -17671,8 +17705,8 @@
         CrudFormComponent.prototype.handleRowOrdered = function (control, evt, eventType, parentModel, parentPath, sourceNode, bubble) {
             return __awaiter(this, void 0, void 0, function () {
                 var parentNode, currentNode, value, eventData;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                return __generator(this, function (_g) {
+                    switch (_g.label) {
                         case 0:
                             parentNode = this._rootNode.getNodeByPath(parentPath);
                             // row in table
@@ -17699,8 +17733,8 @@
                             if (!control.onReordered) return [3 /*break*/, 2];
                             return [4 /*yield*/, control.onReordered(eventData)];
                         case 1:
-                            _e.sent();
-                            _e.label = 2;
+                            _g.sent();
+                            _g.label = 2;
                         case 2:
                             if (!bubble) {
                                 this.fireModelChanged();
@@ -17713,15 +17747,15 @@
         };
         CrudFormComponent.prototype.showContextMenu = function (evt, rowData, control) {
             return __awaiter(this, void 0, void 0, function () {
-                var _e;
-                return __generator(this, function (_f) {
-                    switch (_f.label) {
+                var _g;
+                return __generator(this, function (_h) {
+                    switch (_h.label) {
                         case 0:
                             this.rowDataCurrent = rowData;
-                            _e = this;
+                            _g = this;
                             return [4 /*yield*/, control.rowButtons(rowData)];
                         case 1:
-                            _e.buttonContexts = _f.sent();
+                            _g.buttonContexts = _h.sent();
                             if (!this.buttonContexts || this.buttonContexts.length == 0) {
                                 return [2 /*return*/];
                             }
@@ -17995,7 +18029,7 @@
             }
         };
         ControlTreeNode.prototype.initChildNodes = function (model, schemas, keysPlus) {
-            var e_36, _e, e_37, _f;
+            var e_36, _g, e_37, _h;
             if (isLiteralObject(model)) {
                 var allKey = new Set(__spreadArray(__spreadArray([], __read(keysPlus)), __read(Object.keys(model))));
                 try {
@@ -18011,7 +18045,7 @@
                 catch (e_36_1) { e_36 = { error: e_36_1 }; }
                 finally {
                     try {
-                        if (allKey_1_1 && !allKey_1_1.done && (_e = allKey_1.return)) _e.call(allKey_1);
+                        if (allKey_1_1 && !allKey_1_1.done && (_g = allKey_1.return)) _g.call(allKey_1);
                     }
                     finally { if (e_36) throw e_36.error; }
                 }
@@ -18048,7 +18082,7 @@
                     catch (e_37_1) { e_37 = { error: e_37_1 }; }
                     finally {
                         try {
-                            if (model_3_1 && !model_3_1.done && (_f = model_3.return)) _f.call(model_3);
+                            if (model_3_1 && !model_3_1.done && (_h = model_3.return)) _h.call(model_3);
                         }
                         finally { if (e_37) throw e_37.error; }
                     }
@@ -18196,14 +18230,14 @@
             return this.findSchemaInTree(this.rootNode, schemaPath.toLowerCase());
         };
         ControlTreeNode.prototype.findInTree = function (node, modelPath) {
-            var e_38, _e;
+            var e_38, _g;
             if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase()) {
                 return node;
             }
             else {
                 try {
-                    for (var _f = __values(node.childNodes), _g = _f.next(); !_g.done; _g = _f.next()) {
-                        var childNode = _g.value;
+                    for (var _h = __values(node.childNodes), _j = _h.next(); !_j.done; _j = _h.next()) {
+                        var childNode = _j.value;
                         if (childNode.modelPath != null && modelPath.startsWith(childNode.modelPath.toLowerCase())) {
                             var re = this.findInTree(childNode, modelPath);
                             if (re)
@@ -18214,7 +18248,7 @@
                 catch (e_38_1) { e_38 = { error: e_38_1 }; }
                 finally {
                     try {
-                        if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                        if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                     }
                     finally { if (e_38) throw e_38.error; }
                 }
@@ -18222,14 +18256,14 @@
             return null;
         };
         ControlTreeNode.prototype.findSchemaInTree = function (node, schemaPath) {
-            var e_39, _e;
+            var e_39, _g;
             if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase()) {
                 return node;
             }
             else {
                 try {
-                    for (var _f = __values(node.childNodes), _g = _f.next(); !_g.done; _g = _f.next()) {
-                        var childNode = _g.value;
+                    for (var _h = __values(node.childNodes), _j = _h.next(); !_j.done; _j = _h.next()) {
+                        var childNode = _j.value;
                         if (childNode.schemaPath != null && schemaPath.startsWith(childNode.schemaPath.toLowerCase())) {
                             var re = this.findSchemaInTree(childNode, schemaPath);
                             if (re)
@@ -18240,7 +18274,7 @@
                 catch (e_39_1) { e_39 = { error: e_39_1 }; }
                 finally {
                     try {
-                        if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
+                        if (_j && !_j.done && (_g = _h.return)) _g.call(_h);
                     }
                     finally { if (e_39) throw e_39.error; }
                 }
@@ -33344,6 +33378,7 @@
             return _this;
         }
         CommonSearchFormComponent.prototype.ngOnInit = function () {
+            var _this = this;
             if (!this.parentSetting.useCommonFullTextSearch) {
                 this.parentSetting.disableLazyLoadCommonSearch = true;
             }
@@ -33360,9 +33395,22 @@
                 return 0;
             });
             if (this.parentSetting.useCommonFullTextSearch) {
+                var arrLabel_1 = [];
                 var lstTextSearchControl = columnFilters.filter(function (p) { return p.fullTextSearch; });
-                this.lstTextControl = lstTextSearchControl.map(function (p) { return p.field; });
-                this.searchBoxTooltip += "" + (lstTextSearchControl.map(function (x) { return x.label; })).join(', ');
+                if (lstTextSearchControl.length) {
+                    lstTextSearchControl.forEach(function (item) {
+                        arrLabel_1.push(item.label);
+                        _this.lstTextControl.push(item.field);
+                    });
+                }
+                // fullTextSearch custom
+                if (this.parentSetting.arrFullTextSearch.length) {
+                    this.parentSetting.arrFullTextSearch.forEach(function (item) {
+                        arrLabel_1.push(item.name);
+                        _this.lstTextControl.push(item.field);
+                    });
+                }
+                this.searchBoxTooltip += arrLabel_1.join(', ');
                 this._index = 2;
             }
             if (this.isCustomGenerateSearch) {