tnx-shared 5.1.245 → 5.1.246

package/assets/angular-schema-template.json

@@ -7,9 +7,8 @@
         "package-major-template": "npm run prebuild && npm run update-major-version-{{projectName}} && npm run build-{{projectName}} && cd ./dist/{{projectName}} && npm publish && cd ../..",
         "package-minor-template": "npm run prebuild && npm run update-minor-version-{{projectName}} && npm run build-{{projectName}} && cd ./dist/{{projectName}} && npm publish && cd ../..",
         "start-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng serve --project {{projectName}} --configuration={{environmentName}} --port={{port}} --open {{additionalParams}}",
-        "format-template": "vim ./build-config/{{projectName}}/docker-entrypoint.sh -c 'set ff=unix' -c ':wq'",
         "deploy-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod & docker build -f ./build-config/{{projectName}}/Dockerfile -t dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}} . & docker push dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}}",
-        "prebuild-template": "npm run depend-all && npm install && npm run format",
+        "prebuild-template": "npm run depend-all && npm install",
         "depend-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateDepdendServiceToLatest --serviceName tnx-{{serviceName}} --env init",
         "ref-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js copyRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",
         "ref-update-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",

package/assets/gulpfile.js

@@ -512,8 +512,6 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
         input.scripts[`build-${project}-ci`] = angularSchemaTemplate.scripts['build-ci-template']
             .replaceAll('{{projectName}}', project)
             .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize);
-        input.scripts[`format`] = angularSchemaTemplate.scripts['format-template']
-            .replaceAll('{{projectName}}', project);
     });
 
     // add reset all generation

package/bundles/tnx-shared.umd.js

@@ -640,12 +640,17 @@
         function Filter(init) {
             this.valueIsField = false;
             this.filters = [];
+            this.stringCompareOption = exports.StringOptionCompare.Normal;
             for (var key in init) {
                 this[key] = init[key];
             }
         }
         return Filter;
-    }());
+    }());
+    (function (StringOptionCompare) {
+        StringOptionCompare[StringOptionCompare["Normal"] = 0] = "Normal";
+        StringOptionCompare[StringOptionCompare["IgnoreCase"] = 1] = "IgnoreCase";
+    })(exports.StringOptionCompare || (exports.StringOptionCompare = {}));
 
     var TnUser = /** @class */ (function () {
         function TnUser() {
@@ -50122,14 +50127,21 @@
                     evt.model.departmentIds = this.data.departmentIds;
                     evt.model.groupIds = this.data.groupIds;
                     // evt.model.roleIds = this.data.roleIds;
-                    if (this.action && this.action.targetsAllowModify) {
-                        if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.USER; })) {
-                            evt.model.userIds_readOnly = evt.model.userIds.filter(function (q) { return _this.initValue.lstUserIdInWorkflow.some(function (x) { return x == q; }); });
+                    if (this.action) {
+                        if (this.action.targetsAllowModify) {
+                            if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.USER; })) {
+                                evt.model.userIds_readOnly = evt.model.userIds.filter(function (q) { return _this.initValue.lstUserIdInWorkflow.some(function (x) { return x == q; }); });
+                            }
+                            if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.DEPARTMENT; })) {
+                                evt.model.departmentIds_readOnly = evt.model.departmentIds.filter(function (q) { return _this.initValue.lstDonViIdInWorkflow.some(function (x) { return x == q; }); });
+                            }
+                            if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.GROUP; })) {
+                                evt.model.groupIds_readOnly = evt.model.groupIds.filter(function (q) { return _this.initValue.lstGroupIdInWorkflow.some(function (x) { return x == q; }); });
+                            }
                         }
-                        if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.DEPARTMENT; })) {
+                        else {
+                            evt.model.userIds_readOnly = evt.model.userIds.filter(function (q) { return _this.initValue.lstUserIdInWorkflow.some(function (x) { return x == q; }); });
                             evt.model.departmentIds_readOnly = evt.model.departmentIds.filter(function (q) { return _this.initValue.lstDonViIdInWorkflow.some(function (x) { return x == q; }); });
-                        }
-                        if (!this.action.targetsAllowModify.some(function (x) { return x == exports.EnumTargetType.GROUP; })) {
                             evt.model.groupIds_readOnly = evt.model.groupIds.filter(function (q) { return _this.initValue.lstGroupIdInWorkflow.some(function (x) { return x == q; }); });
                         }
                     }