@nocobase/utils 1.7.0-alpha.2 → 1.7.0-alpha.4

package/lib/transformMultiColumnToSingleColumn.d.ts

@@ -9,6 +9,7 @@
 /**
  * 将多列布局转换为单列布局
  * @param {Object} schema - 输入的 JSON Schema 对象
+ * @param {Function} [ignore] - 可选的忽略函数，用于判断是否忽略某个列
  * @returns {Object} - 转换后的 JSON Schema 对象
  */
-export declare const transformMultiColumnToSingleColumn: (schema: any) => any;
+export declare const transformMultiColumnToSingleColumn: (schema: any, ignore?: (colSchema: any) => boolean) => any;

package/lib/transformMultiColumnToSingleColumn.js

@@ -40,21 +40,24 @@ __export(transformMultiColumnToSingleColumn_exports, {
   transformMultiColumnToSingleColumn: () => transformMultiColumnToSingleColumn
 });
 module.exports = __toCommonJS(transformMultiColumnToSingleColumn_exports);
+var import_json_schema = require("@formily/json-schema");
+var import_lodash = __toESM(require("lodash"));
 var import_uid = require("./uid");
 var import_package = __toESM(require("../package.json"));
-var import_lodash = __toESM(require("lodash"));
-const transformMultiColumnToSingleColumn = /* @__PURE__ */ __name((schema) => {
+const transformMultiColumnToSingleColumn = /* @__PURE__ */ __name((schema, ignore) => {
   if (!schema) return schema;
-  if (schema.toJSON) {
-    schema = schema.toJSON();
-  }
   if (schema["x-component"] !== "Grid") {
     Object.keys(schema.properties || {}).forEach((key) => {
-      schema.properties[key] = transformMultiColumnToSingleColumn(schema.properties[key]);
+      schema.properties[key] = transformMultiColumnToSingleColumn(schema.properties[key], ignore);
     });
     return schema;
   }
-  schema = import_lodash.default.cloneDeep(schema);
+  const parent = schema.parent;
+  if (schema.toJSON) {
+    schema = schema.toJSON();
+  } else {
+    schema = import_lodash.default.cloneDeep(schema);
+  }
   const newProperties = {};
   const { properties = {} } = schema;
   let index = 0;
@@ -81,11 +84,25 @@ const transformMultiColumnToSingleColumn = /* @__PURE__ */ __name((schema) => {
         newProperties[key] = row;
         return;
       }
+      if (ignore == null ? void 0 : ignore(column)) {
+        return;
+      }
       delete row.properties[columnKey];
       newProperties[`${(0, import_uid.uid)()}_${columnKey}`] = createRow(column, columnKey, ++index);
     });
   });
   schema.properties = newProperties;
+  if (parent) {
+    const result = new import_json_schema.Schema(schema, parent);
+    if (parent.properties) {
+      Object.keys(parent.properties).forEach((key) => {
+        if (key === schema.name) {
+          parent.properties[key] = result;
+        }
+      });
+    }
+    return result;
+  }
   return schema;
 }, "transformMultiColumnToSingleColumn");
 function createRow(column, key, index) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-alpha.2",
+  "version": "1.7.0-alpha.4",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -16,5 +16,5 @@
     "multer": "^1.4.5-lts.1",
     "object-path": "^0.11.8"
   },
-  "gitHead": "01751fa626d5692137e3decdac3c66a742b8ea80"
+  "gitHead": "e31c3136901b10ec7cbe4bbc8a22dc4cc7481f93"
 }