diff --git a/.eslintrc.js b/.eslintrc.js index 0c30bd7..1c90016 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description .eslintrc.js */ diff --git a/.gitignore b/.gitignore index 6b55d83..6316ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,4 @@ public/video /src/styles/themes/green.scss /src/styles/themes/dark.scss /src/styles/themes/glory.scss - +/.history diff --git a/.stylelintrc.js b/.stylelintrc.js index e4f9127..9be5de0 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description stylelint */ module.exports = { diff --git a/.vscode/settings.json b/.vscode/settings.json index 0c4b368..90106d0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -40,7 +40,7 @@ "editor.suggest.snippetsPreventQuickSuggestions": false, "prettier.htmlWhitespaceSensitivity": "ignore", "prettier.vueIndentScriptAndStyle": true, - "docthis.authorName": "chuzhixin 1204505056@qq.com", + "docthis.authorName": "https://gitee.com/chu1204505056/vue-admin-better", "docthis.includeAuthorTag": true, "docthis.includeDescriptionTag": true, "docthis.enableHungarianNotationEvaluation": true, diff --git a/README.en.md b/README.en.md index 46b7d6e..8048594 100644 --- a/README.en.md +++ b/README.en.md @@ -1,6 +1,6 @@ [简体中文](./README.md) | English -
+

vue-admin-better(element-ui)

The flying snow all over the sky is a flying note, playing out expectations with blessings. May the epidemic dissipate as soon as possible, may you no longer have regrets next year, may you be warm in winter, may you not be cold in spring, and may you have lights in the dark and an umbrella in the rain.

diff --git a/README.md b/README.md index e411581..4d83a5a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ 简体中文 | [English](./README.en.md) -
+

vue-admin-better

diff --git a/babel.config.js b/babel.config.js index 34ff3d0..13ba31c 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description babel.config */ module.exports = { diff --git a/mock/utils/index.js b/mock/utils/index.js index 840cdac..94c52fa 100644 --- a/mock/utils/index.js +++ b/mock/utils/index.js @@ -3,7 +3,7 @@ const { join } = require('path') const fs = require('fs') /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 随机生成图片url。 * @param width * @param height @@ -14,7 +14,7 @@ function handleRandomImage(width = 50, height = 50) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 处理所有 controller 模块,npm run serve时在node环境中自动输出controller文件夹下Mock接口,请勿修改。 * @returns {[]} */ diff --git a/package.json b/package.json index 5506b15..9ecc885 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "author": "vue-admin-beautiful", "participants": [], - "homepage": "https://chu1204505056.gitee.io/vue-admin-beautiful", + "homepage": "https://chu1204505056.gitee.io/vue-admin-better", "publishConfig": { "registry": "https://npm.pkg.github.com/" }, diff --git a/plopfile.js b/plopfile.js index 8121409..76d27c0 100644 --- a/plopfile.js +++ b/plopfile.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 代码生成机 */ const viewGenerator = require('zx-templates/view/prompt') diff --git a/prettier.config.js b/prettier.config.js index cc9ef6e..256e08d 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 代码规范 */ diff --git a/src/config/permission.js b/src/config/permission.js index ce86eb5..92f7e5c 100644 --- a/src/config/permission.js +++ b/src/config/permission.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 路由守卫,目前两种模式:all模式与intelligence模式 */ import router from '@/router' diff --git a/src/layouts/components/VabLogo/index.vue b/src/layouts/components/VabLogo/index.vue index c07c1b2..e4dd023 100644 --- a/src/layouts/components/VabLogo/index.vue +++ b/src/layouts/components/VabLogo/index.vue @@ -42,8 +42,8 @@ @mixin logo { display: inline-block; - width: 28px; - height: 28px; + width: 34px; + height: 34px; margin-right: 3px; color: $base-title-color; vertical-align: middle; @@ -52,7 +52,7 @@ @mixin title { display: inline-block; overflow: hidden; - font-size: 18px; + font-size: 24px; line-height: 55px; color: $base-title-color; text-overflow: ellipsis; diff --git a/src/layouts/export.js b/src/layouts/export.js index 4d522ae..8b04f89 100644 --- a/src/layouts/export.js +++ b/src/layouts/export.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 公共布局及样式自动引入 */ diff --git a/src/main.js b/src/main.js index 6b496d7..2e02be8 100644 --- a/src/main.js +++ b/src/main.js @@ -5,7 +5,7 @@ import router from './router' import './plugins' import '@/layouts/export' /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 生产环境默认都使用mock,如果正式用于生产环境时,记得去掉 */ diff --git a/src/router/index.js b/src/router/index.js index 320ff88..2ec8cf6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description router全局配置,如有必要可分文件抽离,其中asyncRoutes只有在intelligence模式下才会用到,vip文档中已提供路由的基础图标与小清新图标的配置方案,请仔细阅读 */ diff --git a/src/store/index.js b/src/store/index.js index 0b20b4e..4aabc35 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 导入所有 vuex 模块,自动加入namespaced:true,用于解决vuex命名冲突,请勿修改。 */ diff --git a/src/store/modules/errorLog.js b/src/store/modules/errorLog.js index 941c6e5..72b29bb 100644 --- a/src/store/modules/errorLog.js +++ b/src/store/modules/errorLog.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 异常捕获的状态拦截,请勿修改 */ diff --git a/src/store/modules/routes.js b/src/store/modules/routes.js index 73db2fe..38ac391 100644 --- a/src/store/modules/routes.js +++ b/src/store/modules/routes.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 路由拦截状态管理,目前两种模式:all模式与intelligence模式,其中partialRoutes是菜单暂未使用 */ import { asyncRoutes, constantRoutes } from '@/router' diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index fc7cf9d..d18b752 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 所有全局配置的状态管理,如无必要请勿修改 */ diff --git a/src/store/modules/table.js b/src/store/modules/table.js index bf57c09..61c1504 100644 --- a/src/store/modules/table.js +++ b/src/store/modules/table.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 代码生成机状态管理 */ diff --git a/src/store/modules/tabsBar.js b/src/store/modules/tabsBar.js index 254d062..df055e6 100644 --- a/src/store/modules/tabsBar.js +++ b/src/store/modules/tabsBar.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description tabsBar多标签页逻辑,前期借鉴了很多开源项目发现都有个共同的特点很繁琐并不符合框架设计的初衷,后来在github用户hipi的启发下完成了重构,请勿修改 */ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 24d681e..1d68e20 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 登录、获取用户信息、退出登录、清除accessToken逻辑,不建议修改 */ diff --git a/src/styles/loading.scss b/src/styles/loading.scss index f4b398a..5a75034 100644 --- a/src/styles/loading.scss +++ b/src/styles/loading.scss @@ -1,16 +1,16 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 全局加载动画 */ @charset "utf-8"; -@import "./spinner/dots.css"; -@import "./spinner/gauge.css"; -@import "./spinner/inner-circles.css"; -@import "./spinner/plus.css"; +@import './spinner/dots.css'; +@import './spinner/gauge.css'; +@import './spinner/inner-circles.css'; +@import './spinner/plus.css'; -$base-loading: ".vab-loading-type"; +$base-loading: '.vab-loading-type'; /* 自定义loading开始 */ #{$base-loading}1 { @@ -30,7 +30,7 @@ $base-loading: ".vab-loading-type"; width: 8px; height: 8px; margin: auto; - content: ""; + content: ''; border: 3px solid $base-color-blue; border-radius: 50%; animation: vabLoading1 0.5s alternate ease-in infinite; @@ -66,7 +66,7 @@ $base-loading: ".vab-loading-type"; height: 36px; margin-top: -17px; margin-left: -18px; - content: ""; + content: ''; animation: vabLoading2 0.4s linear infinite; } @@ -76,7 +76,7 @@ $base-loading: ".vab-loading-type"; height: 8px; margin-top: -3px; margin-left: -4px; - content: ""; + content: ''; animation: vabLoading2 0.4s linear infinite; } @@ -139,7 +139,7 @@ $base-loading: ".vab-loading-type"; width: 15px; height: 15px; margin: 0; - content: " "; + content: ' '; border: 6px solid $base-color-blue; border-bottom-color: transparent; border-left-color: transparent; @@ -202,7 +202,7 @@ $base-loading: ".vab-loading-type"; position: absolute; width: 20px; height: 20px; - content: ""; + content: ''; background: rgba(0, 0, 0, 0); animation: vabLoading6 0.5s infinite alternate; } @@ -271,7 +271,7 @@ $base-loading: ".vab-loading-type"; left: 9px; width: 10px; height: 10px; - content: ""; + content: ''; background-color: $base-color-white; border-radius: 50%; box-shadow: 30px 0 0 0 $base-color-white; @@ -305,7 +305,7 @@ $base-loading: ".vab-loading-type"; left: 0; width: 4px; height: 4px; - content: ""; + content: ''; background-color: $base-color-blue; animation: vabLoading9_check 1s ease-in-out infinite; } diff --git a/src/styles/transition.scss b/src/styles/transition.scss index 91409e5..7c242db 100644 --- a/src/styles/transition.scss +++ b/src/styles/transition.scss @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description vue过渡动画 */ diff --git a/src/styles/vab.scss b/src/styles/vab.scss index c261841..c1ed12f 100644 --- a/src/styles/vab.scss +++ b/src/styles/vab.scss @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 全局样式 */ @@ -292,4 +292,19 @@ html { /* 下拉树样式-----------结束 */ } + + .side-bar-container { + .el-menu-item, + .el-submenu { + margin: 7px !important; + border-radius: 5px !important; + &:hover { + border-radius: 5px !important; + } + + &.is-active { + background: $base-color-default !important; + } + } + } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index f51cf75..a1c59e1 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,11 +1,11 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 全局主题变量配置 */ /* stylelint-disable */ @charset "utf-8"; //框架默认主题色 -$base-color-default: #41b584; +$base-color-default: #5470c6; //默认层级 $base-z-index: 999; //横向布局纵向布局时菜单背景色 diff --git a/src/utils/accessToken.js b/src/utils/accessToken.js index 1c79c78..7f948ed 100644 --- a/src/utils/accessToken.js +++ b/src/utils/accessToken.js @@ -1,7 +1,7 @@ import { storage, tokenTableName } from '@/config' /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 获取accessToken * @returns {string|ActiveX.IXMLDOMNode|Promise|any|IDBRequest|MediaKeyStatus|FormDataEntryValue|Function|Promise} */ @@ -20,7 +20,7 @@ export function getAccessToken() { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 存储accessToken * @param accessToken * @returns {void|*} @@ -40,7 +40,7 @@ export function setAccessToken(accessToken) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 移除accessToken * @returns {void|Promise} */ diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js index 20a19b7..ee60e4f 100644 --- a/src/utils/clipboard.js +++ b/src/utils/clipboard.js @@ -10,7 +10,7 @@ function clipboardError() { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 复制数据 * @param text * @param event diff --git a/src/utils/encrypt.js b/src/utils/encrypt.js index 9856991..9e672c9 100644 --- a/src/utils/encrypt.js +++ b/src/utils/encrypt.js @@ -5,7 +5,7 @@ const privateKey = 'MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMFPa+v52FkSUXvcUnrGI/XzW3EpZRI0s9BCWJ3oNQmEYA5luWW5p8h0uadTIoTyYweFPdH4hveyxlwmS7oefvbIdiP+o+QIYW/R4Wjsb4Yl8MhR4PJqUE3RCy6IT9fM8ckG4kN9ECs6Ja8fQFc6/mSl5dJczzJO3k1rWMBhKJD/AgMBAAECgYEAucMakH9dWeryhrYoRHcXo4giPVJsH9ypVt4KzmOQY/7jV7KFQK3x//27UoHfUCak51sxFw9ek7UmTPM4HjikA9LkYeE7S381b4QRvFuf3L6IbMP3ywJnJ8pPr2l5SqQ00W+oKv+w/VmEsyUHr+k4Z+4ik+FheTkVWp566WbqFsECQQDjYaMcaKw3j2Zecl8T6eUe7fdaRMIzp/gcpPMfT/9rDzIQk+7ORvm1NI9AUmFv/FAlfpuAMrdL2n7p9uznWb7RAkEA2aP934kbXg5bdV0R313MrL+7WTK/qdcYxATUbMsMuWWQBoS5irrt80WCZbG48hpocJavLNjbtrjmUX3CuJBmzwJAOJg8uP10n/+ZQzjEYXh+BszEHDuw+pp8LuT/fnOy5zrJA0dO0RjpXijO3vuiNPVgHXT9z1LQPJkNrb5ACPVVgQJBALPeb4uV0bNrJDUb5RB4ghZnIxv18CcaqNIft7vuGCcFBAIPIRTBprR+RuVq+xHDt3sNXdsvom4h49+Hky1b0ksCQBBwUtVaqH6ztCtwUF1j2c/Zcrt5P/uN7IHAd44K0gIJc1+Csr3qPG+G2yoqRM8KVqLI8Z2ZYn9c+AvEE+L9OQY=' /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description RSA加密 * @param data * @returns {Promise<{param: PromiseLike}|*>} @@ -31,7 +31,7 @@ export async function encryptedData(data) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description RSA解密 * @param data * @returns {PromiseLike} diff --git a/src/utils/handleRoutes.js b/src/utils/handleRoutes.js index c95ae92..595281e 100644 --- a/src/utils/handleRoutes.js +++ b/src/utils/handleRoutes.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description all模式渲染后端返回路由 * @param constantRoutes * @returns {*} @@ -27,7 +27,7 @@ export function convertRouter(asyncRoutes) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 判断当前路由是否包含权限 * @param permissions * @param route @@ -42,7 +42,7 @@ function hasPermission(permissions, route) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description intelligence模式根据permissions数组拦截路由 * @param routes * @param permissions diff --git a/src/utils/index.js b/src/utils/index.js index 80e89c1..a3618e2 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 格式化时间 * @param time * @param cFormat @@ -45,7 +45,7 @@ export function parseTime(time, cFormat) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 格式化时间 * @param time * @param option @@ -90,7 +90,7 @@ export function formatTime(time, option) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 将url请求参数转为json格式 * @param url * @returns {{}|any} @@ -112,7 +112,7 @@ export function paramObj(url) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 父子关系的数组转换成树形结构数据 * @param data * @returns {*} @@ -143,7 +143,7 @@ export function translateDataToTree(data) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 树形结构数据转换成父子关系的数组 * @param data * @returns {[]} @@ -170,7 +170,7 @@ export function translateTreeToData(data) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 10位时间戳转换 * @param time * @returns {string} @@ -192,7 +192,7 @@ export function tenBitTimestamp(time) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 13位时间戳转换 * @param time * @returns {string} @@ -214,7 +214,7 @@ export function thirteenBitTimestamp(time) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 获取随机id * @param length * @returns {string} @@ -229,7 +229,7 @@ export function uuid(length = 32) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description m到n的随机数 * @param m * @param n @@ -240,7 +240,7 @@ export function random(m, n) { } /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description addEventListener * @type {function(...[*]=)} */ @@ -253,7 +253,7 @@ export const on = (function () { })() /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description removeEventListener * @type {function(...[*]=)} */ diff --git a/src/utils/pageTitle.js b/src/utils/pageTitle.js index 38334c3..3ca1e76 100644 --- a/src/utils/pageTitle.js +++ b/src/utils/pageTitle.js @@ -1,14 +1,12 @@ import { title } from '@/config' /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 设置标题 * @param pageTitle * @returns {string} */ export default function getPageTitle(pageTitle) { - if (pageTitle) { - return `${pageTitle}-${title}` - } + if (pageTitle) return `${pageTitle}-${title}` return `${title}` } diff --git a/src/utils/permission.js b/src/utils/permission.js index 88b3506..c72c644 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -1,7 +1,7 @@ import store from '@/store' /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 检查权限 * @param value * @returns {boolean} diff --git a/src/utils/request.js b/src/utils/request.js index 272a731..41d893e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ import { isArray } from '@/utils/validate' let loadingInstance /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 处理code异常 * @param {*} code * @param {*} msg diff --git a/src/utils/static.js b/src/utils/static.js index bd0abd9..f5a328e 100644 --- a/src/utils/static.js +++ b/src/utils/static.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com + * @author https://gitee.com/chu1204505056/vue-admin-better * @description 导入所有 controller 模块,浏览器环境中自动输出controller文件夹下Mock接口,请勿修改。 */ import Mock from 'mockjs' diff --git a/src/utils/validate.js b/src/utils/validate.js index 01100ed..b585fe0 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -7,9 +7,8 @@ export function isExternal(path) { return /^(https?:|mailto:|tel:)/.test(path) } - /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description 校验密码是否小于6位 * @param str * @returns {boolean} @@ -17,86 +16,6 @@ export function isExternal(path) { export function isPassword(str) { return str.length >= 6 } - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否为数字 - * @param value - * @returns {boolean} - */ -export function isNumber(value) { - const reg = /^[0-9]*$/ - return reg.test(value) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是名称 - * @param value - * @returns {boolean} - */ -export function isName(value) { - const reg = /^[\u4e00-\u9fa5a-zA-Z0-9]+$/ - return reg.test(value) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否为IP - * @param ip - * @returns {boolean} - */ -export function isIP(ip) { - const reg = - /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/ - return reg.test(ip) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是传统网站 - * @param url - * @returns {boolean} - */ -export function isUrl(url) { - const reg = - /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ - return reg.test(url) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是小写字母 - * @param str - * @returns {boolean} - */ -export function isLowerCase(str) { - const reg = /^[a-z]+$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是大写字母 - * @param str - * @returns {boolean} - */ -export function isUpperCase(str) { - const reg = /^[A-Z]+$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是大写字母开头 - * @param str - * @returns {boolean} - */ -export function isAlphabets(str) { - const reg = /^[A-Za-z]+$/ - return reg.test(str) -} - /** * @author chuzhixin 1204505056@qq.com (不想保留author可删除) * @description 判断是否是字符串 @@ -106,7 +25,6 @@ export function isAlphabets(str) { export function isString(str) { return typeof str === 'string' || str instanceof String } - /** * @author chuzhixin 1204505056@qq.com (不想保留author可删除) * @description 判断是否是数组 @@ -119,19 +37,6 @@ export function isArray(arg) { } return Array.isArray(arg) } - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是端口号 - * @param str - * @returns {boolean} - */ -export function isPort(str) { - const reg = - /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/ - return reg.test(str) -} - /** * @author chuzhixin 1204505056@qq.com (不想保留author可删除) * @description 判断是否是手机号 @@ -142,76 +47,3 @@ export function isPhone(str) { const reg = /^1\d{10}$/ return reg.test(str) } - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是身份证号(第二代) - * @param str - * @returns {boolean} - */ -export function isIdCard(str) { - const reg = - /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否是邮箱 - * @param str - * @returns {boolean} - */ -export function isEmail(str) { - const reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否中文 - * @param str - * @returns {boolean} - */ -export function isChina(str) { - const reg = /^[\u4E00-\u9FA5]{2,4}$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否为空 - * @param str - * @returns {boolean} - */ -export function isBlank(str) { - return ( - str == null || - false || - str === '' || - str.trim() === '' || - str.toLocaleLowerCase().trim() === 'null' - ) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否为固话 - * @param str - * @returns {boolean} - */ -export function isTel(str) { - const reg = - /^(400|800)([0-9\\-]{7,10})|(([0-9]{4}|[0-9]{3})(-| )?)?([0-9]{7,8})((-| |转)*([0-9]{1,4}))?$/ - return reg.test(str) -} - -/** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) - * @description 判断是否为数字且最多两位小数 - * @param str - * @returns {boolean} - */ -export function isNum(str) { - const reg = /^\d+(\.\d{1,2})?$/ - return reg.test(str) -} diff --git a/vue.config.js b/vue.config.js index b6778eb..ff4ba8d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,5 @@ /** - * @author chuzhixin 1204505056@qq.com (不想保留author可删除) + * @author https://gitee.com/chu1204505056/vue-admin-better (不想保留author可删除) * @description cli配置 */ @@ -28,7 +28,8 @@ const dayjs = require('dayjs') const date = dayjs().format('YYYY_M_D') const time = dayjs().format('YYYY-M-D HH:mm:ss') process.env.VUE_APP_TITLE = title || 'vue-admin-beautiful' -process.env.VUE_APP_AUTHOR = author || 'chuzhixin 1204505056@qq.com' +process.env.VUE_APP_AUTHOR = + author || 'https://gitee.com/chu1204505056/vue-admin-better' process.env.VUE_APP_UPDATE_TIME = time process.env.VUE_APP_VERSION = version