diff --git a/base-server/src/main/resources/template/js/operate/writeOperate.js b/base-server/src/main/resources/template/js/operate/writeOperate.js index 3b2b9bd328d60e50718deff86ebd0369d8eb325a..ed967e6fd2cb5e8b1de2abe8900b0ddfeebe8de1 100644 --- a/base-server/src/main/resources/template/js/operate/writeOperate.js +++ b/base-server/src/main/resources/template/js/operate/writeOperate.js @@ -92,7 +92,7 @@ layui.config({ $("#openPageName").val(operateOpenPage.name); var type = operateOpenPage.type ? "1" : "2"; $("input:radio[name=type][value=" + type + "]").attr("checked", true); - skyeyeClassEnumUtil.showEnumDataListByClassName("pageOpenType", 'radio', "openType", operateOpenPage.openType, form); + skyeyeClassEnumUtil.showEnumDataListByClassName("pageOpenType", 'radio', "openType", json.bean.openType, form); if (type == 1) { $('#typeChangeBox').html(commonHtml['customPageUrl']); $("#pageUrl").val(operateOpenPage.pageUrl); @@ -223,10 +223,10 @@ layui.config({ name: $("#openPageName").val(), type: type == 1 ? true : false, pageUrl: type == 1 ? $("#pageUrl").val() : dsFormUtil.dsFormChooseMation.id, - openType: dataShowType.getData('openType'), params: pageParams }; params.operateOpenPage = JSON.stringify(operateOpenPage); + params.openType = dataShowType.getData('openType'); } AjaxPostUtil.request({url: reqBasePath + "writeOperate", params: params, type: 'json', method: 'POST', callback: function (json) { diff --git a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js index ba79caa4410179709e749174a3af7ed27df6de40..18c74a1419727002a42140506d6f1c01e50c7c54 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js @@ -773,15 +773,32 @@ var dsFormUtil = { url += `&objectId=${objectId}`; url += `&objectKey=${objectKey}`; } - _openNewWindows({ - url: url, - title: operateOpenPage.name, - pageId: 'page' + operate.id, - area: ['90vw', '90vh'], - callBack: function (refreshCode) { - winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); - dsFormTableUtil.loadTable(); - }}); + if (operate.openType == 1) { + // 正常打开 + _openNewWindows({ + url: url, + title: operateOpenPage.name, + pageId: 'page' + operate.id, + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + dsFormTableUtil.loadTable(); + }}); + } else if (operate.openType == 2) { + // 父页面打开 + parent._openNewWindows({ + url: url, + title: operateOpenPage.name, + pageId: 'page' + operate.id, + area: ['90vw', '90vh'], + callBack: function (refreshCode) { + winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000}); + dsFormTableUtil.loadTable(); + }}); + } else if (operate.openType == 3) { + // 新窗口打开 + window.open(sysMainMation.homePagePath + url, '_blank'); + } } else if (operate.eventType == 'ajax') { // 发送请求 var businessApi = operate.businessApi;