@nocobase/client 1.6.20 → 1.6.21

package/es/index.mjs

@@ -9187,7 +9187,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "1.6.20", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "1.6.21", 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",
@@ -9209,9 +9209,9 @@ const name = "@nocobase/client", version = "1.6.20", license = "AGPL-3.0", main
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.6.20",
-  "@nocobase/sdk": "1.6.20",
-  "@nocobase/utils": "1.6.20",
+  "@nocobase/evaluators": "1.6.21",
+  "@nocobase/sdk": "1.6.21",
+  "@nocobase/utils": "1.6.21",
   ahooks: "^3.7.2",
   antd: "5.12.8",
   "antd-style": "3.7.1",
@@ -9712,7 +9712,7 @@ function useDesignable() {
         if (typeof C != "string")
           return C;
         const b = get$1(i, C);
-        return (S = b[LAZY_COMPONENT_KEY]) != null ? S : b;
+        return (S = b == null ? void 0 : b[LAZY_COMPONENT_KEY]) != null ? S : b;
       },
       [get$1]
     ),
@@ -11058,9 +11058,7 @@ const InternalTableBlockProvider = (e) => {
   var g;
   const { t } = useTranslation(), { getCollectionJoinField: o, getCollection: n } = useCollectionManager_deprecated(), r = useFieldSchema(), i = (e == null ? void 0 : e.fieldSchema) || r, a = useField(), l = useForm(), c = (i == null ? void 0 : i["x-read-pretty"]) || a.readPretty || l.readPretty, u = e == null ? void 0 : e.fieldSchema, { getField: d } = useCollection_deprecated(), p = (e == null ? void 0 : e.collectionField) || d(i.name) || o(i["x-collection-field"]), { label: m } = ((g = i["x-component-props"]) == null ? void 0 : g.fieldNames) || {};
   return (useMemo(() => {
-    if (!p || !(p != null && p.interface) || !["o2o", "oho", "obo", "o2m", "linkTo", "m2o", "m2m", "updatedBy", "createdBy", "mbm", "attachmentURL"].includes(
-      p.interface
-    ))
+    if (!p || !(p != null && p.interface) || !["hasOne", "hasMany", "belongsTo", "belongsToMany", "belongsToArray"].includes(p.type))
       return;
     const f = n(p.target);
     if ((f == null ? void 0 : f.template) === "file")
@@ -12069,34 +12067,35 @@ const useGetAriaLabelOfModal = () => {
   }
 );
 function useDelayedVisible(e, t = 200) {
-  const [o, n] = useState(!1);
+  const [o, n] = useState(t === 0);
   return useEffect(() => {
-    if (e) {
-      const r = setTimeout(() => n(!0), t);
-      return () => clearTimeout(r);
-    } else
-      n(!1);
-  }, [e]), o;
+    if (!o)
+      if (e) {
+        const r = setTimeout(() => n(!0), t);
+        return () => clearTimeout(r);
+      } else
+        n(!1);
+  }, [t, o, e]), o;
 }
 const InternalActionModal = observer$1(
   (e) => {
-    const v = e, { footerNodeName: t = "Action.Modal.Footer", width: o, zIndex: n } = v, r = Y(v, ["footerNodeName", "width", "zIndex"]), { visible: i, setVisible: a, openSize: l = "middle", modalProps: c } = useActionContext(), u = o != null ? o : openSizeWidthMap.get(l), d = useFieldSchema(), p = useField(), { token: m } = useToken(), h = useTabsContext(), g = useZIndexContext(), f = d.reduceProperties((F, I) => I["x-component"] === t ? I : F), { hidden: C } = useCurrentPopupContext(), b = !!f, S = getZIndex("modal", n || g, e.level || 0), y = useDelayedVisible(i, 200);
-    return /* @__PURE__ */ jsx(ActionContextNoRerender, { children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: S, children: /* @__PURE__ */ jsx(TabsContextProvider, P(x({}, h), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
+    const F = e, { footerNodeName: t = "Action.Modal.Footer", width: o, zIndex: n, delay: r = 200 } = F, i = Y(F, ["footerNodeName", "width", "zIndex", "delay"]), { visible: a, setVisible: l, openSize: c = "middle", modalProps: u } = useActionContext(), d = o != null ? o : openSizeWidthMap.get(c), p = useFieldSchema(), m = useField(), { token: h } = useToken(), g = useTabsContext(), f = useZIndexContext(), C = p.reduceProperties((I, w) => w["x-component"] === t ? w : I), { hidden: b } = useCurrentPopupContext(), S = !!C, y = getZIndex("modal", n || f, e.level || 0), v = useDelayedVisible(a, r);
+    return /* @__PURE__ */ jsx(ActionContextNoRerender, { children: /* @__PURE__ */ jsx(zIndexContext.Provider, { value: y, children: /* @__PURE__ */ jsx(TabsContextProvider, P(x({}, g), { tabBarExtraContent: null, children: /* @__PURE__ */ jsx(
       Modal,
       P(x(x({
-        zIndex: C ? -1 : S,
-        width: u,
-        title: p.title
-      }, r), c), {
-        style: x(x({}, c == null ? void 0 : c.style), r == null ? void 0 : r.style),
+        zIndex: b ? -1 : y,
+        width: d,
+        title: m.title
+      }, i), u), {
+        style: x(x({}, u == null ? void 0 : u.style), i == null ? void 0 : i.style),
         destroyOnClose: !0,
-        open: i,
+        open: a,
         onCancel: () => {
-          a(!1, !0);
+          l(!1, !0);
         },
         className: cls(
-          r.className,
-          c == null ? void 0 : c.className,
+          i.className,
+          u == null ? void 0 : u.className,
           css`
                   &.nb-action-popup {
                     .ant-modal-header {
@@ -12111,28 +12110,28 @@ const InternalActionModal = observer$1(
 
                     // 这里的样式是为了保证页面 tabs 标签下面的分割线和页面内容对齐（页面内边距可以通过主题编辑器调节）
                     .ant-tabs-nav {
-                      padding-left: ${m.paddingLG - m.paddingPageHorizontal}px;
-                      padding-right: ${m.paddingLG - m.paddingPageHorizontal}px;
-                      margin-left: ${m.paddingPageHorizontal - m.paddingLG}px;
-                      margin-right: ${m.paddingPageHorizontal - m.paddingLG}px;
+                      padding-left: ${h.paddingLG - h.paddingPageHorizontal}px;
+                      padding-right: ${h.paddingLG - h.paddingPageHorizontal}px;
+                      margin-left: ${h.paddingPageHorizontal - h.paddingLG}px;
+                      margin-right: ${h.paddingPageHorizontal - h.paddingLG}px;
                     }
 
                     .ant-modal-footer {
-                      display: ${b ? "block" : "none"};
+                      display: ${S ? "block" : "none"};
                     }
                   }
                 `
         ),
-        footer: b ? /* @__PURE__ */ jsx(
+        footer: S ? /* @__PURE__ */ jsx(
           NocoBaseRecursionField,
           {
-            basePath: p.address,
-            schema: d,
+            basePath: m.address,
+            schema: p,
             onlyRenderProperties: !0,
-            filterProperties: (F) => F["x-component"] === t
+            filterProperties: (I) => I["x-component"] === t
           }
         ) : !1,
-        children: y ? /* @__PURE__ */ jsx(ActionModalContent, { footerNodeName: t, field: p, schema: d }) : /* @__PURE__ */ jsx(Skeleton, { active: !0, paragraph: { rows: 6 } })
+        children: v ? /* @__PURE__ */ jsx(ActionModalContent, { footerNodeName: t, field: m, schema: p }) : /* @__PURE__ */ jsx(Skeleton, { active: !0, paragraph: { rows: 6 } })
       })
     ) })) }) });
   },
@@ -16988,7 +16987,7 @@ const useFormItemInitializerFields = (e) => {
 }, useCustomFormItemInitializerFields = (e) => {
   var u;
   const { name: t, currentFields: o } = useCollection_deprecated(), { getInterface: n, getCollection: r } = useCollectionManager_deprecated(), i = useForm(), { readPretty: a = i.readPretty, block: l = "Form" } = e || {}, c = useRemoveGridFormItem();
-  return (u = o == null ? void 0 : o.filter((d) => (d == null ? void 0 : d.interface) && d.interface !== "snapshot" && d.type !== "sequence")) == null ? void 0 : u.map((d) => {
+  return (u = o == null ? void 0 : o.filter((d) => !d.inherit && (d == null ? void 0 : d.interface) && d.interface !== "snapshot" && d.type !== "sequence")) == null ? void 0 : u.map((d) => {
     var h, g, f;
     const p = n(d.interface), m = {
       type: "string",
@@ -17022,7 +17021,7 @@ const useFormItemInitializerFields = (e) => {
 }, findSchema = (e, t, o, n) => Schema.isSchemaInstance(e) ? e.reduceProperties((r, i) => {
   if (i[t] === o && (!n || i.name === n))
     return i;
-  if (i["x-component"] !== "Action.Container" && !i["x-component"].includes("AssociationField")) {
+  if (i["x-component"] && i["x-component"] !== "Action.Container" && !i["x-component"].includes("AssociationField")) {
     const a = findSchema(i, t, o, n);
     if (a)
       return a;
@@ -24759,6 +24758,7 @@ function InputInner(e) {
   );
   return /* @__PURE__ */ jsx(Input$3, P(x({}, n), { onChange: r }));
 }
+InputInner.Password = Input$3.Password;
 const Input$2 = Object.assign(
   connect(
     InputInner,

package/es/schema-component/antd/action/types.d.ts

@@ -78,6 +78,7 @@ export type ActionDrawerProps<T = DrawerProps> = T & {
     footerNodeName?: string;
     /** 当前弹窗嵌套的层级 */
     level?: number;
+    delay?: number;
 };
 export type ComposedActionDrawer<T = DrawerProps> = React.FC<ActionDrawerProps<T>> & {
     Footer?: React.FC;