@hzab/list-render 1.9.8 → 1.9.10-beta

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# @hzab/list-render@1.9.10
+
+fix: 修复 model query 被污染
+# @hzab/list-render@1.9.9
+
+fix: Tags、PrefixNode 使用 @hzab/formily-result-utils 组件 EnumRender 实现
+
 # @hzab/list-render@1.9.8
 
 feat: 去除 schema x-display 属性 去除 labelCol wrapperCol 属性

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.9.8",
+  "version": "1.9.10-beta",
   "description": "",
   "main": "src",
   "scripts": {
     "dev": "webpack serve -c ./config/webpack.config.js --env local",
     "build": "webpack -c ./config/webpack.config.js --env production",
+    "publish-beta": "npm publish --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"
@@ -22,6 +23,7 @@
     "@ant-design/icons": "^4.8.1",
     "@hzab/data-model": "^1.7.4",
     "@hzab/form-render": "^1.6.12",
+    "@hzab/formily-result-utils": "^1.2.0",
     "@hzab/schema-descriptions": "^1.3.0",
     "@hzab/webpack-config": "^0.7.2",
     "@types/react": "^17.0.62",
@@ -42,6 +44,7 @@
     "@formily/reactive-react": "2.3.1",
     "@hzab/data-model": ">=1.7.4",
     "@hzab/form-render": ">=1.0.0",
+    "@hzab/formily-result-utils": ">=1.2.0",
     "@hzab/schema-descriptions": ">=1.0.0",
     "antd": "4.x",
     "axios": ">=1.4.0",

package/src/list-render.jsx

@@ -154,7 +154,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       delete mergedQueries.$timerange;
     }
 
-    model.query = mergedQueries;
+    // model.query = mergedQueries;
 
     // 取消上一次请求
     getListSourceRef.current?.cancel({ code: 601, message: "取消上一次请求" });
@@ -210,7 +210,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       model.query.pageSize = pageSizeOptions[0];
     }
     formQueryRef.current = query;
-    model.query = Object.assign(model.query, query);
+    // model.query = Object.assign(model.query, query);
     getList(query);
   }
 

package/src/table-render/index.jsx

@@ -1,12 +1,11 @@
 import { useEffect, useState, useMemo, useCallback, useRef } from "react";
 import { Table, Button, Popconfirm, Tooltip, Checkbox, Popover } from "antd";
-import { Schema } from "@formily/json-schema";
 import { QuestionCircleOutlined, FilterOutlined, SettingOutlined } from "@ant-design/icons";
 import _ from "lodash";
 
+import EnumRender from "@hzab/formily-result-utils/src/components/EnumRender";
+import { SHOW_MODE_TYPES } from "@hzab/formily-result-utils/src/common/constant";
 import { FormilyField } from "../components/Formily/FormilyField";
-import Tags from "../components/Tags";
-import PrefixNode from "../components/PrefixNode";
 // getColRender 使用 observer 包裹一层 column 的 render 函数，解决数据无法响应的问题
 import { getColRender } from "../common/formily-utils";
 import { getVal, getFieldList } from "../common/utils";
@@ -106,7 +105,7 @@ function TableRender(props) {
           };
         } else {
           colRender = function (text, record, index, ...args) {
-            const { width, ellipsis, emptyValue, showTags, showPrefixNode } = _colConf || {};
+            const { width, ellipsis, emptyValue, showTags, showPrefixNode, showMode, enumRenderProps } = _colConf || {};
             const schemaDefaultValue = fieldSchemas[name]?.componentProps?.emptyValue;
             const defaultValue = emptyValue ?? schemaDefaultValue ?? tableEmptyValue ?? "";
 
@@ -130,25 +129,22 @@ function TableRender(props) {
                 </Tooltip>
               );
             }
-            // 使用 tag 渲染内容
-            if (showTags) {
-              // field 通过 fieldSchemas 获取最新的 field 数据
-              return (
-                <Tags
-                  value={_.get(record, name)}
-                  config={typeof showTags === "object" ? showTags : undefined}
-                  field={{ ...field, ...fieldSchemas?.[name] }}
-                />
-              );
-            }
-            // 使用 前缀节点 渲染内容
-            if (showPrefixNode || (showPrefixNode !== false && comName === "Switch")) {
+
+            if (showMode || showTags || showPrefixNode || (showPrefixNode !== false && comName === "Switch")) {
               // field 通过 fieldSchemas 获取最新的 field 数据
+              let _showMode = showMode;
+              if (showTags) {
+                _showMode = SHOW_MODE_TYPES.tags;
+              } else if (showPrefixNode) {
+                _showMode = SHOW_MODE_TYPES.prefixNode;
+              }
+
               return (
-                <PrefixNode
+                <EnumRender
+                  showMode={_showMode}
                   value={_.get(record, name)}
-                  config={typeof showPrefixNode === "object" ? showPrefixNode : undefined}
                   field={{ ...field, ...fieldSchemas?.[name] }}
+                  {...enumRenderProps}
                 />
               );
             }