@moluoxixi/ajax-package 0.0.15 → 0.0.17-beta.1

package/es/_types/api.d.ts

@@ -1,3 +1,4 @@
+import { AxiosRequestConfig } from 'axios';
 import { App } from 'vue';
 import { MessageInstance } from '../_utils/index.ts';
 import { default as BaseApi } from '../class.ts';
@@ -63,3 +64,55 @@ export interface vueAxiosPluginType {
      */
     install: (app: App, options?: vueAxiosPluginOptionsType) => void;
 }
+/**
+ * 通知配置选项
+ */
+export interface NotificationOptions {
+    /**
+     * 通知标题
+     */
+    title?: string;
+    /**
+     * 通知类型
+     */
+    type?: 'success' | 'error' | 'warning' | 'info';
+    /**
+     * 通知持续时间（毫秒）
+     */
+    duration?: number;
+    /**
+     * 是否显示关闭按钮
+     */
+    showClose?: boolean;
+    /**
+     * 自定义类名
+     */
+    customClass?: string;
+    /**
+     * 自定义样式
+     */
+    customStyle?: string | Record<string, any>;
+    /**
+     * 其他通知选项
+     */
+    [key: string]: any;
+}
+/**
+ * 扩展 AxiosRequestConfig，支持自定义通知配置
+ */
+export interface ExtendedAxiosRequestConfig extends AxiosRequestConfig {
+    /**
+     * 错误通知配置选项，用于覆盖默认的错误通知参数
+     */
+    errorNotificationOptions?: NotificationOptions;
+    /**
+     * 提示通知配置选项，用于覆盖默认的提示通知参数
+     */
+    tipsNotificationOptions?: NotificationOptions;
+    /**
+     * 是否使用自定义消息处理
+     * 当为 true 时，handleBusinessError、handleErrorArray、handleTips 都不会执行
+     * 默认值为 false
+     */
+    isCustomMessage?: boolean;
+}

package/es/class.d.ts

@@ -1,5 +1,5 @@
-import { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-import { BaseApiConfig } from './_types/index.ts';
+import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { BaseApiConfig, ExtendedAxiosRequestConfig, NotificationOptions } from './_types/index.ts';
 import { default as BaseHttpClient } from './BaseHttpClient.ts';
 /**
  * BaseApi 类
@@ -69,6 +69,13 @@ export default class BaseApi extends BaseHttpClient {
      * @returns 解析后的响应数据
      */
     protected handleSuccessResponse(response: AxiosResponse): AxiosResponse['data'];
+    /**
+     * 支持路径解析的辅助函数
+     * @param obj
+     * @param path
+     * @protected
+     */
+    protected getValueByPath(obj: any, path: string | undefined): any;
     /**
      * 解析响应字段，支持嵌套路径解析
      * 子类可重写此方法来自定义字段解析逻辑
@@ -99,33 +106,37 @@ export default class BaseApi extends BaseHttpClient {
     /**
      * 处理错误数组 errors（如果有配置）
      * 子类可重写此方法来自定义错误数组处理逻辑
-     * @param responseData - 响应数据
+     * @param httpData
+     * @param response
      */
-    protected handleErrorArray(responseData: any): void;
+    protected handleErrorArray(httpData: any, response: AxiosResponse): void;
     /**
      * 显示错误数组通知
      * 子类可重写此方法来自定义错误数组通知显示方式
      * @param errors - 错误数组
+     * @param notificationOptions
      */
     protected showErrorArrayNotification(errors: Array<{
         code: string;
         message: string;
-    }>): void;
+    }>, notificationOptions?: NotificationOptions): void;
     /**
      * 处理提示信息 tips（如果有配置）
      * 子类可重写此方法来自定义提示信息处理逻辑
-     * @param responseData - 响应数据
+     * @param httpData
+     * @param response
      */
