@hzab/data-model 1.7.4 → 1.7.6

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.7.6
+
+feat: getPublicUrl 获取 public 文件路径（自动拼接 hash 数据）
+
+# @hzab/data-model@1.7.5
+
+fix: array-data-model 数据报错异常处理
+
 # @hzab/data-model@1.7.4
 
 fix: axios 拦截优化，解决请求取消异常问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/data-model",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/array-data-model.js

@@ -2,7 +2,10 @@ import _ from "lodash";
 
 import { objToFormData, formDataToObj, _$Temp } from "./utils";
 import ArrayUtils, { STATE_CODE } from "./ArrayUtils";
-
+const errMsg = {
+  404: "未找到对应子项",
+  501: "未传入表单id",
+};
 /**
  * ArrayDataModel 本地数据 DataModel
  */
@@ -172,11 +175,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.createResMap) {
-          _res = this.createResMap();
+          _res = this.createResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -193,11 +199,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.updateResMap) {
-          _res = this.updateResMap();
+          _res = this.updateResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -214,11 +223,14 @@ class ArrayDataModel extends ArrayUtils {
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.patchResMap) {
-          _res = this.patchResMap();
+          _res = this.patchResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -240,16 +252,17 @@ class ArrayDataModel extends ArrayUtils {
       const { _idKey } = this;
       const id = config[_idKey] || config.params?.[_idKey] || config.data?.[_idKey] || ctx[_idKey];
       const res = this.delItem(id);
-      console.log("res", res);
-
       if (res === STATE_CODE.SUC) {
         let _res = {};
         if (this.deleteResMap) {
-          _res = this.deleteResMap();
+          _res = this.deleteResMap(res);
         }
         resolve(_res);
       } else {
-        reject(res);
+        reject({
+          code: res,
+          _message: errMsg[res] || "未知错误",
+        });
       }
     });
   }
@@ -293,7 +306,7 @@ class ArrayDataModel extends ArrayUtils {
         if (sucList.length > 0) {
           let _res = { sucList, failList };
           if (this.multipleDeleteResMap) {
-            _res = this.multipleDeleteResMap();
+            _res = this.multipleDeleteResMap(_res);
           }
           resolve(_res);
         } else {

package/src/public-utils.js

@@ -0,0 +1,15 @@
+/**
+ * 获取 public 文件路径（自动拼接 hash 数据）
+ * @param {*} url 文件路径
+ * @param {*} opt
+ */
+export function getPublicUrl(url, opt) {
+  if (typeof url !== "string") {
+    return url;
+  }
+  let baseURL = (process.env.WEBPACK_PUBLIC_PATH || ".")?.replace(/^\//, "")?.replace(/\/$/, "");
+  return `${(baseURL.startsWith("http") ? "" : window.location.origin)?.replace(/\/$/, "")}/${baseURL}/${url?.replace(
+    /^\//,
+    "",
+  )}`;
+}