@moluoxixi/ajax-package 0.0.12 → 0.0.14

package/es/BaseHttpClient.d.ts

@@ -4,16 +4,21 @@ import { MessageInstance, NotificationInstance } from './_utils/index.ts';
 export default class BaseHttpClient {
     protected baseURL: string;
     protected timeout: number;
-    protected onTimeout: () => void;
+    protected onTimeout: (messageInstance: MessageInstance) => void;
     protected getToken?: () => string | null;
-    protected onLoginRequired?: () => void;
+    protected onLoginRequired?: (messageInstance: MessageInstance) => void;
     instance: ReturnType<typeof axios.create>;
     protected messageInstance: MessageInstance;
     protected notificationInstance: NotificationInstance;
     constructor(config: BaseHttpClientConfig);
     processRequestConfig(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig<any>;
     processResponseConfig(response: AxiosResponse): AxiosResponse['data'];
+    protected handleHttpStatus(response: AxiosResponse): void;
+    protected handleSuccessResponse(response: AxiosResponse): AxiosResponse['data'];
     processResponseError(error: AxiosError): Promise<AxiosError>;
+    protected handleAuthenticationError(error: AxiosError): void;
+    protected handleTimeoutError(error: AxiosError): void;
+    protected handleNetworkError(error: AxiosError): void;
     private setupInterceptors;
     protected request<R>(config: AxiosRequestConfig): Promise<AxiosResponse['data']>;
     get<R>(url: string, params?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
@@ -22,4 +27,5 @@ export default class BaseHttpClient {
     put<R>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
     all<R>(requests: Array<AxiosRequestConfig | Promise<AxiosResponse<R>>>): Promise<AxiosResponse['data'][]>;
     uploadFile<R>(url: string, file: File | Blob, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    downloadFile(blob: Blob, filename?: string): void;
 }

package/es/SystemErrorDialog.d.ts

@@ -4,7 +4,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: string;
     };
     width: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: number;
     };
     userName: {
@@ -40,7 +40,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: undefined;
     };
     errorCode: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     modelValue: {
@@ -60,7 +60,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: string;
     };
     width: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: number;
     };
     userName: {
@@ -96,7 +96,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         default: undefined;
     };
     errorCode: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: undefined;
     };
     modelValue: {
@@ -110,7 +110,6 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onReport?: (() => any) | undefined;
 }>, {
     title: string;
-    modelValue: boolean;
     width: string | number;
     userName: string;
     userId: string;
@@ -121,5 +120,6 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     traceId: string;
     errorMessage: string;
     errorCode: string | number;
+    modelValue: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/_types/api.d.ts

@@ -1,11 +1,12 @@
 import { App } from 'vue';
+import { MessageInstance } from '../_utils/index.ts';
 import { default as BaseApi } from '../class.ts';
 export interface BaseHttpClientConfig {
     baseURL?: string;
     timeout?: number;
-    onTimeout?: () => void;
+    onTimeout?: (messageInstance: MessageInstance) => void;
     getToken?: () => string | null;
-    onLoginRequired?: () => void;
+    onLoginRequired?: (messageInstance: MessageInstance) => void;
     [key: string]: any;
 }
 export interface BaseApiConfig extends BaseHttpClientConfig {

package/es/class.d.ts

@@ -1,4 +1,4 @@
-import { AxiosError, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import { AxiosError, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios';
 import { BaseApiConfig } from './_types/index.ts';
 import { default as BaseHttpClient } from './BaseHttpClient.ts';
 export default class BaseApi extends BaseHttpClient {
@@ -6,16 +6,38 @@ export default class BaseApi extends BaseHttpClient {
     protected enableSystemErrorDialog: boolean;
     constructor(config: BaseApiConfig);
     processRequestConfig(config: InternalAxiosRequestConfig): InternalAxiosRequestConfig;
-    processResponseError(error: AxiosError): Promise<AxiosError>;
     processResponseConfig(response: AxiosResponse): AxiosResponse['data'];
+    processResponseError(error: AxiosError): Promise<AxiosError>;
+    protected handleHttpStatus(response: AxiosResponse): void;
+    protected handleAuthenticationError(error: AxiosError): void;
+    protected handleTimeoutError(error: AxiosError): void;
+    protected handleNetworkError(error: AxiosError): void;
+    protected handleSuccessResponse(response: AxiosResponse): AxiosResponse['data'];
     protected parseResponseFields(data: any): {
         code: any;
         message: any;
         responseData: any;
     };
-    protected handleErrorCode(response: AxiosResponse, code: any, message: any, responseData: any): void;
-    protected handleErrors(responseData: any): void;
+    protected handleSystemError(response: AxiosResponse, code: any, message: any, responseData: any): void;
+    protected handleBusinessError(code: any, message: any): void;
+    protected handleErrorArray(responseData: any): void;
+    protected showErrorArrayNotification(errors: Array<{
+        code: string;
+        message: string;
+    }>): void;
     protected handleTips(responseData: any): void;
+    protected showTipsNotification(tips: Array<{
+        code: string;
+        message: string;
+    }>): void;
     private showSystemExceptionDialog;
     protected reportError(errorInfo: any): Promise<void>;
+    protected request<R>(config: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    get<R>(url: string, params?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    post<R>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    delete<R>(url: string, params?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    put<R>(url: string, data?: Record<string, any>, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    all<R>(requests: Array<AxiosRequestConfig | Promise<AxiosResponse<R>>>): Promise<AxiosResponse['data'][]>;
+    uploadFile<R>(url: string, file: File | Blob, config?: AxiosRequestConfig): Promise<AxiosResponse['data']>;
+    downloadFile(blob: Blob, filename?: string): void;
 }

package/es/index.d.ts

@@ -2,4 +2,5 @@ import { default as BaseHttpClient } from './BaseHttpClient.ts';
 import { default as BaseApi } from './class.ts';
 import { default as VueAxiosPlugin, createHttpService, getHttpService } from './netseriver.ts';
 export { BaseApi, BaseHttpClient, createHttpService, getHttpService, VueAxiosPlugin, };
+export type { BaseApiConfig, BaseHttpClientConfig, vueAxiosPluginOptionsType, vueAxiosPluginType, vueHttpServiceType, } from './_types/index.ts';
 export default getHttpService;

package/es/index.mjs

@@ -2,9 +2,9 @@
   "use strict";
   try {
     if (typeof document !== "undefined") {
-      if (!document.getElementById("c6a35fc5-e19d-40c8-8129-fe6481835a30")) {
+      if (!document.getElementById("75eddb1d-8897-4198-902d-b3b4a60a3856")) {
         var elementStyle = document.createElement("style");
-        elementStyle.id = "c6a35fc5-e19d-40c8-8129-fe6481835a30";
+        elementStyle.id = "75eddb1d-8897-4198-902d-b3b4a60a3856";
         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);
       }
@@ -12170,7 +12170,11 @@ function extractSystemErrorInfo(response, code, message2) {
     errorMessage: message2
   };
 }
-function defaultOnLoginRequired() {
+function defaultOnLoginRequired(messageInstance) {
+  messageInstance == null ? void 0 : messageInstance.error({
+    message: "登录已过期，请重新登录",
+    duration: 5 * 1e3
+  });
   if (typeof window !== "undefined") {
     window.location.href = `/login?redirect=${encodeURIComponent(window.location.href)}`;
   }
@@ -12215,11 +12219,45 @@ class BaseHttpClient {
     return config;
   }
   processResponseConfig(response) {
+    this.handleHttpStatus(response);
+    return this.handleSuccessResponse(response);
+  }
+  handleHttpStatus(response) {
+    var _a2;
+    if (response.status !== 200) {
+      throw new Error(((_a2 = response.data) == null ? void 0 : _a2.message) || `HTTP Error: ${response.status}`);
+    }
+  }
+  handleSuccessResponse(response) {
     return response.data;
   }
   async processResponseError(error) {
+    this.handleAuthenticationError(error);
+    this.handleTimeoutError(error);
+    this.handleNetworkError(error);
     return error;
   }
+  handleAuthenticationError(error) {
+    var _a2, _b;
+    if (((_a2 = error.response) == null ? void 0 : _a2.status) === 401) {
+      (_b = this.onLoginRequired) == null ? void 0 : _b.call(this, this.messageInstance);
+    }
+  }
+  handleTimeoutError(error) {
+    if (error.code === "ECONNABORTED" && error.message.includes("timeout")) {
+      this.onTimeout(this.messageInstance);
+    }
+  }
+  handleNetworkError(error) {
+    var _a2, _b, _c;
+    if (((_a2 = error.response) == null ? void 0 : _a2.status) !== 401 && error.code !== "ECONNABORTED") {
+      const fallbackError = error;
+      (_c = this.messageInstance) == null ? void 0 : _c.error({
+        message: ((_b = fallbackError.response) == null ? void 0 : _b.data) || fallbackError.message || "网络错误",
+        duration: 5 * 1e3
+      });
+    }
+  }
   setupInterceptors() {
     this.instance.interceptors.request.use(
       (config) => {
@@ -12238,34 +12276,10 @@ class BaseHttpClient {
     );
     this.instance.interceptors.response.use(
       (res) => {
-        var _a2;
-        if (res.status !== 200) {
-          return Promise.reject(new Error(((_a2 = res.data) == null ? void 0 : _a2.message) || "Error"));
-        }
         return this.processResponseConfig(res);
       },
       async (error) => {
-        var _a2, _b, _c, _d, _e, _f;
         await this.processResponseError(error);
-        if (((_a2 = error.response) == null ? void 0 : _a2.status) === 401) {
-          (_b = this.onLoginRequired) == null ? void 0 : _b.call(this);
-          (_c = this.messageInstance) == null ? void 0 : _c.error({
-            message: "登录已过期，请重新登录",
-            duration: 5 * 1e3
-          });
-        } else if (error.code === "ECONNABORTED" && error.message.includes("timeout")) {
-          this.onTimeout();
-          (_d = this.messageInstance) == null ? void 0 : _d.error({
-            message: "请求超时，请检查网络连接或稍后重试",
-            duration: 5 * 1e3
-          });
-        } else {
-          const fallbackError = error;
-          (_f = this.messageInstance) == null ? void 0 : _f.error({
-            message: ((_e = fallbackError.response) == null ? void 0 : _e.data) || fallbackError.message || "网络错误",
-            duration: 5 * 1e3
-          });
-        }
         return Promise.reject(error);
       }
     );
@@ -12308,6 +12322,20 @@ class BaseHttpClient {
       }
     });
   }
+  downloadFile(blob, filename) {
+    if (typeof window === "undefined") {
+      console.warn("downloadFile: 非浏览器环境，无法下载文件");
+      return;
+    }
+    const url = window.URL.createObjectURL(blob);
+    const link = document.createElement("a");
+    link.href = url;
+    link.download = filename || `download-${Date.now()}`;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    window.URL.revokeObjectURL(url);
+  }
 }
 async function dynamicImports(modulePromise, exportNames) {
   const module = await modulePromise;
@@ -12485,14 +12513,31 @@ class BaseApi extends BaseHttpClient {
   processRequestConfig(config) {
     return super.processRequestConfig(config);
   }
+  processResponseConfig(response) {
+    return super.processResponseConfig(response);
+  }
   async processResponseError(error) {
     return super.processResponseError(error);
   }
-  processResponseConfig(response) {
-    const data = response.data;
-    const { code, message: message2, responseData } = this.parseResponseFields(data);
-    this.handleErrorCode(response, code, message2, responseData);
-    this.handleErrors(responseData);
+  handleHttpStatus(response) {
+    return super.handleHttpStatus(response);
+  }
+  handleAuthenticationError(error) {
+    super.handleAuthenticationError(error);
+  }
+  handleTimeoutError(error) {
+    return super.handleTimeoutError(error);
+  }
+  handleNetworkError(error) {
+    return super.handleNetworkError(error);
+  }
+  handleSuccessResponse(response) {
+    const httpData = super.handleSuccessResponse(response);
+    const parsedFields = this.parseResponseFields(httpData);
+    const { code, message: message2, responseData } = parsedFields;
+    this.handleSystemError(response, code, message2, responseData);
+    this.handleBusinessError(code, message2);
+    this.handleErrorArray(responseData);
     this.handleTips(responseData);
     return responseData;
   }
@@ -12517,11 +12562,7 @@ class BaseApi extends BaseHttpClient {
     const responseData = getValueByPath(data, (_c = this.responseFields) == null ? void 0 : _c.data);
     return { code, message: message2, responseData };
   }
-  handleErrorCode(response, code, message2, responseData) {
-    var _a2;
-    if (code === 401) {
-      throw new Error("登录失效，请重新登录");
-    }
+  handleSystemError(response, code, message2, responseData) {
     if (code === -1) {
       if (this.enableSystemErrorDialog) {
         this.showSystemExceptionDialog(response, responseData, code, message2).catch((error) => {
@@ -12530,6 +12571,9 @@ class BaseApi extends BaseHttpClient {
       }
       throw new Error(message2 || "系统异常");
     }
+  }
+  handleBusinessError(code, message2) {
+    var _a2;
     if (code && code !== 200) {
       (_a2 = this.messageInstance) == null ? void 0 : _a2.error({
         message: message2 || "请求失败",
@@ -12538,55 +12582,63 @@ class BaseApi extends BaseHttpClient {
       throw new Error(message2 || "请求失败");
     }
   }
-  handleErrors(responseData) {
-    var _a2, _b, _c;
+  handleErrorArray(responseData) {
+    var _a2;
     const errorsField = (_a2 = this.responseFields) == null ? void 0 : _a2.errors;
     if (errorsField) {
       const errors = responseData == null ? void 0 : responseData[errorsField];
       if (Array.isArray(errors) && errors.length) {
-        const html = errors.map((item) => `<div style="font-size: 14px;color:red">${item.code}：${item.message}</div>`).join("");
-        if (hasDocument) {
-          (_b = this.notificationInstance) == null ? void 0 : _b.call(this, {
-            title: "提示",
-            message: html,
-            type: "error"
-          });
-        } else {
-          const errorMessages = errors.map((item) => `${item.code}：${item.message}`).join("\n");
-          (_c = this.notificationInstance) == null ? void 0 : _c.call(this, {
-            title: "提示",
-            message: errorMessages,
-            type: "error"
-          });
-        }
+        this.showErrorArrayNotification(errors);
         throw new Error("请求错误");
       }
     }
   }
+  showErrorArrayNotification(errors) {
+    var _a2, _b;
+    const html = errors.map((item) => `<div style="font-size: 14px;color:red">${item.code}：${item.message}</div>`).join("");
+    if (hasDocument) {
+      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, {
+        title: "提示",
+        message: html,
+        type: "error"
+      });
+    } 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"
+      });
+    }
+  }
   handleTips(responseData) {
-    var _a2, _b, _c;
+    var _a2;
     const tipsField = (_a2 = this.responseFields) == null ? void 0 : _a2.tips;
     if (tipsField) {
       const tips = responseData == null ? void 0 : responseData[tipsField];
       if (Array.isArray(tips) && tips.length) {
-        const html = tips.map((item) => `<div style="font-size: 14px;color:#E6A23C">${item.code}：${item.message}</div>`).join("");
-        if (hasDocument) {
-          (_b = this.notificationInstance) == null ? void 0 : _b.call(this, {
-            title: "提示",
-            message: html,
-            type: "warning"
-          });
-        } else {
-          const tipMessages = tips.map((item) => `${item.code}：${item.message}`).join("\n");
-          (_c = this.notificationInstance) == null ? void 0 : _c.call(this, {
-            title: "提示",
-            message: tipMessages,
-            type: "warning"
-          });
-        }
+        this.showTipsNotification(tips);
       }
     }
   }
+  showTipsNotification(tips) {
+    var _a2, _b;
+    const html = tips.map((item) => `<div style="font-size: 14px;color:#E6A23C">${item.code}：${item.message}</div>`).join("");
+    if (hasDocument) {
+      (_a2 = this.notificationInstance) == null ? void 0 : _a2.call(this, {
+        title: "提示",
+        message: html,
+        type: "warning"
+      });
+    } 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"
+      });
+    }
+  }
   async showSystemExceptionDialog(response, responseData, code, message2) {
     if (!hasDocument) {
       console.error("系统异常信息：", responseData);
@@ -12642,6 +12694,30 @@ class BaseApi extends BaseHttpClient {
       });
     }
   }
+  async request(config) {
+    return super.request(config);
+  }
+  async get(url, params, config) {
+    return super.get(url, params, config);
+  }
+  async post(url, data, config) {
+    return super.post(url, data, config);
+  }
+  async delete(url, params, config) {
+    return super.delete(url, params, config);
+  }
+  async put(url, data, config) {
+    return super.put(url, data, config);
+  }
+  async all(requests) {
+    return super.all(requests);
+  }
+  async uploadFile(url, file, config) {
+    return super.uploadFile(url, file, config);
+  }
+  downloadFile(blob, filename) {
+    return super.downloadFile(blob, filename);
+  }
 }
 function createHttpService(options = {}) {
   return new BaseApi(options);

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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,21 @@
+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

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

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

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

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

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

package/package.json

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