@utogether/udp-core 1.0.1-beta.9 → 1.0.2

package/src/utils/dataFormat/index.ts

@@ -1,223 +1,223 @@
-/*
- * @Author: wei.li
- * @Date: 2022-06-23 17:29:11
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2024-07-04 21:06:05
- * @Description: file content
- */
-
-import { clone, isArray, isString, isEmpty, toDateString } from 'xe-utils';
-import { useRender } from '@utogether/utils';
-
-const renderHook = useRender();
-
-export const rulesFormat = (records, rule, t) => {
-  records
-    .filter(colunm => colunm.required)
-    .forEach(colunm => {
-      const { field, title } = colunm;
-      rule[field] = [
-        {
-          required: true,
-          message: `${t('message.required')}${title ? t(title) : t(`message.${field}`)}`
-        }
-      ];
-    });
-  return rule;
-};
-
-export const columnFormat = columns => {
-  return columns.map(m => {
-    if (m.type) return m;
-    m.title = m.title || `message.${m.field}`;
-    return m;
-  });
-};
-
-const searchBtn: IFormItemProps = {
-  span: 6,
-  align: 'right',
-  collapseNode: false,
-  itemRender: {
-    name: '$buttons',
-    children: [
-      {
-        props: {
-          type: 'submit',
-          content: 'message.btn.search',
-          status: 'primary',
-          icon: 'vxe-icon-search'
-        }
-      },
-      {
-        props: {
-          type: 'reset',
-          content: 'message.btn.reset',
-          status: 'info',
-          icon: 'ri-refresh-line ri-1x'
-        }
-      }
-    ]
-  }
-};
-
-export const formatGridItems = (records, favorite) => {
-  const formItems = records.filter(f => !f.isHidden);
-  const len = formItems.length;
-  // 前3个存在时间范围 或者 存在span = 12
-  const isDateRange = len > 2 && formItems.some((f, idx) => idx < 3 && (f.span > 6 || getDateRange(f)));
-  // 需要展示折叠按钮
-  const isCollapse = isDateRange || len > 3;
-  const defaultCollapse = { collapseTags: true, collapseTagsTooltip: true };
-  const items = formItems.map((item, idx) => {
-    item.folding = isDateRange ? isCollapse && idx > 1 : isCollapse && idx > 2;
-    item.span = getDateRange(item) ? 12 : item.span || 6;
-    if (item.code && !item.itemRender) {
-      item.itemRender = renderHook.renderDict(item.code);
-    }
-    item.itemRender = item.itemRender || { name: '$input' };
-    item.title = item.title || `message.${item.field}`;
-    if (item.multiple || item.itemRender?.props?.multiple) {
-      item.itemRender.props = Object.assign(defaultCollapse, item.itemRender?.props || {});
-    }
-    return item;
-  });
-  const btn = clone(searchBtn, true);
-  btn.collapseNode = isCollapse;
-  favorite && btn.itemRender.children.length < 3 && btn.itemRender.children.push(favorite);
-
-  if (isCollapse) {
-    // 按钮设置为	折叠节点
-    // 折叠时将搜索按钮插入到第一列的最后
-    const idx = isDateRange ? 2 : 3;
-    items.splice(idx, 0, btn);
-  } else {
-    items.push(btn);
-  }
-  return items;
-};
-
-const getDateRange = item => {
-  if (item.itemRender?.name === '#SuDateRange') {
-    return item.itemRender?.props?.type === 'daterange' || !item.itemRender?.props?.type;
-  }
-  return false;
-};
-export const formatButton = (buttons, auth?) => {
-  buttons.forEach(btn => {
-    btn.auth = auth ? auth[btn.code] || btn.auth : btn.auth;
-    if (!btn.name) {
-      btn.name = `message.${btn.name || btn.code}`;
-    } else if (!btn.name.includes('message.')) {
-      btn.name = `message.${btn.name}`;
-    }
-  });
-  return buttons;
-};
-
-export const queryAll = (props, http, form, fetchParam) => {
-  const params = { pageNum: 1, pageSize: 100000 };
-  Object.assign(params, form, fetchParam || {});
-  const query = formatDateRange(params, props.formItems);
-  const ajax = props.version === 'v2' ? http.get : http.post;
-  return new Promise((resolve, reject) => {
-    ajax(props.serviceCode.fetch, query)
-      .then((response: IResponseData) => {
-        resolve(response.list);
-      })
-      .catch((e: any) => {
-        reject(e);
-      });
-  });
-};
-
-/** 查询服务 */
-export const query = (props, form, page, http, fetchParam) => {
-  for (const i in form) {
-    if (form[i] && isString(form[i])) {
-      form[i] = form[i].trim();
-    }
-  }
-  const params = {
-    pageNum: page.currentPage,
-    pageSize: page.pageSize
-  };
-  Object.assign(params, form, fetchParam || {});
-  const query = formatDateRange(params, props.formItems);
-  const {
-    version,
-    serviceCode: { fetch }
-  } = props;
-  if (!fetch) return null;
-  if (version === 'v2') {
-    return http.get(fetch, query);
-  }
-  return http.post(fetch, query);
-};
-/** 删除服务 */
-export const del = (http, removeRecords, props) => {
-  const { serviceCode, version, isSingleSubmit } = props;
-  const { del } = serviceCode;
-  if (!del) return null;
-  if (version === 'v2') {
-    return http.delete(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
-  }
-  return http.post(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
-};
-/** 更新服务 */
-export const save = (http, body, props, confirmParam) => {
-  const allService = [];
-  const { serviceCode, isSingleSubmit, version, multiField } = props;
-  const { add, update } = serviceCode;
-  const { insertRecords, updateRecords } = body;
-
-  if (!isEmpty(insertRecords) && add) {
-    insertRecords.forEach(m => {
-      !isEmpty(confirmParam) && Object.assign(m, confirmParam);
-      m = !isEmpty(multiField) ? setMultiField(props, m, confirmParam) : m;
-    });
-    const service = http.post(add, !isSingleSubmit ? insertRecords : insertRecords[0]);
-    allService.push(service);
-  }
-  if (!isEmpty(updateRecords) && update) {
-    const records = !isEmpty(multiField)
-      ? updateRecords.map(m => setMultiField(props, m, confirmParam))
-      : updateRecords;
-    let service = null;
-    if (version === 'v2') {
-      service = http.put(update, !isSingleSubmit ? records : records[0]);
-    } else {
-      service = http.post(update, !isSingleSubmit ? records : records[0]);
-    }
-    allService.push(service);
-  }
-  return allService;
-};
-
-const formatDateRange = (listQuery: any, formItems) => {
-  const dateRanges = formItems.filter(f => f.itemRender?.name === '#SuDateRange');
-  if (isEmpty(dateRanges)) return listQuery;
-  const query = clone(listQuery, true);
-  dateRanges.forEach((element: any) => {
-    const val = query[element.field];
-    if (val && element.toField) {
-      query[element.fromField] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
-      query[element.toField] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
-      delete query[element.field];
-    } else if (val) {
-      query[`${element.field}From`] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
-      query[`${element.field}To`] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
-      delete query[element.field];
-    }
-  });
-  return query;
-};
-
-const setMultiField = (props, source: any, confirmParam) => {
-  const { multiField } = props;
-  multiField.forEach(field => {
-    source[field] = isArray(source[field]) ? source[field].join(',') : source[field];
-  });
-  Object.assign(source, confirmParam || {});
-  return source;
-};
+/*
+ * @Author: wei.li
+ * @Date: 2022-06-23 17:29:11
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2024-07-04 21:06:05
+ * @Description: file content
+ */
+
+import { clone, isArray, isString, isEmpty, toDateString } from 'xe-utils';
+import { useRender } from '@utogether/utils';
+
+const renderHook = useRender();
+
+export const rulesFormat = (records, rule, t) => {
+  records
+    .filter(colunm => colunm.required)
+    .forEach(colunm => {
+      const { field, title } = colunm;
+      rule[field] = [
+        {
+          required: true,
+          message: `${t('message.required')}${title ? t(title) : t(`message.${field}`)}`
+        }
+      ];
+    });
+  return rule;
+};
+
+export const columnFormat = columns => {
+  return columns.map(m => {
+    if (m.type) return m;
+    m.title = m.title || `message.${m.field}`;
+    return m;
+  });
+};
+
+const searchBtn: IFormItemProps = {
+  span: 6,
+  align: 'right',
+  collapseNode: false,
+  itemRender: {
+    name: '$buttons',
+    children: [
+      {
+        props: {
+          type: 'submit',
+          content: 'message.btn.search',
+          status: 'primary',
+          icon: 'vxe-icon-search'
+        }
+      },
+      {
+        props: {
+          type: 'reset',
+          content: 'message.btn.reset',
+          status: 'info',
+          icon: 'ri-refresh-line ri-1x'
+        }
+      }
+    ]
+  }
+};
+
+export const formatGridItems = (records, favorite) => {
+  const formItems = records.filter(f => f.visible !== false);
+  const len = formItems.length;
+  // 前3个存在时间范围 或者 存在span = 12
+  const isDateRange = len > 2 && formItems.some((f, idx) => idx < 3 && (f.span > 6 || getDateRange(f)));
+  // 需要展示折叠按钮
+  const isCollapse = isDateRange || len > 3;
+  const defaultCollapse = { collapseTags: true, collapseTagsTooltip: true };
+  const items = formItems.map((item, idx) => {
+    item.folding = isDateRange ? isCollapse && idx > 1 : isCollapse && idx > 2;
+    item.span = getDateRange(item) ? 12 : item.span || 6;
+    if (item.code && !item.itemRender) {
+      item.itemRender = renderHook.renderDict(item.code);
+    }
+    item.itemRender = item.itemRender || { name: '$input' };
+    item.title = item.title || `message.${item.field}`;
+    if (item.multiple || item.itemRender?.props?.multiple) {
+      item.itemRender.props = Object.assign(defaultCollapse, item.itemRender?.props || {});
+    }
+    return item;
+  });
+  const btn = clone(searchBtn, true);
+  btn.collapseNode = isCollapse;
+  favorite && btn.itemRender.children.length < 3 && btn.itemRender.children.push(favorite);
+
+  if (isCollapse) {
+    // 按钮设置为	折叠节点
+    // 折叠时将搜索按钮插入到第一列的最后
+    const idx = isDateRange ? 2 : 3;
+    items.splice(idx, 0, btn);
+  } else {
+    items.push(btn);
+  }
+  return items;
+};
+
+const getDateRange = item => {
+  if (item.itemRender?.name === '#SuDateRange') {
+    return item.itemRender?.props?.type === 'daterange' || !item.itemRender?.props?.type;
+  }
+  return false;
+};
+export const formatButton = (buttons, auth?) => {
+  buttons.forEach(btn => {
+    btn.auth = auth ? auth[btn.code] || btn.auth : btn.auth;
+    if (!btn.name) {
+      btn.name = `message.${btn.name || btn.code}`;
+    } else if (!btn.name.includes('message.')) {
+      btn.name = `message.${btn.name}`;
+    }
+  });
+  return buttons;
+};
+
+export const queryAll = (props, http, form, fetchParam) => {
+  const params = { pageNum: 1, pageSize: 100000 };
+  Object.assign(params, form, fetchParam || {});
+  const query = formatDateRange(params, props.formItems);
+  const ajax = props.version === 'v2' ? http.get : http.post;
+  return new Promise((resolve, reject) => {
+    ajax(props.serviceCode.fetch, query)
+      .then((response: IResponseData) => {
+        resolve(response.list);
+      })
+      .catch((e: any) => {
+        reject(e);
+      });
+  });
+};
+
+/** 查询服务 */
+export const query = (props, form, page, http, fetchParam) => {
+  for (const i in form) {
+    if (form[i] && isString(form[i])) {
+      form[i] = form[i].trim();
+    }
+  }
+  const params = {
+    pageNum: page.currentPage,
+    pageSize: page.pageSize
+  };
+  Object.assign(params, form, fetchParam || {});
+  const query = formatDateRange(params, props.formItems);
+  const {
+    version,
+    serviceCode: { fetch }
+  } = props;
+  if (!fetch) return null;
+  if (version === 'v2') {
+    return http.get(fetch, query);
+  }
+  return http.post(fetch, query);
+};
+/** 删除服务 */
+export const del = (http, removeRecords, props) => {
+  const { serviceCode, version, isSingleSubmit } = props;
+  const { del } = serviceCode;
+  if (!del) return null;
+  if (version === 'v2') {
+    return http.delete(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
+  }
+  return http.post(del, !isSingleSubmit ? removeRecords : removeRecords[0]);
+};
+/** 更新服务 */
+export const save = (http, body, props, confirmParam) => {
+  const allService = [];
+  const { serviceCode, isSingleSubmit, version, multiField } = props;
+  const { add, update } = serviceCode;
+  const { insertRecords, updateRecords } = body;
+
+  if (!isEmpty(insertRecords) && add) {
+    insertRecords.forEach(m => {
+      !isEmpty(confirmParam) && Object.assign(m, confirmParam);
+      m = !isEmpty(multiField) ? setMultiField(props, m, confirmParam) : m;
+    });
+    const service = http.post(add, !isSingleSubmit ? insertRecords : insertRecords[0]);
+    allService.push(service);
+  }
+  if (!isEmpty(updateRecords) && update) {
+    const records = !isEmpty(multiField)
+      ? updateRecords.map(m => setMultiField(props, m, confirmParam))
+      : updateRecords;
+    let service = null;
+    if (version === 'v2') {
+      service = http.put(update, !isSingleSubmit ? records : records[0]);
+    } else {
+      service = http.post(update, !isSingleSubmit ? records : records[0]);
+    }
+    allService.push(service);
+  }
+  return allService;
+};
+
+const formatDateRange = (listQuery: any, formItems) => {
+  const dateRanges = formItems.filter(f => f.itemRender?.name === '#SuDateRange');
+  if (isEmpty(dateRanges)) return listQuery;
+  const query = clone(listQuery, true);
+  dateRanges.forEach((element: any) => {
+    const val = query[element.field];
+    if (val && element.toField) {
+      query[element.fromField] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
+      query[element.toField] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
+      delete query[element.field];
+    } else if (val) {
+      query[`${element.field}From`] = toDateString(val[0], 'yyyy-MM-dd 00:00:00');
+      query[`${element.field}To`] = toDateString(val[1], 'yyyy-MM-dd 23:59:59');
+      delete query[element.field];
+    }
+  });
+  return query;
+};
+
+const setMultiField = (props, source: any, confirmParam) => {
+  const { multiField } = props;
+  multiField.forEach(field => {
+    source[field] = isArray(source[field]) ? source[field].join(',') : source[field];
+  });
+  Object.assign(source, confirmParam || {});
+  return source;
+};

package/src/utils/index.ts

@@ -2,11 +2,13 @@
  * @Author: wei.li
  * @Date: 2022-07-07 14:43:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-06-03 09:26:49
+ * @LastEditTime: 2025-09-12 14:49:00
  * @Description: file content
  */
 
 // export * from './udp/useRender';
+export * from './browers';
+export * from './lifecycle';
 
 export const getKeyList = (data, key) => {
   const array = [];

package/src/utils/lifecycle.ts

@@ -1,20 +1,39 @@
-/*
- * @Author: wei.li
- * @Date: 2024-06-26 16:30:54
- * @LastEditors: wei.li
- * @LastEditTime: 2024-06-26 17:11:58
- * @Description: file content
- */
-
-export const lifeCycleEvent = {
-  onLogined: () => {},
-  onBeforeLogout: () => {}
-};
-
-export const onLogined = () => {
-  lifeCycleEvent.onLogined();
-};
-
-export const onBeforeLogout = () => {
-  lifeCycleEvent.onBeforeLogout();
-};
+/*
+ * @Author: wei.li
+ * @Date: 2024-06-26 16:30:54
+ * @LastEditors: wei.li
+ * @LastEditTime: 2024-06-26 17:11:58
+ * @Description: file content
+ */
+
+export const lifeCycleEvent = {
+  onBeforeLogined: () => {},
+  onLogined: () => {},
+  onBeforeLogout: () => {},
+  onAfterLogout: () => {}
+};
+
+/**
+ * 平台登录前
+ */
+export const onBeforeLogined = () => {
+  lifeCycleEvent.onBeforeLogined();
+};
+/**
+ * 平台登录后
+ */
+export const onLogined = () => {
+  lifeCycleEvent.onLogined();
+};
+/**
+ * 平台退出前
+ */
+export const onBeforeLogout = () => {
+  lifeCycleEvent.onBeforeLogout();
+};
+/**
+ * 平台退出后
+ */
+export const onAfterLogout = () => {
+  lifeCycleEvent.onAfterLogout();
+};

package/src/utils/propTypes.ts

@@ -7,12 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import type { CSSProperties, VNodeChild } from 'vue';
-import {
-  createTypes,
-  toValidableType,
-  type VueTypesInterface,
-  type VueTypeValidableDef
-} from 'vue-types';
+import { createTypes, toValidableType, type VueTypesInterface, type VueTypeValidableDef } from 'vue-types';
 
 export type VueNode = VNodeChild | JSX.Element;
 

package/src/utils/storage/index.ts

@@ -26,8 +26,8 @@ export const injectResponsiveStorage = (app: App, config: ServerConfigs) => {
         darkMode: config.DarkMode ?? false,
         sidebarStatus: config.SidebarStatus ?? true,
         epThemeColor: config.EpThemeColor ?? '#409EFF',
-        themeColor: config.Theme ?? 'light', // 主题色（对应项目配置中的主题色，与theme不同的是它不会受到浅色、深色整体风格切换的影响，只会在手动点击主题色时改变）
-        overallStyle: config.OverallStyle ?? 'light' // 整体风格（浅色：light、深色：dark、自动：system）
+        themeColor: config.Theme ?? 'light', // 主题色（对应项目配置中的主题色，与theme不同的是它不会受到浅色、深色主题模式切换的影响，只会在手动点击主题色时改变）
+        overallStyle: config.OverallStyle ?? 'light' // 主题模式（浅色：light、深色：dark、自动：system）
       },
       configure: Storage.getData('configure', nameSpace) ?? {
         grey: config.Grey ?? false,

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

@@ -1,7 +1,6 @@
 import Axios, { type AxiosInstance, type AxiosRequestConfig } from 'axios';
 import type { SuHttpError, RequestMethods, SuHttpResponse, SuHttpRequestConfig } from './types.d';
-
-import { errorMessage, cookies, NProgress } from '@utogether/utils';
+import { NProgress, cookies, errorMessage } from '@utogether/utils';
 import { isRef } from 'vue';
 import { has } from 'xe-utils';
 
@@ -20,7 +19,7 @@ class SuHttp {
     this.httpInterceptorsResponse();
   }
   router = undefined;
-  baseUrl = null;
+  baseUrl = 'http: //192.168.101.138.8099';
   /** token过期后，暂存待执行的请求 */
   private static requests = [];
 
@@ -82,17 +81,23 @@ class SuHttp {
               if (!SuHttp.isRefreshing) {
                 SuHttp.isRefreshing = true;
                 // requests.push(() => SuHttp.axiosInstance(config));
-                this.get((this.baseUrl || '') + '/uath/refreshToken', {
+                this.get(this.baseUrl + '/uath/refreshToken', {
                   refreshToken: data.refreshToken
                 })
                   .then((res: any) => {
-                    // 替换token
-                    this.setToken(res);
-                    config.headers['Authorization'] = 'Bearer ' + res.access_token;
-                    // token 刷新后将数组的方法重新执行
-                    // @ts-ignore
-                    SuHttp.requests.forEach(cb => cb(res.access_token));
-                    SuHttp.requests = []; // 重新请求完清空
+                    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;
@@ -130,6 +135,14 @@ class SuHttp {
     // 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;

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

@@ -5,7 +5,7 @@
  * @LastEditTime: 2023-12-01 13:55:46
  * @Description: SuHttp Axios 类型定义文件
  */
-import { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from "axios";
+import type { Method, AxiosError, AxiosResponse, AxiosRequestConfig } from 'axios';
 
 export type resultType = {
   access_token: string;
@@ -13,10 +13,7 @@ export type resultType = {
   expires_in: number;
 };
 
-export type RequestMethods = Extract<
-  Method,
-  "get" | "post" | "put" | "delete" | "patch" | "option" | "head"
->;
+export type RequestMethods = Extract<Method, 'get' | 'post' | 'put' | 'delete' | 'patch' | 'option' | 'head'>;
 
 export interface SuHttpError extends AxiosError {
   isCancelRequest?: boolean;
@@ -40,10 +37,6 @@ export default class SuHttp {
     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>;
+  postRouter<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
   get<T, P>(url: string, params?: T, config?: SuHttpRequestConfig): Promise<P>;
 }