@nocobase/client 0.20.0-alpha.6 → 0.20.0-alpha.8

package/es/index.mjs

@@ -5958,8 +5958,9 @@ function flatData$2(e) {
   return t;
 }
 function isSubMode(e) {
-  var t;
-  return ["Nester", "SubTable", "PopoverNester"].includes((t = e["x-component-props"]) == null ? void 0 : t.mode);
+  var n, o;
+  const t = ((n = e["x-component-props"]) == null ? void 0 : n.mode) || ((o = e.componentProps) == null ? void 0 : o.mode);
+  return ["Nester", "SubTable", "PopoverNester"].includes(t);
 }
 const key = Symbol("isNewRecord"), isNewRecord = (e) => !!(e != null && e[key]), markRecordAsNew = (e) => {
   if (!isObject$1(e))
@@ -20330,15 +20331,15 @@ const useCreateActionProps = () => {
             updateAssociationValues: h
           });
           if (a == null || a(!1), u.data.loading = !1, u.data.data = D, (j = (I = i == null ? void 0 : i.service) == null ? void 0 : I.refresh) == null || j.call(I), !(b != null && b.successMessage)) {
-            message.success(m("Saved successfully")), yield n.reset(void 0, { forceClear: !0 });
+            message.success(m("Saved successfully")), yield resetFormCorrectly(n);
             return;
           }
           b != null && b.manualClose ? p.success({
             title: d(b == null ? void 0 : b.successMessage),
             onOk: () => O(this, null, function* () {
-              yield n.reset(void 0, { forceClear: !0 }), b != null && b.redirecting && (b != null && b.redirectTo) && (isURL(b.redirectTo) ? window.location.href = b.redirectTo : l(b.redirectTo));
+              yield resetFormCorrectly(n), b != null && b.redirecting && (b != null && b.redirectTo) && (isURL(b.redirectTo) ? window.location.href = b.redirectTo : l(b.redirectTo));
             })
-          }) : (message.success(d(b == null ? void 0 : b.successMessage)), yield n.reset(void 0, { forceClear: !0 }), b != null && b.redirecting && (b != null && b.redirectTo) && (isURL(b.redirectTo) ? window.location.href = b.redirectTo : l(b.redirectTo)));
+          }) : (message.success(d(b == null ? void 0 : b.successMessage)), yield resetFormCorrectly(n), b != null && b.redirecting && (b != null && b.redirectTo) && (isURL(b.redirectTo) ? window.location.href = b.redirectTo : l(b.redirectTo)));
         } catch (D) {
           u.data.loading = !1;
         }
@@ -20923,7 +20924,7 @@ const useAssociationNames = (e) => {
           b(A);
         });
       }
-      const C = f && ((S = r(h.target)) == null ? void 0 : S.template) === "tree";
+      const C = f && ((S = r(h.target, e)) == null ? void 0 : S.template) === "tree";
       if (h && (f || g) && p["x-component"] !== "TableField") {
         const b = !f && g ? getAssociationPath(p.name) : p.name, P = m === "" || !m ? b : m + "." + b;
         if (C ? (n.add(P), n.add(`${P}.parent(recursively=true)`)) : n.add(P), ["Nester", "SubTable", "PopoverNester"].includes((y = p["x-component-props"]) == null ? void 0 : y.mode)) {
@@ -20964,6 +20965,15 @@ function getTargetField(e) {
   });
   return n.slice(0, o);
 }
+function resetFormCorrectly(e) {
+  return O(this, null, function* () {
+    untracked(() => {
+      Object.keys(e.fields).forEach((t) => {
+        isSubMode(e.fields[t]) && (e.fields[t].initialValue = null);
+      });
+    }), yield e.reset();
+  });
+}
 const useSyncFromForm = (e, t, n) => {
   const { getCollectionJoinField: o, getCollectionFields: r } = useCollectionManager_deprecated(), i = ArrayBase.useArray(), a = ArrayBase.useIndex(), l = ArrayBase.useRecord(), c = useCompile(), { t: u } = useTranslation(), d = useForm(), p = /* @__PURE__ */ ((f) => (C, { exclude: S = [], depth: y = 0, maxDepth: b, prefix: P = "", disabled: A = !1 }, k) => {
     const w = `${C}-${S.join(",")}-${y}-${b}-${P}`, I = f.get(w);
@@ -29653,7 +29663,7 @@ const initializerComponents = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Obje
                             border-right: 1px solid rgba(0, 0, 0, 0.06);
                           `,
                       onClick: () => {
-                        n.value = n.value || [], n.value.push(markRecordAsNew({})), n.onInput(n.value);
+                        n.value = n.value || [], n.value.push(markRecordAsNew({}));
                       },
                       children: r("Add new")
                     }
@@ -39193,11 +39203,11 @@ const getSchema$4 = (e, t, n) => {
         };
       }), T = (N = R.fields.filter((E) => !["hasOne", "hasMany", "belongsToMany"].includes(E == null ? void 0 : E.type))) == null ? void 0 : N.map((E) => {
         var V;
-        return { value: E.name, key: E.name, label: l((V = E.uiSchema) == null ? void 0 : V.title) };
+        return { value: E.name, key: E.name, label: l(((V = E.uiSchema) == null ? void 0 : V.title) || E.name) };
       }).concat(z);
       q.push({
         value: B,
-        label: l(R.title),
+        label: l(R.title || R.name),
         children: T
       });
     }), h(q);
@@ -39295,7 +39305,7 @@ const getSchema$4 = (e, t, n) => {
               const N = b(T);
               D(v(x({}, $), { interface: T, uiSchema: (E = N == null ? void 0 : N.default) == null ? void 0 : E.uiSchema }), R);
             },
-            children: z.map((T) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: w(T.label), children: T.children.map((N) => /* @__PURE__ */ jsx(Select$1.Option, { value: N.value, children: w(N.label) }, N.value)) }, T.key))
+            children: z.map((T) => /* @__PURE__ */ jsx(Select$1.OptGroup, { label: w(T.label), children: T.children.map((N) => /* @__PURE__ */ jsx(Select$1.Option, { value: N.name, children: w(N.label) }, N.value)) }, T.key))
           }
         );
       }

package/es/schema-component/antd/association-field/util.d.ts

@@ -1,4 +1,4 @@
-import { ISchema, Schema } from '@formily/react';
+import { ISchema } from '@formily/react';
 export declare const useLabelUiSchemaV2: () => (collectionName: string, label: string) => ISchema;
 export declare const useLabelUiSchema: (collectionName: string, label: string) => ISchema;
 export declare const getDatePickerLabels: (props: any) => string;
@@ -9,4 +9,4 @@ export declare function isShowFilePicker(labelUiSchema: any): boolean;
 /**
  * 当前字段的模式是否是 `子表格` 或者 `子表单`
  */
-export declare function isSubMode(fieldSchema: Schema): boolean;
+export declare function isSubMode(field: any): boolean;