From 6248c7c510af52bca5d05af2d4c4ceb45d567e3c Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 1 Mar 2022 14:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20form[data-table-id]=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E6=88=90=E5=8A=9F=E5=8F=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0=20lay.table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/admin.js | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/public/static/admin.js b/public/static/admin.js
index 5514cc6ea..61f051bf4 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -317,8 +317,8 @@ $(function () {
         /*! 加载 HTML 到弹出层 */
         this.modal = function (url, data, name, call, load, tips, area, offset) {
             this.load(url, data, 'GET', function (res) {
-                if (typeof (res) === 'object') return $.msg.auto(res), false;
-                $.msg.mdx.push(layer.open({
+                if (typeof res === 'object') return $.msg.auto(res) && false;
+                return $.msg.mdx.push(layer.open({
                     type: 1, btn: false, area: area || "800px", resize: false, content: res, title: name || '', offset: offset || 'auto', success: function ($dom, idx) {
                         $.form.reInit($dom.off('click', '[data-close]').on('click', '[data-close]', function () {
                             (function (confirm, callable) {
@@ -326,10 +326,9 @@ $(function () {
                             })(this.dataset.confirm, function () {
                                 layer.close(idx);
                             });
-                        }));
+                        })) && typeof call === 'function' && call.call(that, $dom);
                     }
-                }));
-                return (typeof call === 'function') && call.call(that);
+                })) && false;
             }, load, tips);
         };
     };
@@ -516,9 +515,17 @@ $(function () {
     $.vali.listen = function () {
         $('form[data-auto]').map(function (index, form) {
             $(this).vali(function (data) {
-                var type = form.method || 'POST', href = form.action || location.href;
-                var call = window[form.dataset.callable || '_default_callable'] || undefined;
+                var taid = form.dataset.tableId || false;
+                var type = form.method || 'post', href = form.action || location.href;
                 var tips = form.dataset.tips || undefined, time = form.dataset.time || undefined;
+                var call = window[form.dataset.callable || '_default_callable'] || (taid ? function (ret) {
+                    if (typeof ret === 'object' && ret.code > 0 && $('#' + taid).size() > 0) {
+                        return $.msg.success(ret.info, 3, function () {
+                            (typeof ret.data === 'string' && ret.data) ? location.href = ret.data : $('#' + taid).trigger('reload');
+                            $.msg.close($.msg.mdx.length > 0 ? $.msg.mdx.pop() : null);
+                        }) && false;
+                    }
+                } : undefined);
                 (function (confirm, callable) {
                     confirm ? $.msg.confirm(confirm, callable) : callable();
                 })(form.dataset.confirm, function () {