@hzab/data-model 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+# @hzab/data-model@1.0.2
+
+- fix: getApiUrl 增加调用来源，错误提示增加入参展示
+
+# @hzab/data-model@1.0.1
+
+- fix: 修复 delete 入参问题
+- fix: getApiUrl :xx 参数替换正则处理
+
 # @hzab/data-model@0.2.3
 
 - fix: axios delete 入参写法问题修复

package/package.json

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

package/src/data-model.js

@@ -71,15 +71,18 @@ 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);
     _.each(params, (value, key) => {
       if (!_.isString(value) || !_.isNumber(value) || _.isBoolean(value)) {
-        apiUrl = apiUrl.replace(`:${key}`, value);
+        apiUrl = apiUrl.replace(new RegExp(`:${key}$|:${key}(?=\/)`), value);
       }
     });
     return apiUrl;
@@ -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,
@@ -167,7 +170,7 @@ class DataModel {
       _params = this.createReqMap(_params);
     }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.createApi, _params, ctx);
+      const apiUrl = this.getApiUrl(this.createApi, _params, ctx, { from: "create" });
       const opt = { ...this.axiosConf };
       if (_params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
@@ -196,7 +199,7 @@ class DataModel {
       _params = this.updateReqMap(_params);
     }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.updateApi, _params, ctx);
+      const apiUrl = this.getApiUrl(this.updateApi, _params, ctx, { from: "update" });
       const opt = { ...this.axiosConf };
       if (_params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
@@ -219,15 +222,28 @@ class DataModel {
     });
   }
 
-  delete(params, ctx) {
-    let _params = _.cloneDeep(params);
+  /**
+   * 删除接口
+   * @param {*} config axios.delete config 参数，
+   * @param {*} config.params axios.delete url 参数，
+   * @param {*} config.data axios.delete data 参数，
+   * @param {*} ctx
+   * @returns
+   */
+  delete(config, ctx) {
+    let _config = _.cloneDeep(config) || {};
     if (this.deleteReqMap) {
-      _params = this.deleteReqMap(_params);
+      _config = this.deleteReqMap(_config);
     }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.deleteApi, _params, ctx);
+      const apiUrl = this.getApiUrl(
+        this.deleteApi,
+        Object.assign(_.cloneDeep(_config), _config.params, _config.data),
+        ctx,
+        { from: "delete" },
+      );
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, params: _params })
+        .delete(apiUrl, { ...this.axiosConf, ..._config })
         .then((response) => {
           this.handleRes(
             response,
@@ -244,15 +260,28 @@ class DataModel {
     });
   }
 
-  multipleDelete(params, ctx) {
-    let _params = _.cloneDeep(params);
+  /**
+   * 批量删除接口
+   * @param {*} config axios.delete config 参数，
+   * @param {*} config.params axios.delete url 参数，
+   * @param {*} config.data axios.delete data 参数，
+   * @param {*} ctx
+   * @returns
+   */
+  multipleDelete(config, ctx) {
+    let _config = _.cloneDeep(config) || {};
     if (this.multipleDeleteReqMap) {
-      _params = this.multipleDeleteReqMap(_params);
+      _config = this.multipleDeleteReqMap(_config);
     }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.multipleDeleteApi, _params, ctx);
+      const apiUrl = this.getApiUrl(
+        this.multipleDeleteApi,
+        Object.assign(_.cloneDeep(_config), _config.params, _config.data),
+        ctx,
+        { from: "multipleDelete" },
+      );
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, params: _params })
+        .delete(apiUrl, { ...this.axiosConf, ..._config })
         .then((response) => {
           this.handleRes(
             response,