@utogether/udp-core 2.0.0-beta.27 → 2.0.0-beta.28

package/src/utils/udp/http/index.ts

@@ -1,6 +1,8 @@
 import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
-import type { XHttpError, RequestMethods, XHttpRequestConfig } from './types.d';
+import type { RequestMethods, XHttpRequestConfig } from './types.d';
+// import { NProgress, cookies, errorMessage } from "./index";
 import { NProgress, cookies, errorMessage } from '@utogether/utils';
+
 import { isRef } from 'vue';
 import { has } from 'xe-utils';
 
@@ -61,6 +63,10 @@ class XHttp {
   }
   router = undefined;
   baseUrl = null;
+
+  // 服务白名单，判断是否需要token
+  whiteList = [/\/refreshToken$/, /\/login$/];
+
   /** token过期后，暂存待执行的请求 */
   private static requests = [];
 
@@ -98,7 +104,7 @@ class XHttp {
         }
 
         // 重复请求取消前一个
-        addPending(config);
+        !config.url.includes('uath/refreshToken') && addPending(config);
 
         // 开启进度条动画
         NProgress.start();
@@ -109,9 +115,7 @@ class XHttp {
           return config;
         }
 
-        // 服务白名单，判断是否需要token
-        const whiteList = [/\/refreshToken$/, /\/login$/];
-        if (whiteList.some(pattern => pattern.test(config.url))) return config;
+        if (this.whiteList.some(pattern => pattern.test(config.url))) return config;
 
         return new Promise(async resolve => {
           const token = cookies.get(kTOKENKEY);
@@ -122,9 +126,10 @@ class XHttp {
             if (expired) {
               if (!XHttp.isRefreshing) {
                 XHttp.isRefreshing = true;
-                this.get(this.baseUrl + '/uath/refreshToken', {
-                  refreshToken: data.refreshToken
-                })
+                XHttp.axiosInstance
+                  .get(this.baseUrl + '/uath/refreshToken', {
+                    params: { refreshToken: data.refreshToken }
+                  })
                   .then((res: any) => {
                     if (!res?.access_token) {
                       this.routeToLogin();
@@ -144,7 +149,9 @@ class XHttp {
                     XHttp.isRefreshing = false;
                   });
               }
-              return XHttp.retryOriginalRequest(config);
+              // 请求完成，移除pending记录
+              // @ts-ignore
+              resolve(XHttp.retryOriginalRequest(config));
             } else {
               config.headers['Authorization'] = 'Bearer ' + data.accessToken;
               resolve(config);
@@ -169,7 +176,8 @@ class XHttp {
     const cache = {
       accessToken: access_token,
       refreshToken: refresh_token,
-      expires: Date.now() + expires_in * 1000
+      expires: Date.now() + expires_in
+      // expires: Date.now() + expires_in * 1000
     };
     cookies.set(kTOKENKEY, JSON.stringify(cache));
   }
@@ -211,7 +219,7 @@ class XHttp {
 
         return response.data;
       },
-      (error: XHttpError) => {
+      (error: any) => {
         // 被取消的请求不做错误提示
         if (Axios.isCancel(error)) {
           console.warn('请求已取消:', error.message);

package/src/views/uhome/components/home-todo.vue

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-11-05 18:11:29
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2026-05-18 13:58:13
+ * @LastEditTime: 2026-08-13 16:23:03
  * @FilePath: \udp-crm\packages\udp-crm\src\views\uflow\todo\flow-todo.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -58,15 +58,17 @@
 </template>
 
 <script setup lang="tsx">
-import { useRouter } from 'vue-router';
-import { ref, onMounted, nextTick } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { ref, onMounted, nextTick, watch } from 'vue';
 
 import { cookies } from '@utogether/utils';
 import { isEmpty } from 'xe-utils';
 import to from 'await-to-js';
 import { getServiceApi } from '../../../api';
 import { kLOGINER } from '../../../contant';
+
 const router = useRouter();
+const route = useRoute();
 
 const xgrid = ref(null);
 const ygrid = ref(null);
@@ -172,6 +174,16 @@ const handleTodo = (row, dataStatus = 'detail') => {
   router.push({ name: 'FlowApproval' });
 };
 
+// 监听路由跳转，返回首页时刷新列表
+watch(
+  () => route.fullPath,
+  () => {
+    if (route.name === 'UdpWelcome') {
+      getDataList(activeName.value, keywords.value);
+    }
+  }
+);
+
 onMounted(() => {
   data.value[`${activeName.value}Page`] = pagination;
   getDataList('todo', null);

package/src/views/uhome/dynamic-card.vue

@@ -1,31 +1,31 @@
-<!--
- * @Author: levi7754 levi7754@163.com
- * @Date: 2025-12-26 13:53:05
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-12-30 09:23:25
- * @FilePath: \udp-front\packages\udp-core\src\views\uhome\dynamic-card.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <div class="dynamic-card w-full">
-    <vxe-row :gutter="[10, 10]" wrap>
-      <vxe-col v-for="data in list" :key="data.id" :span="data.span">
-        <vxe-card :title="data.title" :height="data.height" shadow>
-          <dynamicComponent :data="data" />
-        </vxe-card>
-      </vxe-col>
-    </vxe-row>
-  </div>
-</template>
-<script setup lang="tsx">
-import dynamicComponent from './components/dynamic-component.vue';
-
-interface IProps {
-  list: IRecord;
-}
-withDefaults(defineProps<IProps>(), {
-  list: () => {
-    return [];
-  }
-});
-</script>
+<!--
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-12-26 13:53:05
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-12-30 09:23:25
+ * @FilePath: \udp-front\packages\udp-core\src\views\uhome\dynamic-card.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="dynamic-card w-full">
+    <vxe-row :gutter="[10, 10]" wrap>
+      <vxe-col v-for="data in list" :key="data.id" :span="data.span">
+        <vxe-card :title="data.title" :height="data.height" shadow>
+          <dynamicComponent :data="data" />
+        </vxe-card>
+      </vxe-col>
+    </vxe-row>
+  </div>
+</template>
+<script setup lang="tsx">
+import dynamicComponent from './components/dynamic-component.vue';
+
+interface IProps {
+  list: IRecord;
+}
+withDefaults(defineProps<IProps>(), {
+  list: () => {
+    return [];
+  }
+});
+</script>