@pubinfo-pr/core 0.230.1 → 0.231.1

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-pr/core",
   "type": "module",
-  "version": "0.230.1",
+  "version": "0.231.1",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -27,9 +27,9 @@
     "node": "^20.19.0 || >=22.12.0"
   },
   "peerDependencies": {
-    "@pubinfo-pr/config": "0.230.1",
-    "@pubinfo-pr/devtools": "0.230.1",
-    "@pubinfo-pr/vite": "0.230.1",
+    "@pubinfo-pr/config": "0.231.1",
+    "@pubinfo-pr/devtools": "0.231.1",
+    "@pubinfo-pr/vite": "0.231.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.230.1",
+    "@pubinfo-pr/shared": "0.231.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.230.1",
+    "@pubinfo-pr/config": "0.231.1",
     "@pubinfo/openapi": "^0.9.1",
     "@pubinfo/preset-openapi": "^0.9.1",
-    "@pubinfo-pr/vite": "0.230.1",
+    "@pubinfo-pr/vite": "0.231.1",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.6",
     "@types/nprogress": "^0.2.3",
@@ -91,7 +91,7 @@
     "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"

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

@@ -5,7 +5,6 @@ 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';
 
@@ -75,7 +74,7 @@ const element = computed(() => {
 const icon = shallowRef<string | undefined>(undefined);
 
 function getIconLookupMeta(rawName: string) {
-  const parsed = parseCustomIconName(rawName);
+  const parsed = parseString(rawName);
   const fileName = `${parsed.name}${parsed.ext || '.svg'}`;
   const moduleId = parsed.prefix || undefined;
   return { fileName, moduleId } as const;
@@ -160,6 +159,48 @@ 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/dist/features/components/PubinfoIcon/parser.d.ts

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

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

@@ -1,42 +0,0 @@
-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),
-  };
-}