@hzab/data-model 1.0.1 → 1.1.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/data-model@1.1.0
+
+- formData 问题修复
+
+# @hzab/data-model@1.0.2
+
+- fix: getApiUrl 增加调用来源，错误提示增加入参展示
+
 # @hzab/data-model@1.0.1
 
 - fix: 修复 delete 入参问题

package/package.json

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

package/src/data-model.js

@@ -71,9 +71,12 @@ class DataModel {
     this.multipleDeleteResMap = multipleDeleteResMap;
   }
 
-  getApiUrl(api, record, ctx = this.ctx) {
+  getApiUrl(api, record, ctx = this.ctx, opt) {
+    const { from } = opt ?? {};
     if (!api) {
-      throw new Error("Error api 不能为空", api, record, ctx);
+      const errMsg = `${from ?? ""} api 不能为空。`;
+      console.error(`Error ${errMsg} 具体入参：api、record、ctx、opt：`, api, record, ctx, opt);
+      throw new Error(errMsg);
     }
     let apiUrl = api;
     const params = _.merge({}, record, ctx);
@@ -94,7 +97,7 @@ class DataModel {
     }
 
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.getApi, query, ctx);
+      const apiUrl = this.getApiUrl(this.getApi, query, ctx, { from: "get" });
       this.axios
         .get(apiUrl, {
           ...this.axiosConf,
@@ -132,7 +135,7 @@ class DataModel {
       resultList = await this.getListFunc(query);
     } else {
       const getPro = new Promise((resolve, reject) => {
-        const apiUrl = this.getApiUrl(this.getListApi, q, ctx);
+        const apiUrl = this.getApiUrl(this.getListApi, q, ctx, { from: "getList" });
         this.axios
           .get(apiUrl, {
             ...this.axiosConf,
@@ -162,15 +165,16 @@ class DataModel {
   }
 
   create(params, ctx) {
-    let _params = _.cloneDeep(params);
-    if (this.createReqMap) {
-      _params = this.createReqMap(_params);
-    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.createApi, _params, ctx);
       const opt = { ...this.axiosConf };
-      if (_params instanceof FormData) {
+      let _params = _.cloneDeep(formDataToObj(params));
+      if (this.createReqMap) {
+        _params = this.createReqMap(_params, params);
+      }
+      const apiUrl = this.getApiUrl(this.createApi, _params, ctx, { from: "create" });
+      if (params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
+        _params = objToFormData(_params);
       }
       this.axios
         .post(apiUrl, _params, opt)
@@ -191,15 +195,16 @@ class DataModel {
   }
 
   update(params, ctx) {
-    let _params = _.cloneDeep(params);
-    if (this.updateReqMap) {
-      _params = this.updateReqMap(_params);
-    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.updateApi, _params, ctx);
       const opt = { ...this.axiosConf };
-      if (_params instanceof FormData) {
+      let _params = _.cloneDeep(formDataToObj(params));
+      if (this.updateReqMap) {
+        _params = this.updateReqMap(_params, params);
+      }
+      const apiUrl = this.getApiUrl(this.updateApi, _params, ctx, { from: "update" });
+      if (params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
+        _params = objToFormData(_params);
       }
       this.axios
         .put(apiUrl, _params, opt)
@@ -237,6 +242,7 @@ class DataModel {
         this.deleteApi,
         Object.assign(_.cloneDeep(_config), _config.params, _config.data),
         ctx,
+        { from: "delete" },
       );
       this.axios
         .delete(apiUrl, { ...this.axiosConf, ..._config })
@@ -274,6 +280,7 @@ class DataModel {
         this.multipleDeleteApi,
         Object.assign(_.cloneDeep(_config), _config.params, _config.data),
         ctx,
+        { from: "multipleDelete" },
       );
       this.axios
         .delete(apiUrl, { ...this.axiosConf, ..._config })
@@ -357,6 +364,28 @@ export function setDefaultErrMsg(msg) {
   }
 }
 
+export function objToFormData(data) {
+  if (data instanceof FormData) {
+    return data;
+  }
+  const formData = new FormData();
+  Object.keys(data)?.forEach((key) => {
+    formData.set(key, data[key]);
+  });
+  return formData;
+}
+
+export function formDataToObj(formData) {
+  if (!(formData instanceof FormData)) {
+    return formData;
+  }
+  const tempData = {};
+  for (const [key, value] of formData.entries()) {
+    tempData[key] = value;
+  }
+  return tempData;
+}
+
 export { axios, DataModel, setDefaultAxios };
 
 export default DataModel;