From b2e8441194668806dab2608df594aa3ace116691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sat, 16 Oct 2021 14:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AccountController.cs          |  12 +-
 .../SwaggerDoc.xml                            |   7 +
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 65536 -> 65536 bytes
 .../Yi.Framework.Service/RoleService.cs       |   4 +-
 Yi.Vue/src/api/MenuApi.js                     |  35 +++
 Yi.Vue/src/api/mouldApi.js                    |  10 +
 Yi.Vue/src/api/roleApi.js                     |   7 +
 Yi.Vue/src/components/ccTreeview.vue          | 212 +++++++++++++++---
 Yi.Vue/src/views/AdmMenu.vue                  |  19 +-
 Yi.Vue/src/views/AdmRoleMenu.vue              |  20 +-
 10 files changed, 275 insertions(+), 51 deletions(-)
 create mode 100644 Yi.Vue/src/api/mouldApi.js

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
index 06c7d7cf..24a4c2f8 100644
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/AccountController.cs
@@ -35,12 +35,12 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         [HttpPost]
         public async Task<Result> Login(user _user)
         {
-            if (await _userService.Login(_user))
-            {
-                _user.roles = await _userService.GetRolesByUser(_user);
-                var toke = MakeJwt.app(_user);
-                return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
-            }
+            //if (await _userService.Login(_user))
+            //{
+            //    _user.roles = await _userService.GetRolesByUser(_user);
+            //    var toke = MakeJwt.app(_user);
+            //    return Result.Success().SetData(new { user = new { _user.id, _user.username, _user.introduction, _user.icon, _user.nick }, toke });
+            //}
             return Result.Error();
         }
 
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml b/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
index eee596b1..b83daa02 100644
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
@@ -66,6 +66,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.MenuController.AddChildrenMenu(Yi.Framework.DTOModel.ChildrenDto{Yi.Framework.Model.Models.menu})">
+            <summary>
+            给一个菜单添加子节点（注意：添加，不是覆盖）
+            </summary>
+            <param name="childrenDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:Yi.Framework.ApiMicroservice.Controllers.MouldController.UpdateMould(Yi.Framework.Model.Models.mould)">
             <summary>
             更
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index b2c233d87e56f739f19854503b45862550172f91..4d20b1b8772eae74cd5d07c76345c6698d7887c5 100644
GIT binary patch
delta 994
zcmZ{jOK1~O6o&7exk+=A%=}4)E^4g}NfpylwDAEhT)7g2xRtI%MM~8|l9f=BjkO}R
zrLjUlkwj`Ez8h)<UFbp)yC{O<`$b7Ir4&&V7rOA?nY0b98HOLu%zw`J&zYHYnx)h1
z&X*W9GGAjGsAF<J^XU$B6PS2{9Qx5+^!xTA6m)oqVYD<6LW!#@x=ozN5BGE)>pRq2
zzLqWB90_Fl`%bqTT0zkl@d5XdKn#1Z6A`Qj^k>NGm-M*4Pv4{y?VVN-V^3<St%jSl
zHtr_WMTnf2NFIzQlSdLsb7IsyGieTAEDep71_$O(4OMRCDkB4WTR?Vf{7;AFU2^&B
zxXS0oOT$-|Tq$22n~k?^S{v%PD(4I3!Re|iqDxm7Cu<(X3RVk_XqJ_b)M~Fiv6de8
z*l@yEZKxI=q;AsGDqarfG?9$=oH#0XxJ62N>a2NtO!2tgL>^R(ae8>Q*lty>m0OCZ
zp{8&<?Sczi$RQBnW`W2YNQEiS^rzN!5Ypn6@tW2?_59Tf^SP;zy4;mZg*!NRt;CC3
z`J#5fs3yWOm;`_D3*TTC{lPcb>|iRTOl7Ldsmc_Ua&bZBR(^((bT8s3O2YjL%?*rN
zZYSfEs;ZMwPMN|O=RBVdj*hT)16hK<_>CW;&%{$a#zRbF4j=IvFEE3<xQ=mLMpk^E
zy@)ylUN<ZaSn8Lm`78xf3Du=&QoK?;nVH#L0+X-B%;6K>;w5JB9FK5MKyF|HdGUum
z5SS!7Wv3w}AjL1mCq)qWGJ#hK#o5n0d|rkH8}S_rMSuD|8f7MxSt=IBsUnuf{{ifW
B7JL8z

delta 315
zcmZo@U}<Pz+3>)hk!$ipe>p~$O#v(dJS_aR4E!(nkMb|%uiY#tkjp>0Hoskhi=Ur?
z|33e2{^|V1{QmsT{AT=`{4)IfKoy_)ytuiz7(jrLgMopKn-iJCf#5K4vm<f1*dQEE
zpdKYwE(S?uX$A(4$&vNSj2x3|>!rAqnBjtl>XmIcI5~<-iZb)kOHzwVjP$|ev#s4P
z)=xE(X9TL0mjr4@Rs&W7QL$)&!lnf*3P4|+X5jzB|DFF6|68CRAM@Ykzs`S=|1{7S
m>-i_2K5q$BaUNC0J^q{gSNP8ZRcz+peEz<vz-E>OfA|4VDpdLa

diff --git a/Yi.Framework/Yi.Framework.Service/RoleService.cs b/Yi.Framework/Yi.Framework.Service/RoleService.cs
index d0450289..e8dc9390 100644
--- a/Yi.Framework/Yi.Framework.Service/RoleService.cs
+++ b/Yi.Framework/Yi.Framework.Service/RoleService.cs
@@ -47,9 +47,9 @@ namespace Yi.Framework.Service
             {
                 return false;
             }
-            var menuList = _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
+            var menuList = await _Db.Set<menu>().Where(u => menuIds.Contains(u.id)&&u.is_delete == (short)Common.Enum.DelFlagEnum.Normal).ToListAsync();
             
-             role_data.menus = (ICollection<menu>)menuList;
+             role_data.menus =menuList;
             return await AddAsync(role_data);
         }
     }
diff --git a/Yi.Vue/src/api/MenuApi.js b/Yi.Vue/src/api/MenuApi.js
index ad489f0d..ad21a96b 100644
--- a/Yi.Vue/src/api/MenuApi.js
+++ b/Yi.Vue/src/api/MenuApi.js
@@ -6,4 +6,39 @@ export default {
             method: 'get'
         })
     },
+    addChildrenMenu(id, data) {
+        return myaxios({
+            url: '/Menu/addChildrenMenu',
+            method: 'post',
+            data: { parentId: id, data }
+        })
+    },
+    UpdateMenu(data) {
+        return myaxios({
+            url: '/Menu/UpdateMenu',
+            method: 'put',
+            data: data
+        })
+    },
+    DelListMenu(ids) {
+        return myaxios({
+            url: '/Menu/DelListMenu',
+            method: 'delete',
+            data: ids
+        })
+    },
+    addMenu(data) {
+        return myaxios({
+            url: '/Menu/addMenu',
+            method: 'post',
+            data: data
+        })
+    },
+    SetMouldByMenu(menuId, mouldId) {
+        return myaxios({
+            url: '/Menu/SetMouldByMenu',
+            method: 'post',
+            data: { id1: menuId, id2: mouldId }
+        })
+    }
 }
\ No newline at end of file
diff --git a/Yi.Vue/src/api/mouldApi.js b/Yi.Vue/src/api/mouldApi.js
new file mode 100644
index 00000000..eefdde37
--- /dev/null
+++ b/Yi.Vue/src/api/mouldApi.js
@@ -0,0 +1,10 @@
+import myaxios from '@/util/myaxios'
+export default {
+    getMould() {
+        return myaxios({
+            url: '/Mould/GetMould',
+            method: 'get'
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/Yi.Vue/src/api/roleApi.js b/Yi.Vue/src/api/roleApi.js
index 9969b632..599f9fb2 100644
--- a/Yi.Vue/src/api/roleApi.js
+++ b/Yi.Vue/src/api/roleApi.js
@@ -5,5 +5,12 @@ export default {
             url: '/Role/getRole',
             method: 'get'
         })
+    },
+    setMenuByRole(roleList, menuList) {
+        return myaxios({
+            url: '/Role/setMenuByRole',
+            method: 'post',
+            data: { ids1: roleList, ids2: menuList }
+        })
     }
 }
\ No newline at end of file
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 1cfe2189..956ecd08 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -1,37 +1,195 @@
 <template>
-  <v-treeview
-    selectable
-    :items="items"
-    :selection-type="selectionType"
-    v-model="selection"
-    return-object
-    open-all
-    hoverable
-    item-text="menu_name"
-  >
-    <template v-slot:append="{ item }">
-      <v-btn>编号:{{ item.id }}</v-btn>
-      <v-btn>图标:{{ item.icon }}</v-btn>
-      <v-btn>路由:{{ item.router }}</v-btn>
-      <v-btn>设置接口权限</v-btn>
-      <v-btn>编辑</v-btn>
-      <v-btn>删除</v-btn>
-      <v-btn>添加子菜单</v-btn>
-    </template>
-  </v-treeview>
+  <div>
+    <app-btn dark class="mb-2 mx-2" @click="dialog = true"> 添加新项 </app-btn>
+    <app-btn dark class="mb-2 mx-2" @click="deleteItem(null)">
+      删除所选
+    </app-btn>
+    <v-dialog v-model="dialog" max-width="500px">
+      <v-card>
+        <v-card-title>
+          <span class="headline">{{ formTitle }}</span>
+        </v-card-title>
+
+        <v-card-text>
+          <v-container>
+            <v-row>
+              <v-col
+                cols="12"
+                sm="6"
+                md="4"
+                v-for="(value, key, index) in editedItem"
+                :key="index"
+              >
+                <v-text-field
+                  v-model="editedItem[key]"
+                  :label="key"
+                ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-container>
+        </v-card-text>
+
+        <v-card-actions>
+          <v-spacer></v-spacer>
+          <v-btn color="blue darken-1" text @click="close"> 取消 </v-btn>
+          <v-btn color="blue darken-1" text @click="save"> 保存 </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <v-treeview
+      selectable
+      :items="desserts"
+      :selection-type="selectionType"
+      v-model="selection"
+      return-object
+      open-all
+      hoverable
+      item-text="menu_name"
+    >
+      <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.router }}</v-btn>
+        <ccCombobox
+          headers="设置接口权限"
+          itemText="mould_name"
+          :items="mouldList"
+          @select="getSelect"
+        >
+          <template v-slot:save>
+            <v-btn @click="setMould(item)" color="blue darken-1" text>
+              保存</v-btn
+            >
+          </template>
+        </ccCombobox>
+        <app-btn class="mx-2" @click="editItem(item)">编辑</app-btn>
+        <app-btn class="mr-2" @click="deleteItem(item)">删除</app-btn>
+        <app-btn
+          @click="
+            parentId = item.id;
+            dialog = true;
+          "
+          >添加子菜单</app-btn
+        >
+      </template>
+    </v-treeview>
+  </div>
 </template>
 <script>
+import mouldApi from "../api/mouldApi";
+import menuApi from "../api/menuApi";
 export default {
   name: "ccTreeview",
-  props: {
-    items: {
-      type: Array,
-    },
-  },
+
   data: () => ({
+    mouldSelect: [],
+    mouldList: [],
+    desserts: [],
     selectionType: "leaf",
     selection: [],
+    dialog: false,
+    editedItem: {},
+    editedIndex: -1,
+    parentId: 0,
+    defaultItem: {
+      icon: "mdi-start",
+      router: "test",
+      menu_name: "测试",
+    },
   }),
+  computed: {
+    formTitle() {
+      return this.editedIndex === -1 ? "添加数据" : "编辑数据";
+    },
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    setMould(item) {
+      menuApi.SetMouldByMenu(item.id, this.mouldSelect[0].id).then((resp) => {
+        this.$dialog.notify.info(resp.msg, {
+          position: "top-right",
+          timeout: 5000,
+        });
+      });
+    },
+
+    getSelect(data) {
+      this.mouldSelect = data;
+    },
+    async deleteItem(item) {
+      this.editedIndex = this.desserts.indexOf(item);
+      this.editedItem = Object.assign({}, item);
+      var p = await this.$dialog.warning({
+        text: "你确定要删除此条记录吗？?",
+        title: "警告",
+        actions: {
+          false: "取消",
+          true: "确定",
+        },
+      });
+      if (p) {
+        this.deleteItemConfirm();
+      }
+    },
+    deleteItemConfirm() {
+      var Ids = [];
+      if (this.editedIndex > -1) {
+        Ids.push(this.editedItem.id);
+      } else {
+        this.selection.forEach(function (item) {
+          Ids.push(item.id);
+        });
+      }
+      menuApi.DelListMenu(Ids).then(() => this.init());
+    },
+
+    close() {
+      this.dialog = false;
+      this.$nextTick(() => {
+        this.editedItem = Object.assign({}, this.defaultItem);
+        this.editedIndex = -1;
+      });
+    },
+    init() {
+      this.parentId = 0;
+      mouldApi.getMould().then((resp) => {
+        this.mouldList = resp.data;
+      });
+
+      menuApi.getMenu().then((resp) => {
+        this.desserts = resp.data;
+      });
+      this.$nextTick(() => {
+        this.editedItem = Object.assign({}, this.defaultItem);
+        this.editedIndex = -1;
+      });
+    },
+    editItem(item) {
+      this.editedIndex = this.desserts.indexOf(item);
+      this.editedItem = Object.assign({}, item);
+      this.dialog = true;
+    },
+
+    save() {
+      if (this.editedIndex > -1) {
+        menuApi.UpdateMenu(this.editedItem).then(() => this.init());
+      } else {
+        if (this.parentId == 0) {
+          menuApi.addMenu(this.editedItem).then(() => {
+            this.init();
+          });
+        } else {
+          menuApi.addChildrenMenu(this.parentId, this.editedItem).then(() => {
+            this.init();
+          });
+        }
+      }
+      this.close();
+    },
+  },
   watch: {
     selection: {
       //深度监听，可监听到对象、数组的变化
@@ -40,7 +198,9 @@ export default {
       },
       deep: true,
     },
+    dialog(val) {
+      val || this.close();
+    },
   },
-  methods: {},
 };
 </script>
\ No newline at end of file
diff --git a/Yi.Vue/src/views/AdmMenu.vue b/Yi.Vue/src/views/AdmMenu.vue
index 64241949..4c24ee8d 100644
--- a/Yi.Vue/src/views/AdmMenu.vue
+++ b/Yi.Vue/src/views/AdmMenu.vue
@@ -1,29 +1,18 @@
 <template>
   <v-card class="mx-auto" width="100%">
-    <v-btn color="primary" dark class="mb-2 mx-2" @click="dialog = true">
-      添加新项
-    </v-btn>
-    <v-btn color="primary" dark class="mb-2 mx-2" @click="dialog = true">
-      删除所选
-    </v-btn>
-    <ccTreeview :items="Menuitems"></ccTreeview>
+    <ccTreeview></ccTreeview>
   </v-card>
 </template>
 <script>
-import menuApi from "../api/MenuApi";
 export default {
   created() {
-    this.init();
+
   },
   data: () => ({
-    Menuitems: [],
+    
   }),
   methods: {
-    init() {
-      menuApi.getMenu().then((resp) => {
-        this.Menuitems = resp.data;
-      });
-    },
+
   },
 };
 </script>
\ No newline at end of file
diff --git a/Yi.Vue/src/views/AdmRoleMenu.vue b/Yi.Vue/src/views/AdmRoleMenu.vue
index 8e16bb2f..0f44ba33 100644
--- a/Yi.Vue/src/views/AdmRoleMenu.vue
+++ b/Yi.Vue/src/views/AdmRoleMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <v-row>
     <v-col cols="12">
- <v-card class="mx-auto" width="100%"><v-btn color="primary">确定分配</v-btn></v-card>
+ <v-card class="mx-auto" width="100%"><app-btn  @click="setMenu">确定分配</app-btn></v-card>
     </v-col>
     <v-col cols="12" md="4" lg="4">
       <v-card class="mx-auto" width="100%">
@@ -41,12 +41,28 @@
 </template>
 <script>
 import roleApi from "../api/roleApi";
-import menuApi from "../api/MenuApi";
+import menuApi from "../api/menuApi";
 export default {
   created() {
  this.init();
   },
   methods: {
+    setMenu(){
+     var roleIds=[];
+     var menuIds=[];
+     this.selectionRole.forEach((ele)=>{
+       roleIds.push(ele.id)
+     })
+     this.selectionMenu.forEach((ele)=>{
+       menuIds.push(ele.id)
+     })
+      roleApi.setMenuByRole(roleIds,menuIds).then(resp=>{
+                this.$dialog.notify.info(resp.msg, {
+          position: "top-right",
+          timeout: 5000,
+        });
+      })
+    },
     init() {
       roleApi.getRole().then((resp) => {
         this.RoleItems = resp.data;