@hzab/list-render 1.9.2-beta4 → 1.9.2-beta6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.9.2-beta4",
+  "version": "1.9.2-beta6",
   "description": "",
   "main": "src",
   "scripts": {
@@ -20,7 +20,7 @@
   "license": "ISC",
   "devDependencies": {
     "@ant-design/icons": "^4.8.1",
-    "@hzab/data-model": "^1.7.2",
+    "@hzab/data-model": "^1.7.4",
     "@hzab/form-render": "^1.1.5",
     "@hzab/schema-descriptions": "^1.0.0",
     "@hzab/webpack-config": "^0.7.2",
@@ -40,7 +40,7 @@
     "@formily/core": "2.3.1",
     "@formily/react": "2.3.1",
     "@formily/reactive-react": "2.3.1",
-    "@hzab/data-model": ">=1.7.2",
+    "@hzab/data-model": ">=1.7.4",
     "@hzab/form-render": ">=1.0.0",
     "@hzab/schema-descriptions": ">=1.0.0",
     "antd": "4.x",

package/src/list-render.jsx

@@ -132,7 +132,7 @@ const ListRender = forwardRef(function (props, parentRef) {
     model.query = mergedQueries;
 
     // 取消上一次请求
-    getListSourceRef.current?.cancel("取消上一次请求");
+    getListSourceRef.current?.cancel({ code: 601, message: "取消上一次请求" });
 
     // 重新获取 source
     getListSourceRef.current = getCancelTokenSource();
@@ -146,6 +146,7 @@ const ListRender = forwardRef(function (props, parentRef) {
         },
       )
       .then((res) => {
+        getListSourceRef.current = null;
         setList(res.list);
         setTotal(res.pagination?.total);
         props.onGetListEnd && props.onGetListEnd(res);
@@ -153,12 +154,12 @@ const ListRender = forwardRef(function (props, parentRef) {
       })
       .catch((err) => {
         if (axios.isCancel(err)) {
-          console.log("请求已取消:", err.message);
-          return;
+          console.info(`请求已取消:`, "", err.message);
+          return Promise.reject(err);
         }
-        console.error(err);
-        handleMessage(err._message);
+        handleMessage(err?._message);
         setListLoading(false);
+        return Promise.reject(err);
       });
   }
 
@@ -232,6 +233,7 @@ const ListRender = forwardRef(function (props, parentRef) {
         .catch((err) => {
           console.error("err", err);
           handleMessage(err._message);
+          return Promise.reject(err);
         });
     } else {
       handleDetail(row, row[idKey]);
@@ -259,6 +261,7 @@ const ListRender = forwardRef(function (props, parentRef) {
         .catch((err) => {
           console.error("err", err);
           handleMessage(err._message);
+          return Promise.reject(err);
         });
     } else {
       handleEdit(row, row[idKey]);
@@ -309,6 +312,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       })
       .catch((err) => {
         handleMessage(err._message);
+        return Promise.reject(err);
       });
   }