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

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

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;
@@ -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) {