From ab2ce14f6c2377e56773bae6fbfa573067247849 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 1 Jan 2020 09:14:30 +0800
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=81=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=87=92=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/menu.js            | 10 ++++++++++
 src/views/authority/apiscope.vue  | 19 +++++++++++++++----
 src/views/authority/datascope.vue | 19 +++++++++++++++----
 src/views/system/dept.vue         |  2 +-
 src/views/system/menu.vue         |  2 +-
 5 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index d94a51b..b7883c4 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -23,6 +23,16 @@ export const getLazyList = (parentId, params) => {
   })
 }
 
+export const getLazyMenuList = (parentId, params) => {
+  return request({
+    url: '/api/blade-system/menu/lazy-menu-list',
+    method: 'get',
+    params: {
+      ...params,
+      parentId
+    }
+  })
+}
 
 export const getMenuList = (current, size, params) => {
   return request({
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index 3226e90..2ff3f80 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -16,7 +16,8 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
-               @on-load="onLoad">
+               @on-load="onLoad"
+               @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
         <el-button type="text"
                    icon="el-icon-setting"
@@ -29,7 +30,7 @@
       </template>
       <template slot-scope="{row}" slot="source">
         <div style="text-align:center">
-          <i :class="row.source"></i>
+          <i :class="row.source"/>
         </div>
       </template>
     </avue-crud>
@@ -75,7 +76,7 @@
     add,
     remove,
     update,
-    getMenuList,
+    getLazyMenuList,
     getMenu
   } from "@/api/system/menu";
   import {
@@ -95,6 +96,7 @@
         selectionList: [],
         query: {},
         loading: true,
+        parentId: 0,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -107,6 +109,7 @@
         scopeMenuName: "菜单",
         menu: true,
         option: {
+          lazy: true,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -440,10 +443,12 @@
       },
       searchReset() {
         this.query = {};
+        this.parentId = 0;
         this.onLoad(this.page);
       },
       searchChange(params, done) {
         this.query = params;
+        this.parentId = '';
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
@@ -496,12 +501,18 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getMenuList(page.currentPage, page.pageSize, params).then(res => {
+        getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
           this.data = res.data.data;
           this.loading = false;
           this.selectionClear();
         });
       },
+      treeLoad(tree, treeNode, resolve) {
+        const parentId = tree.id;
+        getLazyMenuList(parentId).then(res => {
+          resolve(res.data.data);
+        });
+      },
       // 数据权限模块
       handleDataScope(row) {
         this.drawerVisible = true;
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index de1b71b..d685fe0 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -16,7 +16,8 @@
                @current-change="currentChange"
                @size-change="sizeChange"
                @refresh-change="refreshChange"
-               @on-load="onLoad">
+               @on-load="onLoad"
+               @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
         <el-button type="text"
                    icon="el-icon-setting"
@@ -29,7 +30,7 @@
       </template>
       <template slot-scope="{row}" slot="source">
         <div style="text-align:center">
-          <i :class="row.source"></i>
+          <i :class="row.source"/>
         </div>
       </template>
     </avue-crud>
@@ -75,7 +76,7 @@
     add,
     remove,
     update,
-    getMenuList,
+    getLazyMenuList,
     getMenu
   } from "@/api/system/menu";
   import {
@@ -96,6 +97,7 @@
         selectionList: [],
         query: {},
         loading: true,
+        parentId: 0,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -110,6 +112,7 @@
         menu: true,
         watchMode: true,
         option: {
+          lazy: true,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -517,10 +520,12 @@
       },
       searchReset() {
         this.query = {};
+        this.parentId = 0;
         this.onLoad(this.page);
       },
       searchChange(params, done) {
         this.query = params;
+        this.parentId = '';
         this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
@@ -573,12 +578,18 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getMenuList(page.currentPage, page.pageSize, params).then(res => {
+        getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
           this.data = res.data.data;
           this.loading = false;
           this.selectionClear();
         });
       },
+      treeLoad(tree, treeNode, resolve) {
+        const parentId = tree.id;
+        getLazyMenuList(parentId).then(res => {
+          resolve(res.data.data);
+        });
+      },
       // 数据权限模块
       handleDataScope(row) {
         this.drawerVisible = true;
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index f3fcb26..93a27ba 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -294,8 +294,8 @@
       },
       searchChange(params, done) {
         this.query = params;
-        this.page.currentPage = 1;
         this.parentId = '';
+        this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
       },
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index c7d5eb8..fd105d1 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -263,8 +263,8 @@
       },
       searchChange(params, done) {
         this.query = params;
-        this.page.currentPage = 1;
         this.parentId = '';
+        this.page.currentPage = 1;
         this.onLoad(this.page, params);
         done();
       },