@nocobase/utils 1.7.0-beta.2 → 1.7.0-beta.21

package/lib/assign.js

@@ -53,8 +53,14 @@ function getKeys(target) {
 }
 __name(getKeys, "getKeys");
 const mergeStrategies = /* @__PURE__ */ new Map();
-mergeStrategies.set("overwrite", (_, y) => {
-  if (typeof y === "string") {
+mergeStrategies.set("overwrite", (x, y) => {
+  if (y === void 0) {
+    if (typeof x === "string" && x.includes(",")) {
+      return x.split(",");
+    }
+    return x;
+  }
+  if (typeof y === "string" && y.includes(",")) {
     y = y.split(",");
   }
   return y;
@@ -123,15 +129,22 @@ mergeStrategies.set(
   })().filter(Boolean)
 );
 function assign(target, source, strategies = {}) {
-  getKeys(source).forEach((sourceKey) => {
+  const sourceKeys = getKeys(source);
+  const targetKeys = getKeys(target);
+  import_lodash.default.uniq([...sourceKeys, ...targetKeys]).forEach((sourceKey) => {
     const strategy = strategies[sourceKey];
-    let func = mergeStrategies.get("deepMerge");
+    let func;
     if (typeof strategy === "function") {
       func = strategy;
     } else if (typeof strategy === "string" && mergeStrategies.has(strategy)) {
       func = mergeStrategies.get(strategy);
     }
-    target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    if (func) {
+      target[sourceKey] = func(target[sourceKey], source[sourceKey]);
+    } else if (sourceKeys.includes(sourceKey)) {
+      const func2 = mergeStrategies.get("deepMerge");
+      target[sourceKey] = func2(target[sourceKey], source[sourceKey]);
+    }
   });
   return target;
 }

package/lib/client.d.ts

@@ -27,4 +27,5 @@ export * from './isPortalInBody';
 export * from './parseHTML';
 export * from './uid';
 export * from './url';
+export * from './transformMultiColumnToSingleColumn';
 export { dayjs, lodash };

package/lib/client.js

@@ -62,6 +62,7 @@ __reExport(client_exports, require("./isPortalInBody"), module.exports);
 __reExport(client_exports, require("./parseHTML"), module.exports);
 __reExport(client_exports, require("./uid"), module.exports);
 __reExport(client_exports, require("./url"), module.exports);
+__reExport(client_exports, require("./transformMultiColumnToSingleColumn"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs,
@@ -84,5 +85,6 @@ __reExport(client_exports, require("./url"), module.exports);
   ...require("./isPortalInBody"),
   ...require("./parseHTML"),
   ...require("./uid"),
-  ...require("./url")
+  ...require("./url"),
+  ...require("./transformMultiColumnToSingleColumn")
 });

package/lib/common.d.ts

@@ -12,3 +12,14 @@ export declare const isEmpty: (value: unknown) => boolean;
 export declare const isPlainObject: (value: any) => boolean;
 export declare const hasEmptyValue: (objOrArr: object | any[]) => any;
 export declare const nextTick: (fn: () => void) => void;
+/**
+ * 通用树节点深度优先遍历函数
+ * @param {Object|Array} tree - 要遍历的树结构
+ * @param {Function} callback - 遍历每个节点时执行的回调函数，返回真值时停止遍历并返回当前节点
+ * @param {Object} options - 配置选项
+ * @param {string|Function} options.childrenKey - 子节点的属性名，默认为'children'，也可以是一个函数
+ * @returns {any|undefined} - 找到的节点或undefined
+ */
+export declare function treeFind<T = any>(tree: T | T[], callback: (node: T) => boolean, options?: {
+    childrenKey?: string | ((node: T) => T[] | undefined);
+}): T | undefined;

package/lib/common.js

@@ -32,7 +32,8 @@ __export(common_exports, {
   isEmpty: () => isEmpty,
   isPlainObject: () => isPlainObject,
   isString: () => isString,
-  nextTick: () => nextTick
+  nextTick: () => nextTick,
+  treeFind: () => treeFind
 });
 module.exports = __toCommonJS(common_exports);
 const isString = /* @__PURE__ */ __name((value) => {
@@ -76,6 +77,25 @@ const hasEmptyValue = /* @__PURE__ */ __name((objOrArr) => {
 const nextTick = /* @__PURE__ */ __name((fn) => {
   setTimeout(fn);
 }, "nextTick");
+function treeFind(tree, callback, options = {}) {
+  if (!tree) return void 0;
+  const { childrenKey = "children" } = options;
+  const nodes = Array.isArray(tree) ? [...tree] : [tree];
+  for (const node of nodes) {
+    if (callback(node)) {
+      return node;
+    }
+    const children = typeof childrenKey === "function" ? childrenKey(node) : node[childrenKey];
+    if (Array.isArray(children) && children.length > 0) {
+      const found = treeFind(children, callback, options);
+      if (found !== void 0) {
+        return found;
+      }
+    }
+  }
+  return void 0;
+}
+__name(treeFind, "treeFind");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   hasEmptyValue,
@@ -83,5 +103,6 @@ const nextTick = /* @__PURE__ */ __name((fn) => {
   isEmpty,
   isPlainObject,
   isString,
-  nextTick
+  nextTick,
+  treeFind
 });

package/lib/crypto.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare function md5(input: string): string;

package/lib/crypto.js

@@ -0,0 +1,41 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var crypto_exports = {};
+__export(crypto_exports, {
+  md5: () => md5
+});
+module.exports = __toCommonJS(crypto_exports);
+var import_crypto = require("crypto");
+function md5(input) {
+  return (0, import_crypto.createHash)("md5").update(input).digest("hex");
+}
+__name(md5, "md5");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  md5
+});

package/lib/date.d.ts

@@ -35,5 +35,6 @@ export declare const moment2str: (value?: dayjs.Dayjs, options?: Moment2strOptio
  * from https://github.com/moment/moment/blob/dca02edaeceda3fcd52b20b51c130631a058a022/src/lib/units/offset.js#L55-L70
  */
 export declare function offsetFromString(string: string | number): number;
-export declare const getPickerFormat: (picker: any) => "YYYY-MM" | "YYYY" | "YYYY[W]W" | "YYYY-MM-DD" | "YYYY[Q]Q";
+export declare const getPickerFormat: (picker: any) => "YYYY-MM-DD" | "YYYY-MM" | "YYYY" | "YYYY[Q]Q" | "YYYY[W]W";
 export declare const getDateTimeFormat: (picker: any, format: any, showTime: any, timeFormat: any) => any;
+export declare function getFormatFromDateStr(dateStr: string): string | null;

package/lib/date.js

@@ -39,6 +39,7 @@ var date_exports = {};
 __export(date_exports, {
   getDateTimeFormat: () => getDateTimeFormat,
   getDefaultFormat: () => getDefaultFormat,
+  getFormatFromDateStr: () => getFormatFromDateStr,
   getPickerFormat: () => getPickerFormat,
   moment2str: () => moment2str,
   offsetFromString: () => offsetFromString,
@@ -88,12 +89,13 @@ const toLocal = /* @__PURE__ */ __name((value) => {
   }
 }, "toLocal");
 const convertQuarterToFirstDay = /* @__PURE__ */ __name((quarterStr) => {
-  if ((0, import_dayjs.dayjs)(quarterStr).isValid()) {
+  try {
     const year = parseInt(quarterStr.slice(0, 4));
     const quarter = parseInt(quarterStr.slice(-1));
     return (0, import_dayjs.dayjs)().quarter(quarter).year(year);
+  } catch (error) {
+    return null;
   }
-  return null;
 }, "convertQuarterToFirstDay");
 const toMoment = /* @__PURE__ */ __name((val, options) => {
   if (!val) {
@@ -215,10 +217,21 @@ const getDateTimeFormat = /* @__PURE__ */ __name((picker, format, showTime, time
   }
   return format;
 }, "getDateTimeFormat");
+function getFormatFromDateStr(dateStr) {
+  if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(dateStr)) return "YYYY-MM-DD HH:mm:ss";
+  if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return "YYYY-MM-DD";
+  if (/^\d{4}-\d{2}$/.test(dateStr)) return "YYYY-MM";
+  if (/^\d{4}$/.test(dateStr)) return "YYYY";
+  if (/^\d{4}Q[1-4]$/.test(dateStr)) return "YYYY[Q]Q";
+  if (/^\d{4}-\d{2}-\d{2}T/.test(dateStr)) return "YYYY-MM-DDTHH:mm:ss.SSSZ";
+  return null;
+}
+__name(getFormatFromDateStr, "getFormatFromDateStr");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDateTimeFormat,
   getDefaultFormat,
+  getFormatFromDateStr,
   getPickerFormat,
   moment2str,
   offsetFromString,

package/lib/dayjs.js

@@ -42,6 +42,7 @@ module.exports = __toCommonJS(dayjs_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_advancedFormat = __toESM(require("dayjs/plugin/advancedFormat"));
 var import_customParseFormat = __toESM(require("dayjs/plugin/customParseFormat"));
+var import_duration = __toESM(require("dayjs/plugin/duration"));
 var import_isBetween = __toESM(require("dayjs/plugin/isBetween"));
 var import_isSameOrAfter = __toESM(require("dayjs/plugin/isSameOrAfter"));
 var import_isSameOrBefore = __toESM(require("dayjs/plugin/isSameOrBefore"));
@@ -66,6 +67,7 @@ import_dayjs.default.extend(import_weekOfYear.default);
 import_dayjs.default.extend(import_weekYear.default);
 import_dayjs.default.extend(import_customParseFormat.default);
 import_dayjs.default.extend(import_advancedFormat.default);
+import_dayjs.default.extend(import_duration.default);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   dayjs

package/lib/index.d.ts

@@ -7,10 +7,12 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import lodash from 'lodash';
-import { dayjs } from './dayjs';
+export { lodash };
+export { dayjs } from './dayjs';
 export * from './assign';
 export * from './collections-graph';
 export * from './common';
+export * from './crypto';
 export * from './date';
 export * from './dayjs';
 export * from './forEach';
@@ -35,5 +37,4 @@ export * from './url';
 export * from './i18n';
 export * from './wrap-middleware';
 export * from './object-to-cli-args';
-export { dayjs, lodash };
 export { Schema } from '@formily/json-schema';

package/lib/index.js

@@ -47,6 +47,7 @@ var import_dayjs = require("./dayjs");
 __reExport(src_exports, require("./assign"), module.exports);
 __reExport(src_exports, require("./collections-graph"), module.exports);
 __reExport(src_exports, require("./common"), module.exports);
+__reExport(src_exports, require("./crypto"), module.exports);
 __reExport(src_exports, require("./date"), module.exports);
 __reExport(src_exports, require("./dayjs"), module.exports);
 __reExport(src_exports, require("./forEach"), module.exports);
@@ -80,6 +81,7 @@ var import_json_schema = require("@formily/json-schema");
   ...require("./assign"),
   ...require("./collections-graph"),
   ...require("./common"),
+  ...require("./crypto"),
   ...require("./date"),
   ...require("./dayjs"),
   ...require("./forEach"),

package/lib/transformMultiColumnToSingleColumn.d.ts

@@ -0,0 +1,15 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+/**
+ * 将多列布局转换为单列布局
+ * @param {Object} schema - 输入的 JSON Schema 对象
+ * @param {Function} [ignore] - 可选的忽略函数，用于判断是否忽略某个列
+ * @returns {Object} - 转换后的 JSON Schema 对象
+ */
+export declare const transformMultiColumnToSingleColumn: (schema: any, ignore?: (colSchema: any) => boolean) => any;

package/lib/transformMultiColumnToSingleColumn.js

@@ -0,0 +1,127 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var transformMultiColumnToSingleColumn_exports = {};
+__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"));
+const transformMultiColumnToSingleColumn = /* @__PURE__ */ __name((schema, ignore) => {
+  if (!schema) return schema;
+  if (schema["x-component"] !== "Grid") {
+    Object.keys(schema.properties || {}).forEach((key) => {
+      schema.properties[key] = transformMultiColumnToSingleColumn(schema.properties[key], ignore);
+    });
+    return 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;
+  Object.keys(properties).forEach((key, rowIndex) => {
+    const row = properties[key];
+    if (row["x-component"] !== "Grid.Row") {
+      row["x-index"] = ++index;
+      newProperties[key] = row;
+      return;
+    }
+    if (!row.properties) {
+      return;
+    }
+    if (Object.keys(row.properties).length === 1) {
+      row["x-index"] = ++index;
+      newProperties[key] = row;
+      return;
+    }
+    Object.keys(row.properties).forEach((columnKey, colIndex) => {
+      const column = row.properties[columnKey];
+      import_lodash.default.set(column, "x-component-props.width", 100);
+      if (colIndex === 0) {
+        row["x-index"] = ++index;
+        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) {
+  return {
+    type: "void",
+    version: "2.0",
+    "x-component": "Grid.Row",
+    "x-app-version": import_package.default.version,
+    "x-uid": (0, import_uid.uid)(),
+    "x-async": false,
+    "x-index": index,
+    _isJSONSchemaObject: true,
+    properties: {
+      [key]: column
+    }
+  };
+}
+__name(createRow, "createRow");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  transformMultiColumnToSingleColumn
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/utils",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.21",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -13,8 +13,8 @@
     "flat-to-nested": "^1.1.1",
     "graphlib": "^2.1.8",
     "handlebars": "^4.7.8",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.5-lts.2",
     "object-path": "^0.11.8"
   },
-  "gitHead": "58b206bdfca521e79a69989ca55dd19075dca523"
+  "gitHead": "845f6124b170717387ba9d7ebf3cc2df7a861bc3"
 }