@hzab/list-render 1.9.7-beta1 → 1.9.7-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.9.7-beta1",
+  "version": "1.9.7-beta2",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/utils.js

@@ -97,7 +97,7 @@ export function getFieldList(_schema, fieldList = [], opt = {}, isTableSortXIdex
   // 解决 schema 字符串可执行代码、变量等
   const properties = Schema.getOrderProperties(schema);
   const { boxList = [] } = opt || {};
-  let _boxList = ["FormGrid", "FormGrid.GridColumn", "Card"];
+  let _boxList = ["FormGrid", "FormGrid.GridColumn"];
   if (Array.isArray(boxList)) {
     _boxList = [..._boxList, ...boxList];
   } else if (boxList === false) {
@@ -202,25 +202,67 @@ export const getOptItByVal = function (val, options, opt) {
  * @param {Object} data - 原始数据对象
  * @returns {Object} - 处理后的新对象
  */
-export const removeInTableFalseFields = (data) => {
-  // 深拷贝原始数据
-  const result = _.cloneDeep(data);
-  if (result?.form) {
-    delete result.form?.labelCol;
-    delete result.form?.wrapperCol;
-  }
-  // 检查是否存在 schema 和 properties
-  if (result?.schema?.properties) {
-    // 遍历properties中的所有属性
-    Object.keys(result.schema.properties).forEach((key) => {
-      if (result.schema.properties[key].inTable === false) {
-        // 删除整个包含inTable:false的属性
-        delete result.schema.properties[key];
-      } else if (result.schema.properties[key]["x-display"]) {
-        delete result.schema.properties[key]["x-display"];
+
+/**
+ * 移除表格中标记为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", ...(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;
-};
+}