@utogether/udp-core 1.0.1-beta.22 → 1.0.1-beta.24

package/src/plugins/i18n/zh.ts

@@ -109,7 +109,9 @@ export default {
     organizationName: '组织名称',
     organizationCode: '组织编码',
     appupper: '已上架',
-    applower: '已下架'
+    applower: '已下架',
+    isApprovalPage: '审批页面',
+    showLink: '菜单可见'
   },
   btn: {
     passwordReset: '密码重置',
@@ -334,7 +336,7 @@ export default {
     imageCapacity: '图片大小{capacity}',
     singleImg: '仅支持设置单张图',
     emptyAuth: '无系统权限, 请先给用户分配角色重试',
-    initPassword: `初始密码为:【123456】,请及时修改密码`,
+    initPassword: `初始密码为:【{code}】,请及时修改密码`,
     loginFailure: '用户名或密码不能为空',
     updatenow: '立即更新',
     newVersion: '检测到新版本',
@@ -353,6 +355,7 @@ export default {
     dictInfo: '【{name}】字典值',
     lovView: '值集视图',
     lovColConfig: '值集列配置',
-    sequenceInfo: '{name}单据序列配置'
+    sequenceInfo: '{name}单据序列配置',
+    userInfo: '用户信息'
   }
 };

package/src/router/utils.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2024-08-01 21:42:39
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-11-10 09:22:45
+ * @LastEditTime: 2025-11-13 18:18:46
  * @FilePath: \udp-front\packages\udp-core\src\router\utils.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -298,7 +298,7 @@ const addAsyncRoutes = (arrRoutes: Array<any>) => {
     }
     const { icon, permissionCode, extraIcon, frameSrc } = v;
     // 流程菜单保存
-    v.isFlowMenu && processMenus.push(v);
+    v.isApprovalPage === 'Y' && processMenus.push(v);
 
     v.meta = {
       keepAlive: true,

package/src/style/button.scss

@@ -1,85 +1,85 @@
-.vxe-button.size--mini.type--button {
-  height: 25px;
-}
-
-.vxe-button.size--small.type--button {
-  height: 25px;
-}
-
-.vxe-button.type--button.theme--u-cyan,
-.vxe-button.type--button.theme--u-cyan:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-cyan {
-  background-color: #1cbbb4;
-}
-
-.vxe-button.type--button.theme--u-cyan:active {
-  background-color: #39b54a;
-}
-
-// 禁用状态
-.vxe-button.type--button.theme--u-cyan.is--disabled {
-  background-color: #69e4de;
-  border-color: #69e4de;
-}
-
-.vxe-button.type--button.theme--u-color-shallow,
-.vxe-button.type--button.theme--u-color-shallow:hover {
-  color: #fff;
-}
-
-.vxe-button.type--button.theme--u-color-shallow {
-  background-color: #fbbd08;
-}
-
-.vxe-button.type--button.theme--u-color-shallow:active {
-  background-color: #fff;
-}
-
-.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
-  background-color: #40e0d0;
-  border-color: #40e0d0;
-}
-
-.vxe-button.type--button:not(.is--disabled):hover {
-  color: inherit;
-
-  .vxe-button--icon,
-  .vxe-button--item {
-    color: inherit;
-  }
-}
-
-.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
-  .vxe-button--item {
-    color: var(--udp-theme-vxeColor);
-  }
-}
-
-.u-color-royalBlue {
-  color: #4169e1;
-}
-
-.u-color-turquoise {
-  color: #40e0d0;
-}
-
-.el-dropdown {
-  .el-dropdown__caret-button {
-    margin-left: 0;
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  .el-button-group + .el-button {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-
-  .el-button:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-  }
-}
+.vxe-button.size--mini.type--button {
+  height: 25px;
+}
+
+.vxe-button.size--small.type--button {
+  height: 25px;
+}
+
+.vxe-button.type--button.theme--u-cyan,
+.vxe-button.type--button.theme--u-cyan:hover {
+  color: #fff !important;
+}
+
+.vxe-button.type--button.theme--u-cyan {
+  background-color: #1cbbb4;
+}
+
+.vxe-button.type--button.theme--u-cyan:active {
+  background-color: #39b54a;
+}
+
+// 禁用状态
+.vxe-button.type--button.theme--u-cyan.is--disabled {
+  background-color: #69e4de;
+  border-color: #69e4de;
+}
+
+.vxe-button.type--button.theme--u-color-shallow,
+.vxe-button.type--button.theme--u-color-shallow:hover {
+  color: #fff;
+}
+
+.vxe-button.type--button.theme--u-color-shallow {
+  background-color: #fbbd08;
+}
+
+.vxe-button.type--button.theme--u-color-shallow:active {
+  background-color: #fff;
+}
+
+.layout-theme-default .vxe-button.type--button.theme--u-cyan:not(.is--disabled):hover {
+  background-color: #40e0d0;
+  border-color: #40e0d0;
+}
+
+.vxe-button.type--button:not(.is--disabled):hover {
+  color: inherit;
+
+  .vxe-button--icon,
+  .vxe-button--item {
+    color: inherit;
+  }
+}
+
+.vxe-button[name='favorite'].type--button:not(.is--disabled):hover {
+  .vxe-button--item {
+    color: var(--udp-theme-vxeColor);
+  }
+}
+
+.u-color-royalBlue {
+  color: #4169e1;
+}
+
+.u-color-turquoise {
+  color: #40e0d0;
+}
+
+.el-dropdown {
+  .el-dropdown__caret-button {
+    margin-left: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+
+  .el-button-group + .el-button {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+
+  .el-button:first-child {
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+  }
+}

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

@@ -0,0 +1,294 @@
+import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
+import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
+import { NProgress, cookies, errorMessage } from '@utogether/utils';
+import { isRef } from 'vue';
+import { has } from 'xe-utils';
+
+const kTOKENKEY = 'authorized-token';
+const defaultConfig: AxiosRequestConfig = {
+  timeout: 180000,
+  headers: {
+    Accept: 'application/json, text/plain, */*',
+    'Content-Type': 'application/json',
+    'X-Requested-With': 'XMLHttpRequest'
+  }
+};
+class SuHttp {
+  constructor() {
+    this.httpInterceptorsRequest();
+    this.httpInterceptorsResponse();
+  }
+  router = undefined;
+  baseUrl = 'http: //192.168.101.138.8099';
+  /** token过期后，暂存待执行的请求 */
+  private static requests = [];
+
+  /** 防止重复刷新token */
+  private static isRefreshing = false;
+
+  /** 设置router调整 */
+  setRouter(router) {
+    this.router = router;
+  }
+
+  setBaseUrl(baseUrl) {
+    this.baseUrl = baseUrl;
+  }
+  // 初始化配置对象
+  private static initConfig: SuHttpRequestConfig = {};
+
+  // 保存当前Axios实例对象
+  private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
+
+  /** 重连原始请求 */
+  private static retryOriginalRequest(config: SuHttpRequestConfig) {
+    return new Promise(resolve => {
+      // @ts-ignore
+      SuHttp.requests.push((token: string) => {
+        config.headers!['Authorization'] = 'Bearer ' + token;
+        resolve(config);
+      });
+    });
+  }
+
+  // 请求拦截
+  private httpInterceptorsRequest(): void {
+    SuHttp.axiosInstance.interceptors.request.use(
+      (config: any) => {
+        if (has(config, 'loading') && isRef(config.loading)) {
+          config.loading.value = true;
+        }
+        // 开启进度条动画
+        NProgress.start();
+        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
+        if (typeof config.beforeRequestCallback === 'function') {
+          config.beforeRequestCallback(config);
+          return config;
+        }
+        if (SuHttp.initConfig.beforeRequestCallback) {
+          SuHttp.initConfig.beforeRequestCallback(config);
+          return config;
+        }
+        const whiteList = ['/refreshToken', '/login'];
+        if (whiteList.some(v => config.url.indexOf(v) > -1)) return config;
+        return new Promise(resolve => {
+          const token = cookies.get(kTOKENKEY);
+          if (token) {
+            const data = JSON.parse(token);
+            const now = new Date().getTime();
+            const expired = data.expires - now <= 0;
+            if (expired) {
+              if (!SuHttp.isRefreshing) {
+                SuHttp.isRefreshing = true;
+                // requests.push(() => SuHttp.axiosInstance(config));
+                this.get(this.baseUrl + '/uath/refreshToken', {
+                  refreshToken: data.refreshToken
+                })
+                  .then((res: any) => {
+                    if (!res?.access_token) {
+                      this.routeToLogin();
+                    } else {
+                      // 替换token
+                      this.setToken(res);
+                      config.headers['Authorization'] = 'Bearer ' + res.access_token;
+                      // token 刷新后将数组的方法重新执行
+                      SuHttp.requests.forEach(cb => cb(res.access_token));
+                      SuHttp.requests = []; // 重新请求完清空
+                    }
+                  })
+                  .catch(() => {
+                    this.routeToLogin();
+                  })
+                  .finally(() => {
+                    SuHttp.isRefreshing = false;
+                  });
+              }
+              // @ts-ignore
+              resolve(SuHttp.retryOriginalRequest(config));
+            } else {
+              config.headers['Authorization'] = 'Bearer ' + data.accessToken;
+              resolve(config);
+            }
+          } else {
+            const sessionKey = cookies.get('kCookies_token') as string;
+            if (sessionKey) {
+              config.headers['X-Token'] = sessionKey;
+            }
+            resolve(config);
+          }
+        });
+      },
+      error => {
+        return Promise.reject(error);
+      }
+    );
+  }
+
+  private setToken(token) {
+    const { access_token, expires_in, refresh_token } = token;
+    const cache = {
+      accessToken: access_token,
+      refreshToken: refresh_token,
+      expires: Date.now() + expires_in * 1000
+    };
+    cookies.set(kTOKENKEY, JSON.stringify(cache));
+    // cookies.set(kTOKENKEY, JSON.stringify(cache), { expires: expires_in });
+  }
+
+  private routeToLogin() {
+    SuHttp.requests = []; // 重新请求完清空
+    cookies.remove('kCookies_token');
+    cookies.remove('authorized-token');
+    cookies.remove('loginer');
+    this.router.push({ name: 'login' });
+  }
+
+  // 响应拦截
+  private httpInterceptorsResponse(): void {
+    const instance = SuHttp.axiosInstance;
+    instance.interceptors.response.use(
+      (response: SuHttpResponse) => {
+        const $config = response.config;
+        if (has($config, 'loading') && isRef($config.loading)) {
+          $config.loading.value = false;
+        }
+        // 关闭进度条动画
+        NProgress.done();
+        // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
+        if (typeof $config.beforeResponseCallback === 'function') {
+          $config.beforeResponseCallback(response);
+          return response.data;
+        }
+        if (SuHttp.initConfig.beforeResponseCallback) {
+          SuHttp.initConfig.beforeResponseCallback(response);
+          return response.data;
+        }
+        return response.data;
+      },
+      (error: SuHttpError) => {
+        const $error = error;
+        // @ts-ignore
+        if (has(error.config, 'loading') && isRef(error?.config?.loading)) {
+          // @ts-ignore
+          error.config.loading.value = false;
+        }
+        $error.isCancelRequest = Axios.isCancel($error);
+        // 关闭进度条动画
+        NProgress.done();
+        // 所有的响应异常 区分来源为取消请求/非取消请求
+        return Promise.reject($error);
+      }
+    );
+  }
+
+  private transformConfigByMethod(params: any, config: SuHttpRequestConfig): SuHttpRequestConfig {
+    const { method } = config;
+    const methods = ['get'];
+    const m = method!.toLocaleLowerCase();
+    const props = methods.includes(m) ? 'params' : 'data';
+    return {
+      ...config,
+      [props]: params
+    };
+  }
+
+  // 通用请求工具函数
+  public request<T>(
+    method: RequestMethods,
+    url: string,
+    param?: AxiosRequestConfig,
+    axiosConfig?: SuHttpRequestConfig
+  ): Promise<T> {
+    const config = this.transformConfigByMethod(param, {
+      method,
+      url,
+      ...axiosConfig
+    } as SuHttpRequestConfig);
+    // 单独处理自定义请求/响应回掉
+    return new Promise((resolve, reject) => {
+      SuHttp.axiosInstance
+        .request(config)
+        .then((res: any) => {
+          if (res && res?.code === '0') {
+            resolve(res.data);
+          } else if (res.code === '500') {
+            errorMessage(res.msg, { duration: 8000 });
+            if (config.method === 'get') {
+              resolve(res);
+            } else {
+              reject(res.msg);
+            }
+          } else if (res?.code !== '-1') {
+            resolve(res);
+          } else {
+            const msg = res?.msg || '服务异常';
+            errorMessage(msg, { duration: 8000 });
+            reject(msg);
+          }
+        })
+        .catch(e => {
+          if (e?.code) {
+            if (e?.response?.status === 401) {
+              // @ts-ignore
+              return this.router?.push({ path: '/login' });
+            }
+            errorMessage(this.getNetworkError(e?.response?.status) || e?.message, { duration: 8000 });
+          }
+          if (e.config.method === 'get') {
+            resolve(e);
+          } else {
+            reject(e);
+          }
+        });
+    });
+  }
+
+  getNetworkError = code => {
+    if (!code) return null;
+    const msgMap = {
+      400: '错误的请求',
+      401: '服务未授权,请重新登录',
+      403: '拒绝访问',
+      404: '请求错误,未找到该资源',
+      408: '请求超时',
+      500: '服务器端出差',
+      502: '网络超时',
+      503: '服务不可用',
+      504: '网络超时'
+    };
+    return msgMap[code];
+  };
+
+  // 单独抽离的post工具函数
+  public post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('post', url, params, config);
+  }
+
+  // 单独抽离的delete工具函数
+  public delete<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('delete', url, params, config);
+  }
+
+  // 单独抽离的put工具函数
+  public put<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    // @ts-ignore
+    return this.request<P>('put', url, params, config);
+  }
+
+  // 单独抽离的get工具函数
+  public get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P> {
+    for (const key in params) {
+      if (!params[key]) delete params[key];
+    }
+    // @ts-ignore
+    return this.request<P>('get', url, params, config);
+  }
+
+  public postRouter<T>(params?: any): Promise<T> {
+    return this.request<T>('post', 'route/service', params);
+  }
+}
+
+export const http = new SuHttp();

