@hzab/list-render 1.10.17 → 1.10.18

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/list-render@1.10.18
+
+fix: isCancel 兼容 data-model 新老版本
+
 # @hzab/list-render@1.10.17
 
 fix: createMap updateMap 支持异步

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.17",
+  "version": "1.10.18",
   "description": "",
   "main": "src",
   "scripts": {

package/src/list-render.jsx

@@ -5,7 +5,7 @@ model 不要定义在组件外部，避免出现 query 异常的情况。
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { Button, message } from "antd";
 import _, { cloneDeep } from "lodash";
-import axios, { getCancelTokenSource } from "@hzab/data-model/src/axios";
+import axiosI, { isCancel, getCancelTokenSource } from "@hzab/data-model/src/axios";
 
 import QueryRender from "./query-render";
 import Pagination from "./pagination-render";
@@ -195,7 +195,9 @@ const ListRender = forwardRef(function (props, parentRef) {
           setListLoading(false);
         })
         .catch((err) => {
-          if (axios.isCancel(err)) {
+          // 兼容新老版本 data-model isCancel 取法
+          const _isCancel = isCancel || axiosI.isCancel;
+          if (typeof _isCancel === "function" && _isCancel(err)) {
             console.info(`请求已取消:`, "", err.message);
             return Promise.reject(err);
           }