@pubinfo/core 2.0.13 → 2.0.15

package/src/features/api/modules/auth/typings.d.ts

@@ -1,8 +1,34 @@
 /* eslint-disable */
 // @ts-nocheck
 declare namespace API {
+  type CaptchaCheckDto = {
+    /** 类型 clickWord：文字、blockPuzzle：滑块 */
+    captchaType: string;
+    /** 加密坐标 */
+    pointJson: string;
+    /** token */
+    token: string;
+  };
+
+  type CaptchaGetDto = {
+    /** 类型 clickWord：文字、blockPuzzle：滑块、imageCode：图片 */
+    captchaType?: string;
+    /** 客户端UI组件id */
+    clientUid?: string;
+    /** 时间戳 1751542686180 */
+    ts?: string;
+    /** 尺寸(长x宽)，例：150x50表示长为150宽为50，不填默认150x50,最大尺寸:长500，宽200 */
+    size?: string;
+    /** 验证码长度，不填默认4位 */
+    length?: string;
+  };
+
   type getAuthCheckCacheTokenParams = {
     accessToken: string;
+  };
+
+  type getAuthGetTokenListByUserIdParams = {
+    /** 用户id */
     userId: string;
   };
 
@@ -14,11 +40,26 @@ declare namespace API {
   };
 
   type IResponseCode = {
-    code?: number;
     msg?: string;
+    code?: number;
     hint?: string;
   };
 
+  type LoginByPwdCaptchaDto = {
+    /** 登录类型 */
+    loginType: string;
+    /** 登录名 */
+    loginName: string;
+    /** 密码 */
+    loginPwd: string;
+    /** imageCode：验证码hash/其他：加密后的token，AES.encode(token+"---"+pointListStr, key) */
+    codeHash: string;
+    /** 验证码 imageCode类型必填 */
+    code?: string;
+    /** 验证码类型，clickWord：文字、blockPuzzle：滑块、imageCode(默认)：图片 */
+    captchaType?: string;
+  };
+
   type LoginByPwdDto = {
     /** 登录类型 */
     loginType: string;
@@ -45,11 +86,36 @@ declare namespace API {
     orgId: string;
   };
 
+  type postAuthLoginOutByUserIdAndDevTypeParams = {
+    /** 用户id */
+    userId: string;
+    /** 设备类型 */
+    devType: string;
+  };
+
+  type postAuthLoginOutByUserIdParams = {
+    /** 用户id */
+    userId: string;
+  };
+
   type postAuthTokenRefreshParams = {
     /** 刷新令牌 */
     refreshToken: string;
   };
 
+  type PubLoginTokenVo = {
+    /** id */
+    id?: string;
+    /** 服务名称 */
+    appName?: string;
+    /** 用户id */
+    userId?: string;
+    /** 创建时间 */
+    createTime?: string;
+    /** 设备dev */
+    devType?: string;
+  };
+
   type ResponseDataBoolean = {
     code?: number;
     msg?: string;
@@ -58,6 +124,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataListPubLoginTokenVo = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubLoginTokenVo[];
+    success?: boolean;
+  };
+
   type ResponseDataLoginTokenVo = {
     code?: number;
     msg?: string;

package/src/features/api/modules/configData/heibaimingdanfuwu.ts

@@ -38,6 +38,7 @@ export function getBlackWhiteListDeleteById<
   return request.Get<R, T>(`/blackWhiteList/delete/${param0}`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 
@@ -58,6 +59,7 @@ export function getBlackWhiteListGetBlackWhiteListById<
   return request.Get<R, T>(`/blackWhiteList/getBlackWhiteList/${param0}`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 

package/src/features/api/modules/configData/index.ts

@@ -1,5 +1,3 @@
 export * from './heibaimingdanfuwu';
-// API 更新时间：
-// API 唯一标识：
 export * from './xitongpeizhifuwu';
 export * from './zidifuwu';

package/src/features/api/modules/configData/zidifuwu.ts

@@ -20,6 +20,7 @@ export function postDictItemDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -44,6 +45,7 @@ export function deleteDictItemDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -152,6 +154,7 @@ export function postDictTypeDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -176,6 +179,7 @@ export function deleteDictTypeDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }

package/src/features/api/modules/rbac/gangweijiekou.ts

@@ -20,6 +20,7 @@ export function postRbacPostDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -44,6 +45,7 @@ export function deleteRbacPostDeleteById<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -65,6 +67,7 @@ export function getRbacPostDetailById<
   return request.Get<R, T>(`/rbac/post/detail/${param0}`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 

package/src/features/api/modules/rbac/index.ts

@@ -2,11 +2,10 @@ export * from './gangweijiekou';
 export * from './jiaosejiekou';
 export * from './pubJiaosezukongzhiqi';
 export * from './shujuquanxianzhubiaokongzhiqi';
-// API 更新时间：
-// API 唯一标识：
 export * from './yonghujiekou';
 export * from './yonghushoucangbiaojiekou';
 export * from './yonghuzuijinchangyongbiaojiekou';
+export * from './ziyuandaorudaochuxiangguanjiekou';
 export * from './ziyuanjiekou';
 export * from './zuhuguanlijiekou';
 export * from './zuzhijiaosebiaokongzhiqi';

package/src/features/api/modules/rbac/typings.d.ts

@@ -51,6 +51,10 @@ declare namespace API {
     id: string;
   };
 
+  type deleteRbacResourceBackupDeleteResourceBackupParams = {
+    id: string;
+  };
+
   type getRbacCollectByIdDetailParams = {
     id: string;
   };
@@ -120,6 +124,19 @@ declare namespace API {
     id: string;
   };
 
+  type getRbacResourceBackupDetailParams = {
+    id: string;
+  };
+
+  type getRbacResourceBackupListParams = {
+    /** 0历史版本,1导入数据 */
+    type: string;
+  };
+
+  type getRbacResourceBackupRestoreParams = {
+    id: string;
+  };
+
   type getRbacResourceGetRoleListByResourceIdParams = {
     /** 资源id */
     id: string;
@@ -308,9 +325,27 @@ declare namespace API {
     userId: string;
   };
 
+  type postRbacResourceBackupImportResourceDataParams = {
+    parentId: string;
+  };
+
   type postRbacResourceMineOrAllResourceTreeParams = {
     needAll?: boolean;
     enable?: boolean;
+    appResourceCodes?: string;
+  };
+
+  type postRbacUserCaptchaChangePasswordWithVerifyCodeParams = {
+    /** 原密码(使用公钥加密) */
+    oldPassword: string;
+    /** 新密码(使用公钥加密) */
+    newPassword: string;
+    /** 验证码hash,imageCode必填 */
+    codeHash: string;
+    /** 验证码/token */
+    code: string;
+    /** 验证码类型 */
+    captchaType: string;
   };
 
   type postRbacUserChangePasswordParams = {
@@ -720,6 +755,7 @@ declare namespace API {
   };
 
   type PubResourceAddDto = {
+    id?: string;
     /** 父级id */
     parentId?: string;
     /** 资源名称 */
@@ -750,6 +786,42 @@ declare namespace API {
     meta?: Record<string, any>;
   };
 
+  type PubResourceBackupBO = {
+    /** id */
+    id?: string;
+    /** 资源数据 */
+    content?: PubResourceTreeBo[];
+    /** 0备份数据,1导入数据 */
+    contentType?: string;
+    /** 是否删除，0：否，1：是 */
+    deleted?: boolean;
+    /** 创建id */
+    createdBy?: string;
+    /** 创建时间 */
+    createTime?: string;
+    /** 更新人id */
+    updatedBy?: string;
+    /** 更新时间 */
+    updateTime?: string;
+    /** 创建人姓名 */
+    createUserName?: string;
+    contentStr?: string;
+  };
+
+  type PubResourceExportBO = {
+    /** 导出类型：1-导出所有，2-导出选中 */
+    exportType?: string;
+    resourceTree?: PubResourceTreeBo[];
+    md5?: string;
+  };
+
+  type PubResourceReSortUpdateDTO = {
+    /** 资源id */
+    id?: string;
+    /** 子资源列表 */
+    children?: PubResourceReSortUpdateDTO[];
+  };
+
   type PubResourceTreeBo = {
     /** 主键 */
     id?: string;
@@ -1575,6 +1647,14 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataListPubResourceBackupBO = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubResourceBackupBO[];
+    success?: boolean;
+  };
+
   type ResponseDataListPubResourceTreeBo = {
     code?: number;
     msg?: string;
@@ -1783,6 +1863,22 @@ declare namespace API {
     success?: boolean;
   };
 
+  type ResponseDataPubResourceBackupBO = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubResourceBackupBO;
+    success?: boolean;
+  };
+
+  type ResponseDataPubResourceExportBO = {
+    code?: number;
+    msg?: string;
+    hint?: string;
+    data?: PubResourceExportBO;
+    success?: boolean;
+  };
+
   type ResponseDataPubRoleBo = {
     code?: number;
     msg?: string;
@@ -1910,7 +2006,7 @@ declare namespace API {
     /** 群组id */
     groups?: shujuquanxianmokuaihuixiandequnzuduixiang[];
     /** 资源id */
-    resources?: PubResourceTreeBo[];
+    resources?: PubResource[];
   };
 
   type shujuquanxianchaxunduixiang = {

package/src/features/api/modules/rbac/yonghujiekou.ts

@@ -1,5 +1,30 @@
 import { basic as request } from '@/features/api/request';
 
+/**
+ * @description 验证码-修改登录密码
+ * @url /rbac/user/captcha/changePasswordWithVerifyCode
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacUserCaptchaChangePasswordWithVerifyCode<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postRbacUserCaptchaChangePasswordWithVerifyCodeParams,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>(
+    '/rbac/user/captcha/changePasswordWithVerifyCode',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
 /**
  * @description 修改登录密码
  * @url /rbac/user/changePassword

package/src/features/api/modules/rbac/yonghushoucangbiaojiekou.ts

@@ -20,6 +20,7 @@ export function postRbacCollectByIdDelete<
     {
       params: { ...queryParams },
       ...(options || {}),
+      meta: { ...(options?.meta ?? {}), pathParams: [param0] },
     },
   );
 }
@@ -41,6 +42,7 @@ export function getRbacCollectByIdDetail<
   return request.Get<R, T>(`/rbac/collect/${param0}/detail`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 

package/src/features/api/modules/rbac/yonghuzuijinchangyongbiaojiekou.ts

@@ -17,6 +17,7 @@ export function getRbacUsedByIdDetail<
   return request.Get<R, T>(`/rbac/used/${param0}/detail`, {
     params: { ...queryParams },
     ...(options || {}),
+    meta: { ...(options?.meta ?? {}), pathParams: [param0] },
   });
 }
 

package/src/features/api/modules/rbac/ziyuandaorudaochuxiangguanjiekou.ts

@@ -0,0 +1,158 @@
+import { basic as request } from '@/features/api/request';
+
+/**
+ * @description 删除备份数据数据
+ * @url /rbac/resource-backup/deleteResourceBackup
+ * @method DELETE
+ * @author @pubinfo/openapi
+ */
+export function deleteRbacResourceBackupDeleteResourceBackup<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.deleteRbacResourceBackupDeleteResourceBackupParams,
+  options?: Parameters<typeof request.Delete<R, T>>[2],
+) {
+  return request.Delete<R, T>(
+    '/rbac/resource-backup/deleteResourceBackup',
+    {},
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/**
+ * @description 查看详情
+ * @url /rbac/resource-backup/detail
+ * @method GET
+ * @author @pubinfo/openapi
+ */
+export function getRbacResourceBackupDetail<
+  R = API.ResponseDataPubResourceBackupBO,
+  T = API.ResponseDataPubResourceBackupBO,
+>(
+  params: API.getRbacResourceBackupDetailParams,
+  options?: Parameters<typeof request.Get<R, T>>[1],
+) {
+  return request.Get<R, T>('/rbac/resource-backup/detail', {
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 资源导出
+ * @url /rbac/resource-backup/exportResourceData
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacResourceBackupExportResourceData<
+  R = API.ResponseDataPubResourceExportBO,
+  T = API.ResponseDataPubResourceExportBO,
+>(body: string[], options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/rbac/resource-backup/exportResourceData', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 资源导入
+ * @url /rbac/resource-backup/importResourceData
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacResourceBackupImportResourceData<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.postRbacResourceBackupImportResourceDataParams,
+  body: Record<string, unknown>,
+  file?: File,
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  const formData = new FormData();
+
+  if (file) {
+    formData.append('file', file);
+  }
+
+  Object.keys(body).forEach((ele) => {
+    const item = (body as any)[ele];
+
+    if (item !== undefined && item !== null) {
+      if (typeof item === 'object' && !(item instanceof File)) {
+        if (Array.isArray(item)) {
+          item.forEach(f => formData.append(ele, f || ''));
+        }
+        else {
+          formData.append(ele, JSON.stringify(item));
+        }
+      }
+      else {
+        formData.append(ele, item);
+      }
+    }
+  });
+
+  return request.Post<R, T>(
+    '/rbac/resource-backup/importResourceData',
+    formData,
+    {
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/**
+ * @description 查看列表
+ * @url /rbac/resource-backup/list
+ * @method GET
+ * @author @pubinfo/openapi
+ */
+export function getRbacResourceBackupList<
+  R = API.ResponseDataListPubResourceBackupBO,
+  T = API.ResponseDataListPubResourceBackupBO,
+>(
+  params: API.getRbacResourceBackupListParams,
+  options?: Parameters<typeof request.Get<R, T>>[1],
+) {
+  return request.Get<R, T>('/rbac/resource-backup/list', {
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 恢复数据
+ * @url /rbac/resource-backup/restore
+ * @method GET
+ * @author @pubinfo/openapi
+ */
+export function getRbacResourceBackupRestore<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  params: API.getRbacResourceBackupRestoreParams,
+  options?: Parameters<typeof request.Get<R, T>>[1],
+) {
+  return request.Get<R, T>('/rbac/resource-backup/restore', {
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}

package/src/features/api/modules/rbac/ziyuanjiekou.ts

@@ -160,6 +160,27 @@ export function postRbacResourceMineOrAllResourceTree<
   );
 }
 
+/**
+ * @description 资源拖拉拽更新
+ * @url /rbac/resource/reSortUpdate
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postRbacResourceReSortUpdate<
+  R = API.ResponseDataVoid,
+  T = API.ResponseDataVoid,
+>(
+  body: API.PubResourceReSortUpdateDTO[],
+  options?: Parameters<typeof request.Post<R, T>>[2],
+) {
+  return request.Post<R, T>('/rbac/resource/reSortUpdate', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 资源删除
  * @url /rbac/resource/resourceDelete

package/src/features/enum.ts

@@ -11,7 +11,7 @@ export enum RESOURCE_TYPE {
   /** 非菜单页 */
   NON_MENU = '5',
   /** 微应用 */
-  MICRO_APP = '6',
+  // MICRO_APP = '6',
   /** 动态应用 */
   DYNAMIC_APP = '7',
   /** 内嵌 */

package/src/features/stores/modules/iframe.ts

@@ -77,14 +77,23 @@ const useIframeStore = defineStore(
      * 如果路径是一个字符串，则关闭单个 iframe 路由。
      * 如果路径是一个字符串数组，则关闭多个 iframe 路由。
      * @param path 要关闭的 iframe 路由的路径（路径）。
+     * @param destroy 是否真正销毁 iframe（true: 从 openedList 移除；false: 仅标记为非激活保留 DOM）
      */
-    function close(path: string | string[]) {
+    function close(path: string | string[], destroy = false) {
       function closeIframeRoute(path: string | string[]) {
         const idx = list.value.findIndex(item => item.path === path);
         if (~idx) {
-          list.value[idx].isOpen = false;
-          list.value[idx].isLoading = true;
+          if (destroy) {
+            // 真正销毁：从 openedList 移除，下次进入会重新创建
+            list.value[idx].isOpen = false;
+            list.value[idx].isLoading = true;
+          }
+          else {
+            // 仅标记非激活：保留 isOpen=true，通过 v-show 隐藏，保持 DOM 实例
+            // 不修改 isOpen 状态，让 iframe 继续存在于 openedList
+          }
         }
+        // 无论是否销毁，都从最近访问列表中移除
         recentPathList.value = recentPathList.value.filter(item => item !== path);
       }
 

package/src/features/stores/modules/menu.ts

@@ -97,25 +97,32 @@ const useMenuStore = defineStore(
      * @returns {MenuData['children']} 当前活动菜单的子菜单，如果没有菜单则返回空数组。
      */
     const sidebarMenus = computed<MenuData['children']>(() => {
-      const tempAllMenus = allMenus.value.filter(item => !get(item, 'meta.isDev', false));
-      if (tempAllMenus.length > 0) {
-        if (tempAllMenus.length > 1) {
-          while (get(allMenus.value[actived.value], 'meta.isDev', false) && actived.value < allMenus.value.length - 1) {
-            actived.value++;
-          }
-          return allMenus.value[actived.value].children;
+      // 过滤 meta.isDev 为 true 的应用
+      const filteredAllMenus = allMenus.value.filter(item => !get(item, 'meta.isDev', false));
+
+      if (filteredAllMenus.length === 0) {
+        return [];
+      }
+
+      while (true) {
+        const menu = allMenus.value[actived.value];
+
+        if (actived.value >= allMenus.value.length - 1) {
+          break;
         }
-        else {
-          return get(allMenus.value[0], 'meta.isDev', false) ? [] : allMenus.value[0].children;
+
+        // 有子菜单且不为开发中的应用
+        if (menu.children.length > 0 && !get(menu, 'meta.isDev', false)) {
+          break;
         }
+
+        actived.value++;
       }
-      else {
-        return [];
-      }
+
+      return allMenus.value[actived.value].children ?? [];
     });
 
     /**
-     * TODO V1: 如果第一个菜单是一个isDev为true的菜单，那么这个计算属性可能会出现问题
      * 返回第一个侧边栏菜单的最深路径的计算属性。
      *
      * @returns {string} 第一个侧边栏菜单的最深路径，如果没有侧边栏菜单则返回'/'。