by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap 2024-08-26 14:46:57 +08:00
commit 7141e25e95
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/@core/composables/src/use-priority-value.ts
View File

@ -26,13 +26,13 @@ export function usePriorityValue<
// 通过判断原始props是否有值来判断是否传入 // 通过判断原始props是否有值来判断是否传入
const rawProps = (instance?.vnode?.props || {}) as T; const rawProps = (instance?.vnode?.props || {}) as T;
const standardRwaProps = {} as T; const standardRawProps = {} as T;
for (const [key, value] of Object.entries(rawProps)) { for (const [key, value] of Object.entries(rawProps)) {
standardRwaProps[kebabToCamelCase(key) as K] = value; standardRawProps[kebabToCamelCase(key) as K] = value;
} }
const propsKey = const propsKey =
standardRwaProps?.[key] === undefined ? undefined : props[key]; standardRawProps?.[key] === undefined ? undefined : props[key];
// slot可以关闭 // slot可以关闭
return getFirstNonNullOrUndefined( return getFirstNonNullOrUndefined(

2
packages/effects/layouts/src/widgets/color-toggle.vue
View File

@ -25,7 +25,7 @@ function handleUpdate(value: BuiltinThemeType) {
<template> <template>
<div class="group relative flex items-center overflow-hidden"> <div class="group relative flex items-center overflow-hidden">
<div <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"> <template v-for="preset in COLOR_PRESETS" :key="preset.color">
<VbenIconButton <VbenIconButton

2
packages/effects/request/src/request-client/preset-interceptors.ts
View File

@ -60,6 +60,8 @@ export const authenticateResponseInterceptor = ({
client.refreshTokenQueue.forEach((callback) => callback('')); client.refreshTokenQueue.forEach((callback) => callback(''));
client.refreshTokenQueue = []; client.refreshTokenQueue = [];
console.error('Refresh token failed, please login again.'); console.error('Refresh token failed, please login again.');
await doReAuthenticate();
throw refreshError; throw refreshError;
} finally { } finally {
client.isRefreshing = false; client.isRefreshing = false;