发布v2.15.7版本，更新内容请查看：https://github.com/bufanyun/hotgo/tree/v2.0/docs/guide-zh-CN/addon-version-upgrade.md

2026-01-22 07:06:02 +08:00 · 2024-07-21 22:21:02 +08:00
parent 7d8330f72f
commit a37d088360
440 changed files with 6303 additions and 3339 deletions
--- a/web/src/utils/hotgo.ts
+++ b/web/src/utils/hotgo.ts
@@ -1,9 +1,13 @@
+// @ts-ignore
 import onerrorImg from '@/assets/images/onerror.png';
 import { usePermission } from '@/hooks/web/usePermission';
 import { ActionItem } from '@/components/Table';
 import { isBoolean, isFunction } from '@/utils/is';
 import { PermissionsEnum } from '@/enums/permissionsEnum';

+/**
+ * @deprecated 这个方法将来未来版本完全弃用，请统一使用useDictStore()来维护字典选项
+ */
 export interface Option {
  label: string;
  value: string | number;
@@ -12,11 +16,17 @@ export interface Option {
  listClass: 'default' | 'error' | 'primary' | 'info' | 'success' | 'warning';
 }

+/**
+ * @deprecated 这个方法将来未来版本完全弃用，请统一使用useDictStore()来维护字典选项
+ */
 export interface Options {
  [name: string]: Option[];
 }

-// 获取选项名称
+/**
+ * 获取选项名称
+ * @deprecated 这个方法将来未来版本完全弃用，请统一使用useDictStore()来维护字典选项
+ */
 export function getOptionLabel(options: Option[], value) {
  if (options === undefined || options?.length === 0) {
    return `unknown`;
@@ -30,7 +40,10 @@ export function getOptionLabel(options: Option[], value) {
  return `unknown`;
 }

-// 获取选项标签
+/**
+ * 获取选项标签
+ * @deprecated 这个方法将来未来版本完全弃用，请统一使用useDictStore()来维护字典选项
+ */
 export function getOptionTag(options: Option[], value) {
  if (options === undefined || options?.length === 0) {
    return 'default';
@@ -54,7 +67,7 @@ export function adaModalWidth(def = 840) {
  }
 }

-interface TableColumn {
+export interface TableColumn {
  width?: number | string;
  auth?: PermissionsEnum | PermissionsEnum[] | string | string[];
  ifShow?: boolean | ((action: ActionItem) => boolean);
@@ -91,12 +104,17 @@ export function isIfShow(action: ActionItem): boolean {
  return isIfShow;
 }

-// 图片加载失败显示自定义默认图片(缺省图)
+// 图片加载失败显示自定义默认图片(缺省图) img标签使用
 export function errorImg(e: any): void {
  e.target.src = onerrorImg;
  e.target.onerror = null;
 }

+// 图片加载失败显示自定义默认图片(缺省图) NImage组件使用
+export function fallbackSrc(): string {
+  return onerrorImg;
+}
+
 export function timeFix() {
  const time = new Date();
  const hour = time.getHours();
@@ -144,8 +162,8 @@ export function convertListToTree(list: any[], idField = 'id', pidField = 'pid')

 // 从树选项中获取所有key
 export function getTreeKeys(data: any[], idField = 'id') {
-  const keys = [];
-  data.map((item) => {
+  const keys: any = [];
+  data.map((item: any) => {
    keys.push(item[idField]);
    if (item.children && item.children.length) {
      keys.push(...getTreeKeys(item.children));
--- a/web/src/utils/index.ts
+++ b/web/src/utils/index.ts
@@ -13,9 +13,10 @@ import {
 } from 'naive-ui';
 import { EllipsisHorizontalCircleOutline } from '@vicons/ionicons5';
 import { PageEnum } from '@/enums/pageEnum';
-import { isObject } from './is/index';
+import { isNullObject, isObject } from './is/index';
 import { cloneDeep } from 'lodash-es';
-import { VNode } from '@vue/runtime-core';
+import { VNode } from 'vue';
+import { DictType, useDictStore } from '@/store/modules/dict';

 export const renderTooltip = (trigger, content) => {
  return h(NTooltip, null, {
@@ -73,6 +74,27 @@ export const renderTag: SelectRenderTag = ({ option }) => {
  );
 };

+// renderOptionTag 选项标签
+export const renderOptionTag = (type: DictType, value: any) => {
+  if (isNullObject(value)) {
+    return ``;
+  }
+  const dict = useDictStore();
+  return h(
+    NTag,
+    {
+      style: {
+        marginRight: '6px',
+      },
+      type: dict.getType(type, value),
+      bordered: false,
+    },
+    {
+      default: () => dict.getLabel(type, value),
+    }
+  );
+};
+
 export interface MemberSumma {
  id: number; // 用户ID
  realName: string; // 真实姓名
@@ -329,7 +351,7 @@ export function lighten(color: string, amount: number) {

 // 获取树的所有节点key
 export function getAllExpandKeys(treeData: any): any[] {
-  let expandedKeys = [];
+  let expandedKeys: any = [];
  const expandKeys = (items: any[]) => {
    items.forEach((item: any) => {
      expandedKeys.push(item.key);
@@ -347,7 +369,7 @@ export function getAllExpandKeys(treeData: any): any[] {
 }

 // 从树中查找指定节点
-export function findTreeNode(data: any[], key?: string | number, keyField = 'key'): any {
+export function findTreeNode(data: any, key?: string | number, keyField = 'key'): any {
  for (const item of data) {
    if (item[keyField] == key) {
      return item;
--- a/web/src/utils/urlUtils.ts
+++ b/web/src/utils/urlUtils.ts
@@ -1,3 +1,6 @@
+import { RouteLocationRaw } from 'vue-router';
+import router from '@/router';
+
 /**
 * 将对象添加当作参数拼接到URL上面
 * @param baseUrl 需要拼接的url
@@ -49,3 +52,14 @@ export function getNowUrl(): string {
  const w = window.location;
  return w.protocol + '//' + w.host + w.pathname;
 }
+
+// 返回上一页
+export function goBackOrToPage(to: RouteLocationRaw): void {
+  if (router.currentRoute.value.matched.length > 0) {
+    router.go(-1);
+  } else {
+    router.push(to).catch((e) => {
+      console.log('返回上一页失败:', e);
+    });
+  }
+}
--- a/web/src/utils/validateUtil.ts
+++ b/web/src/utils/validateUtil.ts
@@ -3,7 +3,8 @@ import { FormItemRule } from 'naive-ui';
 * @description 表单验证封装
 */
 export const validate = {
-  ip(rule: FormItemRule, value: any, callback: Function) {
+  // 验证ipv4
+  ip(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    // 支持通配符的ipv4正则
    const ipv4Regex =
      /^(?:[1-9]?[0-9]|1[0-9]{2}|2(?:[0-4][0-9]|5[0-5]))(?!.*?\.\*\.[*\d])(?:\.(?:(?:[1-9]?[0-9]|1[0-9]{2}|2(?:[0-4][0-9]|5[0-5]))|\*)){1,3}$/;
@@ -20,9 +21,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  //0-100百分比验证
-  percentage(rule: FormItemRule, value: any, callback: Function) {
+  percentage(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const reg = /^([1-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/;
    if (!value && !rule.required) {
      callback(new Error('请输入比例'));
@@ -31,9 +33,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 手机号 （eg:138********,159********）
-  phone(rule: FormItemRule, value: any, callback: Function) {
+  phone(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regPhone = /^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/;
    if (!value && !rule.required) {
      callback();
@@ -44,9 +47,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 用户名 （eg:a123456）
-  userName(rule: FormItemRule, value: any, callback: Function) {
+  userName(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regUserName = /^[0-9a-zA-Z]{6,16}$/;
    if (!value && !rule.required) {
      callback(new Error('请输入登录账号'));
@@ -55,9 +59,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 账号
-  account(rule: FormItemRule, value: any, callback: Function) {
+  account(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regex = /^[\w_\d]{6,16}$/;
    if (!value && !rule.required) {
      callback();
@@ -68,9 +73,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 密码
-  password(rule: FormItemRule, value: any, callback: Function) {
+  password(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regPassword = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,18}$/;
    if (!value && !rule.required) {
      callback(new Error('请输入密码'));
@@ -79,9 +85,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 邮箱
-  email(rule: FormItemRule, value: any, callback: Function) {
+  email(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regEmails = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
    // console.log('isRequired is: ', JSON.stringify(isRequired))
    if (!value && !rule.required) {
@@ -93,9 +100,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 金额验证
-  amount(rule: FormItemRule, value: any, callback: Function) {
+  amount(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regAmount = /(^[0-9]{1,10}$)|(^[0-9]{1,10}[\.]{1}[0-9]{1,2}$)/;
    if (!value && !rule.required) {
      callback();
@@ -106,9 +114,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 身份证验证
-  idCard(rule: FormItemRule, value: any, callback: Function, isEnabled = true) {
+  idCard(rule: FormItemRule, value: any, callback: Function, isEnabled = true): boolean | Error {
    const regIdCard =
      /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X|x)$/;
    if (!isEnabled) {
@@ -122,9 +131,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 银行卡验证
-  bank(rule: FormItemRule, value: any, callback: Function) {
+  bank(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regBank = /^([1-9]{1})(\d{15}|\d{16}|\d{18})$/;
    if (!value && !rule.required) {
      callback();
@@ -135,9 +145,10 @@ export const validate = {
    } else {
      callback();
    }
+    return true;
  },
  // 非零正整数验证
-  num(rule: FormItemRule, value: any, callback: Function) {
+  num(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const reg = /^\+?[1-9][0-9]*$/;
    if (!value && !rule.required) {
      callback(new Error('请填写非零正整数'));
@@ -148,9 +159,10 @@ export const validate = {
        callback();
      }
    }
+    return true;
  },
  // 银行卡
-  bankCard(rule: FormItemRule, value: any, callback: Function) {
+  bankCard(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regBankCard = /^(\d{16}|\d{19})$/;
    if (value == '' && !rule.required) {
      callback(new Error('请输入银行卡号'));
@@ -161,9 +173,10 @@ export const validate = {
        callback();
      }
    }
+    return true;
  },
  // 固话格式
-  tel(rule: FormItemRule, value: any, callback: Function) {
+  tel(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regTel = /^(0\d{2,3}-?)?\d{7,8}$/;
    if (value == '' && !rule.required) {
      callback(new Error('请输入座机号码'));
@@ -174,9 +187,10 @@ export const validate = {
        callback();
      }
    }
+    return true;
  },
  // QQ号码
-  qq(rule: FormItemRule, value: any, callback: Function) {
+  qq(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regex = /^[1-9][0-9]{4,}$/;
    if (!value && !rule.required) {
      callback();
@@ -189,9 +203,10 @@ export const validate = {
        callback();
      }
    }
+    return true;
  },
  // weibo号
-  weibo(rule: FormItemRule, value: any, callback: Function) {
+  weibo(rule: FormItemRule, value: any, callback: Function): boolean | Error {
    const regex = /^[0-9a-zA-Z\u4e00-\u9fa5_-]*$/;
    if (!value && !rule.required) {
      callback();
@@ -204,9 +219,11 @@ export const validate = {
        callback();
      }
    }
+    return true;
  },
  // 不验证
-  none(_rule: FormItemRule, _value: any, callback: Function) {
+  none(_rule: FormItemRule, _value: any, callback: Function): boolean {
    callback();
+    return true;
  },
 };