tnx-shared 5.3.378 → 5.3.380

package/bundles/tnx-shared.umd.js

@@ -1106,6 +1106,7 @@
             this.entityKey = 'id';
             this.modelSchemas = [];
             this.cols = [];
+            this.rawCols = [];
             this.commonSchemas = [];
             this.columnSetting = new ColumnSetting();
             this.pageSetting = new PageSetting();
@@ -27376,6 +27377,7 @@
             this.model.baseReady = false;
             if (this.setting.cols) {
                 this.setting.cols = this.setting.cols.filter(function (q) { return !q.removeOnInit; });
+                Object.assign(this.setting.rawCols, this.setting.cols);
             }
             this.setting.customGetData = this.customGetData;
             this.mergeInfoToColumnSchema();
@@ -30173,35 +30175,49 @@
             var result = [
                 {
                     path: '',
-                    component: SplashComponentComponent,
+                    component: SplashComponentComponent
                 },
                 {
                     path: 'dashboard',
                     component: CommonDashboardComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'access-denied',
                     component: AccessDeniedComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'universal-link',
                     component: UniversalLinkProcessorComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'thong-bao',
                     component: ThongBaoComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'my-drive',
                     component: MyDriveComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'change-password',
                     component: ChangePasswordComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
                 {
                     path: 'profile',
                     component: ProfileComponent,
+                    canActivate: [],
+                    canActivateChild: []
                 },
             ];
             result.forEach(function (item) {
@@ -33385,7 +33401,7 @@
             this.mdWidth = this.parentSetting.mdWidthCommonSearch;
             this.setting.baseService = this.parentSetting.baseService;
             this.isCustomGenerateSearch = this.parentSetting.commonSchemas.length > 0;
-            var columnFilters = this.parentSetting.cols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
+            var columnFilters = this.parentSetting.rawCols.filter(function (p) { return p.allowFilter && !p.field.startsWith('str'); }).sort(function (a, b) {
                 if (a.order < b.order) {
                     return -1;
                 }
@@ -33612,7 +33628,7 @@
                     var _a;
                     if (!data.hasOwnProperty(item) || (!data[item] || data[item].length < 1))
                         return;
-                    var valueField = ((_a = _this.parentSetting.cols.find(function (p) { return p.field === item; })) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
+                    var valueField = ((_a = _this.parentSetting.rawCols.find(function (p) { return p.field === item; })) === null || _a === void 0 ? void 0 : _a.valueField) || 'id';
                     if (data[item].length) {
                         data[item] = data[item].map(function (p) { return p[valueField]; });
                     }
@@ -39574,7 +39590,7 @@
                                     top.location.href = '/';
                                 }
                                 else {
-                                    top.location.href = '/access-denied';
+                                    top.location.href = window['baseHref'] + '/access-denied';
                                 }
                                 resolve(false);
                             }