From c651b60c59278243e3ba1755bc71949efc930219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Fri, 29 Apr 2022 00:31:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MenuController.cs             |   2 +-
 .../yi-sqlsugar-dev.db                        | Bin 102400 -> 102400 bytes
 .../Yi.Framework.Repository/IRepository.cs    |   2 +-
 .../Yi.Framework.Repository/Repository.cs     |   2 +-
 Yi.Vue2.x/src/api/menuApi.js                  |  19 ++++-------
 Yi.Vue2.x/src/components/ccTreeview.vue       |  30 ++++++------------
 6 files changed, 19 insertions(+), 36 deletions(-)

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<Result> 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 dc8a76bd2837ca776b57e02d6ac984d19ab27e43..9c6a6b2d5e6236c04938bc5245c68645191390c7 100644
GIT binary patch
delta 380
zcmZozz}B#UZGyC5FaraFBoK1~F%uArPt-AH4Q9}DU$HS|PX2a50mk?IlMMtUSQ&wm
z91#A*0M=;+j4Yd3Cj31w&;Eyji>;f1Zz^99&vTw7oaZ<faujhmvURgx2EomW0@-Za
zyVDp88CkeqGq_Gx6mZ<`n8CP)iHUJ1P;x8d=80@E%+m@OSp?YlwlVPE;@`sG#~;AY
z&$n%}qQWA+`fxTLHhB(FHU?`3Yfc7Haj7^tCIN=$>lQwr&}M9GT#{N`A}V6KCBjL7
z!N|bKNY}tb*T_=Az`)AT+{(Z}&%nR{RoKYV%G6ZP!py>+m4{80LzIKT8R#>h!4mmp
zaD$(1?S8R-D#&bURNV#^R;FfpmS#p~#)jt81L_&K2(a;QX5jzA{~YM_v-}76H*Z#K
WSi%o;CmRnl8zanY*6C;a8I1wZ++tk-

delta 439
zcmZozz}B#UZGyC*4+8^(BoM=Z*hC#;Rv!jE>yH~#=Hv_U@<%eT@JloB-{RlG-^VY_
zFTGh&fs>!fhIM*SJ);c^P@CywMFB%56_)7}>KRoTnWt|9QB2eC04YKKFF@S~82Fz9
z^`GTGz<*$~pu;-;$p`e=j7+ygGzl=W@-VY8ii&_a3@mVtlK=xVj1zuHfPo2U56|Ww
z{hSx%xn48yuyr%=P2~&XdCs$hTZH`&=Q+-W97P<CY~AdaH!BKcvu*EAV=QE3a~5I~
z4>z2=kXu4M-ZwR`G(JBkCEm!u$jHFN$SmFvQ;c)FV+P|ICME_=pr2Gjnt27;#SIM^
zTU|>MlX6lq)nkfqI0v~phPWz(I6C>bDkxzpn7B`Ua}8@D%d`SU79JM<09eQd0K?UR
ee|kVY;})RsSqA<ukU#?l*j{jeO~2gFs0#oyB6Xqw

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<bool> UpdateIgnoreNullAsync(T entity);
         public  Task<List<S>> UseSqlAsync<S>(string sql);
         public  Task<bool> UseSqlAsync(string sql);
-
+        ISugarQueryable<T> 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<T> QueryConditionHandler(QueryCondition pars)
+        public ISugarQueryable<T> 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 @@
         </ccCombobox> -->
         <app-btn
           @click="
-            parentId = item.id;
+            editedItem.parentId = item.id;
             dialog = true;
           "
           >添加子菜单</app-btn
@@ -88,7 +88,6 @@
   </div>
 </template>
 <script>
-import mouldApi from "../api/mouldApi";
 import menuApi from "../api/menuApi";
 export default {
   name: "ccTreeview",
@@ -102,12 +101,12 @@ export default {
     dialog: false,
     editedItem: {},
     editedIndex: -1,
-    parentId: 0,
     defaultItem: {
-      icon: "mdi-start",
-      router: "test",
-      menu_name: "测试",
-      is_show: 1,
+      // icon: "mdi-start",
+      permissionCode: "test",
+      menuName: "管理",
+      parentId: 0,
+      MenuType:0
     },
   }),
   computed: {
@@ -137,7 +136,7 @@ export default {
       this.mouldSelect = data;
     },
     async deleteItem(item) {
-      this.editedIndex = this.desserts.indexOf(item);
+      this.editedIndex = 1;
       this.editedItem = Object.assign({}, item);
       var p = await this.$dialog.warning({
         text: "你确定要删除此条记录吗？?",
@@ -160,7 +159,7 @@ export default {
           Ids.push(item.id);
         });
       }
-      menuApi.DelListMenu(Ids).then(() => this.init());
+      menuApi.DeleteList(Ids).then(() => this.init());
     },
 
     close() {
@@ -172,9 +171,6 @@ export default {
     },
     init() {
       this.parentId = 0;
-      // mouldApi.getMould().then((resp) => {
-      //   this.mouldList = resp.data;
-      // });
 
       menuApi.getMenuTree().then((resp) => {
         this.desserts = resp.data;
@@ -192,17 +188,11 @@ export default {
 
     save() {
       if (this.editedIndex > -1) {
-        menuApi.UpdateMenu(this.editedItem).then(() => this.init());
+        menuApi.Update(this.editedItem).then(() => this.init());
       } else {
-        if (this.parentId == 0) {
-          menuApi.AddTopMenu(this.editedItem).then(() => {
+        menuApi.Add(this.editedItem).then(() => {
             this.init();
           });
-        } else {
-          menuApi.addChildrenMenu(this.parentId, this.editedItem).then(() => {
-            this.init();
-          });
-        }
       }
       this.close();
     },