diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js index 9c93f5f3..d0e85c88 100644 --- a/public/assets/js/require-backend.min.js +++ b/public/assets/js/require-backend.min.js @@ -9927,12 +9927,17 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator'], function ($, undef var initCommonSearch = function (pColumns, that) { var vFormCommon = createFormCommon(pColumns, that); - var vModal = sprintf("
", that.options.searchFormVisible ? "" : "hidden"); + var vModal = "
"; vModal += vFormCommon; vModal += "
"; that.$container.prepend($(vModal)); that.$commonsearch = $(".commonsearch-table", that.$container); var form = $("form.form-commonsearch", that.$commonsearch); + if(!that.options.searchFormVisible){ + setTimeout(function () { + that.$commonsearch.addClass('hidden'); + },100); + } require(['form'], function (Form) { Form.api.bindevent(form); @@ -11568,18 +11573,21 @@ define("drop", function(){}); if (options.close && $("li", navobj).size() > 0) { tabitem.append(' '); } - //创建新TAB的内容 - conitem = $('
'); - //是否指定TAB内容 - if (opts.content) { - conitem.append(opts.content); - } else if (options.iframeUse && !opts.ajax) {//没有内容,使用IFRAME打开链接 - var height = options.iframeHeight; - conitem.append('
'); - } else { - $.get(url, function (data) { - conitem.append(data); - }); + if (conitem.size() === 0) { + //创建新TAB的内容 + conitem = $('
'); + //是否指定TAB内容 + if (opts.content) { + conitem.append(opts.content); + } else if (options.iframeUse && !opts.ajax) {//没有内容,使用IFRAME打开链接 + var height = options.iframeHeight; + conitem.append(''); + } else { + $.get(url, function (data) { + conitem.append(data); + }); + } + tabobj.append(conitem); } //加入TABS if ($('.tabdrop li', navobj).size() > 0) { @@ -11587,7 +11595,6 @@ define("drop", function(){}); } else { navobj.append(tabitem); } - tabobj.append(conitem); } else { //强制刷新iframe if (options.iframeForceRefresh) {