diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs index f51a85ef..0566c588 100644 --- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs +++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/BaseController/BaseCrudController.cs @@ -32,7 +32,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// /// - [Permission($"{nameof(T)}:get:list")] + [Permission($"{nameof(T)}:get")] [HttpGet] public virtual async Task GetById(long id) { @@ -43,7 +43,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// 列表查询 /// /// - [Permission($"{nameof(T)}:get:list")] + [Permission($"{nameof(T)}:get")] [HttpPost] public virtual async Task GetList(QueryCondition queryCondition) { @@ -55,7 +55,7 @@ namespace Yi.Framework.ApiMicroservice.Controllers /// /// /// - [Permission($"{nameof(T)}:get:list")] + [Permission($"{nameof(T)}:get")] [HttpPost] public virtual async Task PageList(QueryPageCondition queryCondition) { 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 1027981e..293aa5df 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.Vue2.x/src/components/ccTable.vue b/Yi.Vue2.x/src/components/ccTable.vue index aa4ae38b..0428165b 100644 --- a/Yi.Vue2.x/src/components/ccTable.vue +++ b/Yi.Vue2.x/src/components/ccTable.vue @@ -24,7 +24,7 @@ > @@ -72,7 +72,7 @@ mdi-pencil - + mdi-delete @@ -119,6 +119,9 @@ export default { axiosUrls: { type: Object, }, + btnEnable: { + type: Object, + }, }, data: () => ({ page: 1, @@ -166,7 +169,7 @@ export default { }); }, initialize() { - if(this.axiosUrls.get!=undefined && this.axiosUrls.get!=null ) + if(this.btnEnable.get==true ) { this.dataInit(this.axiosUrls.get) } diff --git a/Yi.Vue2.x/src/components/ccTreeview.vue b/Yi.Vue2.x/src/components/ccTreeview.vue index 4fe46133..b3987808 100644 --- a/Yi.Vue2.x/src/components/ccTreeview.vue +++ b/Yi.Vue2.x/src/components/ccTreeview.vue @@ -107,9 +107,9 @@ export default { editedIndex: -1, defaultItem: { menuIcon: "mdi-view-dashboard", - permissionCode: "test", - menuName: "管理", - router:"/", + permissionCode: "", + menuName: "", + router:"", parentId: 0, MenuType:0 }, diff --git a/Yi.Vue2.x/src/layouts/default/Drawer.vue b/Yi.Vue2.x/src/layouts/default/Drawer.vue index bbaf372e..980c08e0 100644 --- a/Yi.Vue2.x/src/layouts/default/Drawer.vue +++ b/Yi.Vue2.x/src/layouts/default/Drawer.vue @@ -1,15 +1,6 @@