-    protected handleTips(responseData: any): void;
+    protected handleTips(httpData: any, response: AxiosResponse): void;
     /**
      * 显示提示信息通知
      * 子类可重写此方法来自定义提示信息通知显示方式
      * @param tips - 提示信息数组
+     * @param notificationOptions
      */
     protected showTipsNotification(tips: Array<{
         code: string;
         message: string;
-    }>): void;
+    }>, notificationOptions?: NotificationOptions): void;
     /**
      * 显示系统异常对话框，当响应状态码为 -1 时调用
      * @param response - Axios 响应对象
@@ -145,7 +156,7 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - Axios 请求配置对象
      * @returns 解析后的响应数据
      */
-    protected request<R>(config: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    protected request<R>(config: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 发送 GET 请求
      * 显式声明以确保类型一致性，子类可重写此方法
@@ -154,7 +165,7 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - 额外的请求配置
      * @returns 解析后的响应数据
      */
-    get<R>(url: string, params?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    get<R>(url: string, params?: Record<string, any>, config?: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 发送 POST 请求
      * 显式声明以确保类型一致性，子类可重写此方法
@@ -163,7 +174,7 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - 额外的请求配置
      * @returns 解析后的响应数据
      */
-    post<R>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    post<R>(url: string, data?: Record<string, any>, config?: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 发送 DELETE 请求
      * 显式声明以确保类型一致性，子类可重写此方法
@@ -172,7 +183,7 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - 额外的请求配置
      * @returns 解析后的响应数据
      */
-    delete<R>(url: string, params?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    delete<R>(url: string, params?: Record<string, any>, config?: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 发送 PUT 请求
      * 显式声明以确保类型一致性，子类可重写此方法
@@ -181,14 +192,14 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - 额外的请求配置
      * @returns 解析后的响应数据
      */
-    put<R>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    put<R>(url: string, data?: Record<string, any>, config?: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 批量请求，并发发送多个请求
      * 显式声明以确保类型一致性，子类可重写此方法
      * @param requests - 请求配置数组或已发起的请求 Promise 数组
      * @returns 所有请求的响应数据数组
      */
-    all<R>(requests: Array<AxiosRequestConfig | Promise<AxiosResponse<R>>>): Promise<AxiosResponse['data'][]>;
+    all<R>(requests: Array<ExtendedAxiosRequestConfig | Promise<AxiosResponse<R>>>): Promise<AxiosResponse['data'][]>;
     /**
      * 文件上传，将文件包装为 FormData 发送
      * 显式声明以确保类型一致性，子类可重写此方法
@@ -197,7 +208,7 @@ export default class BaseApi extends BaseHttpClient {
      * @param config - 额外的请求配置
      * @returns 解析后的响应数据
      */
-    uploadFile<R>(url: string, file: File | Blob, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    uploadFile<R>(url: string, file: File | Blob, config?: ExtendedAxiosRequestConfig): Promise<AxiosResponse['data']>;
     /**
      * 下载文件，将 Blob 对象下载到本地
      * 显式声明以确保类型一致性，子类可重写此方法

package/es/index.mjs

@@ -2,9 +2,9 @@
   "use strict";
   try {
     if (typeof document !== "undefined") {
-      if (!document.getElementById("ffe3dd99-bf7e-4730-8936-fd7b509c3c02")) {
+      if (!document.getElementById("fff2b744-05a5-42b2-a548-d0942177ace6")) {
         var elementStyle = document.createElement("style");
-        elementStyle.id = "ffe3dd99-bf7e-4730-8936-fd7b509c3c02";
+        elementStyle.id = "fff2b744-05a5-42b2-a548-d0942177ace6";
         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);
       }
@@ -12613,8 +12613,8 @@ class BaseApi extends BaseHttpClient {
       code: "Code",
       message: "Message",
       data: "data",
-      errors: "errors",
-      tips: "tips",
+      errors: "data.errors",
+      tips: "data.tips",
       ...responseFields
     };
     this.enableSystemErrorDialog = enableSystemErrorDialog;
@@ -12691,12 +12691,36 @@ class BaseApi extends BaseHttpClient {
     const httpData = super.handleSuccessResponse(response);
     const parsedFields = this.parseResponseFields(httpData);
     const { code, message: message2, responseData } = parsedFields;
+    const config = response.config;
+    const isCustomMessage = (config == null ? void 0 : config.isCustomMessage) ?? false;
     this.handleSystemError(response, code, message2, responseData);
-    this.handleBusinessError(code, message2);
-    this.handleErrorArray(responseData);
-    this.handleTips(responseData);
+    if (!isCustomMessage) {
+      this.handleBusinessError(code, message2, response);
+      this.handleErrorArray(httpData, response);
+      this.handleTips(httpData, response);
+    }
     return responseData;
   }
+  /**
+   * 支持路径解析的辅助函数
+   * @param obj
+   * @param path
+   * @protected
+   */
+  getValueByPath(obj, path) {
+    if (!path)
+      return obj;
+    const keys = path.split(".");
+    let result = obj;
+    for (const key of keys) {
+      if (result && typeof result === "object" && key in result) {
+        result = result[key];
+      } else {
+        return void 0;
+      }
+    }
+    return result;
+  }
   /**
    * 解析响应字段，支持嵌套路径解析
    * 子类可重写此方法来自定义字段解析逻辑
@@ -12705,23 +12729,9 @@ class BaseApi extends BaseHttpClient {
    */
   parseResponseFields(data) {
     var _a2, _b, _c;
-    const getValueByPath = (obj, path) => {
-      if (!path)
-        return obj;
-      const keys = path.split(".");
-      let result = obj;
-      for (const key of keys) {
-        if (result && typeof result === "object" && key in result) {
-          result = result[key];
-        } else {
-          return void 0;
-        }
-      }
-      return result;
-    };
-    const code = getValueByPath(data, (_a2 = this.responseFields) == null ? void 0 : _a2.code);
-    const message2 = getValueByPath(data, (_b = this.responseFields) == null ? void 0 : _b.message);
-    const responseData = getValueByPath(data, (_c = this.responseFields) == null ? void 0 : _c.data);
+    const code = this.getValueByPath(data, (_a2 = this.responseFields) == null ? void 0 : _a2.code);
+    const message2 = this.getValueByPath(data, (_b = this.responseFields) == null ? void 0 : _b.message);
+    const responseData = this.getValueByPath(data, (_c = this.responseFields) == null ? void 0 : _c.data);
     return { code, message: message2, responseData };
   }
   /**
@@ -12761,15 +12771,18 @@ class BaseApi extends BaseHttpClient {
   /**
    * 处理错误数组 errors（如果有配置）
    * 子类可重写此方法来自定义错误数组处理逻辑
-   * @param responseData - 响应数据
+   * @param httpData
+   * @param response
    */
-  handleErrorArray(responseData) {
+  handleErrorArray(httpData, response) {
     var _a2;
     const errorsField = (_a2 = this.responseFields) == null ? void 0 : _a2.errors;
     if (errorsField) {
-      const errors = responseData == null ? void 0 : responseData[errorsField];
+      const errors = this.getValueByPath(httpData, errorsField);
       if (Array.isArray(errors) && errors.length) {
-        this.showErrorArrayNotification(errors);
+        const config = response.config;
+        const notificationOptions = config == null ? void 0 : config.errorNotificationOptions;
+        this.showErrorArrayNotification(errors, notificationOptions);
         throw new Error("请求错误");
       }
     }
@@ -12778,37 +12791,47 @@ class BaseApi extends BaseHttpClient {
    * 显示错误数组通知
    * 子类可重写此方法来自定义错误数组通知显示方式
    * @param errors - 错误数组
+   * @param notificationOptions
    */
-  showErrorArrayNotification(errors) {
+  showErrorArrayNotification(errors, notificationOptions) {
     var _a2, _b;
     const html = errors.map((item) => `<div style="font-size: 14px;color:red">${item.code}：${item.message}</div>`).join("");
+    const defaultOptions = {
+      title: "提示",
+      type: "error"
+    };
     if (hasDocument) {
-      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, {
-        title: "提示",
-        message: html,
-        type: "error"
-      });
+      const finalOptions = {
+        ...defaultOptions,
+        ...notificationOptions,
+        message: html
+      };
+      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, finalOptions);
     } else {
       const errorMessages = errors.map((item) => `${item.code}：${item.message}`).join("\n");
-      (_b = this.notificationInstance) == null ? void 0 : _b.call(this, {
-        title: "提示",
-        message: errorMessages,
-        type: "error"
-      });
+      const finalOptions = {
+        ...defaultOptions,
+        ...notificationOptions,
+        message: errorMessages
+      };
+      (_b = this.notificationInstance) == null ? void 0 : _b.call(this, finalOptions);
     }
   }
   /**
    * 处理提示信息 tips（如果有配置）
    * 子类可重写此方法来自定义提示信息处理逻辑
-   * @param responseData - 响应数据
+   * @param httpData
+   * @param response
    */
-  handleTips(responseData) {
+  handleTips(httpData, response) {
     var _a2;
     const tipsField = (_a2 = this.responseFields) == null ? void 0 : _a2.tips;
     if (tipsField) {
-      const tips = responseData == null ? void 0 : responseData[tipsField];
+      const tips = this.getValueByPath(httpData, tipsField);
       if (Array.isArray(tips) && tips.length) {
-        this.showTipsNotification(tips);
+        const config = response.config;
+        const notificationOptions = config == null ? void 0 : config.tipsNotificationOptions;
+        this.showTipsNotification(tips, notificationOptions);
       }
     }
   }
@@ -12816,23 +12839,30 @@ class BaseApi extends BaseHttpClient {
    * 显示提示信息通知
    * 子类可重写此方法来自定义提示信息通知显示方式
    * @param tips - 提示信息数组
+   * @param notificationOptions
    */
-  showTipsNotification(tips) {
+  showTipsNotification(tips, notificationOptions) {
     var _a2, _b;
     const html = tips.map((item) => `<div style="font-size: 14px;color:#E6A23C">${item.code}：${item.message}</div>`).join("");
+    const defaultOptions = {
+      title: "提示",
+      type: "warning"
+    };
     if (hasDocument) {
-      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, {
-        title: "提示",
-        message: html,
-        type: "warning"
-      });
+      const finalOptions = {
+        ...defaultOptions,
+        ...notificationOptions,
+        message: html
+      };
+      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, finalOptions);
     } else {
       const tipMessages = tips.map((item) => `${item.code}：${item.message}`).join("\n");
-      (_b = this.notificationInstance) == null ? void 0 : _b.call(this, {
-        title: "提示",
-        message: tipMessages,
-        type: "warning"
-      });
+      const finalOptions = {
+        ...defaultOptions,
+        ...notificationOptions,
+        message: tipMessages
+      };
+      (_b = this.notificationInstance) == null ? void 0 : _b.call(this, finalOptions);
     }
   }
   /**
@@ -13255,7 +13285,7 @@ const SystemErrorDialog = defineComponent({
             // 黑色错误信息区域
             h("div", { style: { backgroundColor: "#2c3e50", color: "#fff", padding: "16px 20px", fontFamily: 'Monaco, Consolas, "Courier New", monospace', fontSize: "12px", lineHeight: 1.5, maxHeight: "200px", overflowY: "auto" } }, [
               h("div", { style: { marginBottom: "8px", color: "#ecf0f1" } }, `Trace ID: ${props.traceId || "a1b2c3d4-e5f6-7890-g1h2-i3j4k5l6m7n8"}`),
-              h("div", { style: { color: "#e74c3c", fontWeight: "bold" } }, `Error: ${props.errorMessage || "Connection timeout after 5000ms"}`)
+              h("div", { style: { color: "#e74c3c", fontWeight: "bold", whiteSpace: "pre-wrap" } }, `Error: ${props.errorMessage || "Connection timeout after 5000ms"}`)
             ])
           ]),
           footer: () => h("div", { style: { display: "flex", justifyContent: "flex-end", alignItems: "center", paddingTop: "16px" } }, [

package/es/test/service.d.ts

@@ -0,0 +1,40 @@
+export default service;
+/**
+ * 创建 axios 实例
+ * @type {NewApi}
+ */
+declare const service: NewApi;
+/**
+ * 自定义 API 类，继承自 BaseApi
+ * 实现了原有的 axios 封装功能
+ */
+export class NewApi {
+    constructor(config?: {});
+    /**
+     * 处理请求配置
+     * 在请求发送之前进行一些处理
+     * 对应旧代码的请求拦截器逻辑
+     */
+    processRequestConfig(config: any): any;
+    /**
+     * 处理 HTTP 状态码
+     */
+    handleHttpStatus(response: any): void;
+    /**
+     * 处理业务错误（重写父类方法，不抛出错误，只显示消息）
+     */
+    handleBusinessError(code: any, message: any): void;
+    /**
+     * 处理成功响应（完全重写，符合旧代码逻辑）
+     */
+    handleSuccessResponse(response: any): any;
+    /**
+     * 处理超时错误（重写父类方法）
+     */
+    handleTimeoutError(error: any): void;
+    /**
+     * 处理网络错误（重写父类方法）
+     */
+    handleNetworkError(error: any): void;
+}
+export function showErrorNotification(title: any, errors: any): void;

package/package.json

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

package/es/test/utils/BaseRequestApi.d.ts

@@ -1,9 +0,0 @@
-import { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-import { BaseApi, BaseApiConfig } from '@moluoxixi/ajax-package';
-export default class BaseRequestApi extends BaseApi {
-    constructor(config?: Partial<BaseApiConfig>);
-    processRequestConfig(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig;
-    protected handleSuccessResponse(response: AxiosResponse): AxiosResponse['data'];
-    protected handleHttpStatus(response: AxiosResponse): void;
-    protected handleBusinessError(code: any, message: any): void;
-}

package/es/test/utils/DownloadApi.d.ts

@@ -1,21 +0,0 @@
-import { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-import { default as BaseRequestApi } from './BaseRequestApi.ts';
-export default class DownloadApi extends BaseRequestApi {
-    private downloadingFiles;
-    constructor();
-    processRequestConfig(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig;
-    processResponseError(error: AxiosError): Promise<AxiosError>;
-    protected handleSuccessResponse(response: AxiosResponse): AxiosResponse['data'];
-    downloadFileFromUrl(url: string, filename?: string, params?: Record<string, any>, data?: Record<string, any>, method?: 'get' | 'post', config?: AxiosRequestConfig): Promise<boolean>;
-    private getFilenameFromUrl;
-    downloadMultipleFiles(files: Array<{
-        url: string;
-        filename?: string;
-        params?: Record<string, any>;
-        data?: Record<string, any>;
-        method?: 'get' | 'post';
-    }>, onProgress?: (progress: number, currentFile: string) => void): Promise<{
-        success: number;
-        total: number;
-    }>;
-}

package/es/test/utils/RoleApi.d.ts

@@ -1,4 +0,0 @@
-import { BaseApi, BaseApiConfig } from '@moluoxixi/ajax-package';
-export default class RoleApi extends BaseApi {
-    constructor(config?: Partial<BaseApiConfig>);
-}

package/es/test/utils/UserApi.d.ts

@@ -1,4 +0,0 @@
-import { BaseApi, BaseApiConfig } from '@moluoxixi/ajax-package';
-export default class UserApi extends BaseApi {
-    constructor(config?: Partial<BaseApiConfig>);
-}

package/es/test/utils/index.d.ts

@@ -1,9 +0,0 @@
-import { default as DownloadApi } from './DownloadApi.ts';
-import { default as BaseRequestApi } from './BaseRequestApi.ts';
-import { default as UserApi } from './UserApi.ts';
-import { default as RoleApi } from './RoleApi.ts';
-export declare const downloadRequest: DownloadApi;
-export declare const userRequest: any;
-export declare const baseRequest: any;
-export declare const roleRequest: any;
-export { DownloadApi, BaseRequestApi, UserApi, RoleApi, };