@nocobase/client 1.9.58 → 1.9.60

package/es/index.mjs

@@ -2821,6 +2821,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get appendQueryStringToUrl() {
     return appendQueryStringToUrl;
   },
+  get applyCollectionFieldUiSchemaToDefaultValueSchema() {
+    return applyCollectionFieldUiSchemaToDefaultValueSchema;
+  },
   get attachmentFileTypes() {
     return attachmentFileTypes;
   },
@@ -8858,7 +8861,7 @@ function addAppVersion(e, t) {
       addAppVersion((o = e.properties) == null ? void 0 : o[n], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.9.58", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.9.60", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -8879,9 +8882,9 @@ const name = "@nocobase/client", version = "1.9.58", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.9.58",
-  "@nocobase/sdk": "1.9.58",
-  "@nocobase/utils": "1.9.58",
+  "@nocobase/evaluators": "1.9.60",
+  "@nocobase/sdk": "1.9.60",
+  "@nocobase/utils": "1.9.60",
   ahooks: "^3.7.2",
   antd: "5.24.2",
   "antd-mobile": "^5.41.1",
@@ -14557,6 +14560,8 @@ function formatVariableScop(e) {
 const getActionContext = (e) => {
   var n;
   return ((n = e.fieldSchema) == null ? void 0 : n["x-action-context"]) || {};
+}, applyCollectionFieldUiSchemaToDefaultValueSchema = (e, t) => {
+  t && (e["x-component"] = t["x-component"] || "Input", e["x-use-component-props"] = e["x-use-component-props"] || t["x-use-component-props"], e["x-component-props"] = x(x({}, t["x-component-props"] || {}), e["x-component-props"] || {}), t.enum && (e.enum = t.enum), t.type && (e.type = t.type));
 }, SchemaSettingsDefaultValue = function(t) {
   var A, E, L;
   const n = useFieldSchema(), o = (A = t == null ? void 0 : t.fieldSchema) != null ? A : n, r = useField(), { dn: a } = useDesignable(), { t: i } = useTranslation(), l = useActionContext(), c = getActionContext(l).collection;
@@ -14613,11 +14618,7 @@ const getActionContext = (e) => {
             );
             G["x-read-pretty"] = !1, G["x-disabled"] = !1, _.set(G, "x-decorator-props.showTitle", !1);
             const H = getFieldDefaultValue(G, T);
-            if (G["x-component"] === "CollectionField" && (T != null && T.uiSchema)) {
-              const K = _.cloneDeep(T.uiSchema);
-              G["x-component"] = K["x-component"] || "Input", G["x-use-component-props"] = G["x-use-component-props"] || K["x-use-component-props"], G["x-component-props"] = x(x({}, K["x-component-props"] || {}), G["x-component-props"] || {}), K.type && (G.type = K.type);
-            }
-            T.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), T != null && T.uiSchema.type && (G.type = T.uiSchema.type), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", H), G.type = "void");
+            G["x-component"] === "CollectionField" && (T != null && T.uiSchema) && applyCollectionFieldUiSchemaToDefaultValueSchema(G, T.uiSchema), T.target && G["x-component-props"] && (G["x-component-props"].mode = "Select"), (T == null ? void 0 : T.uiSchema["x-component"]) === "Checkbox" && (_.set(G, "x-component-props.defaultChecked", H), G.type = "void");
             const U = useMemo(
               () => P(x({}, G || {}), {
                 "x-decorator": "FormItem",
@@ -70620,6 +70621,7 @@ export {
   actionSettingsItems,
   allowAddNew,
   appendQueryStringToUrl,
+  applyCollectionFieldUiSchemaToDefaultValueSchema,
   attachmentFileTypes,
   autoFill,
   autoIncrement,

package/es/schema-settings/SchemaSettingsDefaultValue.d.ts

@@ -8,6 +8,24 @@
  */
 import { Schema } from '@formily/react';
 import React from 'react';
+/**
+ * 将 CollectionField 的 uiSchema 映射到默认值弹窗里真正渲染的字段 schema。
+ *
+ * 默认值弹窗不会直接渲染 CollectionField，而是会把它替换成实际的表单组件。
+ * 这里必须把选项字段依赖的 `enum` 也带过去，否则下拉 / 单选 / 多选在弹窗里会没有可选项。
+ *
+ * @param clonedSchema 当前字段 schema 的克隆副本
+ * @param collectionFieldUiSchema 数据表字段上的 uiSchema
+ * @example
+ * ```typescript
+ * const schema = { 'x-component': 'CollectionField' };
+ * applyCollectionFieldUiSchemaToDefaultValueSchema(schema, {
+ *   'x-component': 'Select',
+ *   enum: [{ label: 'Option 1', value: 'option1' }],
+ * });
+ * ```
+ */
+export declare const applyCollectionFieldUiSchemaToDefaultValueSchema: (clonedSchema: Record<string, any>, collectionFieldUiSchema: Record<string, any>) => void;
 export declare const SchemaSettingsDefaultValue: (props: {
     fieldSchema?: Schema;
     hideVariableButton?: boolean;