@nocobase/client 0.20.0-alpha.15 → 0.20.0-alpha.16

package/es/application/schema-settings/types.d.ts

@@ -26,9 +26,6 @@ export interface SchemaSettingItemItemType extends SchemaSettingsItemCommon<Sche
 export interface SchemaSettingItemGroupType extends SchemaSettingsItemCommon<SchemaSettingsSubMenuProps> {
     type: 'itemGroup';
 }
-export interface SchemaSettingItemSubMenuType extends SchemaSettingsItemCommon<SchemaSettingsSubMenuProps> {
-    type: 'subMenu';
-}
 export interface SchemaSettingItemDividerProps extends SchemaSettingsItemCommon {
     type: 'divider';
 }
@@ -53,10 +50,13 @@ export type SchemaSettingItemModalType = SchemaSettingsItemCommon<SchemaSettings
 export type SchemaSettingItemActionModalType = SchemaSettingsItemCommon<SchemaSettingsSelectItemProps> & {
     type: 'actionModal';
 };
+export interface SchemaSettingItemSubMenuType extends SchemaSettingsItemCommon<SchemaSettingsSubMenuProps> {
+    type: 'subMenu';
+}
 export interface SchemaSettingItemComponentType<T = {}> extends SchemaSettingsItemCommon<T> {
     Component: string | ComponentType<T>;
 }
-export type SchemaSettingItemAllBuiltType = SchemaSettingItemDividerProps | SchemaSettingItemRemoveType | SchemaSettingItemActionModalType | SchemaSettingItemSwitchType | SchemaSettingItemPopupType | SchemaSettingItemCascaderType | SchemaSettingItemModalType | SchemaSettingItemItemType | SchemaSettingItemSelectType | SchemaSettingItemGroupType;
+export type SchemaSettingItemAllBuiltType = SchemaSettingItemDividerProps | SchemaSettingItemRemoveType | SchemaSettingItemActionModalType | SchemaSettingItemSwitchType | SchemaSettingItemPopupType | SchemaSettingItemCascaderType | SchemaSettingItemModalType | SchemaSettingItemItemType | SchemaSettingItemSelectType | SchemaSettingItemSubMenuType | SchemaSettingItemGroupType;
 export type SchemaSettingsItemType = SchemaSettingItemComponentType | SchemaSettingItemAllBuiltType;
 export type SchemaSettingsItemTypeWithoutName = Omit<SchemaSettingItemComponentType, 'name'> | Omit<SchemaSettingItemAllBuiltType, 'name'>;
 export {};

package/es/index.mjs

