@hzab/data-model 2.0.0-alpha.0 → 2.0.0-alpha.2

package/CHANGELOG.md

@@ -1,6 +1,7 @@
-# @hzab/data-model@1.9.0
+# @hzab/data-model@2.0.0
 
 break: axios 默认导出实例化后的 axios 实例，axios 源对象通过 axiosDef 导出
+refactor: js 文件改为 js 文件
 
 # @hzab/data-model@1.8.8
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.2",
   "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

@@ -481,10 +481,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) {

package/src/data-model.ts

@@ -1,5 +1,5 @@
 import _ from "lodash";
-import { axios, axiosDef } from "./axios";
+import { axios, isCancel } from "./axios";
 import {
   objToFormData,
   formDataToObj,
@@ -406,7 +406,7 @@ class DataModel<T = any> {
     const params = _.merge({}, record, ctx);
     _.each(params, (value, key) => {
       if (!_.isString(value) || !_.isNumber(value) || _.isBoolean(value)) {
-        apiUrl = apiUrl.replace(new RegExp(`:${key}$|:${key}(?=\/)`), value);
+        apiUrl = apiUrl.replace(new RegExp(`:${key}$|:${key}(?=/)`), value);
       }
     });
     return apiUrl;
@@ -513,7 +513,7 @@ class DataModel<T = any> {
    * @param axiosConf axios 配置
    * @returns Promise<ResponseData>
    */
-  create(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  create(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = {
         ...this.axiosConf,
@@ -554,7 +554,7 @@ class DataModel<T = any> {
    * @param axiosConf axios 配置
    * @returns Promise<ResponseData>
    */
-  update(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  update(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.updateAxiosConf, ...axiosConf };
       let _params = _.cloneDeep(formDataToObj(params));
@@ -591,7 +591,7 @@ class DataModel<T = any> {
    * @param axiosConf axios 配置
    * @returns Promise<ResponseData>
    */
-  patch(params: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
+  patch(params?: RequestData | FormData, ctx?: JSONObject, axiosConf?: AxiosConfig): Promise<ResponseData> {
     return new Promise((resolve, reject) => {
       const opt: AxiosConfig = { ...this.axiosConf, ...this.patchAxiosConf, ...axiosConf };
       let _params = _.cloneDeep(formDataToObj(params));
@@ -704,8 +704,8 @@ class DataModel<T = any> {
    * @param reject 失败回调
    */
   handleRes(response: any, resolve: (res: any) => void, reject: (err: ApiError) => void) {
-    if (axiosDef.isCancel(response)) {
-      console.info("errorHandler axiosDef.isCancel", response);
+    if (isCancel(response)) {
+      console.info("errorHandler isCancel", response);
       return;
     }
     if (this.isResponse) {
@@ -755,8 +755,8 @@ class DataModel<T = any> {
    * @param reject Promise reject 回调
    */
   errorHandler(err: any = {}, reject: (err: ApiError) => void) {
-    if (axiosDef.isCancel(err)) {
-      console.info("errorHandler axiosDef.isCancel", err);
+    if (isCancel(err)) {
+      console.info("errorHandler isCancel", err);
       return;
     }
     if (this.isResponse) {

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(/^\//, "")}`;