Merge branch 'master' of https://github.com/chuzhixin/vue-admin-beautiful into master

mock/controller/roleManagement.js

@@ -1,4 +1,3 @@
-import { mock } from "mockjs";
 const totalCount = 2;
 const List = [
   {
@@ -17,8 +16,7 @@ export default [
     response(config) {
       const { title = "", pageNo = 1, pageSize = 20 } = config.body;
       let mockList = List.filter((item) => {
-        if (title && item.title.indexOf(title) < 0) return false;
-        return true;
+        return !(title && item.title.indexOf(title) < 0);
       });
       const pageList = mockList.filter(
         (item, index) =>
@@ -35,7 +33,7 @@ export default [
   {
     url: "/roleManagement/doEdit",
     type: "post",
-    response(config) {
+    response() {
       return {
         code: 200,
         msg: "模拟保存成功",
@@ -45,7 +43,7 @@ export default [
   {
     url: "/roleManagement/doDelete",
     type: "post",
-    response(config) {
+    response() {
       return {
         code: 200,
         msg: "模拟删除成功",

mock/controller/table.js

@@ -1,5 +1,6 @@
 import { mock } from "mockjs";
 import { handleRandomImage } from "../utils";
+
 const List = [];
 const count = 999;
 for (let i = 0; i < count; i++) {
@@ -50,8 +51,7 @@ export default [
       }
       const { title = "", pageNo = 1, pageSize = 20 } = config.body;
       let mockList = List.filter((item) => {
-        if (title && item.title.indexOf(title) < 0) return false;
-        return true;
+        return !(title && item.title.indexOf(title) < 0);
       });
       const pageList = mockList.filter(
         (item, index) =>
@@ -68,7 +68,7 @@ export default [
   {
     url: "/table/doEdit",
     type: "post",
-    response(config) {
+    response() {
       return {
         code: 200,
         msg: "模拟保存成功",
@@ -78,7 +78,7 @@ export default [
   {
     url: "/table/doDelete",
     type: "post",
-    response(config) {
+    response() {
       return {
         code: 200,
         msg: "模拟删除成功",

mock/controller/user.js

@@ -1,4 +1,3 @@
-import { handleRandomImage } from "../utils";
 const accessTokens = {
   admin: "admin-accessToken",
   editor: "editor-accessToken",
@@ -9,7 +8,7 @@ export default [
   {
     url: "/publicKey",
     type: "post",
-    response(config) {
+    response() {
       return {
         code: 200,
         msg: "success",
@@ -83,7 +82,6 @@ export default [
       };
     },
   },
-
   {
     url: "/logout",
     type: "post",

src/api/user.js

@@ -29,6 +29,7 @@ export function logout() {
     method: "post",
   });
 }
+
 export function register() {
   return request({
     url: "/register",

src/colorfulIcon/svg/vab.svg

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="Layer_1"
      xmlns="http://www.w3.org/2000/svg"
-xmlns:xlink="http://www.w3.org/1999/xlink"
      width="550px" height="400px"
      xml:space="preserve">
 <g id="PathID_1" transform="matrix(10.7099, 0, 0, 10.7099, 76.4, 396.15)" opacity="1">

src/config/permission.js

@@ -10,9 +10,9 @@ import getPageTitle from "@/utils/pageTitle";
 import {
   authentication,
   loginInterception,
-  routesWhiteList,
   progressBar,
   recordRoute,
+  routesWhiteList,
 } from "./settings";
 
 VabProgress.configure({

src/plugins/support.js

@@ -1,6 +1,7 @@
 import { MessageBox } from "element-ui";
 import { donation } from "@/config/settings";
-import { repository, dependencies } from "../../package.json";
+import { dependencies, repository } from "../../package.json";
+
 if (!!window.ActiveXObject || "ActiveXObject" in window) {
   MessageBox({
     title: "温馨提示",

src/plugins/vabKeel.js

@@ -1,5 +1,6 @@
 import { Heading, Img, Keel, Text } from "zx-keel";
 import "zx-keel/dist/zx-keel.css";
+
 const VabKeel = Keel;
 const VabKeelHeading = Heading;
 const VabKeelImg = Img;

src/plugins/vabMarkdownEditor.js

@@ -1,4 +1,5 @@
 import ZxMarkdownEditor from "zx-markdown-editor";
 import "zx-markdown-editor/dist/zx-markdown-editor.css";
+
 const VabMarkdownEditor = ZxMarkdownEditor;
 export default VabMarkdownEditor;

src/plugins/vabVerify.js

@@ -1,3 +1,4 @@
 import VabVerify from "zx-verify";
 import "zx-verify/dist/zx-verify.css";
+
 export default VabVerify;

src/store/modules/user.js

@@ -30,7 +30,7 @@ const mutations = {
     state.accessToken = accessToken;
     setAccessToken(accessToken);
   },
-  setusername(state, username) {
+  setUsername(state, username) {
     state.username = username;
   },
   setAvatar(state, avatar) {
@@ -77,7 +77,7 @@ const actions = {
     let { permissions, username, avatar } = data;
     if (permissions && username && Array.isArray(permissions)) {
       commit("setPermissions", permissions);
-      commit("setusername", username);
+      commit("setUsername", username);
       commit("setAvatar", avatar);
       return permissions;
     } else {

src/views/vab/echarts/index.vue

@@ -608,9 +608,6 @@
             text: "2099年世界GDP（亿元）",
             subtext: "数据来自vue-admin-beautiful杜撰",
           },
-          tooltip: {
-            trigger: "item",
-          },
           dataRange: {
             orient: "horizontal",
             min: 0,

vue.config.js

@@ -39,8 +39,7 @@ const resolve = (dir) => {
 
 const mockServer = () => {
   if (process.env.NODE_ENV === "development") {
-    const mockServer = require("./mock/mockServer.js");
-    return mockServer;
+    return require("./mock/mockServer.js");
   } else {
     return "";
   }