tnx-shared 5.3.270 → 5.3.272

package/bundles/tnx-shared.umd.js

@@ -1307,6 +1307,7 @@
             this.hiddenKySoSimCaNhan = false;
             this.hiddenKySoUsbCaNhan = false;
             this.hiddenKySoDonVi = false;
+            this.arrFieldMustValidate = [];
             this.getCustomDataTrinhKy = function (rowData) { return ({}); };
             for (var key in init) {
                 this[key] = init[key];
@@ -16268,14 +16269,15 @@
         };
         CrudFormComponent.prototype.validateForm = function (setValidateForm) {
             if (setValidateForm === void 0) { setValidateForm = true; }
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var _this = this;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            if (!setValidateForm) return [3 /*break*/, 2];
+                            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)];
+                            return [4 /*yield*/, this.validateModel(this._rootNode, setValidateForm)];
                         case 1:
                             _e.sent();
                             if (this._inValidForm) {
@@ -16284,13 +16286,18 @@
                                 }, 100);
                                 return [2 /*return*/, false];
                             }
-                            _e.label = 2;
-                        case 2: return [2 /*return*/, true];
+                            return [3 /*break*/, 3];
+                        case 2:
+                            this.removeAllError();
+                            _e.label = 3;
+                        case 3: return [2 /*return*/, true];
                     }
                 });
             });
         };
-        CrudFormComponent.prototype.validateModel = function (currentNode) {
+        CrudFormComponent.prototype.validateModel = function (currentNode, setValidateForm) {
+            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;
@@ -16303,6 +16310,12 @@
                         case 1:
                             if (!!_f.done) return [3 /*break*/, 5];
                             childNode = _f.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);
+                                    return [3 /*break*/, 4];
+                                }
+                            }
                             if (!childNode.control) {
                                 if (childNode.childNodes == null) {
                                     return [3 /*break*/, 4];
@@ -16729,6 +16742,59 @@
                 this._removeError(field);
             }
         };
+        CrudFormComponent.prototype.removeAllError = function () {
+            var e_30, _e;
+            try {
+                for (var _f = __values(this._rootNode.childNodes), _g = _f.next(); !_g.done; _g = _f.next()) {
+                    var childNode = _g.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);
+                }
+                finally { if (e_30) throw e_30.error; }
+            }
+        };
+        CrudFormComponent.prototype.removeAllErrorByNodes = function (currentNode) {
+            var e_31, _e, e_32, _f;
+            var _a, _b;
+            currentNode.parentNode.model._errors[currentNode.field] = [];
+            if (!((_a = currentNode.childNodes) === null || _a === void 0 ? void 0 : _a.length)) {
+                return;
+            }
+            try {
+                for (var _g = __values(currentNode.childNodes), _h = _g.next(); !_h.done; _h = _g.next()) {
+                    var childNode = _h.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;
+                            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);
+                        }
+                        finally { if (e_32) throw e_32.error; }
+                    }
+                }
+            }
+            catch (e_31_1) { e_31 = { error: e_31_1 }; }
+            finally {
+                try {
+                    if (_h && !_h.done && (_e = _g.return)) _e.call(_g);
+                }
+                finally { if (e_31) throw e_31.error; }
+            }
+        };
         CrudFormComponent.prototype.cacheControlValue = function (control, value, parentPath) {
             if (control && control.enableCaching) {
                 this.cachedValues[parentPath + '.' + control.field] = value;
@@ -16808,7 +16874,7 @@
          * @param options
          */
         CrudFormComponent.prototype.focusFirstControl = function () {
-            var e_30, _e;
+            var e_33, _e;
             var formElement = this.formElement.nativeElement;
             var divs = formElement.querySelectorAll('div.crud-form-control');
             if (divs) {
@@ -16843,12 +16909,12 @@
                         }
                     }
                 }
-                catch (e_30_1) { e_30 = { error: e_30_1 }; }
+                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);
                     }
-                    finally { if (e_30) throw e_30.error; }
+                    finally { if (e_33) throw e_33.error; }
                 }
             }
         };
