ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !96 from Ronrey/master

This commit is contained in:
Gitee 2019-06-03 20:22:19 +08:00
parent 36738bca90 7aefa2673d
commit bb42b3c5e8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js vendored
View File

@ -239,11 +239,11 @@
item.isShow = false; item.isShow = false;
// 这里兼容几种常见Root节点写法 // 这里兼容几种常见Root节点写法
// 默认的几种判断 // 默认的几种判断
var firstCode = (0 == index ? item[options.parentCode] : '-'); // var firstCode = (0 == index ? item[options.parentCode] : '-');
var _defaultRootFlag = item[options.parentCode] == '0' || var _defaultRootFlag = item[options.parentCode] == '0' ||
item[options.parentCode] == 0 || item[options.parentCode] == 0 ||
item[options.parentCode] == null || item[options.parentCode] == null ||
item[options.parentCode] == firstCode || // item[options.parentCode] == firstCode ||
item[options.parentCode] == ''; item[options.parentCode] == '';
if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) { if (!item[options.parentCode] || (_root ? (item[options.parentCode] == options.rootIdValue) : _defaultRootFlag)) {
if (!target.data_list["_root_"]) { if (!target.data_list["_root_"]) {