@pubinfo-pr/core 0.228.1 → 0.230.1

package/dist/features/api/modules/auth/renzhengfuwu.d.ts

@@ -1,4 +1,18 @@
 import { auth as request } from '../../request';
+/**
+ * @description 双因素认证-二次认证准备
+ * @url /auth/2fa/prepare
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export declare function postAuth2FaPrepare<R = API.ResponseDataString, T = API.ResponseDataString>(body: API.Prepare2faDto, options?: Parameters<typeof request.Post<R, T>>[2]): import('alova').Method<import('alova').RespondedAlovaGenerics<import('../../../..').AG, R, T>>;
+/**
+ * @description 双因素认证-二次认证验证
+ * @url /auth/2fa/verify
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export declare function postAuth2FaVerify<R = API.ResponseDataLoginTokenVo, T = API.ResponseDataLoginTokenVo>(body: API.Verify2faDto, options?: Parameters<typeof request.Post<R, T>>[2]): import('alova').Method<import('alova').RespondedAlovaGenerics<import('../../../..').AG, R, T>>;
 /**
  * @description 验证码-前端校验 需要校验的验证码类型：blockPuzzle、clickWord
  * @url /auth/captcha/check

package/dist/features/components/PubinfoIcon/parser.d.ts

@@ -0,0 +1,6 @@
+export interface ParsedIconName {
+    prefix: string;
+    name: string;
+    ext: string;
+}
+export declare function parseCustomIconName(str: string): ParsedIconName;

package/dist/index.js

@@ -4,7 +4,7 @@ import { A as T, B as re, C as ie, D as ae, E as oe, F as se, M as ce, N as le,
 import { s as Re, t as ze } from "./watchDiff-DJP3s9bb.js";
 import { a as Be, c as Ve, d as He, f as Ue, i as We, l as Ge, n as Ke, o as qe, r as Je, u as Ye } from "./dist-HLiWAOC7.js";
 import { z as Xe } from "./tree-select-gPCwtMia.js";
-import { a as Ze, c as Qe, d as $e, i as et, l as tt, n as nt, o as rt, r as it, s as at, t as ot, u as st } from "./components-CKVAXENc.js";
+import { a as Ze, c as Qe, d as $e, i as et, l as tt, n as nt, o as rt, r as it, s as at, t as ot, u as st } from "./components-BHWiQ3ez.js";
 import { t as ct } from "./_plugin-vue_export-helper-CsLplWgU.js";
 import { n as D, t as lt } from "./useContext-Dlqfap_7.js";
 import { t as ut } from "./HButton-pEqyd918.js";
@@ -112,7 +112,7 @@ function Rn(e = {}) {
 var zn = [{
 	path: "/change-password/:changePassWordToken",
 	name: "ChangePassword",
-	component: () => import("./change-password-D-ZqBAmY.js"),
+	component: () => import("./change-password-BTb3qYGv.js"),
 	beforeEnter: (e) => ue(e.params.changePassWordToken) ? { name: "Login" } : !0,
 	meta: {
 		whiteList: !0,
@@ -121,7 +121,7 @@ var zn = [{
 }, {
 	path: "/change-organization/:orgId",
 	name: "ChangeOrganization",
-	component: () => import("./change-organization-EdR25ifs.js"),
+	component: () => import("./change-organization-BezqpSfp.js"),
 	beforeEnter: (e) => {
 		let t = ve();
 		return ue(e.params.orgId) || e.params.orgId !== t.user.orgId ? { name: "Login" } : !0;
@@ -1723,7 +1723,7 @@ var la = /* @__PURE__ */ I({
 	name: "Preferences",
 	__name: "index",
 	setup(e, { expose: t }) {
-		let n = Ut(() => import("./PreferencesContent-CuNffqV_.js")), [r, i] = Ue(!1);
+		let n = Ut(() => import("./PreferencesContent-8y4xvxPh.js")), [r, i] = Ue(!1);
 		return t({ open: () => i() }), (e, t) => {
 			let i = At;
 			return z(), A(i, {
@@ -3519,7 +3519,7 @@ var Rs = L({
 	name: "SettingBar",
 	__name: "index",
 	setup(e) {
-		let t = Ut(() => import("./AppSetting-BBCop_0D.js")), { settingsStore: n, isDev: r } = D();
+		let t = Ut(() => import("./AppSetting-DxV7nNkI.js")), { settingsStore: n, isDev: r } = D();
 		function i() {
 			window.open("http://124.223.184.245:10000/docs/");
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo-pr/core",
   "type": "module",
-  "version": "0.228.1",
+  "version": "0.230.1",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -27,9 +27,9 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
-    "@pubinfo-pr/config": "0.228.1",
-    "@pubinfo-pr/devtools": "0.228.1",
-    "@pubinfo-pr/vite": "0.228.1",
+    "@pubinfo-pr/config": "0.230.1",
+    "@pubinfo-pr/devtools": "0.230.1",
+    "@pubinfo-pr/vite": "0.230.1",
     "alova": "^3.5.0",
     "pinia": "^3.0.4",
     "vue": "^3.5.28",
@@ -42,7 +42,7 @@
     "@headlessui/vue": "^1.7.23",
     "@imengyu/vue3-context-menu": "^1.5.4",
     "@pubinfo/pro-components": "^1.8.2",
-    "@pubinfo-pr/shared": "0.228.1",
+    "@pubinfo-pr/shared": "0.230.1",
     "@unocss/reset": "^66.6.0",
     "@vueuse/core": "^14.2.1",
     "@vueuse/integrations": "^14.2.1",
@@ -69,10 +69,10 @@
     "@alova/mock": "^2.0.18",
     "@iconify/json": "^2.2.437",
     "@iconify/vue": "^5.0.0",
-    "@pubinfo-pr/config": "0.228.1",
+    "@pubinfo-pr/config": "0.230.1",
     "@pubinfo/openapi": "^0.9.1",
     "@pubinfo/preset-openapi": "^0.9.1",
-    "@pubinfo-pr/vite": "0.228.1",
+    "@pubinfo-pr/vite": "0.230.1",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.6",
     "@types/nprogress": "^0.2.3",

package/src/features/api/modules/auth/renzhengfuwu.ts

@@ -1,5 +1,41 @@
 import { auth as request } from '@/features/api/request';
 
+/**
+ * @description 双因素认证-二次认证准备
+ * @url /auth/2fa/prepare
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuth2FaPrepare<
+  R = API.ResponseDataString,
+  T = API.ResponseDataString,
+>(body: API.Prepare2faDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/2fa/prepare', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
+/**
+ * @description 双因素认证-二次认证验证
+ * @url /auth/2fa/verify
+ * @method POST
+ * @author @pubinfo/openapi
+ */
+export function postAuth2FaVerify<
+  R = API.ResponseDataLoginTokenVo,
+  T = API.ResponseDataLoginTokenVo,
+>(body: API.Verify2faDto, options?: Parameters<typeof request.Post<R, T>>[2]) {
+  return request.Post<R, T>('/auth/2fa/verify', body, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    ...(options || {}),
+  });
+}
+
 /**
  * @description 验证码-前端校验 需要校验的验证码类型：blockPuzzle、clickWord
  * @url /auth/captcha/check

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

@@ -40,9 +40,9 @@ declare namespace API {
   };
 
   type IResponseCode = {
-    msg?: string;
     code?: number;
     hint?: string;
+    msg?: string;
   };
 
   type LoginByPwdCaptchaDto = {
@@ -79,6 +79,8 @@ declare namespace API {
     /** 访问令牌 */
     accessToken?: string;
     loginResponse?: IResponseCode;
+    /** 2FA登录码 不为空表示开启了2FA登录 */
+    login2faCode?: string;
   };
 
   type postAuthChangeLoginOrgParams = {
@@ -103,6 +105,13 @@ declare namespace API {
     refreshToken: string;
   };
 
+  type Prepare2faDto = {
+    /** login2faCode */
+    login2faCode: string;
+    /** 二次认证方式 默认支持sms */
+    fa2Type: string;
+  };
+
   type PubLoginTokenVo = {
     /** id */
     id?: string;
@@ -174,4 +183,13 @@ declare namespace API {
     key?: string;
     plaintext?: string;
   };
+
+  type Verify2faDto = {
+    /** login2faCode */
+    login2faCode: string;
+    /** 二次认证方式 默认支持sms */
+    fa2Type: string;
+    /** 认证码 */
+    verifyCode: string;
+  };
 }

package/src/features/components/PubinfoIcon/index.vue

@@ -5,6 +5,7 @@ import { Icon } from '@iconify/vue';
 import { shallowRef, watch } from 'vue';
 import { getCachedIcon, setCachedIcon, setupIcon } from '@/core';
 import { useProvider } from '../PubinfoProvider';
+import { parseCustomIconName } from './parser';
 import PrismBox from './PrismBox.vue';
 import SquareBox from './SquareBox.vue';
 
@@ -74,7 +75,7 @@ const element = computed(() => {
 const icon = shallowRef<string | undefined>(undefined);
 
 function getIconLookupMeta(rawName: string) {
-  const parsed = parseString(rawName);
+  const parsed = parseCustomIconName(rawName);
   const fileName = `${parsed.name}${parsed.ext || '.svg'}`;
   const moduleId = parsed.prefix || undefined;
   return { fileName, moduleId } as const;
@@ -159,48 +160,6 @@ watch(
   { immediate: true, flush: 'sync' },
 );
 
-interface Parsed {
-  prefix: string
-  name: string
-  ext: string
-}
-
-function parseString(str: string): Parsed {
-  let prefix = '';
-  let name = '';
-  let ext = '';
-
-  // 匹配 RBAC-[org.svg] 或 RBAC-[org]
-  const match = str.match(/^([^-\s]+)-\[(.+)\]$/);
-
-  if (match) {
-    prefix = match[1];
-    const inner = match[2];
-
-    const dotIdx = inner.lastIndexOf('.');
-    if (dotIdx !== -1) {
-      name = inner.slice(0, dotIdx);
-      ext = inner.slice(dotIdx);
-    }
-    else {
-      name = inner;
-    }
-  }
-  else {
-    // 如果没有前缀格式，就当普通文件处理
-    const dotIdx = str.lastIndexOf('.');
-    if (dotIdx !== -1) {
-      name = str.slice(0, dotIdx);
-      ext = str.slice(dotIdx);
-    }
-    else {
-      name = str;
-    }
-  }
-
-  return { prefix, name, ext };
-}
-
 const style = computed(() => {
   const transform: string[] = [];
   if (props.flip) {

package/src/features/components/PubinfoIcon/parser.ts

@@ -0,0 +1,42 @@
+export interface ParsedIconName {
+  prefix: string
+  name: string
+  ext: string
+}
+
+function splitNameExt(value: string) {
+  const dotIdx = value.lastIndexOf('.');
+  if (dotIdx !== -1) {
+    return {
+      name: value.slice(0, dotIdx),
+      ext: value.slice(dotIdx),
+    };
+  }
+
+  return {
+    name: value,
+    ext: '',
+  };
+}
+
+export function parseCustomIconName(str: string): ParsedIconName {
+  const markerIdx = str.lastIndexOf('-[');
+  const hasScopedSyntax = markerIdx > 0 && str.endsWith(']');
+
+  if (hasScopedSyntax) {
+    const prefix = str.slice(0, markerIdx);
+    const inner = str.slice(markerIdx + 2, -1);
+
+    if (prefix && inner) {
+      return {
+        prefix,
+        ...splitNameExt(inner),
+      };
+    }
+  }
+
+  return {
+    prefix: '',
+    ...splitNameExt(str),
+  };
+}