ps-toolkit-ui 1.4.8 → 1.4.11

package/bundles/ps-toolkit-ui.umd.js

@@ -322,18 +322,16 @@
             var _this = this;
             if (v === void 0) { v = null; }
             if (k != null && (/^-?\d+$/.test(k) || /^\d+\.\d+$/.test(k))) {
-                console.log(area, c, k, v, '=>', k);
                 return k;
             }
             var cv = _.get(this.lang, area ? area + "." + c + "." + k : c + "." + k);
             if (!cv) {
-                cv = _.get(this.lang, "public." + c + "." + k);
+                cv = _.get(this.lang, "Public." + c + "." + k);
             }
             if (!cv) {
-                cv = _.get(this.lang, "public." + k);
+                cv = _.get(this.lang, "Public." + k);
             }
             if (!cv) {
-                console.log(area, c, k, v, '=>', k);
                 return k;
             }
             if (v !== null) {
@@ -346,7 +344,6 @@
                     cv = cv.replace('{}', this.get(area, c, v, null));
                 }
             }
-            console.log(area, c, k, v, '=>', cv);
             return cv;
         };
         return LangClass;
@@ -1338,7 +1335,7 @@
                 }
                 btn.loading = true;
             }
-            this.getClient(table.getUrl(), table.method, table.searchData(), function (res) {
+            this.getClient(table.url, table.method, table.searchData(), function (res) {
                 if (res.status === exports.ResultStatusEnum.Success) {
                     table.rows = res.result.List;
                     table.count = res.result.Count;
@@ -7448,13 +7445,10 @@
             }
             return this.searchForm ? this.searchForm.json(d) : d;
         };
-        TableClass.prototype.getUrl = function () {
-            return this.url + 'list';
-        };
         TableClass.prototype.showInsertModal = function (cId) {
             if (cId === void 0) { cId = null; }
             var insertAccess = this.permissions.getAccess(exports.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 = exports.Method.Post;
             this.form.inputs.filter(function (x) { return x.inEditDisabled; }).forEach(function (x) { return x.disabled = false; });
@@ -7470,7 +7464,7 @@
                 var listAccess = this.permissions.getAccess(exports.PermissionAccessTypeEnum.List);
                 if (listAccess !== null) {
                     this.title = listAccess.Name;
-                    this.url = this.permissions.getUrl();
+                    this.url = listAccess.Url;
                     if (this.permissions.Type !== exports.PermissionTypeEnum.Form) {
                         this.load();
                     }
@@ -7491,7 +7485,7 @@
                 if (access.AccessType === exports.PermissionAccessTypeEnum.Insert) {
                     accessInp.class = accessInp.class.replace('blue', 'green');
                     if (this_1.form) {
-                        this_1.form.url = this_1.form.baseUrl = this_1.url + 'insert';
+                        this_1.form.url = this_1.form.baseUrl = access.Url;
                         if (!this_1.form.onTop) {
                             accessInp.onClick = function () {
                                 _this.form.onSuccessBase = function () {
@@ -7513,7 +7507,7 @@
                             };
                         }
                         else {
-                            accessInp.url = this_1.url + 'insert';
+                            accessInp.url = access.Url;
                         }
                     }
                 }