tnx-shared 5.3.261 → 5.3.263

package/bundles/tnx-shared.umd.js

@@ -6251,7 +6251,7 @@
                     switch (_c.label) {
                         case 0:
                             dataSource = [];
-                            return [4 /*yield*/, this.doGetAll(groupCode)];
+                            return [4 /*yield*/, this.doGetAllCustom(groupCode)];
                         case 1:
                             result = _c.sent();
                             result.data.forEach(function (element) {
@@ -6487,6 +6487,16 @@
                 });
             });
         };
+        // thực hiện get list singleCategory theo groupCategoryCode trên redis
+        MasterDataService.prototype.doGetAllCustom = function (groupCode) {
+            return __awaiter(this, void 0, void 0, function () {
+                var uri;
+                return __generator(this, function (_c) {
+                    uri = this.singleCategoryEndpoint + "/GetDataByGroupCode/" + groupCode;
+                    return [2 /*return*/, this._httpClient.get(uri).toPromise()];
+                });
+            });
+        };
         MasterDataService.prototype.getData = function (uri, gridInfo) {
             return this._httpClient.post(uri, gridInfo).toPromise();
         };
@@ -6709,10 +6719,12 @@
                 _this.get(groupCode)
                     .then(function (res) {
                     var result = [];
-                    if (arrValue == null)
+                    if (arrValue == null) {
                         result = res;
-                    else
+                    }
+                    else {
                         result = res.filter(function (x) { return arrValue.some(function (v) { return v == x[options.valueField]; }); });
+                    }
                     resolve(result);
                 }).catch(function (err) { return reject(err); });
             });
@@ -13686,8 +13698,9 @@
             var value = event.value;
             if (!isArray(value) || !(value === null || value === void 0 ? void 0 : value.length))
                 return true;
-            var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-            return !value.some(function (x) { return !re.test(String(x).toLowerCase()); });
+            var strValue = value.join(',').replaceAll(' ', '');
+            var re = /^(([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+([;,.](([a-zA-Z0-9_\-\.]+)@([a-zA-Z0-9_\-\.]+)\.([a-zA-Z]{2,5}){1,25})+)*$/;
+            return re.test(strValue);
         };
         LstEmailValidator.prototype.getError = function () {
             return 'Có phần tử không đúng định dạng thư điện tử';