ps-toolkit-ui 1.4.10 → 1.4.13

package/fesm2015/ps-toolkit-ui.js

@@ -931,7 +931,7 @@ class RequestClass {
             }
             btn.loading = true;
         }
-        this.getClient(table.getUrl(), table.method, table.searchData(), (res) => {
+        this.getClient(table.url, table.method, table.searchData(), (res) => {
             if (res.status === ResultStatusEnum.Success) {
                 table.rows = res.result.List;
                 table.count = res.result.Count;
@@ -1969,7 +1969,7 @@ class TableRowComponent {
         this.setOptions();
     }
     loadChildren(p) {
-        new RequestClass(this.table.environment, this.table.l).send(this.table.url + `List/${p}`, Method.Post, null, this.showChildren, (result) => {
+        new RequestClass(this.table.environment, this.table.l).send(this.table.url + `/${p}`, Method.Post, null, this.showChildren, (result) => {
             this.children = result.List;
             setTimeout(() => {
                 $$1(this.childrenDiv.nativeElement).slideDown();
@@ -1997,7 +1997,7 @@ class TableRowComponent {
                         const data = [];
                         // @ts-ignore
                         $$1(this.childrenDiv.nativeElement).sortable('toArray').forEach(x => data.push(x));
-                        new RequestClass(this.table.l).send(this.table.url + 'Sort', Method.Post, data, null, () => {
+                        new RequestClass(this.table.l).send(this.table.url + '/Sort', Method.Post, data, null, () => {
                             if (this.table.onSort) {
                                 this.table.onSort();
                             }
@@ -2015,12 +2015,7 @@ class TableRowComponent {
             inp.tooltip = option.Name;
             inp.onChange = () => {
                 this.row.Data[option.Action] = !inp.data();
-                const p = new PermissionClass();
-                p.RelatedId = this.table.permissions.RelatedId;
-                p.Area = this.table.permissions.Area;
-                p.Controller = option.Controller;
-                p.Action = option.Action;
-                new RequestClass(this.table.environment, this.table.l).send(p.getUrl() + '/' + this.row.Data.Id, Method.Post, null, null, () => {
+                new RequestClass(this.table.environment, this.table.l).send(option.url + '/' + this.row.Data.Id, Method.Post, null, null, () => {
                 });
             };
             inp.displayLabel = false;
@@ -2035,7 +2030,7 @@ class TableRowComponent {
             if (option.AccessType === PermissionAccessTypeEnum.Update) {
                 if (this.table.form) {
                     opt.onClick = () => {
-                        this.table.form.url = this.table.url + 'update/' + this.row.Data.Id;
+                        this.table.form.url = option.Url + '/' + this.row.Data.Id;
                         if (this.table.hasChildren && this.row.Data.ParentId != null) {
                             this.table.form.onSuccessBase = () => {
                                 this.table.modal.hide();
@@ -2060,7 +2055,7 @@ class TableRowComponent {
                     };
                 }
                 else {
-                    opt.url = this.table.url + '/update/' + this.row.Data.Id;
+                    opt.url = option.Url + '/' + this.row.Data.Id;
                 }
             }
             else if (option.AccessType === PermissionAccessTypeEnum.Delete) {
@@ -2074,7 +2069,7 @@ class TableRowComponent {
                         this.changeRows.emit(this.row.Data);
                     }
                     else {
-                        this.confirmShow.emit({ id: this.row.Data.Id, accept: () => {
+                        this.confirmShow.emit({ url: option.Url.replace('{}', this.row.Data.Id), accept: () => {
                                 if (this.table.hasChildren && this.table.childrenAutoLoad && this.row.Data.ParentId != null) {
                                     this.loadParent.emit(this.row.Data.ParentId);
                                 }
@@ -2086,20 +2081,12 @@ class TableRowComponent {
                 };
             }
             else if (option.AccessType === PermissionAccessTypeEnum.Report) {
-                const p = new PermissionClass();
-                p.Area = this.table.permissions.Area;
-                p.Controller = 'Print';
-                p.Action = option.Controller;
-                opt.url = '/Report' + p.getUrl() + '/' + this.row.Data.Id;
+                opt.url = '/Report' + option.Url + '/' + this.row.Data.Id;
                 opt.urlNewTab = true;
             }
             else if (option.InputAction === PermissionInputActionEnum.Link || option.InputAction === PermissionInputActionEnum.LinkNewTab) {
                 const p = new PermissionClass();
-                p.RelatedId = this.table.permissions.RelatedId;
-                p.Area = this.table.permissions.Area;
-                p.Controller = option.Controller;
-                p.Action = option.Action;
-                opt.url = p.getUrl() + '/' + this.row.Data.Id;
+                opt.url = option.Url + '/' + this.row.Data.Id;
                 opt.urlNewTab = option.InputAction === PermissionInputActionEnum.LinkNewTab;
             }
             else if (option.InputAction === PermissionInputActionEnum.Modal) {
@@ -2114,15 +2101,15 @@ class TableRowComponent {
                         p.Accesses = this.row.Options.filter(x => x.ParentId === option.Id);
                         opt.modal.table.permissions = p;
                         if (opt.modal.table.form) {
-                            opt.modal.table.form.url = p.getUrl() + 'insert';
-                            opt.modal.table.form.baseUrl = p.getUrl() + 'insert';
+                            opt.modal.table.form.url = option.Url + 'insert';
+                            opt.modal.table.form.baseUrl = option.Url + 'insert';
                         }
                         opt.modal.table.set();
                     }
                     if (opt.modal.form) {
                         opt.modal.form.name = option.Name;
-                        opt.modal.form.url = opt.modal.form.baseUrl + 'update/' + this.row.Data.Id;
-                        opt.modal.form.loadData(opt.modal.form.baseUrl + 'get/' + this.row.Data.Id);
+                        opt.modal.form.url = option.Url + 'update/' + this.row.Data.Id;
+                        opt.modal.form.loadData(option.Url + 'get/' + this.row.Data.Id);
                         opt.modal.form.onSuccessBase = () => {
                             opt.modal.hide();
                         };
@@ -2138,8 +2125,8 @@ class TableRowComponent {
                                 p.Accesses = this.row.Options.filter(x => x.ParentId === option.Id);
                                 r.table.permissions = p;
                                 if (r.table.form) {
-                                    r.table.form.url = p.getUrl() + 'insert';
-                                    r.table.form.baseUrl = p.getUrl() + 'insert';
+                                    r.table.form.url = option.Url + 'insert';
+                                    r.table.form.baseUrl = option.Url + 'insert';
                                 }
                                 r.table.set();
                             }
@@ -2153,7 +2140,7 @@ class TableRowComponent {
                 p.Area = this.table.permissions.Area;
                 p.Controller = option.Controller;
                 p.Action = option.Action;
-                opt.url = '/File' + p.getUrl() + '/' + this.row.Data.Id;
+                opt.url = '/File' + option.Url + '/' + this.row.Data.Id;
                 opt.urlNewTab = true;
             }
             else if (option.InputAction === PermissionInputActionEnum.Confirm) {
@@ -2163,7 +2150,7 @@ class TableRowComponent {
                     p.Area = this.table.permissions.Area;
                     p.Controller = option.Controller;
                     p.Action = option.Action;
-                    this.table.showConfirm(this.table.l(option.Action + 'Confirm'), p.getUrl() + '/' + this.row.Data.Id, null, () => {
+                    this.table.showConfirm(this.table.l(option.Action + 'Confirm'), option.Url + '/' + this.row.Data.Id, null, () => {
                         this.table.load();
                     });
                 };
@@ -2497,7 +2484,7 @@ class TableComponent {
         return this.changeRows.emit(e);
     }
     onConfirmShow(e) {
-        this.confirm.show(this.table.l('DeleteConfirm'), this.table.url + 'Delete/' + e.id, null, e.accept);
+        this.confirm.show(this.table.l('DeleteConfirm'), e.url, null, e.accept);
     }
     changeSort(e, s) {
         if ($$1(e.target).closest('.header-search').hasClass('header-search')) {
@@ -6485,12 +6472,9 @@ class TableClass {
         }
         return this.searchForm ? this.searchForm.json(d) : d;
     }
-    getUrl() {
-        return this.url + 'list';
-    }
     showInsertModal(cId = null) {
         const insertAccess = this.permissions.getAccess(PermissionAccessTypeEnum.Insert);
-        this.form.url = this.form.baseUrl = this.url + 'insert' + (cId ? '/' + cId : '');
+        this.form.url = this.form.baseUrl = insertAccess.Url + (cId ? '/' + cId : '');
         this.form.name = insertAccess.Name;
         this.form.method = Method.Post;
         this.form.inputs.filter(x => x.inEditDisabled).forEach(x => x.disabled = false);
@@ -6501,10 +6485,9 @@ class TableClass {
         this.permission = true;
         if (this.permissions) {
             const listAccess = this.permissions.getAccess(PermissionAccessTypeEnum.List);
-            console.log(listAccess);
             if (listAccess !== null) {
                 this.title = listAccess.Name;
-                this.url = this.permissions.getUrl();
+                this.url = listAccess.Url;
                 if (this.permissions.Type !== PermissionTypeEnum.Form) {
                     this.load();
                 }
@@ -6525,7 +6508,7 @@ class TableClass {
             if (access.AccessType === PermissionAccessTypeEnum.Insert) {
                 accessInp.class = accessInp.class.replace('blue', 'green');
                 if (this.form) {
-                    this.form.url = this.form.baseUrl = this.url + 'insert';
+                    this.form.url = this.form.baseUrl = access.Url;
                     if (!this.form.onTop) {
                         accessInp.onClick = () => {
                             this.form.onSuccessBase = () => {
@@ -6547,7 +6530,7 @@ class TableClass {
                         };
                     }
                     else {
-                        accessInp.url = this.url + 'insert';
+                        accessInp.url = access.Url;
                     }
                 }
             }