Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin
This commit is contained in:
commit
7141e25e95
@ -26,13 +26,13 @@ export function usePriorityValue<
|
||||
// 通过判断原始props是否有值来判断是否传入
|
||||
const rawProps = (instance?.vnode?.props || {}) as T;
|
||||
|
||||
const standardRwaProps = {} as T;
|
||||
const standardRawProps = {} as T;
|
||||
|
||||
for (const [key, value] of Object.entries(rawProps)) {
|
||||
standardRwaProps[kebabToCamelCase(key) as K] = value;
|
||||
standardRawProps[kebabToCamelCase(key) as K] = value;
|
||||
}
|
||||
const propsKey =
|
||||
standardRwaProps?.[key] === undefined ? undefined : props[key];
|
||||
standardRawProps?.[key] === undefined ? undefined : props[key];
|
||||
|
||||
// slot可以关闭
|
||||
return getFirstNonNullOrUndefined(
|
||||
|
@ -25,7 +25,7 @@ function handleUpdate(value: BuiltinThemeType) {
|
||||
<template>
|
||||
<div class="group relative flex items-center overflow-hidden">
|
||||
<div
|
||||
class="ease-ou flex w-0 overflow-hidden transition-all duration-500 group-hover:w-60"
|
||||
class="flex w-0 overflow-hidden transition-all duration-500 ease-out group-hover:w-60"
|
||||
>
|
||||
<template v-for="preset in COLOR_PRESETS" :key="preset.color">
|
||||
<VbenIconButton
|
||||
|
@ -60,6 +60,8 @@ export const authenticateResponseInterceptor = ({
|
||||
client.refreshTokenQueue.forEach((callback) => callback(''));
|
||||
client.refreshTokenQueue = [];
|
||||
console.error('Refresh token failed, please login again.');
|
||||
await doReAuthenticate();
|
||||
|
||||
throw refreshError;
|
||||
} finally {
|
||||
client.isRefreshing = false;
|
||||
|
Loading…
Reference in New Issue
Block a user