@hzab/data-model 1.0.0 → 1.0.1

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+# @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.1",
   "description": "data model",
   "main": "src",
   "scripts": {

package/src/data-model.js

@@ -79,7 +79,7 @@ class DataModel {
     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;
@@ -219,15 +219,27 @@ 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,
+      );
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, params: _params })
+        .delete(apiUrl, { ...this.axiosConf, ..._config })
         .then((response) => {
           this.handleRes(
             response,
@@ -244,15 +256,27 @@ 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,
+      );
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, params: _params })
+        .delete(apiUrl, { ...this.axiosConf, ..._config })
         .then((response) => {
           this.handleRes(
             response,