diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs index 136eccd7..5159bca4 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs @@ -36,7 +36,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers //暂未制作逻辑删除与多租户的过滤 public async Task GetMenuTree() { - return Result.Success().SetData(await _iMenuService.GetMenuTreeAsync()); + return Result.Success().SetData(await _iMenuService. GetMenuTreeAsync()); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index dc8a76bd..9c6a6b2d 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs index 6b281189..390cdc8e 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs @@ -23,6 +23,6 @@ namespace Yi.Framework.Repository public Task UpdateIgnoreNullAsync(T entity); public Task> UseSqlAsync(string sql); public Task UseSqlAsync(string sql); - + ISugarQueryable QueryConditionHandler(QueryCondition pars); } } diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs index 3017074f..a78f4704 100644 --- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs +++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs @@ -134,7 +134,7 @@ namespace Yi.Framework.Repository - private ISugarQueryable QueryConditionHandler(QueryCondition pars) + public ISugarQueryable QueryConditionHandler(QueryCondition pars) { var sugarParamters = pars.Parameters.Select(it => (IConditionalModel)new ConditionalModel() { diff --git a/Yi.Vue2.x/src/api/menuApi.js b/Yi.Vue2.x/src/api/menuApi.js index 12c00e16..3a770bf8 100644 --- a/Yi.Vue2.x/src/api/menuApi.js +++ b/Yi.Vue2.x/src/api/menuApi.js @@ -6,30 +6,23 @@ export default { method: 'get' }) }, - addChildrenMenu(id, data) { + Update(data) { return myaxios({ - url: '/Menu/addChildrenMenu', - method: 'post', - data: { parentId: id, data } - }) - }, - UpdateMenu(data) { - return myaxios({ - url: '/Menu/UpdateMenu', + url: '/Menu/Update', method: 'put', data: data }) }, - DelListMenu(ids) { + DeleteList(ids) { return myaxios({ - url: '/Menu/DelListMenu', + url: '/Menu/DeleteList', method: 'delete', data: ids }) }, - AddTopMenu(data) { + Add(data) { return myaxios({ - url: '/Menu/AddTopMenu', + url: '/Menu/Add', method: 'post', data: data }) diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x/src/components/ccTreeview.vue index 744eaa01..a63bfa1d 100644 --- a/Yi.Vue2.x/src/components/ccTreeview.vue +++ b/Yi.Vue2.x/src/components/ccTreeview.vue @@ -73,7 +73,7 @@ --> 添加子菜单