github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fastjson增加配置

Browse Source
This commit is contained in:
zhuangqian 2016-11-23 21:57:01 +08:00
parent ee2b53a66a
commit ee741a30aa
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/spring/springmvc-servlet.xml
View File

@ -60,6 +60,12 @@
<value>DisableCircularReferenceDetect</value> <value>DisableCircularReferenceDetect</value>
</list> </list>
</property> </property>
<property name="serializerFeatures">
<list>
<!-- 空字段也返回, 不需要的可以注释掉 -->
<value>WriteMapNullValue</value>
</list>
</property>
<property name="dateFormat" value="yyyy-MM-dd HH:mm:ss"></property> <property name="dateFormat" value="yyyy-MM-dd HH:mm:ss"></property>
</bean> </bean>
</property> </property>

33
src/main/webapp/static/blade/js/blade-tab.js
View File

@ -9,30 +9,20 @@ var addTabs = function(obj) {
// mainHeight = $(document.body).height(); // mainHeight = $(document.body).height();
mainHeight = $(window).height() - 110; mainHeight = $(window).height() - 110;
// 创建新TAB的title // 创建新TAB的title
title = '<li id="tab_' + id + '" class="li-tab"><a href="#' + id title = '<li id="tab_' + id + '" class="li-tab"><a href="#' + id + '" data-toggle="tab"><i class="' + obj.icon + '"></i>&nbsp;' + obj.title + '';
+ '" data-toggle="tab"><i class="' + obj.icon + '"></i>&nbsp;'
+ obj.title + '';
// 是否允许关闭 // 是否允许关闭
if (obj.close) { if (obj.close) {
title += '&nbsp;&nbsp; <i aria-controls="' + id title += '&nbsp;&nbsp; <i aria-controls="' + id + '" class="close-tab fa fa-times-circle"></i>';
+ '" class="close-tab fa fa-times-circle"></i>';
} }
title += '</a></li>'; title += '</a></li>';
// 是否指定TAB内容 // 是否指定TAB内容
if (obj.content) { if (obj.content) {
content = '<div role="tabpanel" class="tab-pane iframe-tab" id="' content = '<div role="tabpanel" class="tab-pane iframe-tab" id="' + id + '">' + obj.content + '</div>';
+ id + '">' + obj.content + '</div>';
} else { // 没有内容，使用IFRAME打开链接 } else { // 没有内容，使用IFRAME打开链接
content = '<div role="tabpanel" class="tab-pane iframe-tab" id="' content = '<div role="tabpanel" class="tab-pane iframe-tab" id="' + id + '">' +
+ id '<iframe onload="onIframeLoad(this)" class="layui-layer-load" data-type="tab_iframe" id="iframe_' + id + '" src="' + obj.url + '" width="100%" height="' + mainHeight + '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="yes" allowtransparency="yes"></iframe>' +
+ '"><iframe onload="onIframeLoad(this)" class="layui-layer-load" data-type="tab_iframe" id="iframe_' '</div>';
+ id
+ '" src="'
+ obj.url
+ '" width="100%" height="'
+ mainHeight
+ '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="yes" allowtransparency="yes"></iframe></div>';
} }
var left = parseInt($("#blade_tab").css("left")) - tabWidth() - 1; var left = parseInt($("#blade_tab").css("left")) - tabWidth() - 1;
@ -246,13 +236,10 @@ var middleWidth = function() {
var initMain = function(id, url) { var initMain = function(id, url) {
var mainHeight = $(window).height() - 110; var mainHeight = $(window).height() - 110;
var content = '<div role="tabpanel" class="tab-pane iframe-tab home-tab" id="' var content = '<div role="tabpanel" class="tab-pane iframe-tab home-tab" id="' + id + '">' +
+ id '<iframe class="layui-layer-load" data-type="tab_iframe" id="iframe_' + id + '" src="' + url + '" width="100%" height="' + mainHeight + '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="yes" allowtransparency="yes"></iframe>' +
+ '"><iframe class="layui-layer-load" data-type="tab_iframe" id="iframe_' '</div>';
+ id
+ '" src="' + url + '" width="100%" height="'
+ mainHeight
+ '" frameborder="no" border="0" marginwidth="0" marginheight="0" scrolling="yes" allowtransparency="yes"></iframe></div>';
$(".tab-content").append(content); $(".tab-content").append(content);
$("#tab_" + id).addClass('active'); $("#tab_" + id).addClass('active');
$("#" + id).addClass("active"); $("#" + id).addClass("active");