@hzab/list-render 1.10.16 → 1.10.18

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/list-render@1.10.18
+
+fix: isCancel 兼容 data-model 新老版本
+
+# @hzab/list-render@1.10.17
+
+fix: createMap updateMap 支持异步
+
 # @hzab/list-render@1.10.16
 
 fix: model?.patchMap 类型判断修复

package/package.json

@@ -1,16 +1,19 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.16",
+  "version": "1.10.18",
   "description": "",
   "main": "src",
   "scripts": {
     "dev": "webpack serve -c ./config/webpack.config.js --env local",
     "build": "webpack -c ./config/webpack.config.js --env production",
-    "release:alpha": "npm version prerelease --preid=alpha && npm publish --tag alpha",
-    "release:beta": "npm version prerelease --preid=beta && npm publish --tag beta",
-    "publish-patch": "npm version patch && npm publish --access public",
-    "publish-minor": "npm version minor && npm publish --access public",
-    "publish-major": "npm version major && npm publish --access public"
+    "version:alpha": "npm version prerelease --preid=alpha",
+    "publish:alpha": "npm publish --tag alpha",
+    "version:beta": "npm version prerelease --preid=beta",
+    "publish:beta": "npm publish --tag beta",
+    "version:patch": "npm version patch",
+    "version:minior": "npm version minor",
+    "version:major": "npm version major",
+    "publish:stable": "npm publish --access public"
   },
   "files": [
     "src",

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);
           }
@@ -294,7 +296,10 @@ const ListRender = forwardRef(function (props, parentRef) {
   }
 
   async function onCreateSubmit(data) {
-    let _data = typeof model?.createMap === "function" ? model.createMap(data) : data;
+    let _data = data;
+    if (typeof model?.createMap === "function") {
+      _data = await model.createMap(data);
+    }
     if (useFormData) {
       _data = objToFormData(_data);
     }
@@ -385,10 +390,10 @@ const ListRender = forwardRef(function (props, parentRef) {
     let _data = data;
     if (isPatchUpdate) {
       if (typeof model?.patchMap === "function") {
-        _data = model.patchMap(data, opt);
+        _data = await model.patchMap(data, opt);
       }
     } else if (typeof model?.updateMap === "function") {
-      _data = model.updateMap(data, opt);
+      _data = await model.updateMap(data, opt);
     }
 
     // 行内编辑确认前的校验