ps-toolkit-ui 1.16.87 → 1.16.88

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

@@ -3515,6 +3515,7 @@
                                 opt.modal.table.form.url = option.Url.replace('{}', _this.row.Data.Id) + '-insert';
                                 opt.modal.table.form.baseUrl = option.Url.replace('{}', _this.row.Data.Id) + '-insert';
                             }
+                            opt.modal.table.relatedRow = _this.row.Data;
                             opt.modal.table.set();
                         }
                         if (opt.modal.form) {
@@ -9125,6 +9126,8 @@
             this.searchForm = null;
             this.modal = null;
             this.level = null;
+            this.withRelatedRow = false;
+            this.relatedRow = false;
             this.listAccess = null;
             this.insertAccess = null;
             this.onLoad = null;
@@ -9156,7 +9159,7 @@
             return (relatedId ? url.replace('{}', relatedId) : (url.match(/{}/g) || []).length > 1 ? url.replace('/{}', '') : url).replace('{}', rowId);
         };
         TableClass.prototype.searchData = function (report) {
-            var e_1, _a, e_2, _b;
+            var e_1, _a;
             if (report === void 0) { report = false; }
             var d = {};
             if (!report) {
@@ -9175,42 +9178,50 @@
                 d.SortType = this.sortType;
             }
             try {
-                for (var _c = __values(this.cols.filter(function (x) { return x.withSearch && x.search != null && x.search.data() != null && x.search.data() !== ''; })), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var c = _d.value;
+                for (var _b = __values(this.cols.filter(function (x) { return x.withSearch && x.search != null && x.search.data() != null && x.search.data() !== ''; })), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var c = _c.value;
                     var vl = c.search.data();
-                    if (typeof vl === 'object' && !(vl instanceof Array)) {
-                        try {
-                            for (var _e = (e_2 = void 0, __values(Object.entries(vl))), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                var _g = __read(_f.value, 2), key = _g[0], value = _g[1];
-                                if (value != null) {
-                                    d[key] = value;
-                                }
-                            }
-                        }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
-                            }
-                            finally { if (e_2) throw e_2.error; }
-                        }
-                    }
-                    else {
-                        if (vl != null) {
-                            d[c.name] = vl;
-                        }
-                    }
+                    this.addData(d, c.name, vl);
                 }
             }
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
+            if (this.withRelatedRow) {
+                d = Object.assign({}, d, this.relatedRow);
+            }
+            console.log(d, 'dddddddddd');
             return this.searchForm ? this.searchForm.data(d) : d;
         };
+        TableClass.prototype.addData = function (d, name, vl) {
+            var e_2, _a;
+            if (typeof vl === 'object' && !(vl instanceof Array)) {
+                try {
+                    for (var _b = __values(Object.entries(vl)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                        var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
+                        if (value != null) {
+                            d[key] = value;
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            }
+            else {
+                if (vl != null) {
+                    d[name] = vl;
+                }
+            }
+        };
         TableClass.prototype.getUrl = function (url) {
             return this.permissions.RelatedId ? url.replace('{}', this.permissions.RelatedId) : url.replace('/{}', '');
         };