diff --git a/mock/controller/roleManagement.js b/mock/controller/roleManagement.js index fb689a9..5e0137b 100644 --- a/mock/controller/roleManagement.js +++ b/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: "模拟删除成功", diff --git a/mock/controller/table.js b/mock/controller/table.js index 9c7f5c6..cb30f5b 100644 --- a/mock/controller/table.js +++ b/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: "模拟删除成功", diff --git a/mock/controller/user.js b/mock/controller/user.js index 43c0780..2a21354 100644 --- a/mock/controller/user.js +++ b/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", diff --git a/package.json b/package.json index a085af6..2763346 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "clipboard": "^2.0.6", "codemirror": "^5.56.0", "core-js": "^3.6.5", - "dayjs": "^1.8.31", + "dayjs": "^1.8.32", "echarts": "^4.8.0", "echarts-wordcloud": "^1.1.3", "element-ui": "^2.13.2", @@ -65,7 +65,7 @@ "vue-amap": "^0.5.10", "vue-echarts": "^5.0.0-beta.0", "vue-qart": "^2.2.0", - "vue-router": "^3.3.4", + "vue-router": "^3.4.1", "vuedraggable": "^2.24.0", "vuex": "^3.5.1", "zx-comparison": "^1.0.3", diff --git a/src/api/user.js b/src/api/user.js index 513198d..95a2416 100644 --- 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", diff --git a/src/colorfulIcon/svg/vab.svg b/src/colorfulIcon/svg/vab.svg index f8521cc..5c46271 100644 --- a/src/colorfulIcon/svg/vab.svg +++ b/src/colorfulIcon/svg/vab.svg @@ -1,9 +1,8 @@ + xmlns="http://www.w3.org/2000/svg" + width="550px" height="400px" + xml:space="preserve"> diff --git a/src/config/permission.js b/src/config/permission.js index 530fb64..2335558 100644 --- 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({ diff --git a/src/plugins/support.js b/src/plugins/support.js index 5d1ad20..82e5943 100644 --- a/src/plugins/support.js +++ b/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: "温馨提示", diff --git a/src/plugins/vabKeel.js b/src/plugins/vabKeel.js index 48fcf85..a9a9015 100644 --- a/src/plugins/vabKeel.js +++ b/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; diff --git a/src/plugins/vabMarkdownEditor.js b/src/plugins/vabMarkdownEditor.js index c506274..bfa51a8 100644 --- a/src/plugins/vabMarkdownEditor.js +++ b/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; diff --git a/src/plugins/vabVerify.js b/src/plugins/vabVerify.js index c01fbe2..88fb9fd 100644 --- a/src/plugins/vabVerify.js +++ b/src/plugins/vabVerify.js @@ -1,3 +1,4 @@ import VabVerify from "zx-verify"; import "zx-verify/dist/zx-verify.css"; + export default VabVerify; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2437cbb..e1064c4 100644 --- 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 { diff --git a/src/views/vab/echarts/index.vue b/src/views/vab/echarts/index.vue index 217378d..9c03214 100644 --- 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, diff --git a/vue.config.js b/vue.config.js index d4e2b7c..d67f6b0 100644 --- 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 mockServer; + return require("./mock/mockServer.js"); } else { return ""; }