@hzab/data-model 2.0.0-alpha.1 → 2.0.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.3",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/ArrayUtils.ts

@@ -133,7 +133,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
    * @returns 匹配的子项或 null
    */
   findItemById(id: string | number): T | null {
-    if (this._unuseabled(id)) {
+    if (this._isInvalidId(id)) {
       return null;
     }
     const { _idKey } = this;
@@ -152,7 +152,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
     const id = query[this._idKey];
 
     // 如果有 ID 且 ID 有效，优先通过 ID 查询
-    if (!this._unuseabled(id)) {
+    if (!this._isInvalidId(id)) {
       return this.findItemById(id);
     }
 
@@ -428,7 +428,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
   replaceItem(data: T): StateCode {
     const { _idKey, _list } = this;
     const id = data[_idKey];
-    if (this._unuseabled(id)) {
+    if (this._isInvalidId(id)) {
       return STATE_CODE.ERR_INPUT_ID;
     }
     const idx = _list.findIndex((it) => it[_idKey] === id);
@@ -448,13 +448,14 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
   updateItemValue(data: Partial<T> & { [key: string]: any }): StateCode {
     const { _idKey, _list } = this;
     const id = data[_idKey];
-    if (this._unuseabled(id)) {
+    if (this._isInvalidId(id)) {
       return STATE_CODE.ERR_INPUT_ID;
     }
-    const item = cloneDeep(_list.find((it) => it[_idKey] === id));
-    if (!item) {
+    const index = _list.findIndex((it) => it[_idKey] === id);
+    if (index < 0) {
       return STATE_CODE.NOT_FOUNT;
     }
+    const item = _list[index];
     Object.keys(data).forEach((key) => {
       if (key !== _idKey) {
         (item as any)[key] = data[key];
@@ -471,7 +472,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
    */
   delItem(id: any): StateCode {
     const { _idKey, _list } = this;
-    if (this._unuseabled(id)) {
+    if (this._isInvalidId(id)) {
       return STATE_CODE.ERR_INPUT_ID;
     }
     const idx = _list.findIndex((it) => it[_idKey] === id);
@@ -482,6 +483,49 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
     return STATE_CODE.SUC;
   }
 
+  /**
+   * 清空所有数据
+   * @returns 状态码
+   */
+  clearAll(): StateCode {
+    this._list = [];
+    return STATE_CODE.SUC;
+  }
+
+  /**
+   * 批量删除
+   * @param ids 要删除的 ID 数组
+   * @returns 删除成功的数量
+   */
+  deleteItems(ids: any[]): number {
+    let successCount = 0;
+    ids.forEach((id) => {
+      const res = this.delItem(id);
+      if (res === STATE_CODE.SUC) {
+        successCount++;
+      }
+    });
+    return successCount;
+  }
+
+  /**
+   * 判断列表是否为空
+   * @returns 是否为空
+   */
+  isEmpty(): boolean {
+    return this._list.length === 0;
+  }
+
+  /**
+   * 获取指定范围的列表
+   * @param start 起始索引
+   * @param end 结束索引
+   * @returns 切片后的列表
+   */
+  slice(start?: number, end?: number): T[] {
+    return cloneDeep(this._list.slice(start, end));
+  }
+
   /**
    * 检查单个 item 是否匹配所有 query 条件
    * @param item - 待检查的列表项
@@ -624,11 +668,11 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
   }
 
   /**
-   * 检查 ID 是否有效
+   * 检查 ID 是否无效
    * @param id 要检查的 ID
    * @returns ID 是否无效（为空）
    */
-  protected _unuseabled(id: any): boolean {
+  protected _isInvalidId(id: any): boolean {
     return isNil(id) || id === "";
   }
 
@@ -638,7 +682,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
    * @returns 设置 ID 后的子项
    */
   protected _setId(item: T): T {
-    if (isObject(item) && this._unuseabled((item as any)[this._idKey])) {
+    if (isObject(item) && this._isInvalidId((item as any)[this._idKey])) {
       (item as any)[this._idKey] = nanoid();
     }
     return item;
@@ -649,7 +693,7 @@ export class ArrayUtils<T extends Record<string, any> = Record<string, any>> {
    * @param item 要设置创建时间的子项
    */
   protected _setCreateTime(item: T): void {
-    if (isObject(item) && this._unuseabled((item as any).createTime)) {
+    if (isObject(item) && this._isInvalidId((item as any).createTime)) {
       (item as any).createTime = Date.now();
     }
   }

package/src/array-data-model.ts

@@ -1,7 +1,9 @@
 import { merge, pickBy, isNil, cloneDeep, isObject } from "lodash";
 
 import { _$Temp } from "./utils";
-import ArrayUtils, { STATE_CODE, FindListResult, ItemQuery, ArrayUtilsOptions } from "./ArrayUtils";
+import ArrayUtils, { STATE_CODE, FindListResult, ArrayUtilsOptions } from "./ArrayUtils";
+
+import { JSONObject, QueryParams, RequestData, MapFunction, RequestMapFunction, GetListFunc } from "./type";
 
 const errMsg: Record<number | string, string> = {
   404: "未找到对应子项",
@@ -11,67 +13,67 @@ const errMsg: Record<number | string, string> = {
 /**
  * ArrayDataModel 构造函数参数接口
  */
-export interface ArrayDataModelOptions<T = any> extends ArrayUtilsOptions<T> {
+export interface ArrayDataModelOptions<R = any> extends ArrayUtilsOptions<R> {
   /** 请求 url 替换的额外参数 */
-  ctx?: Record<string, any>;
+  ctx?: JSONObject;
   /** GET 请求的参数 */
-  query?: Record<string, any>;
+  query?: QueryParams;
 
   /** POST 接口地址 */
   createApi?: string;
   /** POST 接口提交前的数据处理回调 */
-  createMap?: (record: T) => T;
+  createMap?: MapFunction;
   /** GET 详情 接口地址 */
   getApi?: string;
   /** GET 详情 接口返回后的数据处理回调 */
-  getMap?: (record: T) => T;
+  getMap?: MapFunction;
   /** GET 列表 接口地址 */
   getListApi?: string;
   /** GET 列表 接口返回后的数据处理回调 */
-  getListMap?: (record: T) => T;
+  getListMap?: MapFunction;
   /** GET 列表 接口回调，用于自定义列表请求接口 */
-  getListFunc?: (query: Record<string, any>) => Promise<FindListResult<T>>;
+  getListFunc?: GetListFunc<R>;
   /** PUT 接口地址 */
   updateApi?: string;
   /** PUT 接口提交前的数据处理回调 */
-  updateMap?: (record: T) => T;
+  updateMap?: MapFunction;
   /** PATCH 接口地址 */
   patchApi?: string;
   /** PATCH 接口提交前的数据处理回调 */
-  patchMap?: (record: T) => T;
+  patchMap?: MapFunction;
   /** DELETE 接口地址 */
   deleteApi?: string;
   /** DELETE 批量删除 接口地址 */
   multipleDeleteApi?: string;
 
   /** GET 列表 接口请求前数据处理回调 */
-  getListReqMap?: (params: Record<string, any>) => Record<string, any>;
+  getListReqMap?: RequestMapFunction<QueryParams>;
   /** GET 列表 接口请求结果数据处理回调 */
-  getListResMap?: (result: FindListResult<T>) => FindListResult<T>;
+  getListResMap?: MapFunction;
   /** GET 详情 接口请求前数据处理回调 */
-  getReqMap?: (params: Record<string, any>) => Record<string, any>;
+  getReqMap?: RequestMapFunction<QueryParams>;
   /** GET 详情 接口请求结果数据处理回调 */
-  getResMap?: (record: T) => T;
+  getResMap?: MapFunction;
   /** POST 接口请求前数据处理回调 */
-  createReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  createReqMap?: RequestMapFunction<RequestData>;
   /** POST 接口请求结果数据处理回调 */
-  createResMap?: (data: Record<string, any>) => Record<string, any>;
+  createResMap?: MapFunction;
   /** PUT 接口请求前数据处理回调 */
-  updateReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  updateReqMap?: RequestMapFunction<RequestData>;
   /** PUT 接口请求结果数据处理回调 */
-  updateResMap?: (data: Record<string, any>) => Record<string, any>;
+  updateResMap?: MapFunction;
   /** PATCH 接口请求前数据处理回调 */
-  patchReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  patchReqMap?: RequestMapFunction<RequestData>;
   /** PATCH 接口请求结果数据处理回调 */
-  patchResMap?: (data: Record<string, any>) => Record<string, any>;
+  patchResMap?: MapFunction;
   /** DELETE 接口请求前数据处理回调 */
-  deleteReqMap?: (config: Record<string, any>) => Record<string, any>;
+  deleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 接口请求结果数据处理回调 */
-  deleteResMap?: (data: Record<string, any>) => Record<string, any>;
+  deleteResMap?: MapFunction;
   /** DELETE 批量删除 接口请求前数据处理回调 */
-  multipleDeleteReqMap?: (config: Record<string, any>) => Record<string, any>;
+  multipleDeleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 批量删除 接口请求结果数据处理回调 */
-  multipleDeleteResMap?: (data: { sucList: any[]; failList: any[] }) => { sucList: any[]; failList: any[] };
+  multipleDeleteResMap?: MapFunction;
 
   /** 查询选项 */
   arrOptions?: ArrOptions;
@@ -125,63 +127,63 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
   /** 请求 url 替换的额外参数 */
   ctx: Record<string, any>;
   /** GET 请求的参数 */
-  query: Record<string, any>;
+  query: QueryParams;
 
   /** POST 接口地址 */
   createApi?: string;
   /** POST 接口提交前的数据处理回调 */
-  createMap?: (record: T) => T;
+  createMap?: MapFunction;
   /** GET 详情 接口地址 */
   getApi?: string;
   /** GET 详情 接口返回后的数据处理回调 */
-  getMap?: (record: T) => T;
+  getMap?: MapFunction;
   /** GET 列表 接口地址 */
   getListApi?: string;
   /** GET 列表 接口返回后的数据处理回调 */
-  getListMap?: (record: T) => T;
-  /** GET 列表 接口回调，用于自定义列表请求接口。query => ({list: [], pagination: { total: 0 }}) 优先级高于 getListApi */
-  getListFunc?: (query: Record<string, any>) => Promise<FindListResult<T>>;
+  getListMap?: MapFunction;
+  /** GET 列表 接口回调，用于自定义列表请求接口 */
+  getListFunc?: GetListFunc<T>;
   /** PUT 接口地址 */
   updateApi?: string;
   /** PUT 接口提交前的数据处理回调 */
-  updateMap?: (record: T) => T;
+  updateMap?: MapFunction;
   /** PATCH 接口地址 */
   patchApi?: string;
   /** PATCH 接口提交前的数据处理回调 */
-  patchMap?: (record: T) => T;
+  patchMap?: MapFunction;
   /** DELETE 接口地址 */
   deleteApi?: string;
   /** DELETE 批量删除 接口地址 */
   multipleDeleteApi?: string;
 
   /** GET 列表 接口请求前数据处理回调 */
-  getListReqMap?: (params: Record<string, any>) => Record<string, any>;
+  getListReqMap?: RequestMapFunction<QueryParams>;
   /** GET 列表 接口请求结果数据处理回调 */
-  getListResMap?: (result: FindListResult<T>) => FindListResult<T>;
+  getListResMap?: MapFunction;
   /** GET 详情 接口请求前数据处理回调 */
-  getReqMap?: (params: Record<string, any>) => Record<string, any>;
+  getReqMap?: RequestMapFunction<QueryParams>;
   /** GET 详情 接口请求结果数据处理回调 */
-  getResMap?: (record: T) => T;
+  getResMap?: MapFunction;
   /** POST 接口请求前数据处理回调 */
-  createReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  createReqMap?: RequestMapFunction<RequestData>;
   /** POST 接口请求结果数据处理回调 */
-  createResMap?: (data: Record<string, any>) => Record<string, any>;
+  createResMap?: MapFunction;
   /** PUT 接口请求前数据处理回调 */
-  updateReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  updateReqMap?: RequestMapFunction<RequestData>;
   /** PUT 接口请求结果数据处理回调 */
-  updateResMap?: (data: Record<string, any>) => Record<string, any>;
+  updateResMap?: MapFunction;
   /** PATCH 接口请求前数据处理回调 */
-  patchReqMap?: (params: Record<string, any>, originalParams?: any) => Record<string, any>;
+  patchReqMap?: RequestMapFunction<RequestData>;
   /** PATCH 接口请求结果数据处理回调 */
-  patchResMap?: (data: Record<string, any>) => Record<string, any>;
+  patchResMap?: MapFunction;
   /** DELETE 接口请求前数据处理回调 */
-  deleteReqMap?: (config: Record<string, any>) => Record<string, any>;
+  deleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 接口请求结果数据处理回调 */
-  deleteResMap?: (data: Record<string, any>) => Record<string, any>;
+  deleteResMap?: MapFunction;
   /** DELETE 批量删除 接口请求前数据处理回调 */
-  multipleDeleteReqMap?: (config: Record<string, any>) => Record<string, any>;
+  multipleDeleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 批量删除 接口请求结果数据处理回调 */
-  multipleDeleteResMap?: (data: MultipleDeleteResult) => MultipleDeleteResult;
+  multipleDeleteResMap?: MapFunction;
 
   /** 查询选项 */
   private _arrOptions?: ArrOptions;
@@ -263,7 +265,7 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param q query 参数
    * @returns Promise<T>
    */
-  get(q: Record<string, any> = {}): Promise<T | null> {
+  get(q: QueryParams = {}): Promise<T> {
     let query = merge({}, this.query, q);
     query = pickBy(query, (val) => !isNil(val) && val !== "");
 
@@ -288,7 +290,7 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param q query 参数
    * @returns Promise<FindListResult<T>>
    */
-  async getList(q: Record<string, any> = {}): Promise<FindListResult<T>> {
+  async getList(q: QueryParams = {}): Promise<FindListResult<T>> {
     let query = merge({}, this.query, q);
     query = pickBy(query, (val) => !isNil(val) && val !== "");
 
@@ -321,22 +323,11 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param params 参数
    * @returns Promise<Record<string, any>>
    */
-  create(params: Record<string, any> | FormData): Promise<Record<string, any>> {
+  create(params: RequestData | FormData): Promise<Record<string, any>> {
     return new Promise((resolve, reject) => {
       const _params = this.handleInputParams(params, this.createReqMap);
       const res = this.pushItem(_params);
-      if (res === STATE_CODE.SUC) {
-        let _res: Record<string, any> = {};
-        if (this.createResMap) {
-          _res = this.createResMap(_res);
-        }
-        resolve(_res);
-      } else {
-        reject({
-          code: res,
-          _message: errMsg[res] || "未知错误",
-        });
-      }
+      this.handleRes(res, resolve, reject, { resMap: this.createResMap });
     });
   }
 
@@ -345,22 +336,11 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param params 参数
    * @returns Promise<Record<string, any>>
    */
-  update(params: Record<string, any> | FormData): Promise<Record<string, any>> {
+  update(params: RequestData | FormData): Promise<Record<string, any>> {
     return new Promise((resolve, reject) => {
       const _params = this.handleInputParams(params, this.updateReqMap);
       const res = this.replaceItem(_params as T);
-      if (res === STATE_CODE.SUC) {
-        let _res: Record<string, any> = {};
-        if (this.updateResMap) {
-          _res = this.updateResMap(_res);
-        }
-        resolve(_res);
-      } else {
-        reject({
-          code: res,
-          _message: errMsg[res] || "未知错误",
-        });
-      }
+      this.handleRes(res, resolve, reject, { resMap: this.updateResMap });
     });
   }
 
@@ -369,22 +349,11 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param params 参数
    * @returns Promise<Record<string, any>>
    */
-  patch(params: Record<string, any> | FormData): Promise<Record<string, any>> {
+  patch(params: RequestData | FormData): Promise<Record<string, any>> {
     return new Promise((resolve, reject) => {
       const _params = this.handleInputParams(params, this.patchReqMap);
       const res = this.updateItemValue(_params);
-      if (res === STATE_CODE.SUC) {
-        let _res: Record<string, any> = {};
-        if (this.patchResMap) {
-          _res = this.patchResMap(_res);
-        }
-        resolve(_res);
-      } else {
-        reject({
-          code: res,
-          _message: errMsg[res] || "未知错误",
-        });
-      }
+      this.handleRes(res, resolve, reject, { resMap: this.patchResMap });
     });
   }
 
@@ -405,18 +374,7 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
       const { _idKey } = this;
       const id = (config as any)?.[_idKey] || config?.params?.[_idKey] || config?.data?.[_idKey] || ctx?.[_idKey];
       const res = this.delItem(id);
-      if (res === STATE_CODE.SUC) {
-        let _res: Record<string, any> = {};
-        if (this.deleteResMap) {
-          _res = this.deleteResMap(_res);
-        }
-        resolve(_res);
-      } else {
-        reject({
-          code: res,
-          _message: errMsg[res] || "未知错误",
-        });
-      }
+      this.handleRes(res, resolve, reject, { resMap: this.deleteResMap });
     });
   }
 
@@ -481,10 +439,10 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
   handleInputParams(
     params: any,
     reqMapFn?: (params: Record<string, any>, originalParams?: any) => Record<string, any>,
-  ): Record<string, any> {
-    let _params = cloneDeep(params);
+  ): Partial<T> & Record<string, any> {
+    let _params = cloneDeep(params) as Partial<T> & Record<string, any>;
     if (reqMapFn) {
-      _params = reqMapFn.bind(this)(_params, params);
+      _params = reqMapFn(_params, params) as Partial<T> & Record<string, any>;
     }
     // TODO: FormData 文件存储？
     // if (params instanceof FormData) {
@@ -499,82 +457,21 @@ class ArrayDataModel<T = any> extends ArrayUtils<T> {
    * @param resolve 成功回调
    * @param reject 失败回调
    */
-  handleRes(response: any, resolve: (res: any) => void, reject: (err: any) => void): void {
-    if (typeof response !== "object") {
-      reject(new Error("response not object"));
-      return;
-    }
-    let _res = response;
-    // 兼容 传入的是 response.data 的情况
-    if (_res.data && _res.headers && _res.request) {
-      _res = _res.data;
-    }
-    const { code, data } = _res;
-    const message = this.handleMsg(response);
-    if (code == 200) {
-      const _data = data ?? {};
-      if (isObject(_data)) {
-        if (_data.content && _data.pageNumber && _data.total) {
-          _data.list = _data.content;
-          _data.pagination = { current: _data.pageNumber, total: _data.total };
-        }
-        // 前缀 _ 避免与 data 里已有的 message 冲突
-        _data._msg = message;
-        _data._message = message;
+  handleRes(res: any, resolve: (res: any) => void, reject: (err: any) => void, opt?): void {
+    const { resMap } = opt || {};
+    if (res === STATE_CODE.SUC) {
+      let _res: Record<string, any> = {};
+      if (resMap) {
+        _res = resMap(_res);
       }
-      resolve(_data);
+      resolve(_res);
     } else {
-      const error = new Error(message);
-      (error as any).code = code;
-      (error as any).response = response;
-      (error as any)._msg = message;
-      (error as any)._message = message;
-      reject(error);
-    }
-  }
-
-  /**
-   * 错误处理器
-   * @param err 错误对象
-   * @param reject Promise reject 回调
-   */
-  errorHandler(err: any = {}, reject: (err: any) => void): void {
-    const response = err.response || err;
-    if (response) {
-      const message = this.handleMsg(response, { useStatusText: true });
-      const error = new Error(message);
-      (error as any).code = response.status;
-      (error as any).response = response;
-      if (message) {
-        // 前缀 _ 避免与 data 里已有的 message 冲突
-        (error as any)._message = message;
-        (error as any)._msg = message;
-      }
-      reject(error);
-      return;
+      reject({
+        code: res,
+        _message: errMsg[res] || "未知错误",
+        _msg: errMsg[res] || "未知错误",
+      });
     }
-    reject(err || { _msg: _$Temp.defaultErrMsg });
-  }
-
-  /**
-   * 处理错误消息
-   * @param response 响应对象
-   * @param opt 选项
-   * @returns 错误消息
-   */
-  handleMsg(
-    response: any,
-    opt: HandleMsgOptions = {
-      useStatusText: false,
-    },
-  ): string {
-    const { useStatusText } = opt || {};
-    let message = (response.data && (response.data.message || response.data.msg)) || response.msg || response.message;
-    if (!message && useStatusText) {
-      message = response.statusText;
-    }
-
-    return message || _$Temp.defaultErrMsg;
   }
 }
 

package/src/data-model.ts

@@ -1,5 +1,7 @@
 import _ from "lodash";
+
 import { axios, isCancel } from "./axios";
+
 import {
   objToFormData,
   formDataToObj,
@@ -9,11 +11,13 @@ import {
   setNetworkErrMsg,
   checkNetwork,
 } from "./utils";
+
 import {
   JSONObject,
   QueryParams,
   RequestData,
   ResponseData,
+  ResData,
   AxiosConfig,
   MapFunction,
   RequestMapFunction,
@@ -26,34 +30,34 @@ import {
 /**
  * DataModel 构造函数参数接口
  */
-export interface DataModelOptions<T = any> {
+export interface DataModelOptions<R = any> {
   /** 请求 url 替换的额外参数 */
-  ctx?: JSONObject;
+  ctx: Record<string, any>;
   /** GET 请求的参数 */
   query?: QueryParams;
 
   /** POST 接口地址 */
   createApi?: string;
   /** POST 接口提交前的数据处理回调 */
-  createMap?: MapFunction<T, T>;
+  createMap?: MapFunction;
   /** GET 详情 接口地址 */
   getApi?: string;
   /** GET 详情 接口返回后的数据处理回调 */
-  getMap?: MapFunction<T, T>;
+  getMap?: MapFunction;
   /** GET 列表 接口地址 */
   getListApi?: string;
   /** GET 列表 接口返回后的数据处理回调 */
-  getListMap?: MapFunction<T, T>;
+  getListMap?: MapFunction;
   /** GET 列表 接口回调，用于自定义列表请求接口 */
-  getListFunc?: GetListFunc<T>;
+  getListFunc?: GetListFunc<R>;
   /** PUT 接口地址 */
   updateApi?: string;
   /** PUT 接口提交前的数据处理回调 */
-  updateMap?: MapFunction<T, T>;
+  updateMap?: MapFunction;
   /** PATCH 接口地址 */
   patchApi?: string;
   /** PATCH 接口提交前的数据处理回调 */
-  patchMap?: MapFunction<T, T>;
+  patchMap?: MapFunction;
   /** DELETE 接口地址 */
   deleteApi?: string;
   /** DELETE 批量删除 接口地址 */
@@ -62,31 +66,31 @@ export interface DataModelOptions<T = any> {
   /** GET 列表 接口请求前数据处理回调 */
   getListReqMap?: RequestMapFunction<QueryParams>;
   /** GET 列表 接口请求结果数据处理回调 */
-  getListResMap?: MapFunction<GetListResult<T>, GetListResult<T>>;
+  getListResMap?: MapFunction;
   /** GET 详情 接口请求前数据处理回调 */
   getReqMap?: RequestMapFunction<QueryParams>;
   /** GET 详情 接口请求结果数据处理回调 */
-  getResMap?: MapFunction<T, T>;
+  getResMap?: MapFunction;
   /** POST 接口请求前数据处理回调 */
   createReqMap?: RequestMapFunction<RequestData>;
   /** POST 接口请求结果数据处理回调 */
-  createResMap?: MapFunction<ResponseData, ResponseData>;
+  createResMap?: MapFunction;
   /** PUT 接口请求前数据处理回调 */
   updateReqMap?: RequestMapFunction<RequestData>;
   /** PUT 接口请求结果数据处理回调 */
-  updateResMap?: MapFunction<ResponseData, ResponseData>;
+  updateResMap?: MapFunction;
   /** PATCH 接口请求前数据处理回调 */
   patchReqMap?: RequestMapFunction<RequestData>;
   /** PATCH 接口请求结果数据处理回调 */
-  patchResMap?: MapFunction<ResponseData, ResponseData>;
+  patchResMap?: MapFunction;
   /** DELETE 接口请求前数据处理回调 */
   deleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 接口请求结果数据处理回调 */
-  deleteResMap?: MapFunction<ResponseData, ResponseData>;
+  deleteResMap?: MapFunction;
   /** DELETE 批量删除 接口请求前数据处理回调 */
   multipleDeleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 批量删除 接口请求结果数据处理回调 */
-  multipleDeleteResMap?: MapFunction<ResponseData, ResponseData>;
+  multipleDeleteResMap?: MapFunction;
 
   /** 统一 response 回调，用于处理定制 response 格式 */
   handleResponse?: HandleResponseFunc;
@@ -150,7 +154,7 @@ export interface HandleMsgOptions {
  * DataModel 类
  * 用于封装常用的 CRUD 请求方法
  */
-class DataModel<T = any> {
+class DataModel<T = any, R = Record<string, any>> {
   /** 是否返回完整的接口数据（response.data） */
   isResponseData: boolean;
   /** 是否直接返回 response */
@@ -159,32 +163,32 @@ class DataModel<T = any> {
   handleResponse?: HandleResponseFunc;
 
   /** 请求 url 替换的额外参数 */
-  ctx: JSONObject;
+  ctx: Record<string, any>;
   /** GET 请求的参数 */
   query: QueryParams;
 
   /** POST 接口地址 */
   createApi?: string;
   /** POST 接口提交前的数据处理回调 */
-  createMap?: MapFunction<T, T>;
+  createMap?: MapFunction;
   /** GET 详情 接口地址 */
   getApi?: string;
   /** GET 详情 接口返回后的数据处理回调 */
-  getMap?: MapFunction<T, T>;
+  getMap?: MapFunction;
   /** GET 列表 接口地址 */
   getListApi?: string;
   /** GET 列表 接口返回后的数据处理回调 */
-  getListMap?: MapFunction<T, T>;
+  getListMap?: MapFunction;
   /** GET 列表 接口回调，用于自定义列表请求接口 */
   getListFunc?: GetListFunc<T>;
   /** PUT 接口地址 */
   updateApi?: string;
   /** PUT 接口提交前的数据处理回调 */
-  updateMap?: MapFunction<T, T>;
+  updateMap?: MapFunction;
   /** PATCH 接口地址 */
   patchApi?: string;
   /** PATCH 接口提交前的数据处理回调 */
-  patchMap?: MapFunction<T, T>;
+  patchMap?: MapFunction;
   /** DELETE 接口地址 */
   deleteApi?: string;
   /** DELETE 批量删除 接口地址 */
@@ -193,31 +197,31 @@ class DataModel<T = any> {
   /** GET 列表 接口请求前数据处理回调 */
   getListReqMap?: RequestMapFunction<QueryParams>;
   /** GET 列表 接口请求结果数据处理回调 */
-  getListResMap?: MapFunction<GetListResult<T>, GetListResult<T>>;
+  getListResMap?: MapFunction;
   /** GET 详情 接口请求前数据处理回调 */
   getReqMap?: RequestMapFunction<QueryParams>;
   /** GET 详情 接口请求结果数据处理回调 */
-  getResMap?: MapFunction<T, T>;
+  getResMap?: MapFunction;
   /** POST 接口请求前数据处理回调 */
   createReqMap?: RequestMapFunction<RequestData>;
   /** POST 接口请求结果数据处理回调 */
-  createResMap?: MapFunction<ResponseData, ResponseData>;
+  createResMap?: MapFunction;
   /** PUT 接口请求前数据处理回调 */
   updateReqMap?: RequestMapFunction<RequestData>;
   /** PUT 接口请求结果数据处理回调 */
-  updateResMap?: MapFunction<ResponseData, ResponseData>;
+  updateResMap?: MapFunction;
   /** PATCH 接口请求前数据处理回调 */
   patchReqMap?: RequestMapFunction<RequestData>;
   /** PATCH 接口请求结果数据处理回调 */
-  patchResMap?: MapFunction<ResponseData, ResponseData>;
+  patchResMap?: MapFunction;
   /** DELETE 接口请求前数据处理回调 */
   deleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 接口请求结果数据处理回调 */
-  deleteResMap?: MapFunction<ResponseData, ResponseData>;
+  deleteResMap?: MapFunction;
   /** DELETE 批量删除 接口请求前数据处理回调 */
   multipleDeleteReqMap?: RequestMapFunction<JSONObject>;
   /** DELETE 批量删除 接口请求结果数据处理回调 */
-  multipleDeleteResMap?: MapFunction<ResponseData, ResponseData>;
+  multipleDeleteResMap?: MapFunction;
 
   /** 请求的 axios 实例 */
   axios: typeof axios;
@@ -417,9 +421,9 @@ class DataModel<T = any> {
    * @param q query 参数
    * @param ctx url 替换的额外参数
    * @param axiosConf axios 配置
-   * @returns Promise<T>
+   * @returns Promise<any>
    */
-  get(q: QueryParams = {}, ctx: JSONObject = {}, axiosConf?: AxiosConfig): Promise<T> {
+  get(q: QueryParams = {}, ctx: JSONObject = {}, axiosConf?: AxiosConfig): Promise<any> {
     let query = _.merge({}, this.query, q);
     query = _.pickBy(query, (val) => !_.isNil(val) && val !== "");
 
@@ -436,10 +440,10 @@ class DataModel<T = any> {
           ...axiosConf,
           params: query,
         })
-        .then((response) => {
+        .then((response: ResponseData) => {
           this.handleRes(
             response,
-            (res: T) => {
+            (res: ResData<R>) => {
               if (this.getMap) {
                 res = this.getMap(res);
               }
@@ -503,6 +507,7 @@ class DataModel<T = any> {
     if (this.getListResMap) {
       resultList = this.getListResMap(resultList);
     }
+
     return resultList;
   }
 
@@ -511,9 +516,9 @@ class DataModel<T = any> {
    * @param params 参数
    * @param ctx url 替换的额外参数
    * @param axiosConf axios 配置
-   * @returns Promise<ResponseData>
+   * @returns Promise<any>
    */
-  create(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  create(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<any> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = {
         ...this.axiosConf,
@@ -531,10 +536,10 @@ class DataModel<T = any> {
       }
       this.axios
         .post(apiUrl, _params, opt)
-        .then((response) => {
+        .then((response: ResponseData) => {
           this.handleRes(
             response,
-            (res: ResponseData) => {
+            (res) => {
               if (this.createResMap) {
                 res = this.createResMap(res);
               }
@@ -552,9 +557,9 @@ class DataModel<T = any> {
    * @param params 参数
    * @param ctx url 替换的额外参数
    * @param axiosConf axios 配置
-   * @returns Promise<ResponseData>
+   * @returns Promise<any>
    */
-  update(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  update(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<any> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.updateAxiosConf, ...axiosConf };
       let _params = _.cloneDeep(formDataToObj(params));
@@ -571,7 +576,7 @@ class DataModel<T = any> {
         .then((response) => {
           this.handleRes(
             response,
-            (res: ResponseData) => {
+            (res) => {
               if (this.updateResMap) {
                 res = this.updateResMap(res);
               }
@@ -589,9 +594,9 @@ class DataModel<T = any> {
    * @param params 参数
    * @param ctx url 替换的额外参数
    * @param axiosConf axios 配置
-   * @returns Promise<ResponseData>
+   * @returns Promise<any>
    */
-  patch(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  patch(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<any> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.patchAxiosConf, ...axiosConf };
       let _params = _.cloneDeep(formDataToObj(params));
@@ -608,7 +613,7 @@ class DataModel<T = any> {
         .then((response) => {
           this.handleRes(
             response,
-            (res: ResponseData) => {
+            (res) => {
               if (this.patchResMap) {
                 res = this.patchResMap(res);
               }
@@ -627,9 +632,9 @@ class DataModel<T = any> {
    * @param config.params axios.delete url 参数
    * @param config.data axios.delete data 参数
    * @param ctx url 替换的额外参数
-   * @returns Promise<ResponseData>
+   * @returns Promise<any>
    */
-  delete(config?: DeleteConfig, ctx?: JSONObject): Promise<ResponseData> {
+  delete(config?: DeleteConfig, ctx?: JSONObject): Promise<any> {
     let _config = _.cloneDeep(config) || {};
     if (this.deleteReqMap) {
       _config = this.deleteReqMap(_config);
@@ -646,7 +651,7 @@ class DataModel<T = any> {
         .then((response) => {
           this.handleRes(
             response,
-            (res: ResponseData) => {
+            (res) => {
               if (this.deleteResMap) {
                 res = this.deleteResMap(res);
               }
@@ -665,9 +670,9 @@ class DataModel<T = any> {
    * @param config.params axios.delete url 参数
    * @param config.data axios.delete data 参数
    * @param ctx url 替换的额外参数
-   * @returns Promise<ResponseData>
+   * @returns Promise<any>
    */
-  multipleDelete(config?: DeleteConfig, ctx?: JSONObject): Promise<ResponseData> {
+  multipleDelete(config?: DeleteConfig, ctx?: JSONObject): Promise<any> {
     let _config = _.cloneDeep(config) || {};
     if (this.multipleDeleteReqMap) {
       _config = this.multipleDeleteReqMap(_config);
@@ -703,7 +708,7 @@ class DataModel<T = any> {
    * @param resolve 成功回调
    * @param reject 失败回调
    */
-  handleRes(response: any, resolve: (res: any) => void, reject: (err: ApiError) => void) {
+  handleRes(response: ResponseData, resolve: (res: any) => void, reject: (err: ApiError) => void) {
     if (isCancel(response)) {
       console.info("errorHandler isCancel", response);
       return;
@@ -720,12 +725,19 @@ class DataModel<T = any> {
       reject(new Error("response not object") as ApiError);
       return;
     }
-    let _res = this.handleResponse ? this.handleResponse(response) : response;
-    // 兼容 传入的是 response.data 的情况
-    if (_res.data && _res.headers && _res.request) {
+
+    let _res: ResponseData | ResData;
+    _res = this.handleResponse ? this.handleResponse(response) : response;
+
+    const isAxiosResponse = (obj: any): obj is ResponseData => {
+      return obj && "status" in obj && "headers" in obj && "request" in obj;
+    };
+
+    if (isAxiosResponse(_res)) {
       _res = _res.data;
     }
-    const { code, data } = _res;
+
+    const { code, data } = _res as ResData;
     const message = this.handleMsg(response);
     if (code == 200) {
       const _data = data ?? {};
@@ -815,7 +827,7 @@ class DataModel<T = any> {
    * @param httpCode HTTP 状态码
    * @returns 错误消息
    */
-  getNetworkErrMsg(httpCode: any): string {
+  getNetworkErrMsg(httpCode: string): string {
     const { networkErrMsg } = _$Temp;
     if (httpCode === "ERR_NETWORK") {
       return networkErrMsg;

package/src/public-utils.ts

@@ -17,7 +17,7 @@ export function getPublicUrl(url: string | any, opt?: GetPublicUrlOptions): stri
     return url;
   }
   const { isFullPath } = opt || {};
-  let baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
+  const baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
   if (isFullPath) {
     const fullPathname = (location.origin + location.pathname).replace(/[^\/]+.html\/?$/, "").replace(/\/$/, "");
     return `${fullPathname}/${baseURL?.replace(/^\./, "")}/${url?.replace(/^\//, "")}`;

package/src/type.ts

@@ -1,98 +1,109 @@
-import { AxiosRequestConfig, AxiosInstance, AxiosResponse } from "axios";
-
-/**
- * 通用 JSON 对象类型
- */
-export type JSONObject = Record<string, any>;
-
-/**
- * 查询参数类型
- */
-export type QueryParams = JSONObject;
-
-/**
- * 请求数据类型
- */
-export type RequestData = JSONObject;
-
-/**
- * 响应数据类型
- */
-export type ResponseData = JSONObject;
-
-/**
- * Axios 配置类型
- */
-export type AxiosConfig = AxiosRequestConfig;
-
-/**
- * 数据映射函数类型
- * @template T - 输入类型
- * @template R - 输出类型（默认为 T）
- */
-export type MapFunction<T = any, R = T> = (data: T) => R;
-
-/**
- * 带原始参数的映射函数类型（用于请求前处理）
- * @template T - 处理后的参数类型
- * @template P - 原始参数类型
- */
-export type RequestMapFunction<T = RequestData, P = any> = (params: T, originalParams?: P) => T;
-
-/**
- * 列表请求返回结果接口
- * @template T - 列表项数据类型
- */
-export interface GetListResult<T = any> {
-  /** 列表数据 */
-  list: T[];
-  /** 分页信息 */
-  pagination: { current?: number; total: number; pageSize?: number };
-  /** 其他扩展字段 */
-  [key: string]: any;
-}
-
-/**
- * 自定义列表请求函数类型
- * @template T - 列表项数据类型
- */
-export type GetListFunc<T = any> = (query: QueryParams) => Promise<GetListResult<T>>;
-
-/**
- * 响应处理函数类型
- */
-export type HandleResponseFunc = (response: AxiosResponse) => ResponseData;
-
-/**
- * API 错误接口
- */
-export interface ApiError extends Error {
-  /** 错误码 */
-  code?: number | string;
-  /** 响应对象 */
-  response?: AxiosResponse;
-  /** 错误消息（带下划线前缀） */
-  _msg?: string;
-  /** 错误消息（带下划线前缀） */
-  _message?: string;
-  /** 原始错误数据 */
-  data?: any;
-}
-
-/**
- * 网络链接信息接口（非标准 API）
- */
-export interface NetworkConnection {
-  type?: string;
-  downlink?: number;
-  effectiveType?: string;
-}
-
-/**
- * 扩展 Navigator 接口（包含非标准连接属性）
- */
-export interface ExtendedNavigator extends Navigator {
-  connection?: NetworkConnection;
-  mozConnection?: NetworkConnection;
-  webkitConnection?: NetworkConnection;
-}
+import { AxiosRequestConfig, AxiosInstance, AxiosResponse } from "axios";
+
+/**
+ * 通用 JSON 对象类型
+ */
+export type JSONObject = Record<string, any>;
+
+/**
+ * 查询参数类型
+ */
+export type QueryParams = JSONObject;
+
+/**
+ * 请求数据类型
+ */
+export type RequestData = JSONObject;
+
+/**
+ * 响应数据类型
+ */
+export interface ResponseData<T = Record<string, any>> extends AxiosResponse {
+  data: ResData<T>;
+}
+
+/**
+ * 接口返回数据格式
+ */
+export interface ResData<T = Record<string, any>> {
+  code: number;
+  data: T;
+  msg: string;
+}
+
+/**
+ * Axios 配置类型
+ */
+export type AxiosConfig = AxiosRequestConfig;
+
+/**
+ * 数据映射函数类型
+ * @template T - 输入类型
+ * @template R - 输出类型（默认为 T）
+ */
+export type MapFunction<T = any, R = T> = (data: T) => R;
+
+/**
+ * 带原始参数的映射函数类型（用于请求前处理）
+ * @template T - 处理后的参数类型
+ * @template P - 原始参数类型
+ */
+export type RequestMapFunction<T = RequestData, P = any> = (params: T, originalParams?: P) => T;
+
+/**
+ * 列表请求返回结果接口
+ * @template T - 列表项数据类型
+ */
+export interface GetListResult<T = any> {
+  /** 列表数据 */
+  list: T[];
+  /** 分页信息 */
+  pagination: { current?: number; total: number; pageSize?: number };
+  /** 其他扩展字段 */
+  [key: string]: any;
+}
+
+/**
+ * 自定义列表请求函数类型
+ * @template T - 列表项数据类型
+ */
+export type GetListFunc<T = any> = (query: QueryParams) => Promise<GetListResult<T>>;
+
+/**
+ * 响应处理函数类型
+ */
+export type HandleResponseFunc = (response: AxiosResponse) => ResponseData;
+
+/**
+ * API 错误接口
+ */
+export interface ApiError extends Error {
+  /** 错误码 */
+  code?: number | string;
+  /** 响应对象 */
+  response?: AxiosResponse;
+  /** 错误消息（带下划线前缀） */
+  _msg?: string;
+  /** 错误消息（带下划线前缀） */
+  _message?: string;
+  /** 原始错误数据 */
+  data?: any;
+}
+
+/**
+ * 网络链接信息接口（非标准 API）
+ */
+export interface NetworkConnection {
+  type?: string;
+  downlink?: number;
+  effectiveType?: string;
+}
+
+/**
+ * 扩展 Navigator 接口（包含非标准连接属性）
+ */
+export interface ExtendedNavigator extends Navigator {
+  connection?: NetworkConnection;
+  mozConnection?: NetworkConnection;
+  webkitConnection?: NetworkConnection;
+}