@@ -17012,7 +17078,7 @@
             if (fireEventFinish === void 0) { fireEventFinish = true; }
             return __awaiter(this, void 0, void 0, function () {
                 var tableNode, index, parentPath, data, _e, _f, subControl, toAdd, newRowNode, _b_3, _c_3, _d_1;
-                var e_31, _g;
+                var e_34, _g;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
@@ -17044,12 +17110,12 @@
                                     this.initControlDefaultValue(data, subControl, parentPath);
                                 }
                             }
-                            catch (e_31_1) { e_31 = { error: e_31_1 }; }
+                            catch (e_34_1) { e_34 = { error: e_34_1 }; }
                             finally {
                                 try {
                                     if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
                                 }
-                                finally { if (e_31) throw e_31.error; }
+                                finally { if (e_34) throw e_34.error; }
                             }
                             toAdd = true;
                             if (control.onAdding) {
@@ -17135,7 +17201,7 @@
         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_32, _g;
+                var e_35, _g;
                 return __generator(this, function (_h) {
                     switch (_h.label) {
                         case 0:
@@ -17157,12 +17223,12 @@
                                     this.initControlModel(data, subControl, parentPath);
                                 }
                             }
-                            catch (e_32_1) { e_32 = { error: e_32_1 }; }
+                            catch (e_35_1) { e_35 = { error: e_35_1 }; }
                             finally {
                                 try {
                                     if (_f && !_f.done && (_g = _e.return)) _g.call(_e);
                                 }
-                                finally { if (e_32) throw e_32.error; }
+                                finally { if (e_35) throw e_35.error; }
                             }
                             toAdd = true;
                             if (control.onAdding) {
@@ -17597,7 +17663,7 @@
             }
         };
         ControlTreeNode.prototype.initChildNodes = function (model, schemas, keysPlus) {
-            var e_33, _e, e_34, _f;
+            var e_36, _e, e_37, _f;
             if (isLiteralObject(model)) {
                 var allKey = new Set(__spreadArray(__spreadArray([], __read(keysPlus)), __read(Object.keys(model))));
                 try {
@@ -17610,12 +17676,12 @@
                         }
                     }
                 }
-                catch (e_33_1) { e_33 = { error: e_33_1 }; }
+                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);
                     }
-                    finally { if (e_33) throw e_33.error; }
+                    finally { if (e_36) throw e_36.error; }
                 }
                 // Sau khi đã init xong node cho row thì fire event cho các control trong row
                 // Thường dùng với mục đích cần disabled, hidden các control của row khi có nhu cầu
@@ -17647,12 +17713,12 @@
                             i++;
                         }
                     }
-                    catch (e_34_1) { e_34 = { error: e_34_1 }; }
+                    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);
                         }
-                        finally { if (e_34) throw e_34.error; }
+                        finally { if (e_37) throw e_37.error; }
                     }
                 }
             }
@@ -17798,7 +17864,7 @@
             return this.findSchemaInTree(this.rootNode, schemaPath.toLowerCase());
         };
         ControlTreeNode.prototype.findInTree = function (node, modelPath) {
-            var e_35, _e;
+            var e_38, _e;
             if (node.modelPath != null && node.modelPath.toLowerCase() == modelPath.toLowerCase()) {
                 return node;
             }
@@ -17813,18 +17879,18 @@
                         }
                     }
                 }
-                catch (e_35_1) { e_35 = { error: e_35_1 }; }
+                catch (e_38_1) { e_38 = { error: e_38_1 }; }
                 finally {
                     try {
                         if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
                     }
-                    finally { if (e_35) throw e_35.error; }
+                    finally { if (e_38) throw e_38.error; }
                 }
             }
             return null;
         };
         ControlTreeNode.prototype.findSchemaInTree = function (node, schemaPath) {
-            var e_36, _e;
+            var e_39, _e;
             if (node.schemaPath != null && node.schemaPath.toLowerCase() == schemaPath.toLowerCase()) {
                 return node;
             }
@@ -17839,12 +17905,12 @@
                         }
                     }
                 }
-                catch (e_36_1) { e_36 = { error: e_36_1 }; }
+                catch (e_39_1) { e_39 = { error: e_39_1 }; }
                 finally {
                     try {
                         if (_g && !_g.done && (_e = _f.return)) _e.call(_f);
                     }
-                    finally { if (e_36) throw e_36.error; }
+                    finally { if (e_39) throw e_39.error; }
                 }
             }
             return null;