diff --git a/.eslintrc.js b/.eslintrc.js index 976e600..61d1e3a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -114,10 +114,7 @@ module.exports = { }, overrides: [ { - files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)', - ], + files: ['**/__tests__/*.{j,t}s?(x)', '**/tests/unit/**/*.spec.{j,t}s?(x)'], env: { jest: true, }, diff --git a/package.json b/package.json index 731fd95..7345783 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "sortablejs": "^1.15.0", "vab-icon": "file:vab-icon", "vue": "~2.7.14", - "vue-echarts": "6.6.0", + "vue-echarts": "6.6.1", "vue-router": "^3.6.5", "vue-template-compiler": "~2.7.14", "vuex": "^3.6.2", diff --git a/prettier.config.js b/prettier.config.js index 86e9fc4..1bc3ace 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -4,7 +4,7 @@ */ module.exports = { - printWidth: 80, + printWidth: 100, tabWidth: 2, useTabs: false, semi: false, diff --git a/src/components/SelectTree/index.vue b/src/components/SelectTree/index.vue index db20eed..9f5e0cb 100644 --- a/src/components/SelectTree/index.vue +++ b/src/components/SelectTree/index.vue @@ -86,13 +86,8 @@ defaultSelectedKeys: [], //初始选中值数组 currentNodeKey: this.selectedKey, selectValue: - this.selectType == 'multiple' - ? this.selectedValue.split(',') - : this.selectedValue, //下拉框选中值label - selectKey: - this.selectType == 'multiple' - ? this.selectedKey.split(',') - : this.selectedKey, //下拉框选中值value + this.selectType == 'multiple' ? this.selectedValue.split(',') : this.selectedValue, //下拉框选中值label + selectKey: this.selectType == 'multiple' ? this.selectedKey.split(',') : this.selectedKey, //下拉框选中值value } }, mounted() { diff --git a/src/components/VabCharge/index.vue b/src/components/VabCharge/index.vue index 39de737..a90c90a 100644 --- a/src/components/VabCharge/index.vue +++ b/src/components/VabCharge/index.vue @@ -144,12 +144,7 @@ width: $width; height: $width; transform: translate(-50%, -50%); - animation: moveToTop - #{random(6) + - 3}s - ease-in-out -#{random(5000) / - 1000}s - infinite; + animation: moveToTop #{random(6) + 3}s ease-in-out -#{random(5000) / 1000}s infinite; } } diff --git a/src/components/VabProfile/index.vue b/src/components/VabProfile/index.vue index bfe2fb4..6e7ec33 100644 --- a/src/components/VabProfile/index.vue +++ b/src/components/VabProfile/index.vue @@ -88,8 +88,7 @@ height: 2px; background: var(--card-bg-color); transform: translateX(-100%); - animation: slide-in-horizontal 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) - forwards; + animation: slide-in-horizontal 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) forwards; } .border-right { @@ -99,8 +98,7 @@ height: 100%; background: var(--card-bg-color); transform: translateY(100%); - animation: slide-in-vertical 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) - forwards; + animation: slide-in-vertical 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) forwards; } .border-bottom { @@ -110,8 +108,7 @@ height: 2px; background: var(--card-bg-color); transform: translateX(100%); - animation: slide-in-horizontal-reverse 0.8s - cubic-bezier(0.645, 0.045, 0.355, 1) forwards; + animation: slide-in-horizontal-reverse 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) forwards; } .border-left { @@ -121,8 +118,7 @@ height: 100%; background: var(--card-bg-color); transform: translateY(-100%); - animation: slide-in-vertical-reverse 0.8s - cubic-bezier(0.645, 0.045, 0.355, 1) forwards; + animation: slide-in-vertical-reverse 0.8s cubic-bezier(0.645, 0.045, 0.355, 1) forwards; } } diff --git a/src/components/VabSnow/index.vue b/src/components/VabSnow/index.vue index 5131d52..96516ad 100644 --- a/src/components/VabSnow/index.vue +++ b/src/components/VabSnow/index.vue @@ -69,8 +69,7 @@ @keyframes fall-#{$i} { #{percentage($random-yoyo-time)} { - transform: translate($random-x-end, $random-yoyo-y) - scale($random-scale); + transform: translate($random-x-end, $random-yoyo-y) scale($random-scale); } to { diff --git a/src/components/VabUpload/index.vue b/src/components/VabUpload/index.vue index 1217757..b4a7e0c 100644 --- a/src/components/VabUpload/index.vue +++ b/src/components/VabUpload/index.vue @@ -36,11 +36,7 @@ :on-success="handleSuccess" > - +
@@ -52,13 +48,8 @@ class="dialog-footer" style="position: relative; padding-right: 15px; text-align: right" > -
- 正在上传中... 当前上传成功数:{{ imgSuccessNum }}张 当前上传失败数:{{ - imgErrorNum - }}张 +
+ 正在上传中... 当前上传成功数:{{ imgSuccessNum }}张 当前上传失败数:{{ imgErrorNum }}张
关闭 { - this.$baseMessage( - `上传完成! 共上传${fileList.length}张图片`, - 'success' - ) + this.$baseMessage(`上传完成! 共上传${fileList.length}张图片`, 'success') }, 1000) } diff --git a/src/config/net.config.js b/src/config/net.config.js index a083439..770ce4f 100644 --- a/src/config/net.config.js +++ b/src/config/net.config.js @@ -3,10 +3,7 @@ **/ const network = { // 默认的接口地址 如果是开发环境和生产环境走vab-mock-server，当然你也可以选择自己配置成需要的接口地址 - baseURL: - process.env.NODE_ENV === 'development' - ? 'vab-mock-server' - : 'vab-mock-server', + baseURL: process.env.NODE_ENV === 'development' ? 'vab-mock-server' : 'vab-mock-server', //配后端数据的接收方式application/json;charset=UTF-8或者application/x-www-form-urlencoded;charset=UTF-8 contentType: 'application/json;charset=UTF-8', //消息框消失时间 diff --git a/src/config/permission.js b/src/config/permission.js index d73d248..771799d 100644 --- a/src/config/permission.js +++ b/src/config/permission.js @@ -33,8 +33,7 @@ router.beforeResolve(async (to, from, next) => { if (progressBar) VabProgress.done() } else { const hasPermissions = - store.getters['user/permissions'] && - store.getters['user/permissions'].length > 0 + store.getters['user/permissions'] && store.getters['user/permissions'].length > 0 if (hasPermissions) { next() } else { diff --git a/src/plugins/support.js b/src/plugins/support.js index 10469c3..30eb310 100644 --- a/src/plugins/support.js +++ b/src/plugins/support.js @@ -15,5 +15,4 @@ if (!!window.ActiveXObject || 'ActiveXObject' in window) { dangerouslyUseHTMLString: true, }) } -if (!dependencies['vab-icon'] || !dependencies['layouts']) - document.body.innerHTML = '' +if (!dependencies['vab-icon'] || !dependencies['layouts']) document.body.innerHTML = '' diff --git a/src/router/index.js b/src/router/index.js index 6c8520d..bfe6743 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -177,8 +177,7 @@ export const asyncRoutes = [ path: 'menu1-1-1', name: 'Menu1-1-1', meta: { title: '嵌套路由 1-1-1' }, - component: () => - import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'), + component: () => import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'), }, ], }, @@ -249,22 +248,19 @@ export const asyncRoutes = [ { path: 'userManagement', name: 'UserManagement', - component: () => - import('@/views/personnelManagement/userManagement/index'), + component: () => import('@/views/personnelManagement/userManagement/index'), meta: { title: '用户管理' }, }, { path: 'roleManagement', name: 'RoleManagement', - component: () => - import('@/views/personnelManagement/roleManagement/index'), + component: () => import('@/views/personnelManagement/roleManagement/index'), meta: { title: '角色管理' }, }, { path: 'menuManagement', name: 'MenuManagement', - component: () => - import('@/views/personnelManagement/menuManagement/index'), + component: () => import('@/views/personnelManagement/menuManagement/index'), meta: { title: '菜单管理', badge: 'New' }, }, ], diff --git a/src/store/modules/routes.js b/src/store/modules/routes.js index df8f78c..28c54d5 100644 --- a/src/store/modules/routes.js +++ b/src/store/modules/routes.js @@ -28,10 +28,7 @@ const mutations = { const actions = { async setRoutes({ commit }, permissions) { //开源版只过滤动态路由permissions，admin不再默认拥有全部权限 - const finallyAsyncRoutes = await filterAsyncRoutes( - [...asyncRoutes], - permissions - ) + const finallyAsyncRoutes = await filterAsyncRoutes([...asyncRoutes], permissions) commit('setRoutes', finallyAsyncRoutes) return finallyAsyncRoutes }, diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 5965b71..a6ff855 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -6,8 +6,7 @@ import defaultSettings from '@/config' const { tabsBar, logo, layout, header, themeBar } = defaultSettings -const theme = - JSON.parse(localStorage.getItem('vue-admin-beautiful-theme')) || '' +const theme = JSON.parse(localStorage.getItem('vue-admin-beautiful-theme')) || '' const state = () => ({ tabsBar: theme.tabsBar || tabsBar, logo, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 61aa476..fdd7c77 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -5,11 +5,7 @@ import Vue from 'vue' import { getUserInfo, login, logout } from '@/api/user' -import { - getAccessToken, - removeAccessToken, - setAccessToken, -} from '@/utils/accessToken' +import { getAccessToken, removeAccessToken, setAccessToken } from '@/utils/accessToken' import { resetRouter } from '@/router' import { title, tokenName } from '@/config' @@ -62,10 +58,7 @@ const actions = { : '晚上好' Vue.prototype.$baseNotify(`欢迎登录${title}`, `${thisTime}！`) } else { - Vue.prototype.$baseMessage( - `登录接口异常，未正确返回${tokenName}...`, - 'error' - ) + Vue.prototype.$baseMessage(`登录接口异常，未正确返回${tokenName}...`, 'error') } }, async getUserInfo({ commit, state }) { diff --git a/src/utils/encrypt.js b/src/utils/encrypt.js index be7175b..66b4405 100644 --- a/src/utils/encrypt.js +++ b/src/utils/encrypt.js @@ -21,9 +21,7 @@ export async function encryptedData(data) { return data } const encrypt = new JSEncrypt() - encrypt.setPublicKey( - `-----BEGIN PUBLIC KEY-----${publicKey}-----END PUBLIC KEY-----` - ) + encrypt.setPublicKey(`-----BEGIN PUBLIC KEY-----${publicKey}-----END PUBLIC KEY-----`) data = encrypt.encrypt(JSON.stringify(data)) return { param: data, @@ -38,9 +36,7 @@ export async function encryptedData(data) { */ export function decryptedData(data) { const decrypt = new JSEncrypt() - decrypt.setPrivateKey( - `-----BEGIN RSA PRIVATE KEY-----${privateKey}-----END RSA PRIVATE KEY-----` - ) + decrypt.setPrivateKey(`-----BEGIN RSA PRIVATE KEY-----${privateKey}-----END RSA PRIVATE KEY-----`) data = decrypt.decrypt(JSON.stringify(data)) return data } diff --git a/src/utils/handleRoutes.js b/src/utils/handleRoutes.js index 36ee0b3..78082ee 100644 --- a/src/utils/handleRoutes.js +++ b/src/utils/handleRoutes.js @@ -10,17 +10,14 @@ export function convertRouter(asyncRoutes) { if (route.component === 'Layout') { route.component = (resolve) => require(['@/layouts'], resolve) } else if (route.component === 'EmptyLayout') { - route.component = (resolve) => - require(['@/layouts/EmptyLayout'], resolve) + route.component = (resolve) => require(['@/layouts/EmptyLayout'], resolve) } else { const index = route.component.indexOf('views') - const path = - index > 0 ? route.component.slice(index) : `views/${route.component}` + const path = index > 0 ? route.component.slice(index) : `views/${route.component}` route.component = (resolve) => require([`@/${path}`], resolve) } } - if (route.children && route.children.length) - route.children = convertRouter(route.children) + if (route.children && route.children.length) route.children = convertRouter(route.children) if (route.children && route.children.length === 0) delete route.children return route }) diff --git a/src/utils/index.js b/src/utils/index.js index d131060..53b48d6 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -75,9 +75,7 @@ export function formatTime(time, option) { if (option) { return parseTime(time, option) } else { - return `${ - d.getMonth() + 1 - }月${d.getDate()}日${d.getHours()}时${d.getMinutes()}分` + return `${d.getMonth() + 1}月${d.getDate()}日${d.getHours()}时${d.getMinutes()}分` } } @@ -108,12 +106,8 @@ export function paramObj(url) { * @returns {*} */ export function translateDataToTree(data) { - const parent = data.filter( - (value) => value.parentId === 'undefined' || value.parentId == null - ) - const children = data.filter( - (value) => value.parentId !== 'undefined' && value.parentId != null - ) + const parent = data.filter((value) => value.parentId === 'undefined' || value.parentId == null) + const children = data.filter((value) => value.parentId !== 'undefined' && value.parentId != null) const translator = (parent, children) => { parent.forEach((parent) => { children.forEach((current, index) => { diff --git a/src/utils/request.js b/src/utils/request.js index e2f1524..54e9c2e 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -63,8 +63,7 @@ instance.interceptors.request.use( ) if ( config.data && - config.headers['Content-Type'] === - 'application/x-www-form-urlencoded;charset=UTF-8' + config.headers['Content-Type'] === 'application/x-www-form-urlencoded;charset=UTF-8' ) config.data = qs.stringify(config.data) if (debounce.some((item) => config.url.includes(item))) @@ -83,9 +82,7 @@ instance.interceptors.response.use( const { data, config } = response const { code, msg } = data // 操作正常Code数组 - const codeVerificationArray = isArray(successCode) - ? [...successCode] - : [...[successCode]] + const codeVerificationArray = isArray(successCode) ? [...successCode] : [...[successCode]] // 是否操作正常 if (codeVerificationArray.includes(code)) { return data diff --git a/src/utils/static.js b/src/utils/static.js index 55261bf..6010822 100644 --- a/src/utils/static.js +++ b/src/utils/static.js @@ -43,10 +43,6 @@ export function mockXHR() { } mocks.forEach((item) => { - Mock.mock( - new RegExp(item.url), - item.type || 'get', - XHRHttpRequst(item.response) - ) + Mock.mock(new RegExp(item.url), item.type || 'get', XHRHttpRequst(item.response)) }) } diff --git a/src/utils/vab.js b/src/utils/vab.js index e88a41b..9820daa 100644 --- a/src/utils/vab.js +++ b/src/utils/vab.js @@ -161,8 +161,7 @@ const install = (Vue) => { urlTemplate: 'http://online{s}.map.bdimg.com/onlinelabel/?qt=tile&x={x}&y={y}&z={z}&styles=pl&scaler=1&p=1', subdomains: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9], - attribution: - '© Baidu', + attribution: '© Baidu', }), }) } diff --git a/src/views/401.vue b/src/views/401.vue index 884aa6f..76d0711 100644 --- a/src/views/401.vue +++ b/src/views/401.vue @@ -4,26 +4,10 @@
- 401 - 401 - 401 - 401 + 401 + 401 + 401 + 401
@@ -38,9 +22,7 @@
{{ info }}
- - {{ jumpTime }}s {{ btn }} - + {{ jumpTime }}s {{ btn }}
diff --git a/src/views/404.vue b/src/views/404.vue index 23b6ec4..ac8873e 100644 --- a/src/views/404.vue +++ b/src/views/404.vue @@ -4,26 +4,10 @@
- 401 - 401 - 401 - 401 + 401 + 401 + 401 + 401
@@ -38,9 +22,7 @@
{{ info }}
- - {{ jumpTime }}s {{ btn }} - + {{ jumpTime }}s {{ btn }} diff --git a/src/views/index/components/VersionInformation.vue b/src/views/index/components/VersionInformation.vue index 4c550f3..b99edee 100644 --- a/src/views/index/components/VersionInformation.vue +++ b/src/views/index/components/VersionInformation.vue @@ -26,29 +26,18 @@ 授权渠道 - + PRO付费版本 购买源码 ￥699 - + Plus付费版本 购买源码 ￥799 - - - 开源免费版 - + + 开源免费版 diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 2cad626..46c29c6 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -3,13 +3,8 @@ -
- +
+ - +

{{ item.title }}

 @@ -86,16 +78,10 @@ QQ讨论群、基础版、文档 - + github下载源码点star - + 码云下载源码点star @@ -239,14 +225,7 @@ //访问量 fwl: { - color: [ - '#1890FF', - '#36CBCB', - '#4ECB73', - '#FBD437', - '#F2637B', - '#975FE5', - ], + color: ['#1890FF', '#36CBCB', '#4ECB73', '#FBD437', '#F2637B', '#975FE5'], backgroundColor: 'rgba(252,252,252,0)', grid: { top: '4%', @@ -282,14 +261,7 @@ }, //授权数 sqs: { - color: [ - '#1890FF', - '#36CBCB', - '#4ECB73', - '#FBD437', - '#F2637B', - '#975FE5', - ], + color: ['#1890FF', '#36CBCB', '#4ECB73', '#FBD437', '#F2637B', '#975FE5'], backgroundColor: 'rgba(252,252,252,0)', grid: { top: '4%', @@ -341,14 +313,7 @@ textStyle: { normal: { color() { - const arr = [ - '#5470c6', - '#91cc75', - '#fac858', - '#ee6666', - '#73c0de', - '#975FE5', - ] + const arr = ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#975FE5'] let index = Math.floor(Math.random() * arr.length) return arr[index] }, diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 96d2fee..5da9f21 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,7 @@
占位符
-