ldeyun/ruoyi-geek-App
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinia替换vuex

Browse Source
This commit is contained in:
D 2023-12-12 14:10:03 +08:00
parent 01a159d4a7
commit fe3834916a
10 changed files with 195 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.js
View File

@ -13,9 +13,10 @@ import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, select
export function createApp() {
const app = createSSRApp(App)
app.use(store)
app.use(uviewPlus)
app.use(plugins)
app.use(store)
// 全局方法挂载
app.config.globalProperties.useDict = useDict

3
src/pages/login.vue
View File

@ -40,6 +40,7 @@ import { getCodeImg } from '@/api/login'
import { ref } from "vue";
import config from '@/config.js'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const codeUrl = ref("");
const captchaEnabled = ref(true);
const globalConfig = ref(config);
@ -49,7 +50,7 @@ const loginForm = ref({
code: "",
uuid: ''
});
const userStore = useUserStore()
// 获取图形验证码
function getCode() {

9
src/pages_mine/pages/avatar/index.vue
View File

@ -51,8 +51,9 @@
<script>
import config from '@/config'
import store from "@/store"
import { uploadAvatar } from "@/api/system/user"
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const baseUrl = config.baseUrl
let sysInfo = uni.getSystemInfoSync()
@ -81,7 +82,7 @@ export default {
*/
data() {
return {
imageSrc: store.getters.avatar,
imageSrc: userStore.avatar,
isShowImg: false,
// 初始化的宽高
cropperInitW: SCREEN_WIDTH,
@ -270,9 +271,9 @@ export default {
uni.hideLoading()
let data = { name: 'avatarfile', filePath: res.tempFilePath }
uploadAvatar(data).then(response => {
//store.commit('SET_AVATAR', response.imgUrl)
// userStore.avatar = response.imgUrl
/*cloud*/
store.commit('SET_AVATAR', baseUrl + response.imgUrl)
userStore.avatar = baseUrl + response.imgUrl
uni.showToast({ title: "修改成功", icon: 'success' })
uni.$emit('refresh');
uni.navigateBack();

11
src/pages_mine/pages/setting/index.vue
View File

@ -30,10 +30,8 @@
</view>
<view>
<uni-popup ref="popup" type="dialog">
<uni-popup-dialog type="info" cancelText="关闭" confirmText="退出"
title="通知" content="确定注销并退出系统吗"
@confirm="dialogConfirm"
@close="dialogClose">
<uni-popup-dialog type="info" cancelText="关闭" confirmText="退出" title="通知" content="确定注销并退出系统吗"
@confirm="dialogConfirm" @close="dialogClose">
</uni-popup-dialog>
</uni-popup>
</view>
@ -41,7 +39,8 @@
<script setup>
import { ref } from "vue";
import store from '@/store'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const windowHeight = ref(uni.getSystemInfoSync().windowHeight);
const popup = ref(null);
@ -74,7 +73,7 @@
};
function dialogConfirm() {
//console.log('----------------点击确认------------')
store.dispatch('LogOut').then(() => {
userStore.logOut().then(() => {
uni.reLaunch({
url: '/pages/login'
});

6
src/pages_template/pages/login/index2.vue
View File

@ -71,7 +71,7 @@
</template>
<script>
import useUserStore from '@/store/modules/user'
export default {
data() {
return {
@ -154,7 +154,7 @@ export default {
},
// 密码登录
async pwdLogin() {
this.$store.dispatch('Login', this.loginForm).then(() => {
useUserStore().login(this.loginForm).then(() => {
this.$modal.closeLoading()
this.loginSuccess()
}).catch(() => {
@ -166,7 +166,7 @@ export default {
// 登录成功后，处理函数
loginSuccess(result) {
// 设置用户信息
this.$store.dispatch('GetInfo').then(res => {
useUserStore().getInfo().then(res => {
this.$tab.reLaunch('/pages/index')
})
}

59
src/plugins/auth.ts
View File

@ -1,26 +1,25 @@
import store from '@/store'
import useUserStore from "@/store/modules/user";
function authPermission(permission: string): boolean {
const all_permission = "*:*:*"
const permissions: Array<string> = store.getters && store.getters.permissions
const all_permission = "*:*:*";
const permissions: Array<string> = useUserStore().permissions;
if (permission && permission.length > 0) {
return permissions.some(v => {
return all_permission === v || v === permission
})
return permissions.some((v) => {
return all_permission === v || v === permission;
});
} else {
return false
return false;
}
}
function authRole(role: string): boolean {
const super_admin = "admin"
const roles: Array<string> = store.getters && store.getters.roles
const super_admin = "admin";
const roles: Array<string> = useUserStore().roles;
if (role && role.length > 0) {
return roles.some(v => {
return super_admin === v || v === role
})
return roles.some((v) => {
return super_admin === v || v === role;
});
} else {
return false
return false;
}
}
@ -31,7 +30,7 @@ export default {
* @returns
*/
hasPermi(permission: string): boolean {
return authPermission(permission)
return authPermission(permission);
},
/**
* 验证用户是否含有指定权限，只需包含其中一个
@ -39,9 +38,9 @@ export default {
* @returns
*/
hasPermiOr(permissions: Array<string>): boolean {
return permissions.some(item => {
return authPermission(item)
})
return permissions.some((item) => {
return authPermission(item);
});
},
/**
* 验证用户是否含有指定权限，必须全部拥有
@ -49,9 +48,9 @@ export default {
* @returns
*/
hasPermiAnd(permissions: Array<string>): boolean {
return permissions.every(item => {
return authPermission(item)
})
return permissions.every((item) => {
return authPermission(item);
});
},
/**
* 验证用户是否具备某角色
@ -59,7 +58,7 @@ export default {
* @returns
*/
hasRole(role: string): boolean {
return authRole(role)
return authRole(role);
},
/**
* 验证用户是否含有指定角色，只需包含其中一个
@ -67,9 +66,9 @@ export default {
* @returns
*/
hasRoleOr(roles: Array<string>): boolean {
return roles.some(item => {
return authRole(item)
})
return roles.some((item) => {
return authRole(item);
});
},
/**
* 验证用户是否含有指定角色，必须全部拥有
@ -77,8 +76,8 @@ export default {
* @returns
*/
hasRoleAnd(roles: Array<string>): boolean {
return roles.every(item => {
return authRole(item)
})
}
}
return roles.every((item) => {
return authRole(item);
});
},
};

111
src/store/modules/user.ts
View File

@ -1,80 +1,89 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import defAva from '@/static/images/profile.jpg'
import { defineStore } from 'pinia'
import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
import defAva from "@/static/images/profile.jpg";
import { defineStore } from "pinia";
export interface LoginForm {
username: string
password: string
code: string
uuid: string
username: string;
password: string;
code: string;
uuid: string;
}
const useUserStore = defineStore(
'user',
{
const useUserStore = defineStore("user", {
state: () => ({
token: getToken(),
name: '',
avatar: '',
name: "",
avatar: "",
roles: Array(),
permissions: []
permissions: [],
}),
actions: {
// 登录
login(userInfo: LoginForm) {
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
const username = userInfo.username.trim();
const password = userInfo.password;
const code = userInfo.code;
const uuid = userInfo.uuid;
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then((res:any) => {
setToken(res.token)
this.token = res.token
resolve(null)
}).catch(error => {
reject(error)
})
login(username, password, code, uuid)
.then((res: any) => {
setToken(res.token);
this.token = res.token;
resolve(null);
})
.catch((error) => {
reject(error);
});
});
},
// 获取用户信息
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then((res:any) => {
const user = res.user
getInfo()
.then((res: any) => {
const user = res.user;
// @ts-ignore
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
const avatar =
user.avatar == "" || user.avatar == null
? defAva
: import.meta.env.VITE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
this.roles = res.roles
this.permissions = res.permissions
if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
this.roles = res.roles;
this.permissions = res.permissions;
} else {
this.roles = ['ROLE_DEFAULT']
this.roles = ["ROLE_DEFAULT"];
}
this.name = user.userName
this.name = user.userName;
this.avatar = avatar;
resolve(res)
}).catch(error => {
reject(error)
})
resolve(res);
})
.catch((error) => {
reject(error);
});
});
},
// 退出系统
logOut() {
return new Promise((resolve, reject) => {
logout().then(() => {
this.token = ''
this.roles = []
this.permissions = []
removeToken()
resolve(null)
}).catch(error => {
reject(error)
})
})
}
}
logout()
.then(() => {
this.token = "";
this.roles = [];
this.permissions = [];
this.name = "";
this.avatar = "";
removeToken();
resolve(null);
})
.catch((error) => {
reject(error);
});
});
},
},
});
export default useUserStore
export default useUserStore;

6
src/utils/permission.ts
View File

@ -1,4 +1,4 @@
import store from '@/store'
import useUserStore from '@/store/modules/user'
/**
* 字符权限校验
@ -7,7 +7,7 @@ import store from '@/store'
*/
export function checkPermi(value:Array<string>) {
if (value && value instanceof Array && value.length > 0) {
const permissions:Array<string> = store.getters && store.getters.permissions
const permissions:Array<string> = useUserStore().permissions
const permissionDatas = value
const all_permission = "*:*:*"
@ -32,7 +32,7 @@ export function checkPermi(value:Array<string>) {
*/
export function checkRole(value:Array<string>) {
if (value && value instanceof Array && value.length > 0) {
const roles:Array<string> = store.getters && store.getters.roles
const roles:Array<string> = useUserStore().roles
const permissionRoles = value
const super_admin = "admin"

4
src/utils/request.ts
View File

@ -1,9 +1,9 @@
import store from '@/store'
import config from '@/config'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
import { RequestConfig, ResponseData } from '@/types/request'
import useUserStore from '@/store/modules/user'
let timeout = 10000
const baseUrl = config.baseUrl
@ -44,7 +44,7 @@ const request = <T>(config:RequestConfig):Promise<ResponseData<T>> => {
if (code === 401) {
showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
if (res.confirm) {
store.dispatch('LogOut').then(res => {
useUserStore().logOut().then(res => {
uni.reLaunch({ url: '/pages/login' })
})
}

5
src/utils/upload.ts
View File

@ -1,9 +1,10 @@
import store from '@/store'
import config from '@/config'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { toast, showConfirm, tansParams } from '@/utils/common'
import { ResponseData, RequestUploadConfig } from '@/types/request'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
let timeout = 10000
const baseUrl = config.baseUrl
@ -39,7 +40,7 @@ const upload = <T>(config:RequestUploadConfig):Promise<ResponseData<T>> => {
} else if (code == 401) {
showConfirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then(res => {
if (res.confirm) {
store.dispatch('LogOut').then(res => {
userStore.logOut().then(res => {
uni.reLaunch({ url: '/pages/login' })
})
}