更新依赖版本,主要将vite升级至6.3.5,并调整相关插件的版本;在多个组件中添加了euid属性以支持用户信息展示;修复了token获取逻辑,优化了用户信息模态框的显示逻辑。
This commit is contained in:
parent
846031a5cb
commit
f1b802cde8
@ -62,7 +62,7 @@
|
|||||||
"unocss": "0.58.0",
|
"unocss": "0.58.0",
|
||||||
"unplugin-auto-import": "^19.2.0",
|
"unplugin-auto-import": "^19.2.0",
|
||||||
"unplugin-vue-components": "^28.5.0",
|
"unplugin-vue-components": "^28.5.0",
|
||||||
"vite": "^4.5.1",
|
"vite": "^6.3.5",
|
||||||
"vite-plugin-compression": "^0.5.1",
|
"vite-plugin-compression": "^0.5.1",
|
||||||
"vite-plugin-vue-devtools": "^7.7.6",
|
"vite-plugin-vue-devtools": "^7.7.6",
|
||||||
"vue-tsc": "^1.8.25",
|
"vue-tsc": "^1.8.25",
|
||||||
|
611
pnpm-lock.yaml
611
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
@ -36,7 +36,7 @@ IconProvider({
|
|||||||
strokeLinejoin: 'bevel'
|
strokeLinejoin: 'bevel'
|
||||||
})
|
})
|
||||||
|
|
||||||
const { uid: showUserId, isShow: isShowUser } = useProvideUserModal()
|
const { uid: showUserId, isShow: isShowUser,euid } = useProvideUserModal()
|
||||||
const { getDarkTheme, getThemeOverride } = useThemeMode()
|
const { getDarkTheme, getThemeOverride } = useThemeMode()
|
||||||
|
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
@ -94,6 +94,7 @@ useClickEvent()
|
|||||||
<UserCardModal
|
<UserCardModal
|
||||||
v-model:show="isShowUser"
|
v-model:show="isShowUser"
|
||||||
v-model:uid="showUserId"
|
v-model:uid="showUserId"
|
||||||
|
:euid="euid"
|
||||||
@update-remark="onChangeRemark"
|
@update-remark="onChangeRemark"
|
||||||
/>
|
/>
|
||||||
</n-layout-content>
|
</n-layout-content>
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
body,
|
body,
|
||||||
html {
|
html {
|
||||||
|
margin-right: 0!important;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
min-width: 500px;
|
min-width: 500px;
|
||||||
color: #333;
|
color: #333;
|
||||||
|
@ -15,6 +15,7 @@ const { showUserInfoModal } = useInject()
|
|||||||
<div class="sys-text">
|
<div class="sys-text">
|
||||||
|
|
||||||
<template v-for="(user, index) in extra.members" :key="index">
|
<template v-for="(user, index) in extra.members" :key="index">
|
||||||
|
{{ data }}
|
||||||
<a @click="showUserInfoModal(user.user_id)">{{ user.nickname }}</a>
|
<a @click="showUserInfoModal(user.user_id)">{{ user.nickname }}</a>
|
||||||
<em v-show="index < extra.members.length - 1">、</em>
|
<em v-show="index < extra.members.length - 1">、</em>
|
||||||
</template>
|
</template>
|
||||||
|
@ -19,6 +19,10 @@ const props = defineProps({
|
|||||||
uid: {
|
uid: {
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 0
|
default: 0
|
||||||
|
},
|
||||||
|
euid: {
|
||||||
|
type: Number,
|
||||||
|
default: 0
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -55,7 +59,7 @@ const options = ref<any>([])
|
|||||||
|
|
||||||
const onLoadData = () => {
|
const onLoadData = () => {
|
||||||
ServeSearchUser({
|
ServeSearchUser({
|
||||||
erp_user_id: props.uid
|
erp_user_id: props.euid
|
||||||
}).then(({ code, data }) => {
|
}).then(({ code, data }) => {
|
||||||
if (code == 200) {
|
if (code == 200) {
|
||||||
userInfo.value = data
|
userInfo.value = data
|
||||||
|
@ -3,8 +3,8 @@ import { inject } from 'vue'
|
|||||||
export function useInject() {
|
export function useInject() {
|
||||||
const user: any = inject('$user')
|
const user: any = inject('$user')
|
||||||
|
|
||||||
const showUserInfoModal = (uid: number) => {
|
const showUserInfoModal = (erp_userid:number,userid?: number,) => {
|
||||||
user(uid)
|
user(erp_userid,userid)
|
||||||
}
|
}
|
||||||
|
|
||||||
return { showUserInfoModal }
|
return { showUserInfoModal }
|
||||||
|
@ -3,8 +3,9 @@ import { ref, provide } from 'vue'
|
|||||||
export function useProvideUserModal() {
|
export function useProvideUserModal() {
|
||||||
const isShow = ref(false)
|
const isShow = ref(false)
|
||||||
const uid = ref(0)
|
const uid = ref(0)
|
||||||
|
const euid=ref(0)
|
||||||
const show = (id: number) => {
|
const show = (eid: number,id:number) => {
|
||||||
|
euid.value=eid
|
||||||
uid.value = id
|
uid.value = id
|
||||||
isShow.value = true
|
isShow.value = true
|
||||||
}
|
}
|
||||||
@ -16,5 +17,5 @@ export function useProvideUserModal() {
|
|||||||
|
|
||||||
provide('$user', show)
|
provide('$user', show)
|
||||||
|
|
||||||
return { isShow, uid, show, close }
|
return { isShow, uid, show, close ,euid}
|
||||||
}
|
}
|
||||||
|
@ -119,6 +119,8 @@ export function useSessionMenu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const onUserInfo = (item: ISession) => {
|
const onUserInfo = (item: ISession) => {
|
||||||
|
console.error('item',item)
|
||||||
|
debugger
|
||||||
user(item.receiver_id)
|
user(item.receiver_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,10 @@ import router from './router'
|
|||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import * as plugins from './plugins'
|
import * as plugins from './plugins'
|
||||||
import request from "@/api/index.js";
|
import request from "@/api/index.js";
|
||||||
|
if (window.__POWERED_BY_WUJIE__) {
|
||||||
|
// eslint-disable-next-line
|
||||||
|
window.__webpack_public_path__ = window.__WUJIE_PUBLIC_PATH__;
|
||||||
|
}
|
||||||
async function bootstrap() {
|
async function bootstrap() {
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ export function isLoggedIn() {
|
|||||||
*/
|
*/
|
||||||
export function getAccessToken() {
|
export function getAccessToken() {
|
||||||
// return storage.get(AccessToken) || ''
|
// return storage.get(AccessToken) || ''
|
||||||
return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22939bb2aea0008a0e4b687680750f2fcff1dd71da701d0a961f65313915a1712826f5c8d3d1fdf999ba3f94912e4744eea50d51ecd72470f47b87cc42ffad74ec3b3c7ff13a011bfbe3a816adfc923db8'
|
return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22b9b32c043123b3db4f35a7a79e1bbe97875bfa18428a4f5ed561887bfbfcab3bd61f2f9348af8bdb89da8c35a7a681fe828af1502b58ebc4ffb99f28fe91d5ba4b0245d1eb24a5ccda9be0cd9bef4d01'
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -320,7 +320,7 @@ onMounted(() => {
|
|||||||
|
|
||||||
<aside class="avatar-column">
|
<aside class="avatar-column">
|
||||||
<im-avatar class="pointer" :src="item.avatar" :size="42" :username="item.nickname"
|
<im-avatar class="pointer" :src="item.avatar" :size="42" :username="item.nickname"
|
||||||
@click="showUserInfoModal(item.erp_user_id)" />
|
@click="showUserInfoModal(item.erp_user_id,item.user_id)" />
|
||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<!-- 主体信息 -->
|
<!-- 主体信息 -->
|
||||||
|
@ -46,9 +46,9 @@ export default defineConfig(({ mode }) => {
|
|||||||
vueJsx({}),
|
vueJsx({}),
|
||||||
compressPlugin(),
|
compressPlugin(),
|
||||||
UnoCSS(),
|
UnoCSS(),
|
||||||
// vueDevTools({
|
vueDevTools({
|
||||||
// launchEditor: 'cursor',
|
launchEditor: 'cursor',
|
||||||
// })
|
})
|
||||||
],
|
],
|
||||||
define: {
|
define: {
|
||||||
__APP_ENV__: env.APP_ENV
|
__APP_ENV__: env.APP_ENV
|
||||||
|
Loading…
Reference in New Issue
Block a user