update rbac

wangbing11 · wangbing11 · commit 1cba9a657775 · 2020-03-09T15:34:05.000+08:00
diff --git a/docs/mock-data/api/rbac/permission-add.json b/docs/mock-data/api/rbac/permission-add.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/docs/mock-data/api/rbac/permission-delete.json b/docs/mock-data/api/rbac/permission-delete.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/docs/mock-data/api/rbac/permission-update.json b/docs/mock-data/api/rbac/permission-update.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/docs/mock-data/api/rbac/role-add.json b/docs/mock-data/api/rbac/role-add.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/docs/mock-data/api/rbac/role-delete.json b/docs/mock-data/api/rbac/role-delete.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/docs/mock-data/api/rbac/role-edit.json b/docs/mock-data/api/rbac/role-edit.json
@@ -0,0 +1,4 @@
+{
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/permission-add.js b/src/page/rbac/mock/rbac/permission-add.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/permission-delete.js b/src/page/rbac/mock/rbac/permission-delete.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/permission-update.js b/src/page/rbac/mock/rbac/permission-update.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/role-add.js b/src/page/rbac/mock/rbac/role-add.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/role-delete.js b/src/page/rbac/mock/rbac/role-delete.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/role-edit.js b/src/page/rbac/mock/rbac/role-edit.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/mock/rbac/user-role-update.js b/src/page/rbac/mock/rbac/user-role-update.js
@@ -0,0 +1,4 @@
+module.exports = {
+  "errno": 0,
+  "msg": "ok"
+}
diff --git a/src/page/rbac/service.js b/src/page/rbac/service.js
@@ -64,6 +64,30 @@ const getRoleList = (params = {}) => {
   };
 };
 
+const roleEdit = (params = {}) => {
+  return {
+    url: "/api/rbac/role-edit",
+    method: "get",
+    params
+  };
+};
+
+const roleAdd = (params = {}) => {
+  return {
+    url: "/api/rbac/role-add",
+    method: "get",
+    params
+  };
+};
+
+const roleDel = (params = {}) => {
+  return {
+    url: "/api/rbac/role-add",
+    method: "get",
+    params
+  };
+};
+
 // Permission
 const getPermissionPageConfig = (params = {}) => {
   return {
@@ -149,6 +173,9 @@ export default {
   userDel,
   getRolePageConfig,
   getRoleList,
+  roleEdit,
+  roleAdd,
+  roleDel,
   getPermissionPageConfig,
   getPermissionList,
   getUserRolePermission,
diff --git a/src/page/rbac/views/role.vue b/src/page/rbac/views/role.vue
@@ -164,8 +164,9 @@ export default {
         .then(res => {
           const { data, errno } = res;
           if (+errno === 0) {
+            const permissions = data.permissions;
             this.editModel = row;
-            this.$set(this.editModel, "permissions", data.map(item => item.id));
+            this.$set(this.editModel, "permissions", permissions.map(item => item.id));
             this.editModel.index = index;
             this.editPermissionDialogOpeon = true;
           }
diff --git a/src/page/rbac/views/user.vue b/src/page/rbac/views/user.vue
@@ -254,6 +254,8 @@ export default {
             .then(res => {
               if (+res.errno === 0) {
                 this.$Message.info("Update Success!");
+                this.editRoleDialogOpeon = false;
+
               } else {
                 this.$Message.error("Update Failed!");
               }
diff --git a/webpack.mock.js b/webpack.mock.js
@@ -3,30 +3,28 @@ import path from "path";
 import glob from "glob";
 
 export default webpackMockServer.add((app, helper) => {
-  function getMockApiPath() {
-    let mockPaths = glob.sync("**/mock/**/*.js", {
-      cwd: path.resolve(__dirname, "./src")
-    });
-    let mockApiPath = {};
-    mockPaths.forEach(mockPath => {
-      const fileIndex = /mock(.+)\.js/.exec(mockPath)[1];
-      const filepath = path.resolve(
-        path.resolve(__dirname, "./src"),
-        mockPath
-      );
-      mockApiPath[fileIndex] = filepath;
-    });
-    return mockApiPath;
-  }
-
-  const mockApiPath = getMockApiPath();
-
   app.all('/api/*', function(req, res) {
+    function getMockApiPath() {
+      let mockPaths = glob.sync("**/mock/**/*.js", {
+        cwd: path.resolve(__dirname, "./src")
+      });
+      let mockApiPath = {};
+      mockPaths.forEach(mockPath => {
+        const fileIndex = /mock(.+)\.js/.exec(mockPath)[1];
+        const filepath = path.resolve(
+          path.resolve(__dirname, "./src"),
+          mockPath
+        );
+        mockApiPath[fileIndex] = filepath;
+      });
+      return mockApiPath;
+    }
+
+    const mockApiPath = getMockApiPath();
     // console.log(req);
     const url = req.url
     Object.keys(mockApiPath).forEach(item => {
       const strPath = mockApiPath[item];
-      console.log(url, item, strPath);
       if (url.indexOf(item) > 0) {
         // removing NodeJs require-cache
         delete require.cache[require.resolve(strPath)];

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "errno": 0,
 +  "msg": "ok"
 +}