@pubinfo/core 2.2.0-beta.2 → 2.2.0-beta.4

package/dist/{watchDiff-DJP3s9bb.js → watchDiff-Dofh9yLN.js}

@@ -1,4 +1,4 @@
-import { Gr as e, Jr as t, Kr as n, Wr as r, Yr as i, qr as a } from "./modal-ybprgEqf.js";
+import { Gr as e, Jr as t, Kr as n, Wr as r, Yr as i, qr as a } from "./modal-DXJis9Ay.js";
 import { watch as o } from "vue";
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/isObjectLike.js
 function s(e) {
@@ -323,7 +323,7 @@ function At() {
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/_hashDelete.js
 function jt(e) {
 	var t = this.has(e) && delete this.__data__[e];
-	return this.size -= t ? 1 : 0, t;
+	return this.size -= +!!t, t;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/_hashGet.js
@@ -348,7 +348,7 @@ function It(e) {
 var Lt = "__lodash_hash_undefined__";
 function Rt(e, t) {
 	var n = this.__data__;
-	return this.size += this.has(e) ? 0 : 1, n[e] = F && t === void 0 ? Lt : t, this;
+	return this.size += +!this.has(e), n[e] = F && t === void 0 ? Lt : t, this;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/_Hash.js
@@ -433,7 +433,7 @@ function B(e, t) {
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/_mapCacheDelete.js
 function qt(e) {
 	var t = B(this, e).delete(e);
-	return this.size -= t ? 1 : 0, t;
+	return this.size -= +!!t, t;
 }
 //#endregion
 //#region ../../node_modules/.pnpm/lodash-es@4.17.23/node_modules/lodash-es/_mapCacheGet.js

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/core",
   "type": "module",
-  "version": "2.2.0-beta.2",
+  "version": "2.2.0-beta.4",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -31,9 +31,9 @@
     "pinia": "^3.0.4",
     "vue": "^3.5.28",
     "vue-router": "^5.0.2",
-    "@pubinfo/config": "2.2.0-beta.2",
-    "@pubinfo/vite": "2.2.0-beta.2",
-    "@pubinfo/devtools": "2.2.0-beta.2"
+    "@pubinfo/config": "2.2.0-beta.4",
+    "@pubinfo/devtools": "2.2.0-beta.4",
+    "@pubinfo/vite": "2.2.0-beta.4"
   },
   "dependencies": {
     "@alova/adapter-axios": "^2.0.17",
@@ -63,7 +63,7 @@
     "unctx": "^2.5.0",
     "vue-m-message": "^4.0.2",
     "zxcvbn": "^4.4.2",
-    "@pubinfo/shared": "2.2.0-beta.2"
+    "@pubinfo/shared": "2.2.0-beta.4"
   },
   "devDependencies": {
     "@alova/mock": "^2.0.18",
@@ -89,12 +89,12 @@
     "unplugin-auto-import": "^21.0.0",
     "unplugin-icons": "^23.0.1",
     "unplugin-vue-components": "^31.0.0",
-    "vite": "^8.0.0",
+    "vite": "^8.0.8",
     "vite-plugin-dts": "^4.5.4",
     "vue": "^3.5.28",
     "vue-router": "^5.0.2",
-    "@pubinfo/vite": "2.2.0-beta.2",
-    "@pubinfo/config": "2.2.0-beta.2"
+    "@pubinfo/config": "2.2.0-beta.4",
+    "@pubinfo/vite": "2.2.0-beta.4"
   },
   "scripts": {
     "dev": "vite build -w -m watch",

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),
+  };
+}