diff --git a/.gitignore b/.gitignore index 6ea4d5f..7e95115 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ ul.db /.VSCodeCounter result.txt test.php +/.env.prod \ No newline at end of file diff --git a/extend/base/admin/view/system/admin/add.html b/extend/base/admin/view/system/admin/add.html index fb81980..efe3ef0 100644 --- a/extend/base/admin/view/system/admin/add.html +++ b/extend/base/admin/view/system/admin/add.html @@ -56,7 +56,7 @@ {notempty name='$Request.param.backTagId'}
返回
{/notempty} - + diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js index c122eca..eafd105 100644 --- a/public/static/plugs/ulthon-admin/ulthon-admin.js +++ b/public/static/plugs/ulthon-admin/ulthon-admin.js @@ -525,6 +525,7 @@ } else if (v === 'add') { if (admin.checkAuth('add', elem)) { toolbarHtml += '\n'; + // toolbarHtml += '\n'; } } else if (v === 'delete') { if (admin.checkAuth('delete', elem)) { @@ -2265,19 +2266,29 @@ closeCurrentOpen: function (option) { option = option || {}; + option.backHref = option.backHref || ''; option.refreshTable = option.refreshTable || false; option.refreshFrame = option.refreshFrame || false; option.onClose = option.onClose || function () { }; if (option.refreshTable === true) { option.refreshTable = init.tableRenderId; } + var backWindow = window.parent; + if (option.backHref) { + backWindow = admin.findPageId(option.backHref); + backWindow.layui.table.reloadData(option.refreshTable); + + admin.findIndexPage(function (window) { + window.layui.element.tabDelete('layuiminiTab', admin.getCurrentPageId()); + }); + } var index = parent.layer.getFrameIndex(window.name); - parent.layer.close(index, option.onClose); + backWindow.layer.close(index, option.onClose); if (option.refreshTable !== false) { - parent.layui.table.reloadData(option.refreshTable); + backWindow.layui.table.reloadData(option.refreshTable); } if (option.refreshFrame) { - parent.location.reload(); + backWindow.location.reload(); } return false; }, @@ -2379,11 +2390,12 @@ if (btnName !== undefined && btnValue !== undefined) { data.field[btnName] = btnValue; } + if (!backHref) { + backHref = admin.getQueryVariable('backTagId'); + } var dataField = data.field; - dataField = admin.api.formSubmitEditor(dataField, v); - dataField = admin.api.formSubmitCity(dataField, v); if (typeof preposeCallback === 'function') { @@ -2392,7 +2404,6 @@ complete = complete || function () { $(form).removeClass('loading'); }; - // admin.api.form(url, dataField, ok, no, ex, refresh, close, complete); if (ok) { var originalOk = ok; @@ -2405,25 +2416,15 @@ res.msg = res.msg || ''; admin.msg.success(res.msg, function () { if (close) { - if (backHref) { - var backWindow = admin.findPageId(backHref); - console.log(backWindow); - console.log(option.refreshTable); - - backWindow.layui.table.reloadData(option.refreshTable); - admin.findIndexPage(function (window) { - window.layui.element.tabDelete('layuiminiTab', backHref); - }); + admin.api.closeCurrentOpen({ + refreshTable: refresh, + backHref: backHref, + onClose: function () { + complete(); + } + }); - } else { - admin.api.closeCurrentOpen({ - refreshTable: refreshTable, - onClose: function () { - complete(); - } - }); - } } }); return false; @@ -2432,7 +2433,7 @@ admin.request.post({ url: url, - data: data, + data: dataField, }, ok, no, ex, complete); return false; @@ -3143,17 +3144,18 @@ }, findPageId(tabId) { var iframeWindow; - this.findIndexPage(function(window){ - window.layui.$('.layui-tab-title li').each(function () { - var checkTabId = $(this).attr('lay-id'); - - if (checkTabId != null && checkTabId === tabId) { - iframeWindow = $(this).find('iframe').contentWindow + this.findIndexPage(function (window) { + // 查找对应的tab内容区域 + var tabContent = window.layui.$('.layui-tab-content .layui-tab-item[lay-id="' + tabId + '"]'); + if (tabContent.length > 0) { + var iframe = tabContent.find('iframe')[0]; + if (iframe) { + iframeWindow = iframe.contentWindow; } - }); - }) - return iframeWindow - } + } + }); + return iframeWindow; + }, };