diff --git a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs index fd050a52..aeeeef43 100644 --- a/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/Good/CoreCmsGoodsCategoryController.cs @@ -71,10 +71,20 @@ namespace CoreCms.Net.Web.Admin.Controllers public async Task GetPageList() { var jm = new AdminUiCallBack(); + //获取数据 var list = await _coreCmsGoodsCategoryServices.QueryListByClauseAsync(p => p.id > 0, p => p.sort, OrderByType.Asc, true, true); - //返回数据 - jm.data = GoodsHelper.GetTree(list,false).data; + var type = Request.Form["type"].FirstOrDefault(); + if (!string.IsNullOrEmpty(type) && type == "layui") + { + //返回数据 + jm.data = GoodsHelper.GetTree(list, false).data; + } + else + { + jm.data = list; + } + jm.code = 0; jm.msg = "数据调用成功!"; return jm; diff --git a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs index 18b50ceb..b22cb292 100644 --- a/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs +++ b/CoreCms.Net.Web.Admin/Controllers/System/SysMenuController.cs @@ -70,8 +70,15 @@ namespace CoreCms.Net.Web.Admin.Controllers //获取数据 var list = await _sysMenuServices.QueryListByClauseAsync(p => p.deleted == false, p => p.sortNumber, OrderByType.Asc); - //返回数据 - jm.data = SysMenuHelper.GetTree(list, false).data; + var type = Request.Form["type"].FirstOrDefault(); + if (!string.IsNullOrEmpty(type) && type == "layui") + { + jm.data = SysMenuHelper.GetTree(list, false).data; + } + else + { + jm.data = list; + } jm.code = 0; jm.count = list.Count; jm.msg = "数据调用成功!"; diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html index 1ae85617..cb8fe207 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goodscategory/index.html @@ -63,6 +63,7 @@ id: 'treeTableBox', elem: '#LAY-app-CoreCmsGoodsCategory-tableBox', url: layui.setter.apiUrl + 'Api/CoreCmsGoodsCategory/GetPageList', + where: { type: 'layui' }, method: 'POST', tree: { customName: { diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html index 4eb6295b..6756aaa3 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html +++ b/CoreCms.Net.Web.Admin/wwwroot/views/system/sysmenu/index.html @@ -76,7 +76,8 @@ //数据绑定 var insTb = treeTable.render({ id: 'treeTableBox', - url: layui.setter.apiUrl + 'Api/SysMenu/GetPageList', + url: layui.setter.apiUrl + 'Api/SysMenu/GetPageList', + where: { type: 'layui' }, method: 'POST', elem: '#LAY-app-SysMenu-tableBox', tree: {