@moluoxixi/ajax-package 0.0.27 → 0.0.29

package/es/_types/props.d.ts

@@ -6,6 +6,8 @@ export interface SystemErrorDialogPropsType {
     deptName?: string;
     deptId?: string;
     clientIp?: string;
+    isStart?: boolean;
+    menuName?: string;
     requestUrl?: string;
     traceId?: string;
     errorMessage?: string;

package/es/_utils/systemErrorInfo.d.ts

@@ -3,4 +3,5 @@ import { SystemErrorDialogPropsType } from '../_types/index.ts';
 export declare function normalizePayload(payload: any): Record<string, any>;
 export declare function resolveTraceId(headers: AxiosResponse['headers'] | undefined): string;
 export declare function getUserInfoFromLocalStorage(): Record<string, any>;
+export declare function getCurrentMenuLocalStorage(): Record<string, any>;
 export declare function extractSystemErrorInfo(response: AxiosResponse, code: number, message: string): Omit<SystemErrorDialogPropsType, 'title' | 'width'>;

package/es/index.mjs

@@ -2,9 +2,9 @@
   "use strict";
   try {
     if (typeof document !== "undefined") {
-      if (!document.getElementById("3fee00ce-04a4-4e27-a631-432b297808e9")) {
+      if (!document.getElementById("d511844d-9a24-4e81-830d-dc2af40a6fec")) {
         var elementStyle = document.createElement("style");
-        elementStyle.id = "3fee00ce-04a4-4e27-a631-432b297808e9";
+        elementStyle.id = "d511844d-9a24-4e81-830d-dc2af40a6fec";
         elementStyle.appendChild(document.createTextNode("._root_11p33_1 .el-dialog__header {\n  padding: 0 12px 12px;\n}\n\n._root_11p33_1 .el-dialog__body {\n  border-top: 1px solid #e5e7eb;\n  border-bottom: 1px solid #e5e7eb;\n  padding: 0 12px;\n}\n\n._root_11p33_1 .el-dialog__footer {\n  padding: 0 12px;\n}"));
         document.head.appendChild(elementStyle);
       }
@@ -7364,6 +7364,20 @@ function getUserInfoFromLocalStorage() {
     return {};
   }
 }
+function getCurrentMenuLocalStorage() {
+  if (typeof window === "undefined" || typeof localStorage === "undefined")
+    return {};
+  try {
+    const userInfoStr = localStorage.getItem("currentMenu");
+    if (!userInfoStr)
+      return {};
+    const currentMenu = JSON.parse(userInfoStr);
+    return currentMenu || {};
+  } catch (error) {
+    console.warn("Failed to parse currentMenu from localStorage:", error);
+    return {};
+  }
+}
 function extractSystemErrorInfo(response, code, message2) {
   var _a2, _b;
   const mergedRequestPayload = {
@@ -7380,12 +7394,15 @@ function extractSystemErrorInfo(response, code, message2) {
     return baseURL.endsWith("/") && url.startsWith("/") ? baseURL + url.slice(1) : baseURL.endsWith("/") || url.startsWith("/") || !url ? baseURL + url : `${baseURL}/${url}`;
   }
   const userInfo = getUserInfoFromLocalStorage();
+  const currentMenu = getCurrentMenuLocalStorage();
   return {
     userName: userInfo.username ?? mergedRequestPayload.userName ?? mergedRequestPayload.username,
     userId: userInfo.id ?? mergedRequestPayload.userId ?? mergedRequestPayload.userid,
     deptName: userInfo.workDeptName ?? mergedRequestPayload.deptName ?? mergedRequestPayload.departmentName,
     deptId: userInfo.workDeptId ?? mergedRequestPayload.deptId ?? mergedRequestPayload.departmentId,
     clientIp: userInfo.loginip ?? mergedRequestPayload.clientIp ?? mergedRequestPayload.ip,
+    isStart: userInfo.isStart ?? mergedRequestPayload.isStart,
+    menuName: currentMenu.title ?? mergedRequestPayload.menuName,
     requestUrl: getFullRequestUrl(),
     traceId: resolveTraceId(response.headers),
     errorCode: code,
@@ -7916,8 +7933,23 @@ const _BaseApi = class _BaseApi extends BaseHttpClient {
     ]);
     (_a2 = this.messageInstance) == null ? void 0 : _a2.error({
       message: messageVNode,
-      duration: 5 * 1e3
+      duration: 5 * 1e3,
+      customClass: "system-error-message"
+      // 添加自定义类名
     });
+    if (typeof document !== "undefined") {
+      let styleElement = document.getElementById("system-error-message-style");
+      if (!styleElement) {
+        styleElement = document.createElement("style");
+        styleElement.id = "system-error-message-style";
+        document.head.appendChild(styleElement);
+      }
+      styleElement.textContent = `
+        .system-error-message {
+          z-index: 99999998 !important;
+        }
+      `;
+    }
   }
   handleBusinessError(code, message2) {
     var _a2;
@@ -7953,6 +7985,7 @@ const _BaseApi = class _BaseApi extends BaseHttpClient {
       const finalOptions = {
         ...defaultOptions,
         ...notificationOptions,
+        dangerouslyUseHTMLString: true,
         message: html
       };
       (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, finalOptions);
@@ -8103,12 +8136,15 @@ const SystemErrorDialog = defineComponent({
     const isMobile = typeof window !== "undefined" && window.innerWidth <= 768;
     const userInfo = computed(() => {
       const localUserInfo = getUserInfoFromLocalStorage();
+      const currentMenu = getCurrentMenuLocalStorage();
       return {
         userName: localUserInfo.username ?? props.userName,
         userId: localUserInfo.usercode ?? props.userId,
+        isStart: localUserInfo.isStart ?? false,
+        menuName: (currentMenu == null ? void 0 : currentMenu.title) ?? "",
         deptName: localUserInfo.workDeptName ?? props.deptName,
         deptId: localUserInfo.workDeptId ?? props.deptId,
-        clientIp: localUserInfo.loginip ?? props.clientIp
+        clientIp: localUserInfo.isStart ? localUserInfo.loginip ?? props.clientIp : ""
       };
     });
     const techSummaryItems = computed(() => [
@@ -8117,7 +8153,8 @@ const SystemErrorDialog = defineComponent({
       { label: "科室名称", value: userInfo.value.deptName },
       { label: "科室ID", value: userInfo.value.deptId },
       { label: "客户端IP", value: userInfo.value.clientIp },
-      { label: "菜单名称", value: currentUrl },
+      { label: "菜单URL", value: currentUrl },
+      { label: "菜单名称", value: userInfo.value.menuName },
       { label: "请求URL路径", value: props.requestUrl },
       { label: "链路ID", value: props.traceId }
     ]);
@@ -8146,7 +8183,8 @@ const SystemErrorDialog = defineComponent({
         clientIp: userInfo.value.clientIp,
         requestPath: props.requestUrl,
         traceId: props.traceId,
-        menuName: currentUrl,
+        menuName: userInfo.value.menuName,
+        menuUrl: currentUrl,
         errorMessage: props.errorMessage
       });
       ElMessage.success("上报成功");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moluoxixi/ajax-package",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "AjaxPackage 组件",
   "sideEffects": [
     "*.css",