5.0.216版本发布
parent
dcf568e496
commit
06372821de
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
|
@ -689,12 +689,17 @@ layui.define(['view', 'theme', 'common'], function (exports) {
|
||||||
var tab = obj.elem.find('li').eq(obj.index)
|
var tab = obj.elem.find('li').eq(obj.index)
|
||||||
let $iframe = admin.tabsBody(obj.index).find('iframe');
|
let $iframe = admin.tabsBody(obj.index).find('iframe');
|
||||||
if ($iframe.length > 0) {
|
if ($iframe.length > 0) {
|
||||||
yhpreview = $iframe[0].contentWindow['yhpreview'];
|
try {
|
||||||
if (yhpreview && yhpreview.getPage().hasDataChanged()) {
|
yhpreview = $iframe[0].contentWindow['yhpreview'];
|
||||||
layer.msg('存在未保存的数据,请先保存数据再关闭页面');
|
if (yhpreview && yhpreview.getPage() && yhpreview.getPage().hasDataChanged()) {
|
||||||
obj.canClose = false;
|
layer.msg('存在未保存的数据,请先保存数据再关闭页面');
|
||||||
return;
|
obj.canClose = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
//这里忽略一些跨域访问iframe的问题错误
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (obj.canClose !== false) {
|
if (obj.canClose !== false) {
|
||||||
if (tab.hasClass('layui-this')) {
|
if (tab.hasClass('layui-this')) {
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="format-detection" content="telephone=no">
|
<meta name="format-detection" content="telephone=no">
|
||||||
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/style.css'> </@jstime>">
|
||||||
<link href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/design.css'> </@jstime>" rel="stylesheet">
|
<link href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/design.css'> </@jstime>" rel="stylesheet">
|
||||||
<link href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/bigscreenTheme/theme.css'> </@jstime>" rel="stylesheet">
|
<link href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/bigscreenTheme/theme.css'> </@jstime>" rel="stylesheet">
|
||||||
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/font-awesome/css/font-awesome.css'> </@jstime>" media="all" />
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/font-awesome/css/font-awesome.css'> </@jstime>" media="all" />
|
||||||
|
@ -41,6 +42,7 @@
|
||||||
|
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/jquery.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/jquery.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/layui/layui.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/layui/layui.js'> </@jstime>"></script>
|
||||||
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/vue.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.all.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.all.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.exhide.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.exhide.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/lodash.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/lodash.js'> </@jstime>"></script>
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
<meta name="format-detection" content="telephone=no">
|
<meta name="format-detection" content="telephone=no">
|
||||||
<link rel="icon" href="${request.contextPath}<@configValue id='CAAB580980C74A169D8AFEB418ABB5AA'> </@configValue>" type="image/x-icon"/>
|
<link rel="icon" href="${request.contextPath}<@configValue id='CAAB580980C74A169D8AFEB418ABB5AA'> </@configValue>" type="image/x-icon"/>
|
||||||
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/style.css'> </@jstime>">
|
||||||
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/design.css'> </@jstime>">
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/design.css'> </@jstime>">
|
||||||
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/bigscreenTheme/theme.css'> </@jstime>">
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/bigscreenTheme/theme.css'> </@jstime>">
|
||||||
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/font-awesome/css/font-awesome.css'> </@jstime>" media="all" />
|
<link rel="stylesheet" href="${request.contextPath}<@jstime url='/static/libs/formdesign/css/font-awesome/css/font-awesome.css'> </@jstime>" media="all" />
|
||||||
|
@ -54,6 +55,7 @@
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/jquery.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/jquery.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/layui/layui.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/layui/layui.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/lodash.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/lodash.min.js'> </@jstime>"></script>
|
||||||
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/vue.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.all.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.all.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.exhide.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/formdesign/libs/ztree/js/jquery.ztree.exhide.min.js'> </@jstime>"></script>
|
||||||
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/ajaxhook.min.js'> </@jstime>"></script>
|
<script type="text/javascript" src="${request.contextPath}<@jstime url='/static/libs/ajaxhook.min.js'> </@jstime>"></script>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -23,7 +23,7 @@
|
||||||
<!-- jdk版本 -->
|
<!-- jdk版本 -->
|
||||||
<jdk.version>1.8</jdk.version>
|
<jdk.version>1.8</jdk.version>
|
||||||
<!-- 平台版本 -->
|
<!-- 平台版本 -->
|
||||||
<base.version>5.0.215</base.version>
|
<base.version>5.0.216</base.version>
|
||||||
<!-- Spring 版本号 -->
|
<!-- Spring 版本号 -->
|
||||||
<spring.version>5.1.2.RELEASE</spring.version>
|
<spring.version>5.1.2.RELEASE</spring.version>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue