添加菜单查询

Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/MenuController.cs

@@ -34,9 +34,9 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// <returns></returns>
         [HttpGet]
         //暂未制作逻辑删除与多租户的过滤
-        public async Task<List<MenuEntity>> GetMenuTree()
+        public async Task<Result> GetMenuTree()
         { 
-             return await _iMenuService.GetMenuTreeAsync();
+             return Result.Success().SetData(await _iMenuService.GetMenuTreeAsync());
         }
     }
 }

Yi.Framework.Net6/Yi.Framework.Model/ModelsTemplate/MenuEntity.cs

@@ -32,7 +32,7 @@ namespace Yi.Framework.Model.Models
         /// <summary>
         ///  
         ///</summary>
-         [SugarColumn(ColumnName="MenuCode"    )]
+         [SugarColumn(ColumnName= "PermissionCode")]
          public string PermissionCode { get; set; }
         /// <summary>
         ///  

Yi.Framework.Net6/Yi.Framework.Service/MenuService.cs

@@ -13,7 +13,7 @@ namespace Yi.Framework.Service
         {
             //ParentId 0,代表为根目录，只能存在一个
             //复杂查询直接使用db代理
-            return await _repository._Db.Queryable<MenuEntity>().ToTreeAsync(it=>it.Children,it=>it.ParentId,0);
+            return await _repository._Db.Queryable<MenuEntity>().Where(u=>u.IsDeleted==false).ToTreeAsync(it=>it.Children,it=>it.ParentId,0);
         }
     }
 }

Yi.Vue2.x/src/api/menuApi.js

@@ -1,8 +1,8 @@
 import myaxios from '@/util/myaxios'
 export default {
-    GetMenuInMould() {
+    getMenuTree() {
         return myaxios({
-            url: '/Menu/GetMenuInMould',
+            url: '/Menu/getMenuTree',
             method: 'get'
         })
     },
@@ -34,13 +34,7 @@ export default {
             data: data
         })
     },
-    SetMouldByMenu(menuId, mouldId) {
+
-        return myaxios({
-            url: '/Menu/SetMouldByMenu',
-            method: 'post',
-            data: { id1: menuId, id2: mouldId }
-        })
-    },
     GetTopMenusByHttpUser() {
         return myaxios({
             url: '/Menu/GetTopMenusByHttpUser',

Yi.Vue2.x/src/components/ccTreeview.vue

@@ -1,15 +1,12 @@
 <template>
   <div>
     <v-divider></v-divider>
-    <app-btn  dark class="ma-4" @click="showAll"> 展开全部</app-btn>
+    <app-btn dark class="ma-4" @click="showAll"> 展开全部</app-btn>
-    <app-btn  dark class="my-4 mr-4" @click="dialog = true"> 添加新项 </app-btn>
+    <app-btn dark class="my-4 mr-4" @click="dialog = true"> 添加新项 </app-btn>
-    <app-btn dark class="my-4"  color="secondary" @click="deleteItem(null)">
+    <app-btn dark class="my-4" color="secondary" @click="deleteItem(null)">
       删除所选
     </app-btn>
 
-
- 
-
     <v-dialog v-model="dialog" max-width="500px">
       <v-card>
         <v-card-title>
@@ -53,15 +50,16 @@
       return-object
       open-all
       hoverable
-      item-text="menu_name"
+      item-text="menuName"
     >
       <template v-slot:append="{ item }">
         <v-btn class="mr-2">编号:{{ item.id }}</v-btn>
-        <v-btn class="mr-2">图标:{{ item.icon }}</v-btn>
+        <v-btn class="mr-2">权限:{{ item.permissionCode }}</v-btn>
-        <v-btn class="mr-2">路由:{{ item.router }}</v-btn>
+        <!-- <v-btn class="mr-2">图标:{{ item.icon }}</v-btn> -->
-        <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
+        <!-- <v-btn class="mr-2">路由:{{ item.router }}</v-btn> -->
-        <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn>
+        <!-- <v-btn v-if="item.mould" class="mr-2">接口名:{{ item.mould.mould_name }}</v-btn>
-        <ccCombobox
+        <v-btn  v-if="item.mould" class="mr-2" color="secondary">接口地址:{{ item.mould.url }}</v-btn> -->
+        <!-- <ccCombobox
           headers="设置接口权限"
           itemText="url"
           :items="mouldList"
@@ -72,8 +70,8 @@
               保存</v-btn
             >
           </template>
-        </ccCombobox>
+        </ccCombobox> -->
-         <app-btn
+        <app-btn
           @click="
             parentId = item.id;
             dialog = true;
@@ -82,8 +80,9 @@
         >
         <app-btn class="mx-2" @click="editItem(item)">编辑</app-btn>
 
-        <app-btn color="secondary" class="mr-2" @click="deleteItem(item)">删除</app-btn>
+        <app-btn color="secondary" class="mr-2" @click="deleteItem(item)"
-       
+          >删除</app-btn
+        >
       </template>
     </v-treeview>
   </div>
@@ -108,7 +107,7 @@ export default {
       icon: "mdi-start",
       router: "test",
       menu_name: "测试",
-      is_show:1
+      is_show: 1,
     },
   }),
   computed: {
@@ -120,20 +119,20 @@ export default {
     this.init();
   },
   methods: {
-showAll(){
+    showAll() {
-  this.$refs.tree.updateAll(true);
+      this.$refs.tree.updateAll(true);
-},
-
-    setMould(item) {
-      menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
-        this.$dialog.notify.info(resp.msg, {
-          position: "top-right",
-          timeout: 5000,
-        });
-               this.init();
-      });
     },
 
+    // setMould(item) {
+    //   menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
+    //     this.$dialog.notify.info(resp.msg, {
+    //       position: "top-right",
+    //       timeout: 5000,
+    //     });
+    //     this.init();
+    //   });
+    // },
+
     getSelect(data) {
       this.mouldSelect = data;
     },
@@ -173,20 +172,17 @@ showAll(){
     },
     init() {
       this.parentId = 0;
-      mouldApi.getMould().then((resp) => {
+      // mouldApi.getMould().then((resp) => {
-        this.mouldList = resp.data;
+      //   this.mouldList = resp.data;
-      });
+      // });
 
-      menuApi.GetMenuInMould().then((resp) => {
+      menuApi.getMenuTree().then((resp) => {
-        this.desserts =[ resp.data];
+        this.desserts = resp.data;
       });
       this.$nextTick(() => {
         this.editedItem = Object.assign({}, this.defaultItem);
         this.editedIndex = -1;
       });
-
-
-      
     },
     editItem(item) {
       this.editedIndex = item.id;