@hzab/list-render 1.10.10 → 1.10.12-beta

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# @hzab/list-render@1.10.12
+
+fix: table 响应数据 去除 inTable == false 的字段
+feat: schema title 支持传入 ReactNode
+feat: schema clone 函数
+
+# @hzab/list-render@1.10.11
+
+fix: 行内编辑统一 onEdit 获取数据，单元格编辑支持传入其他参数
+
 # @hzab/list-render@1.10.10
 
 fix: 解决 FormModal 与 DetailModal 相互影响的问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.10",
+  "version": "1.10.12-beta",
   "description": "",
   "main": "src",
   "scripts": {
@@ -27,15 +27,16 @@
     "@hzab/permissions": "^1.0.0",
     "@hzab/schema-descriptions": "^1.3.0",
     "@hzab/webpack-config": "^0.7.2",
+    "@hzab/utils": "^1.0.7",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
     "antd": "^4.24.12",
     "axios": "^1.4.0",
     "eslint": "^8.30.0",
-    "mobx": "^6.7.0",
-    "mobx-react": "^7.6.0",
     "less": "^4.1.3",
     "lodash": "^4.17.21",
+    "mobx": "^6.7.0",
+    "mobx-react": "^7.6.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.8.1",
@@ -49,6 +50,7 @@
     "@hzab/form-render": ">=1.0.0",
     "@hzab/formily-result-utils": ">=1.2.0",
     "@hzab/schema-descriptions": ">=1.0.0",
+    "@hzab/utils": ">=1.0.7",
     "antd": "4.x",
     "axios": ">=1.4.0",
     "c-formily-antd": "2.3.1",

package/src/common/cloneSchema.ts

@@ -0,0 +1,63 @@
+import React from "react";
+
+/**
+ * 检测是否为原生 HTML DOM 节点
+ * @param {any} node 待检测对象
+ * @returns {boolean} 是否为原生 DOM 节点
+ */
+function isHtmlDomNode(node) {
+  // 先判断浏览器环境，避免 SSR 报错；兼容 Node/HTMLElement 类型
+  return !!(typeof window !== "undefined" && node && (node instanceof HTMLElement || node instanceof Node));
+}
+
+/**
+ * 增强版 Formily Schema 克隆函数
+ * 解决 lodash cloneDeep 丢失 React DOM/原生 DOM 的问题，兼容多种特殊类型
+ * @param {object} schema 待克隆的 Formily Schema
+ * @returns {object} 克隆后的 Schema
+ */
+export function cloneSchema(schema) {
+  // 1. 基础类型（null/undefined/字符串/数字/布尔）直接返回
+  if (schema === null || typeof schema !== "object") {
+    return schema;
+  }
+
+  // 2. React 虚拟DOM：直接保留原引用，不拷贝
+  if (React.isValidElement(schema)) {
+    return schema;
+  }
+
+  // 3. 原生 HTML DOM 节点：直接保留原引用
+  if (isHtmlDomNode(schema)) {
+    return schema;
+  }
+
+  // 4. 函数：Formily Schema 中的校验/格式化函数等，保留原引用
+  if (typeof schema === "function") {
+    return schema;
+  }
+
+  // 5. 日期对象：创建新的 Date 实例，保证值相同但引用不同
+  if (schema instanceof Date) {
+    return new Date(schema.getTime());
+  }
+
+  // 6. 正则对象：创建新的 RegExp 实例，保留源和标志
+  if (schema instanceof RegExp) {
+    return new RegExp(schema.source, schema.flags);
+  }
+
+  // 7. 数组：递归克隆每一项
+  if (Array.isArray(schema)) {
+    return schema.map((item) => cloneSchema(item));
+  }
+
+  // 8. 普通对象：递归克隆自有属性
+  const clonedObj = {};
+  for (const key in schema) {
+    if (Object.prototype.hasOwnProperty.call(schema, key)) {
+      clonedObj[key] = cloneSchema(schema[key]);
+    }
+  }
+  return clonedObj;
+}

package/src/common/handleQuerySchema.ts

@@ -1,12 +1,13 @@
 import _ from "lodash";
-import { getFieldMap } from "./utils";
 import {
   isRunStr,
   handleSchemaStrVal,
   isScopeKey as formIsScopeKey,
   getScopeKeyVal,
 } from "@hzab/form-render/src/common/schema-handler";
+import { cloneSchema } from "@hzab/utils/src/formily/cloneSchema";
 import { URL_PARAM_NAME } from "./constant";
+import { getFieldMap } from "./utils";
 
 // ===================== 类型定义 =====================
 
@@ -72,7 +73,7 @@ export const handleQuerySchema = (opt) => {
     index += 1;
   }
 
-  const fieldMap = getFieldMap(_.cloneDeep(schema));
+  const fieldMap = getFieldMap(cloneSchema(schema));
   filters?.forEach((key) => {
     const item = fieldMap[key];
     if (item) {

package/src/common/handleReactions.js

@@ -1,5 +1,6 @@
-import { cloneDeep } from "lodash";
 import { autorun, observable } from "@formily/reactive";
+
+import { cloneSchema } from "@hzab/utils/src/formily/cloneSchema";
 import { getStateFunc } from "./formily-utils";
 
 /**
@@ -14,7 +15,7 @@ export function handleReactions(fieldList, opt = {}) {
     return fieldList;
   }
   const resList = [];
-  cloneDeep(fieldList).forEach((item) => {
+  cloneSchema(fieldList).forEach((item) => {
     handleReaction(item, opt);
     resList.push(item);
   });

package/src/common/utils.js

@@ -1,279 +1,281 @@
-import { Schema } from "@formily/json-schema";
-import _ from "lodash";
-import dayjs from "dayjs";
-import advancedFormat from "dayjs/plugin/advancedFormat";
-import weekOfYear from "dayjs/plugin/weekOfYear";
-
-dayjs.extend(advancedFormat);
-dayjs.extend(weekOfYear);
-
-const dateFormatEnum = {
-  time: "YYYY-MM-DD HH:mm:ss",
-  date: "YYYY-MM-DD",
-  week: "YYYY年 w周",
-  quarter: "YYYY年 Q季度",
-  month: "YYYY-MM",
-  year: "YYYY",
-};
-
-/**
- * 获取 field 对应的值
- * @param {Object} field schema 项
- * @param {Object} data 数据
- * @param {Object} opt 配置项
- * @returns
- */
-export function getVal(field = {}, data = {}, opt = {}) {
-  const {} = opt;
-  let val = _.get(data, field.name);
-  const {} = field || {};
-  const xComponent = field["x-component"];
-  const xComponentProps = field["x-component-props"] || {};
-
-  if (val && (xComponent === "DatePicker" || xComponent === "DatePicker.RangePicker")) {
-    const { picker, showTime } = xComponentProps || {};
-    const mode = showTime === true ? "time" : picker || "date";
-    const _formatEnum = opt.dateFormatEnum || dateFormatEnum;
-    const format = xComponentProps?.format || _formatEnum[mode];
-
-    if (Array.isArray(val)) {
-      return val.map((it) => getDateVal(it, format)).join(" ~ ");
-    }
-    return getDateVal(val, format);
-  }
-
-  if (val && (xComponent === "TimePicker" || xComponent === "TimePicker.RangePicker")) {
-    const format = xComponentProps?.format || "HH:mm:ss";
-    if (Array.isArray(val)) {
-      return val.map((it) => dayjs(it).format(format)).join(" ~ ");
-    }
-    return dayjs(val).format(format);
-  }
-
-  if (xComponent === "Switch") {
-    if (val === undefined || val === false || val === field.inactiveValue) {
-      return field.inactiveText || "否";
-    }
-    if (val === true || val === field.activeValue) {
-      return field.activeText || "是";
-    }
-    return val;
-  }
-  if (typeof field.relation === "object") {
-    const { key, name, label } = field.relation;
-    return data[key]?.[name];
-  }
-
-  const dataSource = field?.dataSource || field.enum;
-  if (
-    (xComponent === "Select" || xComponent === "Radio.Group" || xComponent === "Checkbox.Group") &&
-    Array.isArray(dataSource)
-  ) {
-    if (!Array.isArray(val)) {
-      return getFieldOptItByVal(val, field, opt)?.label || val;
-    } else if (Array.isArray(val)) {
-      let _val = [];
-      val.forEach((valIt) => {
-        _val.push(getFieldOptItByVal(val, field, opt)?.label || valIt);
-      });
-      val = _val;
-    }
-  }
-
-  if (Array.isArray(val)) {
-    return val.join("、");
-  }
-
-  return val;
-}
-
-export function getDateVal(val, format) {
-  return dayjs(val).format(format);
-}
-
-export function getFieldList(_schema, fieldList = [], opt = {}, isTableSortXIdex = false) {
-  const schema = _schema?.schema || _schema;
-
-  // 解决 schema 字符串可执行代码、变量等
-  const properties = Schema.getOrderProperties(schema);
-  const { boxList = [] } = opt || {};
-  let _boxList = ["FormGrid", "FormGrid.GridColumn"];
-  if (Array.isArray(boxList)) {
-    _boxList = [..._boxList, ...boxList];
-  } else if (boxList === false) {
-    _boxList = [];
-  }
-
-  schema?.properties &&
-    properties.forEach((item) => {
-      const field = item.schema;
-      if (!field.name) {
-        field.name = item.key;
-      }
-      const componentName = field["x-component"];
-      if (_boxList.includes(componentName)) {
-        getFieldList(field, fieldList, opt);
-      } else {
-        fieldList.push(field);
-      }
-    });
-  isTableSortXIdex && fieldList.sort((a, b) => a["x-index"] - b["x-index"]);
-  return fieldList;
-}
-
-export function getFieldMap(_schema, fieldMap = {}) {
-  // const fieldMap = _.keyBy(getFieldList(_schema), "name");
-  const schema = _schema?.schema || _schema;
-  schema?.properties &&
-    Object.keys(schema?.properties).forEach((key) => {
-      const field = schema?.properties[key];
-      if (field["x-component"] === "FormGrid") {
-        getFieldMap(field, fieldMap);
-      } else if (field["x-component"] === "FormGrid.GridColumn") {
-        getFieldMap(field, fieldMap);
-      } else {
-        fieldMap[key] = field;
-      }
-    });
-
-  return fieldMap;
-}
-
-export function objToFormData(data) {
-  const formData = new FormData();
-  Object.keys(data)?.forEach((key) => {
-    formData.set(key, data[key]);
-  });
-  return formData;
-}
-
-/**
- * 根据 val 获取对应的 options 项数据
- * @param {string|number|boolean} val
- * @param {Object} field
- */
-export const getFieldOptItByVal = function (val, field, opt) {
-  if (!field) {
-    return {};
-  }
-  const options = Array.isArray(field.enum)
-    ? field.enum
-    : Array.isArray(field.options)
-    ? field.options
-    : field.dataSource || [];
-  return getOptItByVal(val, options, {
-    fieldNames: field.fieldNames || field["x-component-props"]?.fieldNames,
-    ...opt,
-  });
-};
-
-/**
- * 根据 val 获取对应的 options 项数据，并进行数据归一化处理
- * value, label, children
- * @param {string|number|boolean} val
- * @param {Object} field
- */
-export const getOptItByVal = function (val, options, opt) {
-  const { fieldNames } = opt || {};
-  const { value = "value", label = "label", children = "children" } = fieldNames || {};
-  for (let i = 0; i < options.length; i++) {
-    const it = options[i];
-    if (it?.[value] === val) {
-      return {
-        ...it,
-        value: it?.[value],
-        label: it?.[label],
-        children: it?.[children],
-      };
-    }
-    // 递归处理
-    const _children = it?.[children];
-    if (Array.isArray(_children) && _children.length > 0) {
-      const child = getOptItByVal(val, _children, opt);
-      return {
-        ...child,
-        value: child?.[value],
-        label: child?.[label],
-        children: child?.[children],
-      };
-    }
-  }
-};
-
-/**
- * 移除 schema.properties 中包含 "inTable": false 的字段
- * @param {Object} data - 原始数据对象
- * @returns {Object} - 处理后的新对象
- */
-
-/**
- * 移除表格中标记为inTable:false的字段
- * @param {Object} data - 原始数据
- * @param {Object} [opt={}] - 配置选项
- * @param {Array} [opt.boxList=[]] - 需要递归处理的组件类型列表
- * @returns {Object} 处理后的数据
- */
-
-export function removeInTableFalseFields(_schema, opt = {}) {
-  // 1. 深拷贝原始数据
-  const result = _.cloneDeep(_schema);
-
-  // 2. 获取schema对象（支持直接传入schema或包含schema的对象）
-  const schema = result?.schema || result;
-
-  // 3. 处理容器组件配置
-  const { boxList = [] } = opt;
-  const _boxList =
-    boxList === false
-      ? []
-      : [
-          "Card",
-          "FormGrid",
-          "ArrayCards",
-          "Collapse",
-          "Tabs",
-          "FormGrid.GridColumn",
-          ...(Array.isArray(boxList) ? boxList : []),
-        ];
-
-  // 4. 递归删除inTable:false的字段
-  const processProperties = (properties) => {
-    if (!properties || typeof properties !== "object") return;
-
-    Object.keys(properties).forEach((key) => {
-      const item = properties[key];
-
-      // 处理容器组件递归
-      if (item["x-component"] && _boxList.includes(item["x-component"])) {
-        if (item.properties) {
-          processProperties(item.properties);
-        }
-      }
-      // 处理数组类型的子项
-      else if (item.items?.properties) {
-        processProperties(item.items.properties);
-      }
-      // 处理普通字段
-      else if (item.inTable === false) {
-        delete properties[key];
-      }
-      // 移除x-display
-      else if (item["x-display"]) {
-        delete item["x-display"];
-      }
-    });
-  };
-
-  // 5. 处理主properties
-  if (schema.properties) {
-    processProperties(schema.properties);
-  }
-
-  // 6. 移除form的布局属性
-  if (result.form) {
-    delete result.form.labelCol;
-    delete result.form.wrapperCol;
-  }
-
-  return result;
-}
+import { Schema } from "@formily/json-schema";
+import _ from "lodash";
+import dayjs from "dayjs";
+import advancedFormat from "dayjs/plugin/advancedFormat";
+import weekOfYear from "dayjs/plugin/weekOfYear";
+
+import { cloneSchema } from "@hzab/utils/src/formily/cloneSchema";
+
+dayjs.extend(advancedFormat);
+dayjs.extend(weekOfYear);
+
+const dateFormatEnum = {
+  time: "YYYY-MM-DD HH:mm:ss",
+  date: "YYYY-MM-DD",
+  week: "YYYY年 w周",
+  quarter: "YYYY年 Q季度",
+  month: "YYYY-MM",
+  year: "YYYY",
+};
+
+/**
+ * 获取 field 对应的值
+ * @param {Object} field schema 项
+ * @param {Object} data 数据
+ * @param {Object} opt 配置项
+ * @returns
+ */
+export function getVal(field = {}, data = {}, opt = {}) {
+  const {} = opt;
+  let val = _.get(data, field.name);
+  const {} = field || {};
+  const xComponent = field["x-component"];
+  const xComponentProps = field["x-component-props"] || {};
+
+  if (val && (xComponent === "DatePicker" || xComponent === "DatePicker.RangePicker")) {
+    const { picker, showTime } = xComponentProps || {};
+    const mode = showTime === true ? "time" : picker || "date";
+    const _formatEnum = opt.dateFormatEnum || dateFormatEnum;
+    const format = xComponentProps?.format || _formatEnum[mode];
+
+    if (Array.isArray(val)) {
+      return val.map((it) => getDateVal(it, format)).join(" ~ ");
+    }
+    return getDateVal(val, format);
+  }
+
+  if (val && (xComponent === "TimePicker" || xComponent === "TimePicker.RangePicker")) {
+    const format = xComponentProps?.format || "HH:mm:ss";
+    if (Array.isArray(val)) {
+      return val.map((it) => dayjs(it).format(format)).join(" ~ ");
+    }
+    return dayjs(val).format(format);
+  }
+
+  if (xComponent === "Switch") {
+    if (val === undefined || val === false || val === field.inactiveValue) {
+      return field.inactiveText || "否";
+    }
+    if (val === true || val === field.activeValue) {
+      return field.activeText || "是";
+    }
+    return val;
+  }
+  if (typeof field.relation === "object") {
+    const { key, name, label } = field.relation;
+    return data[key]?.[name];
+  }
+
+  const dataSource = field?.dataSource || field.enum;
+  if (
+    (xComponent === "Select" || xComponent === "Radio.Group" || xComponent === "Checkbox.Group") &&
+    Array.isArray(dataSource)
+  ) {
+    if (!Array.isArray(val)) {
+      return getFieldOptItByVal(val, field, opt)?.label || val;
+    } else if (Array.isArray(val)) {
+      let _val = [];
+      val.forEach((valIt) => {
+        _val.push(getFieldOptItByVal(val, field, opt)?.label || valIt);
+      });
+      val = _val;
+    }
+  }
+
+  if (Array.isArray(val)) {
+    return val.join("、");
+  }
+
+  return val;
+}
+
+export function getDateVal(val, format) {
+  return dayjs(val).format(format);
+}
+
+export function getFieldList(_schema, fieldList = [], opt = {}, isTableSortXIdex = false) {
+  const schema = _schema?.schema || _schema;
+
+  // 解决 schema 字符串可执行代码、变量等
+  const properties = Schema.getOrderProperties(schema);
+  const { boxList = [] } = opt || {};
+  let _boxList = ["FormGrid", "FormGrid.GridColumn"];
+  if (Array.isArray(boxList)) {
+    _boxList = [..._boxList, ...boxList];
+  } else if (boxList === false) {
+    _boxList = [];
+  }
+
+  schema?.properties &&
+    properties.forEach((item) => {
+      const field = item.schema;
+      if (!field.name) {
+        field.name = item.key;
+      }
+      const componentName = field["x-component"];
+      if (_boxList.includes(componentName)) {
+        getFieldList(field, fieldList, opt);
+      } else {
+        fieldList.push(field);
+      }
+    });
+  isTableSortXIdex && fieldList.sort((a, b) => a["x-index"] - b["x-index"]);
+  return fieldList;
+}
+
+export function getFieldMap(_schema, fieldMap = {}) {
+  // const fieldMap = _.keyBy(getFieldList(_schema), "name");
+  const schema = _schema?.schema || _schema;
+  schema?.properties &&
+    Object.keys(schema?.properties).forEach((key) => {
+      const field = schema?.properties[key];
+      if (field["x-component"] === "FormGrid") {
+        getFieldMap(field, fieldMap);
+      } else if (field["x-component"] === "FormGrid.GridColumn") {
+        getFieldMap(field, fieldMap);
+      } else {
+        fieldMap[key] = field;
+      }
+    });
+
+  return fieldMap;
+}
+
+export function objToFormData(data) {
+  const formData = new FormData();
+  Object.keys(data)?.forEach((key) => {
+    formData.set(key, data[key]);
+  });
+  return formData;
+}
+
+/**
+ * 根据 val 获取对应的 options 项数据
+ * @param {string|number|boolean} val
+ * @param {Object} field
+ */
+export const getFieldOptItByVal = function (val, field, opt) {
+  if (!field) {
+    return {};
+  }
+  const options = Array.isArray(field.enum)
+    ? field.enum
+    : Array.isArray(field.options)
+    ? field.options
+    : field.dataSource || [];
+  return getOptItByVal(val, options, {
+    fieldNames: field.fieldNames || field["x-component-props"]?.fieldNames,
+    ...opt,
+  });
+};
+
+/**
+ * 根据 val 获取对应的 options 项数据，并进行数据归一化处理
+ * value, label, children
+ * @param {string|number|boolean} val
+ * @param {Object} field
+ */
+export const getOptItByVal = function (val, options, opt) {
+  const { fieldNames } = opt || {};
+  const { value = "value", label = "label", children = "children" } = fieldNames || {};
+  for (let i = 0; i < options.length; i++) {
+    const it = options[i];
+    if (it?.[value] === val) {
+      return {
+        ...it,
+        value: it?.[value],
+        label: it?.[label],
+        children: it?.[children],
+      };
+    }
+    // 递归处理
+    const _children = it?.[children];
+    if (Array.isArray(_children) && _children.length > 0) {
+      const child = getOptItByVal(val, _children, opt);
+      return {
+        ...child,
+        value: child?.[value],
+        label: child?.[label],
+        children: child?.[children],
+      };
+    }
+  }
+};
+
+/**
+ * 移除 schema.properties 中包含 "inTable": false 的字段
+ * @param {Object} data - 原始数据对象
+ * @returns {Object} - 处理后的新对象
+ */
+
+/**
+ * 移除表格中标记为inTable:false的字段
+ * @param {Object} data - 原始数据
+ * @param {Object} [opt={}] - 配置选项
+ * @param {Array} [opt.boxList=[]] - 需要递归处理的组件类型列表
+ * @returns {Object} 处理后的数据
+ */
+
+export function removeInTableFalseFields(_schema, opt = {}) {
+  // 1. 深拷贝原始数据
+  const result = cloneSchema(_schema);
+
+  // 2. 获取schema对象（支持直接传入schema或包含schema的对象）
+  const schema = result?.schema || result;
+
+  // 3. 处理容器组件配置
+  const { boxList = [] } = opt;
+  const _boxList =
+    boxList === false
+      ? []
+      : [
+          "Card",
+          "FormGrid",
+          "ArrayCards",
+          "Collapse",
+          "Tabs",
+          "FormGrid.GridColumn",
+          ...(Array.isArray(boxList) ? boxList : []),
+        ];
+
+  // 4. 递归删除inTable:false的字段
+  const processProperties = (properties) => {
+    if (!properties || typeof properties !== "object") return;
+
+    Object.keys(properties).forEach((key) => {
+      const item = properties[key];
+
+      // 处理容器组件递归
+      if (item["x-component"] && _boxList.includes(item["x-component"])) {
+        if (item.properties) {
+          processProperties(item.properties);
+        }
+      }
+      // 处理数组类型的子项
+      else if (item.items?.properties) {
+        processProperties(item.items.properties);
+      }
+      // 处理普通字段
+      else if (item.inTable === false) {
+        delete properties[key];
+      }
+      // 移除x-display
+      else if (item["x-display"]) {
+        delete item["x-display"];
+      }
+    });
+  };
+
+  // 5. 处理主properties
+  if (schema.properties) {
+    processProperties(schema.properties);
+  }
+
+  // 6. 移除form的布局属性
+  if (result.form) {
+    delete result.form.labelCol;
+    delete result.form.wrapperCol;
+  }
+
+  return result;
+}

package/src/components/Formily/FormilyEditTable.tsx

@@ -27,7 +27,7 @@ export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
   index: number;
   editable: boolean;
   onEdit: (record: Partial<Item> & { key: React.Key }, dataIndex: string, opt: Object) => void;
-  onSave: () => void;
+  onSave: (field: { type: string; name: string }) => void;
   onCancel: () => void;
   topProps: {
     config: { hasEdit: boolean | Function };
@@ -100,7 +100,7 @@ export const EditableCell: React.FC<EditableCellProps> = ({
           />
           {editMode !== "line" ? (
             <div className="cell-editing-actions">
-              <CheckOutlined className="table-cell-confirm-icon" onClick={onSave} />
+              <CheckOutlined className="table-cell-confirm-icon" onClick={() => onSave(field)} />
               <CloseOutlined className="table-cell-cancel-icon" onClick={onCancel} />
             </div>
           ) : null}
@@ -195,13 +195,20 @@ export const useEditTable = (props) => {
   const onEdit = async (record: Partial<Item> & { key: React.Key }, key, opt = { fieldRef: null }) => {
     const { fieldRef } = opt || {};
     editingFiledRef.current = fieldRef;
-
-    // const value = await (props.onEdit && props.onEdit(record));
     formRender?.setValues(record);
     setEditingId(record[idKey]);
     setEditingKey(key);
   };
 
+  /**
+   * 点击编辑按钮
+   * @param record
+   */
+  const onEditAFetch = async (record: Partial<Item> & { key: React.Key }, ...args) => {
+    const value = await (props.onEdit && props.onEdit(record));
+    onEdit.call(this, value, ...args);
+  };
+
   const onCancel = () => {
     setEditingId("");
     setEditingKey("");
@@ -211,11 +218,11 @@ export const useEditTable = (props) => {
   /**
    * 保存数据
    */
-  const onSave = async () => {
+  const onSave = async (field) => {
     try {
       // 点击保存，数据抛出
       (await formRender?.validate()) as Item;
-      onEditSubmit && (await onEditSubmit(formRender.values));
+      onEditSubmit && (await onEditSubmit(formRender.values, { field } ));
       // 清除编辑目标
       setEditingId("");
       setEditingKey("");
@@ -246,7 +253,7 @@ export const useEditTable = (props) => {
           ? isEditing(record) && isEditingCell(col.dataIndex)
           : isEditing(record),
         topProps: props.topProps,
-        onEdit,
+        onEdit: onEditAFetch,
         onSave,
         onCancel,
       }),
@@ -274,6 +281,7 @@ export const useEditTable = (props) => {
   });
 
   return {
+    onEditAFetch,
     onEdit,
     SchemaField,
     mergedColumns,

package/src/components/Formily/FormilyField.tsx

@@ -1,10 +1,11 @@
-import { memo, useEffect, useState, useMemo, useCallback, useRef } from "react";
+import { memo, useMemo, useCallback } from "react";
 import { createForm } from "@formily/core";
-import { createSchemaField, useField, useFieldSchema, observer, FormProvider, Schema } from "@formily/react";
+import { antdComponents, customComponents } from "@hzab/form-render";
+import { createSchemaField, useField, useFieldSchema, Schema } from "@formily/react";
 import { Form } from "c-formily-antd";
-import { handleReaction } from "../../common/handleReactions";
+import { cloneSchema } from "@hzab/utils/src/formily/cloneSchema";
 
-import { antdComponents, customComponents } from "@hzab/form-render";
+import { handleReaction } from "../../common/handleReactions";
 
 type formilyFieldPropsT = {
   schema: Schema;
@@ -19,6 +20,16 @@ type formilyFieldPropsT = {
 export const FormilyField = memo(function (props: formilyFieldPropsT) {
   const { schema, formilyRef, schemaScope, components, reactionOpts } = props;
   const { fields, fieldSchemas } = formilyRef.current || {};
+  const _schema = useMemo(() => {
+    const schemaRmInTable = cloneSchema(schema);
+    // 去除 inTable = false 的字段
+    Object.keys(schemaRmInTable?.schema?.properties)?.forEach((key) => {
+      if (schemaRmInTable?.schema?.properties?.[key]?.inTable === false) {
+        delete schemaRmInTable?.schema?.properties?.[key];
+      }
+    });
+    return schemaRmInTable;
+  }, [schema]);
   const SchemaField = useCallback(
     createSchemaField({
       // @ts-ignore
@@ -60,7 +71,7 @@ export const FormilyField = memo(function (props: formilyFieldPropsT) {
       style={{ display: "none", width: 0, height: 0, overflow: "hidden" }}
       form={formRender}
     >
-      <SchemaField schema={schema}></SchemaField>
+      <SchemaField schema={_schema}></SchemaField>
     </Form>
   );
 });

package/src/list-render.jsx

@@ -70,7 +70,6 @@ const ListRender = forwardRef(function (props, parentRef) {
   const [total, setTotal] = useState(0);
   const [list, setList] = useState([]);
   const [formState, setFormState] = useState("");
-  const [rowId, setRowId] = useState(0);
   const [listLoading, setListLoading] = useState(false);
   const formModalRef = useRef();
   const detailModalRef = useRef();
@@ -329,14 +328,11 @@ const ListRender = forwardRef(function (props, parentRef) {
   }
 
   function handleDetail(data, id) {
-    setRowId(id);
     let title = data[modalConf?.title?.detailKey] || modalConf?.title?.detailText || "详情";
     detailModalRef.current.show(data, title);
   }
 
   function onEdit(row, idx) {
-    //编辑的时候提前存id和状态
-    setRowId(row[idKey]);
     setFormState("edit");
 
     if (props.fetchOnEdit !== false) {
@@ -367,24 +363,27 @@ const ListRender = forwardRef(function (props, parentRef) {
 
   function handleEdit(data, id) {
     const { editMode = "modal" } = props;
-    const isEditTable = editMode !== "modal";
-    if (isEditTable) {
+    // 整行编辑的模式下列表数据回填
+    if (editMode == "line") {
       return tableRef.current.onEditByTable(data, id);
     }
-    let title = data[modalConf?.title?.editKey] || modalConf?.title?.editText || "编辑";
-    formModalRef.current.show(data, title, "edit");
+    if (editMode === "modal") {
+      let title = data[modalConf?.title?.editKey] || modalConf?.title?.editText || "编辑";
+      formModalRef.current.show(data, title, "edit");
+    }
   }
 
-  async function onEditSubmit(data) {
+  async function onEditSubmit(data, opt) {
     let _data = data;
     if (isPatchUpdate) {
       if (model?.patchMap === "function") {
-        _data = model.patchMap(data);
+        _data = model.patchMap(data, opt);
       }
     } else if (typeof model?.updateMap === "function") {
-      _data = model.updateMap(data);
+      _data = model.updateMap(data, opt);
     }
 
+    // 行内编辑确认前的校验
     if (props.onEditReqVerify) {
       await props.onEditReqVerify(_data);
     }
@@ -394,7 +393,7 @@ const ListRender = forwardRef(function (props, parentRef) {
     }
     const request = isPatchUpdate ? model?.patch : model?.update;
     return request
-      .bind(model)(_data, { id: rowId })
+      .bind(model)(_data, { id: data[idKey] })
       .then((res) => {
         getList();
         message.success(res?._message || "编辑成功");

package/src/query-render/index.jsx

@@ -4,10 +4,10 @@ import dayjs from "dayjs";
 import _ from "lodash";
 
 import FormRender from "@hzab/form-render";
+import { cloneSchema } from "@hzab/utils/src/formily/cloneSchema";
 import { handleQuerySchema } from "../common/handleQuerySchema";
 
 import "./index.less";
-import { onFieldValueChange } from "@formily/core";
 
 function QueryRender(props, parentRef) {
   const [schema, setSchema] = useState({});
@@ -20,7 +20,7 @@ function QueryRender(props, parentRef) {
       handleQuerySchema({
         ...props?.config,
         schemaScope: { ...props.schemaScope, scenario: "query" },
-        schema: _.cloneDeep(props.schema),
+        schema: cloneSchema(props.schema),
         search: props.search,
         filters: _.cloneDeep(props.filters),
         onSearch,

package/src/table-render/index.jsx

@@ -218,12 +218,12 @@ const TableRender = forwardRef(function (props, tableRef) {
         }
 
         columns.push({
-          field,
+          // field, // title 传入 ReactNode，内部深克隆导致页面报错白屏
           editable: true,
           ..._colConf,
           onCell: (record, rowIndex) =>
             _colConf?.onCell?.({ ...record, _field: { ...field, ...(fieldSchemas?.[name] || {}) } }, rowIndex) || {},
-          title: isFunction(_colConf?.title) ? _colConf?.title() : _title,
+          title: () => (isFunction(_colConf?.title) ? _colConf?.title() : _title),
           key: name,
           dataIndex: name,
           render: getColRender(colRender),
@@ -283,10 +283,6 @@ const TableRender = forwardRef(function (props, tableRef) {
                 <Button
                   type="link"
                   onClick={() => {
-                    // // 可编辑表格使用对应回调
-                    // if (isEditTable) {
-                    //   return onEditByTable && onEditByTable(record, index);
-                    // }
                     props.onEdit && props.onEdit(record, index);
                   }}
                 >
@@ -430,7 +426,7 @@ const TableRender = forwardRef(function (props, tableRef) {
         <Table {...tableProps} />
       )}
       <FormilyField
-        schema={props.schema}
+        schema={topProps.schema}
         formilyRef={formilyRef}
         components={props.components}
         schemaScope={{