package/src/utils/udp/http/types.d.ts

@@ -0,0 +1,42 @@
+/*
+ * @Author: wei.li
+ * @Date: 2022-03-08 15:17:39
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2023-12-01 13:55:46
+ * @Description: SuHttp Axios 类型定义文件
+ */
+import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
+
+export type resultType = {
+  access_token: string;
+  refresh_token: string;
+  expires_in: number;
+};
+
+export type RequestMethods = Extract<Method, 'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'>;
+
+export interface SuHttpError extends AxiosError {
+  isCancelRequest?: boolean;
+}
+
+export interface SuHttpResponse extends AxiosResponse {
+  config: SuHttpRequestConfig;
+}
+
+export interface SuHttpRequestConfig extends AxiosRequestConfig {
+  beforeRequestCallback?: (request: SuHttpRequestConfig) => void;
+  beforeResponseCallback?: (response: SuHttpResponse) => void;
+  loading?: any;
+}
+
+export default class SuHttp {
+  request<T>(
+    method: RequestMethods,
+    url: string,
+    param?: AxiosRequestConfig,
+    axiosConfig?: SuHttpRequestConfig
+  ): Promise<T>;
+  post<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+  postRouter<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+  get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
+}

package/src/views/system/cron/cron-task.vue

@@ -88,18 +88,8 @@ const columns = [
         return [
           <>
             {app}
-            <ut-button
-              content="stopTask"
-              status="danger"
-              icon="ri-close-line"
-              onTap={() => handleStop(row)}
-            />
-            <ut-button
-              content="taskLog"
-              status="info"
-              icon="ri-file-line"
-              onTap={() => handleLog(row)}
-            />
+            <ut-button content="stopTask" status="danger" icon="ri-close-line" onTap={() => handleStop(row)} />
+            <ut-button content="taskLog" status="info" icon="ri-file-line" onTap={() => handleLog(row)} />
           </>
         ];
       }