This commit is contained in:
sentsin 2017-02-28 03:02:02 +08:00
parent 4cd5b97c9a
commit fd07bf1b47
3 changed files with 9 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -205,20 +205,20 @@ layui.define('jquery', function(exports){
,elemCont = othis.siblings('.layui-colla-content') ,elemCont = othis.siblings('.layui-colla-content')
,parents = othis.parents('.layui-collapse').eq(0) ,parents = othis.parents('.layui-collapse').eq(0)
,filter = parents.attr('lay-filter') ,filter = parents.attr('lay-filter')
,display = elemCont.css('display') === 'none'; ,isNone = elemCont.css('display') === 'none';
//是否手风琴 //是否手风琴
if(typeof parents.attr('lay-accordion') === 'string'){ if(typeof parents.attr('lay-accordion') === 'string'){
var show = parents.children('.layui-colla-item').children('.'+SHOW); var show = parents.children('.layui-colla-item').children('.'+SHOW);
show.siblings('.layui-colla-title').children('.layui-colla-icon').html(''); show.siblings('.layui-colla-title').children('.layui-colla-icon').html('');
show.removeClass(SHOW); show.removeClass(SHOW);
} }
elemCont[display ? 'addClass' : 'removeClass'](SHOW); elemCont[isNone ? 'addClass' : 'removeClass'](SHOW);
icon.html(display ? '' : ''); icon.html(isNone ? '' : '');
layui.event.call(this, MOD_NAME, 'collapse('+ filter +')', { layui.event.call(this, MOD_NAME, 'collapse('+ filter +')', {
title: othis title: othis
,content: elemCont ,content: elemCont
,show: display ,show: isNone
}); });
} }
}; };
@ -366,11 +366,12 @@ layui.define('jquery', function(exports){
elemItem.each(function(){ elemItem.each(function(){
var othis = $(this) var othis = $(this)
,elemTitle = othis.find('.layui-colla-title') ,elemTitle = othis.find('.layui-colla-title')
,elemCont = othis.find('.layui-colla-content'); ,elemCont = othis.find('.layui-colla-content')
,isNone = elemCont.css('display') === 'none';
//初始状态 //初始状态
elemTitle.find('.layui-colla-icon').remove(); elemTitle.find('.layui-colla-icon').remove();
elemTitle.append('<i class="layui-icon layui-colla-icon">'+ (elemCont.css('display') === 'none' ? '&#xe602;' : '&#xe61a;') +'</i>'); elemTitle.append('<i class="layui-icon layui-colla-icon">'+ (isNone ? '&#xe602;' : '&#xe61a;') +'</i>');
//点击标题 //点击标题
elemTitle.off('click', call.collapse).on('click', call.collapse); elemTitle.off('click', call.collapse).on('click', call.collapse);