@@ -5383,15 +5383,15 @@ const SchemaInitializerSubMenuContext = React.createContext({}), SchemaInitializ
     }, r)
   ) });
 }, SchemaInitializerSubMenu = (e) => {
-  const d = e, { children: t, title: n, name: o = uid(), onOpenChange: r, icon: i } = d, a = H(d, ["children", "title", "name", "onOpenChange", "icon"]), l = useCompile(), c = useSchemaInitializerMenuItems(t, o), u = useMemo(() => [
+  const p = e, { children: t, title: n, name: o = uid(), onOpenChange: r, icon: i } = p, a = H(p, ["children", "title", "name", "onOpenChange", "icon"]), l = useCompile(), c = t == null ? void 0 : t.filter((m) => m.useVisible ? m.useVisible() : !0), u = useSchemaInitializerMenuItems(c, o), d = useMemo(() => [
     v(x({}, a), {
       key: o,
       label: l(n),
       icon: typeof i == "string" ? /* @__PURE__ */ jsx(antIcons__default, { type: i }) : i,
-      children: c
+      children: u
     })
-  ], [c, l, i, o, a, n]);
-  return /* @__PURE__ */ jsx(SchemaInitializerMenu, { onOpenChange: r, items: u });
+  ], [u, l, i, o, a, n]);
+  return /* @__PURE__ */ jsx(SchemaInitializerMenu, { onOpenChange: r, items: d });
 }, SchemaInitializerSubMenuInternal = () => {
   const e = useSchemaInitializerItem();
   return /* @__PURE__ */ jsx(SchemaInitializerSubMenu, x({}, e));
@@ -7770,10 +7770,12 @@ const useSchemaToolbarRender = (e) => {
       onSubmit: ({ sort: y }) => {
         var S;
         const b = y.map((I) => I.direction === "desc" ? `-${I.field}` : I.field);
-        _.set(n.componentProps, "service.params.sort", b), (S = t == null ? void 0 : t.onSubmitCallBack) == null || S.call(t, b), c["x-component-props"] = n.componentProps, o.emit("patch", {
+        n.query(new RegExp(`[0-9]+\\.${c.name}$`)).forEach((I) => {
+          _.set(I, "componentProps.service.params.sort", b);
+        }), _.set(c, "x-component-props.service.params.sort", b), (S = t == null ? void 0 : t.onSubmitCallBack) == null || S.call(t, b), o.emit("patch", {
           schema: {
             "x-uid": c["x-uid"],
-            "x-component-props": n.componentProps
+            "x-component-props": c["x-component-props"]
           }
         });
       }
@@ -8553,7 +8555,7 @@ const useCollectionManager_deprecated = (e) => {
       if (!R)
         return [];
       const w = (V = p(q)) == null ? void 0 : V.getCollection(R);
-      return w == null ? void 0 : w.getChildrenCollections(B);
+      return (w == null ? void 0 : w.getChildrenCollections(B)) || [];
     },
     [t, p]
   ), k = useCallback(
@@ -16549,9 +16551,9 @@ function useSchemaSettingsRender(e, t) {
   const n = useApp(), o = useMemo(() => n.schemaSettingsManager.get(e), [n.schemaSettingsManager, e]), r = React.useRef({});
   return e ? o ? {
     exists: !0,
-    render: (i) => {
-      const a = JSON.stringify(t) || "{}";
-      return r.current[a] ? r.current[a] : r.current[a] = React.createElement(SchemaSettingsWrapper, x(x(x({}, o.options), t), i));
+    render: (i = {}) => {
+      const a = JSON.stringify(i);
+      return a && r.current[a] ? r.current[a] : r.current[a] = React.createElement(SchemaSettingsWrapper, x(x(x({}, o.options), t), i));
     }
   } : (console.error(`[nocobase]: SchemaSettings "${e}" not found`), {
     exists: !1,
@@ -38813,7 +38815,7 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         }),
         onChange: (S, I) => {
           var k;
-          (k = e == null ? void 0 : e.onChange) == null || k.call(e, S), y(I.label);
+          (k = e == null ? void 0 : e.onChange) == null || k.call(e, S), y(I.label || S);
         }
       }
     ) });
@@ -38821,15 +38823,15 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
   { displayName: "ForeignKey" }
 ), ThroughCollection = observer$1(
   (e) => {
-    const { disabled: t } = e, n = useCompile(), { getCollections: o } = useCollectionManager_deprecated(), [r, i] = useState([]), a = useField(), c = useRecord()[a.props.name], [u, d] = useState(c || a.initialValue), p = () => o().filter((h) => !(h.autoCreate && h.isThrough)).map((h) => ({
-      label: n(h.title),
-      value: h.name
+    const { disabled: t } = e, n = useCompile(), { getCollections: o } = useCollectionManager_deprecated(), [r, i] = useState([]), a = useField(), c = useRecord()[a.props.name], [u, d] = useState(c || a.initialValue), p = () => o().filter((g) => !(g.autoCreate && g.isThrough)).map((g) => ({
+      label: n(g.title),
+      value: g.name
     }));
     return useEffect(() => {
-      const m = p();
-      if (i(m), c) {
-        const h = m.find((g) => g.value === c);
-        d((h == null ? void 0 : h.label) || c);
+      const h = p();
+      if (i(h), c) {
+        const g = h.find((f) => f.value === c);
+        d((g == null ? void 0 : g.label) || c);
       }
     }, []), /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(
       AutoComplete$1,
@@ -38839,9 +38841,18 @@ const useCurrentAppInfo = () => useContext(CurrentAppInfoContext), CurrentAppInf
         popupMatchSelectWidth: !1,
         value: u,
         options: r,
-        onChange: (m, h) => {
-          var g;
-          (g = e == null ? void 0 : e.onChange) == null || g.call(e, m), d(h.label);
+        onSearch: (h) => {
+          if (h) {
+            const g = r.filter((f) => f.label.toLowerCase().includes(h.toLowerCase()));
+            i(g);
+          } else {
+            const g = p();
+            i(g);
+          }
+        },
+        onChange: (h, g) => {
+          var f;
+          (f = e == null ? void 0 : e.onChange) == null || f.call(e, h), d(g.label || h);
         }
       }
     ) });
@@ -45771,7 +45782,7 @@ const useBlockContext = () => useContext(BlockContext), BlockProvider = (e) => {
   const e = useFilterByTk(), t = useRecord(), { fields: n } = useCollection_deprecated(), o = useFieldSchema(), { getCollectionJoinField: r } = useCollectionManager_deprecated(), i = r((u = o == null ? void 0 : o["x-decorator-props"]) == null ? void 0 : u.resource), a = n.filter((d) => ["boolean", "date", "integer", "radio", "sort", "string", "time", "uid", "uuid"].includes(d.type)).map((d) => d.name), l = Object.keys(t).filter((d) => a.includes(d)).reduce((d, p) => (d[p] = t[p], d), {}), c = {
     filterByTk: e
   };
-  return t.__collection && i && !["oho", "m2o", "obo"].includes(i.interface) && (c.targetCollection = t.__collection), e || (c.filter = l), c;
+  return t.__collection && i && !["oho", "m2o", "obo"].includes(i.interface) && (c.targetCollection = t.__collection), !e && Object.keys(l).length > 0 && (c.filter = l), c;
 }, RecordLink = (e) => {
   const t = useField(), n = useRecord(), l = e, { title: o, to: r } = l, i = H(l, ["title", "to"]), a = template(r || "");
   return /* @__PURE__ */ jsx(Link$1, v(x({}, i), { to: a({ record: n || {} }), children: t.title }));
@@ -51581,7 +51592,7 @@ const SelectActionInitializer = (e) => {
               "x-component": "Action"
             };
           },
-          visible: useVisibleCollection
+          useVisible: useVisibleCollection
         },
         {
           name: "customRequest",
@@ -51659,7 +51670,7 @@ const SelectActionInitializer = (e) => {
                 "x-component": "Action"
               };
             },
-            visible: useVisibleCollection
+            useVisible: useVisibleCollection
           },
           {
             name: "customRequest",