wenyongda/ZRAdmin-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

格式化代码

Browse Source
This commit is contained in:
不做码农 2022-06-25 20:44:37 +08:00
parent 6061592084
commit 9193a609e9
9 changed files with 231 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.prettierrc.js
View File

@ -1,5 +1,5 @@
module.exports = { module.exports = {
// 一行最多 180 字符 // 超过最大值换行
printWidth: 148, printWidth: 148,
// 使用 2 个空格缩进 // 使用 2 个空格缩进
tabWidth: 2, tabWidth: 2,
@ -13,14 +13,14 @@ module.exports = {
quoteProps: 'as-needed', quoteProps: 'as-needed',
// jsx 不使用单引号，而使用双引号 // jsx 不使用单引号，而使用双引号
jsxSingleQuote: false, jsxSingleQuote: false,
// 末尾不需要逗号 // 多行时尽可能打印尾随逗号。（例如，单行数组永远不会出现逗号结尾。） 可选值"<none|es5|all>"，默认none
trailingComma: 'all', trailingComma: 'none',
// 大括号内的首尾需要空格 // 在对象，数组括号与文字之间加空格 "{ foo: bar }"
bracketSpacing: true, bracketSpacing: true,
// jsx 标签的反尖括号需要换行 // jsx 标签的反尖括号需要换行
jsxBracketSameLine: true, jsxBracketSameLine: true,
bracketSameLine: true, bracketSameLine: true,
// 箭头函数，只有一个参数的时候，也需要括号 // 箭头函数，always只有一个参数的时候，也需要括号,'avoid'箭头函数只有一个参数的时候可以忽略括号
arrowParens: 'always', arrowParens: 'always',
// 每个文件格式化的范围是文件的全部内容 // 每个文件格式化的范围是文件的全部内容
rangeStart: 0, rangeStart: 0,
@ -33,6 +33,6 @@ module.exports = {
proseWrap: 'preserve', proseWrap: 'preserve',
// 根据显示样式决定 html 要不要折行 // 根据显示样式决定 html 要不要折行
htmlWhitespaceSensitivity: 'css', htmlWhitespaceSensitivity: 'css',
// 换行符使用 lf // 换行符使用 lf 结尾是 可选值"<auto|lf|crlf|cr>"
endOfLine: 'auto', endOfLine: 'auto'
}; }

3
.vscode/settings.json vendored
View File

@ -19,6 +19,9 @@
"[ts]": { "[ts]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[js]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
// 保存时 prettier 自动格式化 // 保存时 prettier 自动格式化
"editor.formatOnSave": true, "editor.formatOnSave": true,
// 保存时自动启用 eslint --fix 自动修复 // 保存时自动启用 eslint --fix 自动修复

75
src/store/modules/app.js
View File

@ -1,78 +1,5 @@
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
// const state = {
// sidebar: {
// opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
// withoutAnimation: false,
// hide: false
// },
// device: 'desktop',
// size: Cookies.get('size') || 'small',
// lang: Cookies.get('lang') || 'zh-cn'
// }
// const mutations = {
// TOGGLE_SIDEBAR: state => {
// if (state.sidebar.hide) {
// return false;
// }
// state.sidebar.opened = !state.sidebar.opened
// state.sidebar.withoutAnimation = true
// if (state.sidebar.opened) {
// Cookies.set('sidebarStatus', 1)
// } else {
// Cookies.set('sidebarStatus', 0)
// }
// },
// CLOSE_SIDEBAR: (state, withoutAnimation) => {
// Cookies.set('sidebarStatus', 0)
// state.sidebar.opened = false
// state.sidebar.withoutAnimation = withoutAnimation
// },
// TOGGLE_DEVICE: (state, device) => {
// state.device = device
// },
// SET_SIZE: (state, size) => {
// state.size = size
// Cookies.set('size', size)
// },
// SET_SIDEBAR_HIDE: (state, status) => {
// state.sidebar.hide = status
// },
// SET_LANG: (state, lang) => {
// state.lang = lang
// Cookies.set('lang', lang)
// },
// }
// const actions = {
// toggleSideBar({ commit }) {
// commit('TOGGLE_SIDEBAR')
// },
// closeSideBar({ commit }) {
// commit('CLOSE_SIDEBAR', '')
// },
// toggleDevice({ commit }, device) {
// commit('TOGGLE_DEVICE', device)
// },
// setSize({ commit }, size) {
// commit('SET_SIZE', size)
// },
// toggleSideBarHide({ commit }, status) {
// commit('SET_SIDEBAR_HIDE', status)
// },
// setLang({ commit }, lang) {
// commit('SET_LANG', lang)
// },
// }
// export default {
// namespaced: true,
// state,
// mutations,
// actions
// }
const useAppStore = defineStore('app', { const useAppStore = defineStore('app', {
state: () => ({ state: () => ({
sidebar: { sidebar: {
@ -106,7 +33,7 @@ const useAppStore = defineStore('app', {
this.device = device this.device = device
}, },
setSize(size) { setSize(size) {
this.size = size; this.size = size
Cookies.set('size', size) Cookies.set('size', size)
}, },
toggleSideBarHide(status) { toggleSideBarHide(status) {

19
src/store/modules/permission.js
View File

@ -5,8 +5,7 @@ import ParentView from '@/components/ParentView'
import InnerLink from '@/layout/components/InnerLink' import InnerLink from '@/layout/components/InnerLink'
// 匹配views里面所有的.vue文件 // 匹配views里面所有的.vue文件
const modules = const modules = import.meta.glob('./../../views/**/*.vue')
import.meta.glob('./../../views/**/*.vue')
const usePermissionStore = defineStore('permission', { const usePermissionStore = defineStore('permission', {
state: () => ({ state: () => ({
@ -31,9 +30,9 @@ const usePermissionStore = defineStore('permission', {
}, },
// 生成路由 // 生成路由
generateRoutes() { generateRoutes() {
return new Promise(resolve => { return new Promise((resolve) => {
// 向后端请求路由数据 // 向后端请求路由数据
getRouters().then(res => { getRouters().then((res) => {
const sdata = JSON.parse(JSON.stringify(res.data)) const sdata = JSON.parse(JSON.stringify(res.data))
const rdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data))
const defaultData = JSON.parse(JSON.stringify(res.data)) const defaultData = JSON.parse(JSON.stringify(res.data))
@ -53,7 +52,7 @@ const usePermissionStore = defineStore('permission', {
// 遍历后台传来的路由字符串，转换为组件对象 // 遍历后台传来的路由字符串，转换为组件对象
function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
return asyncRouterMap.filter(route => { return asyncRouterMap.filter((route) => {
if (type && route.children) { if (type && route.children) {
route.children = filterChildren(route.children) route.children = filterChildren(route.children)
} }
@ -84,7 +83,7 @@ function filterChildren(childrenMap, lastRouter = false) {
childrenMap.forEach((el, index) => { childrenMap.forEach((el, index) => {
if (el.children && el.children.length) { if (el.children && el.children.length) {
if (el.component === 'ParentView' && !lastRouter) { if (el.component === 'ParentView' && !lastRouter) {
el.children.forEach(c => { el.children.forEach((c) => {
c.path = el.path + '/' + c.path c.path = el.path + '/' + c.path
if (c.children && c.children.length) { if (c.children && c.children.length) {
children = children.concat(filterChildren(c.children, c)) children = children.concat(filterChildren(c.children, c))
@ -104,14 +103,14 @@ function filterChildren(childrenMap, lastRouter = false) {
} }
export const loadView = (view) => { export const loadView = (view) => {
let res; let res
for (const path in modules) { for (const path in modules) {
const dir = path.split('views/')[1].split('.vue')[0]; const dir = path.split('views/')[1].split('.vue')[0]
if (dir === view) { if (dir === view) {
res = () => modules[path](); res = () => modules[path]()
} }
} }
return res; return res
} }
export default usePermissionStore export default usePermissionStore

5
src/store/modules/settings.js
View File

@ -1,7 +1,8 @@
import defaultSettings from '@/settings' import defaultSettings from '@/settings'
import { useDynamicTitle } from '@/utils/dynamicTitle' import { useDynamicTitle } from '@/utils/dynamicTitle'
const { sideTheme, theme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle, showFooter, showWatermark, watermarkText } = defaultSettings const { sideTheme, theme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle, showFooter, showWatermark, watermarkText } =
defaultSettings
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const useSettingsStore = defineStore('settings', { const useSettingsStore = defineStore('settings', {
@ -30,7 +31,7 @@ const useSettingsStore = defineStore('settings', {
// 设置网页标题 // 设置网页标题
setTitle(title) { setTitle(title) {
this.title = title this.title = title
useDynamicTitle(); useDynamicTitle()
} }
} }
}) })

286
src/store/modules/tagsView.js
View File

@ -1,156 +1,154 @@
const useTagsViewStore = defineStore( const useTagsViewStore = defineStore('tagsView', {
'tagsView', state: () => ({
{ visitedViews: [],
state: () => ({ cachedViews: []
visitedViews: [], }),
cachedViews: [] actions: {
}), addView(view) {
actions: { this.addVisitedView(view)
addView(view) { this.addCachedView(view)
this.addVisitedView(view) },
this.addCachedView(view) addVisitedView(view) {
}, if (this.visitedViews.some((v) => v.path === view.path)) return
addVisitedView(view) { this.visitedViews.push(
if (this.visitedViews.some(v => v.path === view.path)) return Object.assign({}, view, {
this.visitedViews.push( title: view.meta.title || 'no-name'
Object.assign({}, view, {
title: view.meta.title || 'no-name'
})
)
},
addCachedView(view) {
if (this.cachedViews.includes(view.name)) return
if (!view.meta.noCache) {
this.cachedViews.push(view.name)
}
},
delView(view) {
return new Promise(resolve => {
this.delVisitedView(view)
this.delCachedView(view)
resolve({
visitedViews: [...this.visitedViews],
cachedViews: [...this.cachedViews]
})
}) })
}, )
delVisitedView(view) { },
return new Promise(resolve => { addCachedView(view) {
for (const [i, v] of this.visitedViews.entries()) { if (this.cachedViews.includes(view.name)) return
if (v.path === view.path) { if (!view.meta.noCache) {
this.visitedViews.splice(i, 1) this.cachedViews.push(view.name)
break }
} },
} delView(view) {
resolve([...this.visitedViews]) return new Promise((resolve) => {
this.delVisitedView(view)
this.delCachedView(view)
resolve({
visitedViews: [...this.visitedViews],
cachedViews: [...this.cachedViews]
}) })
}, })
delCachedView(view) { },
return new Promise(resolve => { delVisitedView(view) {
const index = this.cachedViews.indexOf(view.name) return new Promise((resolve) => {
index > -1 && this.cachedViews.splice(index, 1) for (const [i, v] of this.visitedViews.entries()) {
resolve([...this.cachedViews])
})
},
delOthersViews(view) {
return new Promise(resolve => {
this.delOthersVisitedViews(view)
this.delOthersCachedViews(view)
resolve({
visitedViews: [...this.visitedViews],
cachedViews: [...this.cachedViews]
})
})
},
delOthersVisitedViews(view) {
return new Promise(resolve => {
this.visitedViews = this.visitedViews.filter(v => {
return v.meta.affix || v.path === view.path
})
resolve([...this.visitedViews])
})
},
delOthersCachedViews(view) {
return new Promise(resolve => {
const index = this.cachedViews.indexOf(view.name)
if (index > -1) {
this.cachedViews = this.cachedViews.slice(index, index + 1)
} else {
this.cachedViews = []
}
resolve([...this.cachedViews])
})
},
delAllViews(view) {
return new Promise(resolve => {
this.delAllVisitedViews(view)
this.delAllCachedViews(view)
resolve({
visitedViews: [...this.visitedViews],
cachedViews: [...this.cachedViews]
})
})
},
delAllVisitedViews(view) {
return new Promise(resolve => {
const affixTags = this.visitedViews.filter(tag => tag.meta.affix)
this.visitedViews = affixTags
resolve([...this.visitedViews])
})
},
delAllCachedViews(view) {
return new Promise(resolve => {
this.cachedViews = []
resolve([...this.cachedViews])
})
},
updateVisitedView(view) {
for (let v of this.visitedViews) {
if (v.path === view.path) { if (v.path === view.path) {
v = Object.assign(v, view) this.visitedViews.splice(i, 1)
break break
} }
} }
}, resolve([...this.visitedViews])
delRightTags(view) { })
return new Promise(resolve => { },
const index = this.visitedViews.findIndex(v => v.path === view.path) delCachedView(view) {
if (index === -1) { return new Promise((resolve) => {
return const index = this.cachedViews.indexOf(view.name)
} index > -1 && this.cachedViews.splice(index, 1)
this.visitedViews = this.visitedViews.filter((item, idx) => { resolve([...this.cachedViews])
if (idx <= index || (item.meta && item.meta.affix)) { })
return true },
} delOthersViews(view) {
const i = this.cachedViews.indexOf(item.name) return new Promise((resolve) => {
if (i > -1) { this.delOthersVisitedViews(view)
this.cachedViews.splice(i, 1) this.delOthersCachedViews(view)
} resolve({
return false visitedViews: [...this.visitedViews],
}) cachedViews: [...this.cachedViews]
resolve([...this.visitedViews])
}) })
}, })
delLeftTags(view) { },
return new Promise(resolve => { delOthersVisitedViews(view) {
const index = this.visitedViews.findIndex(v => v.path === view.path) return new Promise((resolve) => {
if (index === -1) { this.visitedViews = this.visitedViews.filter((v) => {
return return v.meta.affix || v.path === view.path
}
this.visitedViews = this.visitedViews.filter((item, idx) => {
if (idx >= index || (item.meta && item.meta.affix)) {
return true
}
const i = this.cachedViews.indexOf(item.name)
if (i > -1) {
this.cachedViews.splice(i, 1)
}
return false
})
resolve([...this.visitedViews])
}) })
resolve([...this.visitedViews])
})
},
delOthersCachedViews(view) {
return new Promise((resolve) => {
const index = this.cachedViews.indexOf(view.name)
if (index > -1) {
this.cachedViews = this.cachedViews.slice(index, index + 1)
} else {
this.cachedViews = []
}
resolve([...this.cachedViews])
})
},
delAllViews(view) {
return new Promise((resolve) => {
this.delAllVisitedViews(view)
this.delAllCachedViews(view)
resolve({
visitedViews: [...this.visitedViews],
cachedViews: [...this.cachedViews]
})
})
},
delAllVisitedViews(view) {
return new Promise((resolve) => {
const affixTags = this.visitedViews.filter((tag) => tag.meta.affix)
this.visitedViews = affixTags
resolve([...this.visitedViews])
})
},
delAllCachedViews(view) {
return new Promise((resolve) => {
this.cachedViews = []
resolve([...this.cachedViews])
})
},
updateVisitedView(view) {
for (let v of this.visitedViews) {
if (v.path === view.path) {
v = Object.assign(v, view)
break
}
} }
},
delRightTags(view) {
return new Promise((resolve) => {
const index = this.visitedViews.findIndex((v) => v.path === view.path)
if (index === -1) {
return
}
this.visitedViews = this.visitedViews.filter((item, idx) => {
if (idx <= index || (item.meta && item.meta.affix)) {
return true
}
const i = this.cachedViews.indexOf(item.name)
if (i > -1) {
this.cachedViews.splice(i, 1)
}
return false
})
resolve([...this.visitedViews])
})
},
delLeftTags(view) {
return new Promise((resolve) => {
const index = this.visitedViews.findIndex((v) => v.path === view.path)
if (index === -1) {
return
}
this.visitedViews = this.visitedViews.filter((item, idx) => {
if (idx >= index || (item.meta && item.meta.affix)) {
return true
}
const i = this.cachedViews.indexOf(item.name)
if (i > -1) {
this.cachedViews.splice(i, 1)
}
return false
})
resolve([...this.visitedViews])
})
} }
}) }
})
export default useTagsViewStore export default useTagsViewStore

91
src/store/modules/user.js
View File

@ -25,29 +25,31 @@ const useUserStore = defineStore('user', {
const code = userInfo.code const code = userInfo.code
const uuid = userInfo.uuid const uuid = userInfo.uuid
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => { login(username, password, code, uuid)
if (res.code == 200) { .then((res) => {
setToken(res.data) if (res.code == 200) {
this.token = res.data setToken(res.data)
resolve() //then处理 this.token = res.data
} else { resolve() //then处理
console.log('login error ', res) } else {
reject(res) //catch处理 console.log('login error ', res)
} reject(res) //catch处理
}).catch(error => { }
reject(error) })
}) .catch((error) => {
reject(error)
})
}) })
}, },
/** /**
* 三方授权登录 * 三方授权登录
* @param {*} data * @param {*} data
* @param { *} param { authSource : ''} * @param {*} param { authSource : ''}
* @returns * @returns
*/ */
oauthLogin(data, param) { oauthLogin(data, param) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
oauthCallback(data, param).then(res => { oauthCallback(data, param).then((res) => {
const { code, data } = res const { code, data } = res
if (code == 200) { if (code == 200) {
setToken(data.token) setToken(data.token)
@ -66,45 +68,50 @@ const useUserStore = defineStore('user', {
// 获取用户信息 // 获取用户信息
getInfo() { getInfo() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo()
const data = res.data .then((res) => {
const avatar = data.user.avatar == "" ? defAva : data.user.avatar; const data = res.data
const avatar = data.user.avatar == '' ? defAva : data.user.avatar
if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 if (data.roles && data.roles.length > 0) {
this.roles = data.roles // 验证返回的roles是否是一个非空数组
this.permissions = data.permissions this.roles = data.roles
} else { this.permissions = data.permissions
this.roles = ['ROLE_DEFAULT'] } else {
} this.roles = ['ROLE_DEFAULT']
}
this.name = data.user.nickName this.name = data.user.nickName
this.avatar = avatar this.avatar = avatar
this.userInfo = data.user //新加 this.userInfo = data.user //新加
this.userId = data.user.userId //新加 this.userId = data.user.userId //新加
resolve(res) resolve(res)
}).catch(error => { })
console.error(error); .catch((error) => {
reject("获取用户信息失败") console.error(error)
}) reject('获取用户信息失败')
})
}) })
}, },
// 退出系统 // 退出系统
logOut() { logOut() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logout(this.token).then((res) => { logout(this.token)
this.token = '' .then((res) => {
this.roles = [] this.token = ''
this.permissions = [] this.roles = []
removeToken() this.permissions = []
resolve(res) removeToken()
}).catch(error => { resolve(res)
reject(error) })
}) .catch((error) => {
reject(error)
})
}) })
}, },
// 前端 登出 // 前端 登出
fedLogOut() { fedLogOut() {
return new Promise(resolve => { return new Promise((resolve) => {
this.token = '' this.token = ''
removeToken() removeToken()
resolve() resolve()

14
vite.config.js
View File

@ -23,7 +23,7 @@ export default defineConfig(({ mode, command }) => {
alias: alias, alias: alias,
// 导入时想要省略的扩展名列表 // 导入时想要省略的扩展名列表
// https://cn.vitejs.dev/config/#resolve-extensions // https://cn.vitejs.dev/config/#resolve-extensions
extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'], extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
}, },
css: { css: {
devSourcemap: true //开发模式时启用 devSourcemap: true //开发模式时启用
@ -37,11 +37,11 @@ export default defineConfig(({ mode, command }) => {
// 将js、css文件分离到单独文件夹 // 将js、css文件分离到单独文件夹
rollupOptions: { rollupOptions: {
output: { output: {
chunkFileNames: "static/js/[name]-[hash].js", chunkFileNames: 'static/js/[name]-[hash].js',
entryFileNames: "static/js/[name]-[hash].js", entryFileNames: 'static/js/[name]-[hash].js',
assetFileNames: "static/[ext]/[name]-[hash].[ext]" assetFileNames: 'static/[ext]/[name]-[hash].[ext]'
} }
}, }
}, },
// vite 相关配置 // vite 相关配置
server: { server: {
@ -60,7 +60,7 @@ export default defineConfig(({ mode, command }) => {
ws: true, ws: true,
rewrite: (path) => path.replace(/^\/msgHub/, '') rewrite: (path) => path.replace(/^\/msgHub/, '')
} }
}, }
}, }
} }
}) })