diff --git a/docs/layout/index.md b/docs/layout/index.md
index f31c2e13..7b0af3b3 100644
--- a/docs/layout/index.md
+++ b/docs/layout/index.md
@@ -131,7 +131,7 @@ layui.use(['element', 'layer', 'util'], function(){
,content: '
处理右侧面板的操作
'
,area: ['260px', '100%']
,offset: 'rt' //右上角
- ,anim: 5
+ ,anim: 'slideLeft'
,shadeClose: true
,scrollbar: false
});
diff --git a/src/css/layui.css b/src/css/layui.css
index 44f2f84a..5cd991e8 100644
--- a/src/css/layui.css
+++ b/src/css/layui.css
@@ -1115,7 +1115,7 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh
.layui-table-tips-c:before{position: relative; right: -2px;}
/** 树表 **/
-.layui-table-tree-nodeIcon {width: 20px;}
+.layui-table-tree-nodeIcon {max-width: 20px;}
.layui-table-tree-nodeIcon > * {width: 100%;}
.layui-table-tree-flexIcon,.layui-table-tree-nodeIcon {margin-right: 2px;}
.layui-table-tree-flexIcon {cursor: pointer;}
diff --git a/src/modules/treeTable.js b/src/modules/treeTable.js
index 1623354c..96404d3b 100644
--- a/src/modules/treeTable.js
+++ b/src/modules/treeTable.js
@@ -233,7 +233,6 @@ layui.define(['table'], function (exports) {
onExpand: null, // 展开之后的回调
}
},
- autoSort: false
};
Class.prototype.getOptions = function () {
@@ -821,7 +820,7 @@ layui.define(['table'], function (exports) {
});
// 对参数进行深度或浅扩展
- that.config = $.extend(deep, {}, that.config, options, {autoSort: false});
+ that.config = $.extend(deep, {}, that.config, options);
// 执行渲染
that.render(type);
@@ -894,6 +893,14 @@ layui.define(['table'], function (exports) {
treeTable.reloadData(id);
} else {
// url异步取数的表格一般需要自己添加监听之后进行reloadData并且把排序参数加入到where中
+ if (options.autoSort) {
+ var tableData = that.initData();
+ var res = {};
+ res[options.response.dataName] = tableData;
+ typeof options.done === 'function' && options.done(
+ res, that.page, that.count
+ );
+ }
}
}