github
/
layui
mirror of https://github.com/layui/layui
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2.x' of github.com:layui/layui into 2.x

pull/1234/head
贤心 2023-04-25 00:29:28 +08:00
parent 393745f2e5 d09bae16c6
commit 4a42e9dcc5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/layout/index.md
View File

@ -131,7 +131,7 @@ layui.use(['element', 'layer', 'util'], function(){
,content: '<div style="padding: 15px;">处理右侧面板的操作</div>' ,content: '<div style="padding: 15px;">处理右侧面板的操作</div>'
,area: ['260px', '100%'] ,area: ['260px', '100%']
,offset: 'rt' //右上角 ,offset: 'rt' //右上角
,anim: 5 ,anim: 'slideLeft'
,shadeClose: true ,shadeClose: true
,scrollbar: false ,scrollbar: false
}); });

2
src/css/layui.css
View File

@ -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-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-nodeIcon > * {width: 100%;}
.layui-table-tree-flexIcon,.layui-table-tree-nodeIcon {margin-right: 2px;} .layui-table-tree-flexIcon,.layui-table-tree-nodeIcon {margin-right: 2px;}
.layui-table-tree-flexIcon {cursor: pointer;} .layui-table-tree-flexIcon {cursor: pointer;}

11
src/modules/treeTable.js
View File

@ -233,7 +233,6 @@ layui.define(['table'], function (exports) {
onExpand: null, // 展开之后的回调 onExpand: null, // 展开之后的回调
} }
}, },
autoSort: false
}; };
Class.prototype.getOptions = function () { 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); that.render(type);
@ -894,6 +893,14 @@ layui.define(['table'], function (exports) {
treeTable.reloadData(id); treeTable.reloadData(id);
} else { } else {
// url异步取数的表格一般需要自己添加监听之后进行reloadData并且把排序参数加入到where中 // 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
);
}
} }
} }