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 @@
-
+
@@ -24,13 +15,7 @@
-
+
Documentation
@@ -54,11 +39,14 @@ import { toTree } from "@/util/menuHandle";
export default {
methods: {
init() {
- this.items=toTree( store.state.user.user.menus);
+ const menus = store.state.user.user.menus.filter((m) => {
+ return m.menuType == 0;
+ });
+ this.items = toTree(menus);
},
logout() {
this.$store.dispatch("Logout")
- this.$router.push({ path: "/login/" });
+ this.$router.push({ path: "/login/" });
},
},
created() {
diff --git a/Yi.Vue2.x/src/util/btnHandle.js b/Yi.Vue2.x/src/util/btnHandle.js
new file mode 100644
index 00000000..b9e080a4
--- /dev/null
+++ b/Yi.Vue2.x/src/util/btnHandle.js
@@ -0,0 +1,77 @@
+import store from '../store/index'
+//匹配按钮,判断是否有按钮存在
+
+function getBtn(par) {
+ var axiosEnable = {
+ get: false,
+ update: false,
+ del: false,
+ add: false,
+ };
+ const per = store.state.user.per;
+ switch (par) {
+ case "user":
+ per.forEach(p => {
+ if(p=="user:get")
+ {
+ axiosEnable.get=true;
+ }
+ else if(p=="user:update")
+ {
+ axiosEnable.update=true;
+ }
+ else if(p=="user:del")
+ {
+ axiosEnable.del=true;
+ }
+ else if(p=="user:add")
+ {
+ axiosEnable.add=true;
+ }
+ });
+ break;
+ case "role":
+ if(p=="role:get")
+ {
+ axiosEnable.get=true;
+ }
+ else if(p=="role:update")
+ {
+ axiosEnable.update=true;
+ }
+ else if(p=="role:del")
+ {
+ axiosEnable.del=true;
+ }
+ else if(p=="role:add")
+ {
+ axiosEnable.add=true;
+ }
+ break;
+ case "menu":
+ if(p=="menu:get")
+ {
+ axiosEnable.get=true;
+ }
+ else if(p=="menu:update")
+ {
+ axiosEnable.update=true;
+ }
+ else if(p=="menu:del")
+ {
+ axiosEnable.del=true;
+ }
+ else if(p=="menu:add")
+ {
+ axiosEnable.add=true;
+ }
+ break;
+
+
+ default: console.log("未发现合法路由")
+ }
+ return axiosEnable;
+}
+
+
+export {getBtn};
diff --git a/Yi.Vue2.x/src/util/menuDic.js b/Yi.Vue2.x/src/util/menuDic.js
deleted file mode 100644
index d999c68a..00000000
--- a/Yi.Vue2.x/src/util/menuDic.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import store from '../store/index'
-//匹配按钮,判断是否有按钮存在
-const btnDic =
-{
- "user:get": "/",
- "user:add": "/",
- "user:update": "/",
- "user:del": "/",
-}
-
-
- function getBtn(par) {
- const per=[];
- switch(par){
- case "user":
-
-
-
-
- break;
- default:console.log("未发现合法路由")
- }
-}
-
-
-export default { menuDic, btnDic };
diff --git a/Yi.Vue2.x/src/views/AdmRole.vue b/Yi.Vue2.x/src/views/AdmRole.vue
index 9af21e41..9239517d 100644
--- a/Yi.Vue2.x/src/views/AdmRole.vue
+++ b/Yi.Vue2.x/src/views/AdmRole.vue
@@ -7,17 +7,20 @@
:defaultItem="defaultItem"
:headers="headers"
:axiosUrls="axiosUrls"
+ :btnEnable="btnEnable"
>