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

6020d11f · chuzhixin · ab97312f · 1696caa3 · 6020d11f · 6020d11f
Commit 6020d11f authored Aug 06, 2020 by chuzhixin
13 changed files
--- a/mock/controller/roleManagement.js
+++ b/mock/controller/roleManagement.js
-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 !(title && item.title.indexOf(title) < 0);
-        return true;
      });
      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: "模拟删除成功",

--- a/mock/controller/table.js
+++ b/mock/controller/table.js
 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 !(title && item.title.indexOf(title) < 0);
-        return true;
      });
      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: "模拟删除成功",

--- a/mock/controller/user.js
+++ b/mock/controller/user.js
-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",

--- a/src/api/user.js
+++ b/src/api/user.js
@@ -29,6 +29,7 @@ export function logout() {
    method: "post",
  });
 }
 export function register() {
  return request({
    url: "/register",

--- a/src/colorfulIcon/svg/vab.svg
+++ b/src/colorfulIcon/svg/vab.svg
 <?xml version="1.0" encoding="utf-8"?>
 <svg version="1.1" id="Layer_1"
-xmlns="http://www.w3.org/2000/svg"
+     xmlns="http://www.w3.org/2000/svg"
-xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="550px" height="400px"
-width="550px" height="400px"
+     xml:space="preserve">
-xml:space="preserve">
 <g id="PathID_1" transform="matrix(10.7099, 0, 0, 10.7099, 76.4, 396.15)" opacity="1">
 <path style="fill: #41b882; fill-opacity: 1;" d="M3.75 -36.65L18.4 -36.65Q22.75 -36.65 24.85 -36.25Q27 -35.9 28.7 -34.75Q30.4 -33.6 31.5 -31.7Q32.65 -29.8 32.65 -27.4Q32.65 -24.85 31.25 -22.7Q29.85 -20.55 27.5 -19.5Q30.85 -18.5 32.65 -16.15Q34.45 -13.8 34.45 -10.6Q34.45 -8.1 33.25 -5.75Q32.1 -3.4 30.1 -1.95Q28.1 -0.55 25.15 -0.25Q23.3 -0.05 16.2 0L3.75 0L3.75 -36.65M11.15 -30.55L11.15 -22.1L16 -22.1Q20.3 -22.1 21.35 -22.2Q23.25 -22.4 24.35 -23.5Q25.45 -24.6 25.45 -26.35Q25.45 -28.05 24.5 -29.1Q23.55 -30.2 21.7 -30.4Q20.6 -30.55 15.4 -30.55L11.15 -30.55M11.15 -16L11.15 -6.2L18 -6.2Q22 -6.2 23.05 -6.4Q24.7 -6.7 25.75 -7.85Q26.8 -9.05 26.8 -11Q26.8 -12.65 26 -13.8Q25.2 -14.95 23.65 -15.45Q22.15 -16 17.1 -16L11.15 -16" />
 </g>

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

--- a/src/plugins/support.js
+++ b/src/plugins/support.js
 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: "温馨提示",

--- a/src/plugins/vabKeel.js
+++ b/src/plugins/vabKeel.js
 import { Heading, Img, Keel, Text } from "zx-keel";
 import "zx-keel/dist/zx-keel.css";
 const VabKeel = Keel;
 const VabKeelHeading = Heading;
 const VabKeelImg = Img;

--- a/src/plugins/vabMarkdownEditor.js
+++ b/src/plugins/vabMarkdownEditor.js
 import ZxMarkdownEditor from "zx-markdown-editor";
 import "zx-markdown-editor/dist/zx-markdown-editor.css";
 const VabMarkdownEditor = ZxMarkdownEditor;
 export default VabMarkdownEditor;
--- a/src/plugins/vabVerify.js
+++ b/src/plugins/vabVerify.js
 import VabVerify from "zx-verify";
 import "zx-verify/dist/zx-verify.css";
 export default VabVerify;
--- a/src/store/modules/user.js
+++ b/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 {

--- a/src/views/vab/echarts/index.vue
+++ b/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,

--- a/vue.config.js
+++ b/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 require("./mock/mockServer.js");
-    return mockServer;
  } else {
    return "";
  }