@nocobase/client 1.2.23-alpha → 1.2.25-alpha

package/es/index.mjs

@@ -61,7 +61,7 @@ import { Outlet, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRou
 import * as nocobaseSDK from "@nocobase/sdk";
 import { APIClient as APIClient$1, getSubAppName } from "@nocobase/sdk";
 import * as antd from "antd";
-import { notification, Spin, message, Tag, Select as Select$1, theme, App, ConfigProvider, Popover, Menu as Menu$1, Switch, Divider, Button, Result, Tooltip, Input as Input$3, Empty, Modal, Typography, Image, Slider, Space as Space$1, Card, Collapse, Badge, Tree as Tree$2, Dropdown, Alert, Cascader as Cascader$1, Radio as Radio$1, Drawer as Drawer$1, Flex, InputNumber as InputNumber$1, DatePicker as DatePicker$1, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, Table as Table$2, Skeleton, AutoComplete as AutoComplete$1, Checkbox as Checkbox$1, ColorPicker as ColorPicker$1, List as List$1, Col, QRCode, Pagination as Pagination$1, TimePicker as TimePicker$1, Row, Popconfirm, Layout } from "antd";
+import { notification, Spin, message, Tag, Result, Button, Select as Select$1, theme, App, ConfigProvider, Popover, Menu as Menu$1, Switch, Divider, Tooltip, Input as Input$3, Empty, Modal, Typography, Image, Slider, Space as Space$1, Card, Collapse, Badge, Tree as Tree$2, Dropdown, Alert, Cascader as Cascader$1, Radio as Radio$1, Drawer as Drawer$1, Flex, InputNumber as InputNumber$1, DatePicker as DatePicker$1, Tabs as Tabs$1, TreeSelect as TreeSelect$2, Upload as Upload$1, Progress, Table as Table$2, Skeleton, AutoComplete as AutoComplete$1, Checkbox as Checkbox$1, ColorPicker as ColorPicker$1, List as List$1, Col, QRCode, Pagination as Pagination$1, TimePicker as TimePicker$1, Row, Popconfirm, Layout } from "antd";
 import * as formilyShared from "@formily/shared";
 import { merge, uid, isArr, isFn, applyMiddleware, isNum as isNum$1, isStr, isBool, toArr as toArr$3, isValid, isReactElement, each } from "@formily/shared";
 import * as ahooks from "ahooks";
@@ -84,7 +84,7 @@ import ReactDOM__default, { createPortal } from "react-dom";
 import * as antdCssinjs from "@ant-design/cssinjs";
 import { useStyleRegister } from "@ant-design/cssinjs";
 import * as antIcons from "@ant-design/icons";
-import antIcons__default, { createFromIconfontCN, RightOutlined, LoadingOutlined, HighlightOutlined, PlusOutlined, TableOutlined, DragOutlined, MenuOutlined, CopyOutlined, CloseCircleOutlined, UserOutlined, CloseCircleFilled, CloseOutlined, InboxOutlined, DownloadOutlined, DeleteOutlined, EditOutlined, DownOutlined, CheckOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, QuestionCircleOutlined, SearchOutlined, FormOutlined, OrderedListOutlined, DisconnectOutlined } from "@ant-design/icons";
+import antIcons__default, { LoadingOutlined, createFromIconfontCN, RightOutlined, HighlightOutlined, PlusOutlined, TableOutlined, DragOutlined, MenuOutlined, CopyOutlined, CloseCircleOutlined, UserOutlined, CloseCircleFilled, CloseOutlined, InboxOutlined, DownloadOutlined, DeleteOutlined, EditOutlined, DownOutlined, CheckOutlined, RightSquareOutlined, SyncOutlined, ExclamationCircleFilled, ApiOutlined, SettingOutlined, ReadOutlined, ReloadOutlined, QuestionCircleOutlined, SearchOutlined, FormOutlined, OrderedListOutlined, DisconnectOutlined } from "@ant-design/icons";
 import { useHotkeys } from "react-hotkeys-hook";
 import * as antdStyle from "antd-style";
 import { createStyles, useAntdToken, createGlobalStyle } from "antd-style";
@@ -3965,7 +3965,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version$1 = "1.2.23-alpha", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version$1 = "1.2.25-alpha", 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.1.4",
@@ -3986,9 +3986,9 @@ const name = "@nocobase/client", version$1 = "1.2.23-alpha", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "1.2.23-alpha",
-  "@nocobase/sdk": "1.2.23-alpha",
-  "@nocobase/utils": "1.2.23-alpha",
+  "@nocobase/evaluators": "1.2.25-alpha",
+  "@nocobase/sdk": "1.2.25-alpha",
+  "@nocobase/utils": "1.2.25-alpha",
   ahooks: "^3.7.2",
   antd: "^5.12.8",
   "antd-style": "3.4.5",
@@ -4937,6 +4937,512 @@ function SetDataLoadingMode() {
     }
   );
 }
+const DataSourceManagerContext = createContext(null);
+DataSourceManagerContext.displayName = "DataSourceManagerContext";
+const DataSourceManagerProvider = ({ children: e, dataSourceManager: t }) => /* @__PURE__ */ jsx(DataSourceManagerContext.Provider, { value: t, children: e });
+function useDataSourceManager() {
+  return useContext(DataSourceManagerContext);
+}
+const DataSourceContext = createContext(null);
+DataSourceContext.displayName = "DataSourceContext";
+const DataSourceProvider = ({ children: e, dataSource: t }) => {
+  const o = useDataSourceManager(), { t: n } = useTranslation(), { refresh: r } = useSchemaComponentContext(), [i, a] = React.useState(0), l = o == null ? void 0 : o.getDataSource(t);
+  return l ? l.status === "loading-failed" ? /* @__PURE__ */ jsx(
+    CollectionDeletedPlaceholder,
+    {
+      type: "Data Source",
+      name: l.displayName || t,
+      message: l.errorMessage || "loading failed"
+    }
+  ) : l.status === "loading" || l.status === "reloading" ? /* @__PURE__ */ jsx(CardItem, { children: /* @__PURE__ */ jsx(
+    Result,
+    {
+      icon: /* @__PURE__ */ jsx(LoadingOutlined, {}),
+      title: `${l.displayName || t} ${n("data source")} ${n("loading")}...`,
+      extra: /* @__PURE__ */ jsx(
+        Button,
+        {
+          type: "primary",
+          onClick: () => l.reload().then(() => {
+            r(), a(Math.random());
+          }),
+          children: n("Refresh")
+        }
+      )
+    }
+  ) }) : /* @__PURE__ */ jsx(DataSourceContext.Provider, { value: l, children: e }) : /* @__PURE__ */ jsx(CollectionDeletedPlaceholder, { type: "Data Source", name: t });
+};
+function useDataSource() {
+  return useContext(DataSourceContext);
+}
+function useDataSourceKey() {
+  const e = useContext(DataSourceContext);
+  return e == null ? void 0 : e.key;
+}
+const ExtendCollectionsContext = createContext(null);
+ExtendCollectionsContext.displayName = "ExtendCollectionsContext";
+const ExtendCollectionsProvider = ({ children: e, collections: t }) => {
+  const o = useExtendCollections(), n = useMemo(() => o ? [...o, ...t] : t, [o, t]), r = useDataSourceKey();
+  return /* @__PURE__ */ jsx(ExtendCollectionsContext.Provider, { value: n, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { dataSource: r, children: e }) });
+};
+function useExtendCollections() {
+  return useContext(ExtendCollectionsContext);
+}
+const CollectionManagerContext = createContext(null);
+CollectionManagerContext.displayName = "CollectionManagerContext";
+const CollectionManagerProviderInner = ({ instance: e, children: t }) => {
+  const o = useDataSource(), n = useExtendCollections(), r = useMemo(() => {
+    const i = e || (o == null ? void 0 : o.collectionManager);
+    return n != null && n.length ? i.clone(n) : i;
+  }, [e, n, o]);
+  return /* @__PURE__ */ jsx(CollectionManagerContext.Provider, { value: r, children: t });
+}, CollectionManagerProvider = ({ instance: e, dataSource: t, children: o }) => /* @__PURE__ */ jsx(DataSourceProvider, { dataSource: t, children: /* @__PURE__ */ jsx(CollectionManagerProviderInner, { instance: e, children: o }) });
+function useCollectionManager() {
+  return useContext(CollectionManagerContext);
+}
+const useCollections = (e) => {
+  const t = useCollectionManager();
+  return useMemo(() => t.getCollections(e), [t, e]);
+}, useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e);
+class CollectionRecord {
+  constructor(t) {
+    P(this, "data");
+    P(this, "parentRecord");
+    P(this, "isNew");
+    const { data: o, parentRecord: n, isNew: r } = t;
+    this.isNew = r, this.data = o, this.parentRecord = n;
+  }
+  setData(t) {
+    this.data = t;
+  }
+  setParentRecord(t) {
+    this.parentRecord = t;
+  }
+}
+const CollectionRecordContext = createContext(null);
+CollectionRecordContext.displayName = "CollectionRecordContext";
+const CollectionRecordProvider = ({
+  isNew: e,
+  record: t,
+  parentRecord: o,
+  children: n
+}) => {
+  const r = useMemo(() => {
+    if (o)
+      return o instanceof CollectionRecord ? o : new CollectionRecord({ data: o });
+    if (t instanceof CollectionRecord)
+      return t.parentRecord;
+  }, [o, t]), i = useMemo(() => {
+    let a;
+    return t ? t instanceof CollectionRecord ? (a = t, a.isNew = t.isNew || e) : a = new CollectionRecord({ data: t, isNew: e }) : a = new CollectionRecord({ isNew: e }), a.setParentRecord(r), a;
+  }, [t, r, e]);
+  return /* @__PURE__ */ jsx(CollectionRecordContext.Provider, { value: i, children: n });
+};
+function useCollectionRecord() {
+  return useContext(CollectionRecordContext);
+}
+function useCollectionRecordData() {
+  const e = useCollectionRecord();
+  return e == null ? void 0 : e.data;
+}
+function useCollectionParentRecord() {
+  const e = useCollectionRecord();
+  return e == null ? void 0 : e.parentRecord;
+}
+function useCollectionParentRecordData() {
+  var t;
+  const e = useCollectionRecord();
+  return (t = e == null ? void 0 : e.parentRecord) == null ? void 0 : t.data;
+}
+class DataSource {
+  constructor(t, o) {
+    P(this, "collectionManager");
+    P(this, "reloadCallbacks", []);
+    this.options = t, this.dataSourceManager = o, this.collectionManager = new CollectionManager(t.collections, this);
+  }
+  get app() {
+    return this.dataSourceManager.app;
+  }
+  get key() {
+    return this.options.key;
+  }
+  get displayName() {
+    return this.options.displayName;
+  }
+  get status() {
+    return this.options.status;
+  }
+  get errorMessage() {
+    return this.options.errorMessage;
+  }
+  get collections() {
+    return this.collectionManager.getCollections() || [];
+  }
+  getOptions() {
+    return this.options;
+  }
+  setOptions(t) {
+    Object.assign(this.options, t);
+  }
+  getOption(t) {
+    return this.options[t];
+  }
+  addReloadCallback(t) {
+    this.reloadCallbacks.includes(t) || this.reloadCallbacks.push(t);
+  }
+  removeReloadCallback(t) {
+    this.reloadCallbacks = this.reloadCallbacks.filter((o) => o !== t);
+  }
+  reload() {
+    return V(this, null, function* () {
+      const t = yield this.getDataSource();
+      return this.setOptions(t), this.collectionManager.setCollections(t.collections || []), this.reloadCallbacks.forEach((o) => o(t.collections)), this.options;
+    });
+  }
+}
+class LocalDataSource extends DataSource {
+  getDataSource() {
+    return {
+      collections: this.collections
+    };
+  }
+}
+class CollectionTemplate {
+  constructor(t) {
+    P(this, "name");
+    P(this, "Collection");
+    P(this, "title");
+    P(this, "color");
+    /** Sorting */
+    P(this, "order");
+    /** Default configuration */
+    P(this, "default");
+    P(this, "events");
+    /** UI configurable CollectionOptions parameters (fields for adding or editing Collection forms) */
+    P(this, "configurableProperties");
+    /** Available field types for the current template */
+    P(this, "availableFieldInterfaces");
+    /** Whether it is a divider */
+    P(this, "divider");
+    /** Template description */
+    P(this, "description");
+    /** Configure buttons in the configuration fields */
+    P(this, "configureActions");
+    // Whether to prohibit deleting fields
+    P(this, "forbidDeletion");
+    P(this, "supportDataSourceType");
+    P(this, "notSupportDataSourceType");
+    this.collectionTemplateManager = t;
+  }
+}
+class CollectionTemplateManager {
+  constructor(t, o) {
+    P(this, "collectionTemplateInstances", {});
+    this.dataSourceManager = o, this.addCollectionTemplates(t);
+  }
+  addCollectionTemplates(t = []) {
+    const o = t.reduce((n, r) => {
+      const i = new r(this);
+      return n[i.name] = i, n;
+    }, {});
+    return Object.assign(this.collectionTemplateInstances, o), this.dataSourceManager.getDataSources().forEach((n) => {
+      const r = n.collectionManager.getCollections((i) => o[i.template]);
+      n.collectionManager.reAddCollections(r);
+    }), o;
+  }
+  getCollectionTemplate(t) {
+    return this.collectionTemplateInstances[t];
+  }
+  getCollectionTemplates(t) {
+    return Object.values(this.collectionTemplateInstances).filter((o) => {
+      var n, r;
+      if (!t || !o.supportDataSourceType && !o.notSupportDataSourceType)
+        return !0;
+      if (o.supportDataSourceType)
+        return (n = o.supportDataSourceType) == null ? void 0 : n.includes(t);
+      if (o.notSupportDataSourceType)
+        return !((r = o.notSupportDataSourceType) != null && r.includes(t));
+    }).sort((o, n) => (o.order || 0) - (n.order || 0));
+  }
+}
+class CollectionFieldInterface {
+  constructor(t) {
+    P(this, "name");
+    P(this, "group");
+    P(this, "title");
+    P(this, "description");
+    P(this, "order");
+    P(this, "default");
+    P(this, "sortable");
+    P(this, "availableTypes");
+    P(this, "supportDataSourceType");
+    P(this, "notSupportDataSourceType");
+    P(this, "hasDefaultValue");
+    P(this, "isAssociation");
+    P(this, "operators");
+    /**
+     * - 如果该值为空，则在 Filter 组件中该字段会被过滤掉
+     * - 如果该值为空，则不会在变量列表中看到该字段
+     */
+    P(this, "filterable");
+    P(this, "titleUsable");
+    P(this, "hidden");
+    this.collectionFieldInterfaceManager = t;
+  }
+}
+class CollectionFieldInterfaceManager {
+  constructor(t, o, n) {
+    P(this, "collectionFieldInterfaceInstances", {});
+    P(this, "collectionFieldGroups", {});
+    this.dataSourceManager = n, this.addFieldInterfaces(t), this.addFieldInterfaceGroups(o);
+  }
+  addFieldInterfaces(t = []) {
+    const o = t.reduce((n, r) => {
+      const i = new r(this);
+      return n[i.name] = i, n;
+    }, {});
+    Object.assign(this.collectionFieldInterfaceInstances, o);
+  }
+  getFieldInterface(t) {
+    return this.collectionFieldInterfaceInstances[t];
+  }
+  getFieldInterfaces(t) {
+    return Object.values(this.collectionFieldInterfaceInstances).filter((o) => {
+      var n, r;
+      if (!t || !o.supportDataSourceType && !o.notSupportDataSourceType)
+        return !0;
+      if (o.supportDataSourceType)
+        return (n = o.supportDataSourceType) == null ? void 0 : n.includes(t);
+      if (o.notSupportDataSourceType)
+        return !((r = o.notSupportDataSourceType) != null && r.includes(t));
+    });
+  }
+  addFieldInterfaceGroups(t) {
+    Object.assign(this.collectionFieldGroups, t);
+  }
+  getFieldInterfaceGroups() {
+    return this.collectionFieldGroups;
+  }
+  getFieldInterfaceGroup(t) {
+    return this.collectionFieldGroups[t];
+  }
+}
+const DEFAULT_DATA_SOURCE_KEY = "main", DEFAULT_DATA_SOURCE_TITLE = '{{t("Main")}}';
+class DataSourceManager {
+  constructor(t = {}, o) {
+    P(this, "dataSourceInstancesMap", {});
+    P(this, "multiDataSources", []);
+    P(this, "collectionMixins", []);
+    P(this, "collectionTemplateManager");
+    P(this, "collectionFieldInterfaceManager");
+    this.options = t, this.app = o, this.collectionTemplateManager = new CollectionTemplateManager(t.collectionTemplates, this), this.collectionFieldInterfaceManager = new CollectionFieldInterfaceManager(
+      t.fieldInterfaces,
+      t.fieldInterfaceGroups,
+      this
+    ), this.collectionMixins.push(...t.collectionMixins || []), this.addDataSource(LocalDataSource, {
+      key: DEFAULT_DATA_SOURCE_KEY,
+      displayName: DEFAULT_DATA_SOURCE_TITLE,
+      collections: t.collections || []
+    }), (t.dataSources || []).forEach((n) => {
+      this.addDataSource(LocalDataSource, n);
+    });
+  }
+  addCollectionMixins(t = []) {
+    const o = t.filter((n) => !this.collectionMixins.includes(n));
+    o.length && (this.collectionMixins.push(...o), this.getDataSources().forEach((n) => n.collectionManager.reAddCollections()));
+  }
+  getDataSources(t) {
+    const o = Object.values(this.dataSourceInstancesMap);
+    return t ? _.filter(o, t) : o;
+  }
+  getDataSource(t) {
+    return t ? this.dataSourceInstancesMap[t] : this.dataSourceInstancesMap[DEFAULT_DATA_SOURCE_KEY];
+  }
+  removeDataSources(t) {
+    t.forEach((o) => {
+      delete this.dataSourceInstancesMap[o];
+    });
+  }
+  addDataSource(t, o) {
+    const n = new t(o, this);
+    return this.dataSourceInstancesMap[n.key] = n, n;
+  }
+  addDataSources(t, o) {
+    return V(this, null, function* () {
+      this.multiDataSources.some(([n, r]) => n === t && r === o) || this.multiDataSources.push([t, o]);
+    });
+  }
+  getAllCollections(t = {}) {
+    const { filterCollection: o, filterDataSource: n } = t;
+    return this.getDataSources(n).reduce(
+      (r, i) => (r.push(F(g({}, i.getOptions()), {
+        collections: i.collectionManager.getCollections(o)
+      })), r),
+      []
+    );
+  }
+  addFieldInterfaceGroups(t) {
+    this.collectionFieldInterfaceManager.addFieldInterfaceGroups(t);
+  }
+  addCollectionTemplates(t = []) {
+    this.collectionTemplateManager.addCollectionTemplates(t);
+  }
+  addFieldInterfaces(t = []) {
+    this.collectionFieldInterfaceManager.addFieldInterfaces(t);
+  }
+  reload() {
+    return V(this, null, function* () {
+      return yield Promise.all(
+        this.multiDataSources.map((n) => V(this, [n], function* ([t, o]) {
+          (yield t()).map((i) => this.addDataSource(o, i));
+        }))
+      ), Promise.all(this.getDataSources().map((t) => t.reload()));
+    });
+  }
+}
+const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
+  var o;
+  return (o = e.collectionFieldInterfaceManager.getFieldInterface(t.interface)) == null ? void 0 : o.titleUsable;
+}, useDataSourceHeaders = (e) => useMemo(() => {
+  if (e && e !== DEFAULT_DATA_SOURCE_KEY)
+    return { [HEADERS_DATA_SOURCE_KEY]: e };
+}, [e]), getDataSourceHeaders = (e) => e && e !== DEFAULT_DATA_SOURCE_KEY ? { [HEADERS_DATA_SOURCE_KEY]: e } : {}, DataBlockResourceContext = createContext(null);
+DataBlockResourceContext.displayName = "DataBlockResourceContext";
+const DataBlockResourceProvider = ({ children: e }) => {
+  const t = useDataBlockProps(), o = useCollectionManager(), { association: n, collection: r, dataSource: i, sourceId: a, parentRecord: l } = t, c = useAPIClient(), u = useDataSourceHeaders(i), d = useMemo(() => typeof r == "string" ? r : r == null ? void 0 : r.name, [r]), p = useMemo(() => {
+    if (a)
+      return a;
+    if (n && l) {
+      const h = o.getSourceKeyByAssociation(n);
+      return (l instanceof CollectionRecord ? l.data : l)[h];
+    }
+  }, [n, a, l]), m = useMemo(() => n ? c.resource(n, p, u) : c.resource(d, void 0, u), [c, n, r, p, u]);
+  return /* @__PURE__ */ jsx(DataBlockResourceContext.Provider, { value: m, children: e });
+};
+function useDataBlockResource() {
+  const e = useContext(DataBlockResourceContext);
+  if (!e)
+    throw new Error("useDataBlockResource() must be used within a DataBlockResourceProvider");
+  return e;
+}
+const DataBlockContext = createContext({});
+DataBlockContext.displayName = "DataBlockContext";
+const AssociationOrCollectionProvider = (e) => {
+  const { collection: t, association: o, allowNull: n = !1 } = e, r = useMemo(() => o ? {
+    Component: AssociationProvider,
+    name: o
+  } : {
+    Component: SanitizedCollectionProvider,
+    name: t
+  }, [t, o]);
+  return /* @__PURE__ */ jsx(r.Component, { name: r.name, allowNull: n, children: e.children });
+}, DataBlockProvider = withDynamicSchemaProps(
+  (e) => {
+    const c = e, { collection: t, association: o, dataSource: n, children: r, hidden: i } = c, a = H(c, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable();
+    return i ? null : /* @__PURE__ */ jsx(
+      DataBlockContext.Provider,
+      {
+        value: {
+          dn: l,
+          props: F(g({}, a), { collection: t, association: o, dataSource: n })
+        },
+        children: /* @__PURE__ */ jsx(CollectionManagerProvider, { dataSource: n, children: /* @__PURE__ */ jsx(AssociationOrCollectionProvider, { collection: t, association: o, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { children: /* @__PURE__ */ jsx(DataBlockResourceProvider, { children: /* @__PURE__ */ jsx(BlockRequestProvider, { children: /* @__PURE__ */ jsx(DataBlockCollector, { params: e.params, children: r }) }) }) }) }) })
+      }
+    );
+  },
+  { displayName: "DataBlockProvider" }
+), useDataBlock = () => {
+  const e = useContext(DataBlockContext);
+  if (!e)
+    throw new Error("useDataBlock() must be used within a DataBlockProvider");
+  return e;
+}, useDataBlockProps = () => useDataBlock().props, BlockRequestContext = createContext(null);
+BlockRequestContext.displayName = "BlockRequestContext";
+function useCurrentRequest(e) {
+  const t = useDataLoadingMode(), o = useDataBlockResource(), { action: n, params: r = {}, record: i, requestService: a, requestOptions: l } = e, c = useMemo(() => a || ((d) => {
+    if (i)
+      return Promise.resolve({ data: i });
+    if (!n)
+      throw new Error(
+        "[nocobase]: The 'action' parameter is missing in the 'DataBlockRequestProvider' component"
+      );
+    const p = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r;
+    return o[n](g(g({}, p), d)).then((m) => m.data);
+  }), [o, n, JSON.stringify(r), JSON.stringify(i), a]);
+  return useRequest(c, F(g({}, l), {
+    manual: t === "manual",
+    ready: !!n,
+    refreshDeps: [n, JSON.stringify(r), JSON.stringify(i), o]
+  }));
+}
+function requestParentRecordData(a) {
+  return V(this, arguments, function* ({
+    sourceId: e,
+    association: t,
+    parentRecord: o,
+    api: n,
+    headers: r,
+    sourceKey: i
+  }) {
+    if (o)
+      return Promise.resolve({ data: o });
+    if (!t || !i || !e)
+      return Promise.resolve({ data: void 0 });
+    const c = `${t.split(".")[0]}:get?filter[${i}]=${e}`;
+    return (yield n.request({ url: c, headers: r })).data;
+  });
+}
+function useParentRequest(e) {
+  const { sourceId: t, association: o, parentRecord: n } = e, r = useAPIClient(), i = useDataBlockProps(), a = useDataSourceHeaders(i.dataSource), l = useSourceKey(o);
+  return useRequest(
+    () => requestParentRecordData({ sourceId: t, association: o, parentRecord: n, api: r, headers: a, sourceKey: l }),
+    {
+      refreshDeps: [o, n, t]
+    }
+  );
+}
+const BlockRequestProvider = ({ children: e }) => {
+  var x, C;
+  const t = useDataBlockProps(), {
+    action: o,
+    filterByTk: n,
+    sourceId: r,
+    params: i = {},
+    association: a,
+    collection: l,
+    record: c,
+    parentRecord: u,
+    requestOptions: d,
+    requestService: p
+  } = t, m = useCurrentRequest({
+    action: o,
+    sourceId: r,
+    record: c,
+    association: a,
+    collection: l,
+    requestOptions: d,
+    requestService: p,
+    params: F(g({}, i), {
+      filterByTk: n || i.filterByTk
+    })
+  }), h = useParentRequest({
+    sourceId: r,
+    association: a,
+    parentRecord: u
+  }), f = useMemo(() => {
+    var S, b;
+    return ((S = h.data) == null ? void 0 : S.data) && new CollectionRecord({ isNew: !1, data: (b = h.data) == null ? void 0 : b.data });
+  }, [(x = h.data) == null ? void 0 : x.data]);
+  return /* @__PURE__ */ jsx(BlockRequestContext.Provider, { value: m, children: o !== "list" ? /* @__PURE__ */ jsx(
+    CollectionRecordProvider,
+    {
+      isNew: o == null,
+      record: (C = m.data) == null ? void 0 : C.data,
+      parentRecord: f,
+      children: e
+    }
+  ) : /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: null, parentRecord: f, children: e }) });
+}, useDataBlockRequest = () => useContext(BlockRequestContext);
 var FilterBlockType = /* @__PURE__ */ ((e) => (e[e.FORM = 0] = "FORM", e[e.TABLE = 1] = "TABLE", e[e.TREE = 2] = "TREE", e[e.COLLAPSE = 3] = "COLLAPSE", e))(FilterBlockType || {});
 const mergeFilter = (e, t = "$and") => {
   const o = e.filter((n) => {
@@ -4955,7 +5461,7 @@ const mergeFilter = (e, t = "$and") => {
     (r) => r.type !== "belongsTo" && r.foreignKey === n.name
   ));
 }, useSupportedBlocks = (e) => {
-  const { getDataBlocks: t } = useFilterBlock(), o = useFieldSchema(), n = useCollection_deprecated(), { getAllCollectionsInheritChain: r } = useCollectionManager_deprecated();
+  const { getDataBlocks: t } = useFilterBlock(), o = useFieldSchema(), n = useCollection(), { getAllCollectionsInheritChain: r } = useCollectionManager_deprecated();
   if (e === 0 || e === 3)
     return t().filter((i) => isSameCollection(i.collection, n));
   if (e === 1 || e === 2)
@@ -5062,32 +5568,33 @@ const FilterBlockProvider = ({ children: e }) => {
   children: e,
   params: t
 }) => {
-  const o = useCollection_deprecated(), { recordDataBlocks: n } = useFilterBlock(), { service: r } = useBlockRequestContext(), i = useField(), a = useFieldSchema(), l = useAssociatedFields(), c = useRef(null), u = useDataLoadingMode(), d = i.decoratorType !== "FilterFormBlockProvider" && i.decoratorType !== "FormBlockProvider" && i.decoratorProps.blockType !== "filter", p = useCallback(() => {
+  var m;
+  const o = useCollection(), { recordDataBlocks: n } = useFilterBlock(), r = useDataBlockRequest(), i = useField(), a = useFieldSchema(), l = useAssociatedFields(), c = useRef(null), u = useDataLoadingMode(), d = i && i.decoratorType !== "FilterFormBlockProvider" && i.decoratorType !== "FormBlockProvider" && i.decoratorProps.blockType !== "filter", p = useCallback(() => {
     n({
       uid: a["x-uid"],
       title: i.componentProps.title,
       doFilter: r.runAsync,
       collection: o,
       associatedFields: l,
-      foreignKeyFields: o.foreignKeyFields,
+      foreignKeyFields: o.getFields("isForeignKey"),
       defaultFilter: (t == null ? void 0 : t.filter) || {},
       service: r,
       dom: c.current,
       dataLoadingMode: u,
-      clearFilter(m) {
-        var C, S, b;
-        const h = ((C = this.service.params) == null ? void 0 : C[0]) || {}, f = ((b = (S = this.service.params) == null ? void 0 : S[1]) == null ? void 0 : b.filters) || {};
-        delete f[m];
-        const x = mergeFilter([
-          ...Object.values(f).map((y) => removeNullCondition(y)),
+      clearFilter(h) {
+        var S, b, y;
+        const f = ((S = this.service.params) == null ? void 0 : S[0]) || {}, x = ((y = (b = this.service.params) == null ? void 0 : b[1]) == null ? void 0 : y.filters) || {};
+        delete x[h];
+        const C = mergeFilter([
+          ...Object.values(x).map((v) => removeNullCondition(v)),
           (t == null ? void 0 : t.filter) || {}
         ]);
         this.service.run(
-          F(g({}, h), {
+          F(g({}, f), {
             page: 1,
-            filter: x
+            filter: C
           }),
-          { filters: f }
+          { filters: x }
         );
       },
       clearData() {
@@ -5098,7 +5605,7 @@ const FilterBlockProvider = ({ children: e }) => {
     l,
     o,
     u,
-    i.componentProps.title,
+    (m = i == null ? void 0 : i.componentProps) == null ? void 0 : m.title,
     a,
     t == null ? void 0 : t.filter,
     n,
@@ -8471,319 +8978,7 @@ https://requirejs.org/docs/errors.html#` + e);
     define
   };
 }
-const DataSourceManagerContext = createContext(null);
-DataSourceManagerContext.displayName = "DataSourceManagerContext";
-const DataSourceManagerProvider = ({ children: e, dataSourceManager: t }) => /* @__PURE__ */ jsx(DataSourceManagerContext.Provider, { value: t, children: e });
-function useDataSourceManager() {
-  return useContext(DataSourceManagerContext);
-}
-const DataSourceContext = createContext(null);
-DataSourceContext.displayName = "DataSourceContext";
-const DataSourceProvider = ({ children: e, dataSource: t }) => {
-  const o = useDataSourceManager(), { t: n } = useTranslation(), { refresh: r } = useSchemaComponentContext(), [i, a] = React.useState(0), l = o == null ? void 0 : o.getDataSource(t);
-  return l ? l.status === "loading-failed" ? /* @__PURE__ */ jsx(
-    CollectionDeletedPlaceholder,
-    {
-      type: "Data Source",
-      name: l.displayName || t,
-      message: l.errorMessage || "loading failed"
-    }
-  ) : l.status === "loading" || l.status === "reloading" ? /* @__PURE__ */ jsx(CardItem, { children: /* @__PURE__ */ jsx(
-    Result,
-    {
-      icon: /* @__PURE__ */ jsx(LoadingOutlined, {}),
-      title: `${l.displayName || t} ${n("data source")} ${n("loading")}...`,
-      extra: /* @__PURE__ */ jsx(
-        Button,
-        {
-          type: "primary",
-          onClick: () => l.reload().then(() => {
-            r(), a(Math.random());
-          }),
-          children: n("Refresh")
-        }
-      )
-    }
-  ) }) : /* @__PURE__ */ jsx(DataSourceContext.Provider, { value: l, children: e }) : /* @__PURE__ */ jsx(CollectionDeletedPlaceholder, { type: "Data Source", name: t });
-};
-function useDataSource() {
-  return useContext(DataSourceContext);
-}
-function useDataSourceKey() {
-  const e = useContext(DataSourceContext);
-  return e == null ? void 0 : e.key;
-}
-class DataSource {
-  constructor(t, o) {
-    P(this, "collectionManager");
-    P(this, "reloadCallbacks", []);
-    this.options = t, this.dataSourceManager = o, this.collectionManager = new CollectionManager(t.collections, this);
-  }
-  get app() {
-    return this.dataSourceManager.app;
-  }
-  get key() {
-    return this.options.key;
-  }
-  get displayName() {
-    return this.options.displayName;
-  }
-  get status() {
-    return this.options.status;
-  }
-  get errorMessage() {
-    return this.options.errorMessage;
-  }
-  get collections() {
-    return this.collectionManager.getCollections() || [];
-  }
-  getOptions() {
-    return this.options;
-  }
-  setOptions(t) {
-    Object.assign(this.options, t);
-  }
-  getOption(t) {
-    return this.options[t];
-  }
-  addReloadCallback(t) {
-    this.reloadCallbacks.includes(t) || this.reloadCallbacks.push(t);
-  }
-  removeReloadCallback(t) {
-    this.reloadCallbacks = this.reloadCallbacks.filter((o) => o !== t);
-  }
-  reload() {
-    return V(this, null, function* () {
-      const t = yield this.getDataSource();
-      return this.setOptions(t), this.collectionManager.setCollections(t.collections || []), this.reloadCallbacks.forEach((o) => o(t.collections)), this.options;
-    });
-  }
-}
-class LocalDataSource extends DataSource {
-  getDataSource() {
-    return {
-      collections: this.collections
-    };
-  }
-}
-class CollectionTemplate {
-  constructor(t) {
-    P(this, "name");
-    P(this, "Collection");
-    P(this, "title");
-    P(this, "color");
-    /** Sorting */
-    P(this, "order");
-    /** Default configuration */
-    P(this, "default");
-    P(this, "events");
-    /** UI configurable CollectionOptions parameters (fields for adding or editing Collection forms) */
-    P(this, "configurableProperties");
-    /** Available field types for the current template */
-    P(this, "availableFieldInterfaces");
-    /** Whether it is a divider */
-    P(this, "divider");
-    /** Template description */
-    P(this, "description");
-    /** Configure buttons in the configuration fields */
-    P(this, "configureActions");
-    // Whether to prohibit deleting fields
-    P(this, "forbidDeletion");
-    P(this, "supportDataSourceType");
-    P(this, "notSupportDataSourceType");
-    this.collectionTemplateManager = t;
-  }
-}
-class CollectionTemplateManager {
-  constructor(t, o) {
-    P(this, "collectionTemplateInstances", {});
-    this.dataSourceManager = o, this.addCollectionTemplates(t);
-  }
-  addCollectionTemplates(t = []) {
-    const o = t.reduce((n, r) => {
-      const i = new r(this);
-      return n[i.name] = i, n;
-    }, {});
-    return Object.assign(this.collectionTemplateInstances, o), this.dataSourceManager.getDataSources().forEach((n) => {
-      const r = n.collectionManager.getCollections((i) => o[i.template]);
-      n.collectionManager.reAddCollections(r);
-    }), o;
-  }
-  getCollectionTemplate(t) {
-    return this.collectionTemplateInstances[t];
-  }
-  getCollectionTemplates(t) {
-    return Object.values(this.collectionTemplateInstances).filter((o) => {
-      var n, r;
-      if (!t || !o.supportDataSourceType && !o.notSupportDataSourceType)
-        return !0;
-      if (o.supportDataSourceType)
-        return (n = o.supportDataSourceType) == null ? void 0 : n.includes(t);
-      if (o.notSupportDataSourceType)
-        return !((r = o.notSupportDataSourceType) != null && r.includes(t));
-    }).sort((o, n) => (o.order || 0) - (n.order || 0));
-  }
-}
-class CollectionFieldInterface {
-  constructor(t) {
-    P(this, "name");
-    P(this, "group");
-    P(this, "title");
-    P(this, "description");
-    P(this, "order");
-    P(this, "default");
-    P(this, "sortable");
-    P(this, "availableTypes");
-    P(this, "supportDataSourceType");
-    P(this, "notSupportDataSourceType");
-    P(this, "hasDefaultValue");
-    P(this, "isAssociation");
-    P(this, "operators");
-    /**
-     * - 如果该值为空，则在 Filter 组件中该字段会被过滤掉
-     * - 如果该值为空，则不会在变量列表中看到该字段
-     */
-    P(this, "filterable");
-    P(this, "titleUsable");
-    P(this, "hidden");
-    this.collectionFieldInterfaceManager = t;
-  }
-}
-class CollectionFieldInterfaceManager {
-  constructor(t, o, n) {
-    P(this, "collectionFieldInterfaceInstances", {});
-    P(this, "collectionFieldGroups", {});
-    this.dataSourceManager = n, this.addFieldInterfaces(t), this.addFieldInterfaceGroups(o);
-  }
-  addFieldInterfaces(t = []) {
-    const o = t.reduce((n, r) => {
-      const i = new r(this);
-      return n[i.name] = i, n;
-    }, {});
-    Object.assign(this.collectionFieldInterfaceInstances, o);
-  }
-  getFieldInterface(t) {
-    return this.collectionFieldInterfaceInstances[t];
-  }
-  getFieldInterfaces(t) {
-    return Object.values(this.collectionFieldInterfaceInstances).filter((o) => {
-      var n, r;
-      if (!t || !o.supportDataSourceType && !o.notSupportDataSourceType)
-        return !0;
-      if (o.supportDataSourceType)
-        return (n = o.supportDataSourceType) == null ? void 0 : n.includes(t);
-      if (o.notSupportDataSourceType)
-        return !((r = o.notSupportDataSourceType) != null && r.includes(t));
-    });
-  }
-  addFieldInterfaceGroups(t) {
-    Object.assign(this.collectionFieldGroups, t);
-  }
-  getFieldInterfaceGroups() {
-    return this.collectionFieldGroups;
-  }
-  getFieldInterfaceGroup(t) {
-    return this.collectionFieldGroups[t];
-  }
-}
-const DEFAULT_DATA_SOURCE_KEY = "main", DEFAULT_DATA_SOURCE_TITLE = '{{t("Main")}}';
-class DataSourceManager {
-  constructor(t = {}, o) {
-    P(this, "dataSourceInstancesMap", {});
-    P(this, "multiDataSources", []);
-    P(this, "collectionMixins", []);
-    P(this, "collectionTemplateManager");
-    P(this, "collectionFieldInterfaceManager");
-    this.options = t, this.app = o, this.collectionTemplateManager = new CollectionTemplateManager(t.collectionTemplates, this), this.collectionFieldInterfaceManager = new CollectionFieldInterfaceManager(
-      t.fieldInterfaces,
-      t.fieldInterfaceGroups,
-      this
-    ), this.collectionMixins.push(...t.collectionMixins || []), this.addDataSource(LocalDataSource, {
-      key: DEFAULT_DATA_SOURCE_KEY,
-      displayName: DEFAULT_DATA_SOURCE_TITLE,
-      collections: t.collections || []
-    }), (t.dataSources || []).forEach((n) => {
-      this.addDataSource(LocalDataSource, n);
-    });
-  }
-  addCollectionMixins(t = []) {
-    const o = t.filter((n) => !this.collectionMixins.includes(n));
-    o.length && (this.collectionMixins.push(...o), this.getDataSources().forEach((n) => n.collectionManager.reAddCollections()));
-  }
-  getDataSources(t) {
-    const o = Object.values(this.dataSourceInstancesMap);
-    return t ? _.filter(o, t) : o;
-  }
-  getDataSource(t) {
-    return t ? this.dataSourceInstancesMap[t] : this.dataSourceInstancesMap[DEFAULT_DATA_SOURCE_KEY];
-  }
-  removeDataSources(t) {
-    t.forEach((o) => {
-      delete this.dataSourceInstancesMap[o];
-    });
-  }
-  addDataSource(t, o) {
-    const n = new t(o, this);
-    return this.dataSourceInstancesMap[n.key] = n, n;
-  }
-  addDataSources(t, o) {
-    return V(this, null, function* () {
-      this.multiDataSources.some(([n, r]) => n === t && r === o) || this.multiDataSources.push([t, o]);
-    });
-  }
-  getAllCollections(t = {}) {
-    const { filterCollection: o, filterDataSource: n } = t;
-    return this.getDataSources(n).reduce(
-      (r, i) => (r.push(F(g({}, i.getOptions()), {
-        collections: i.collectionManager.getCollections(o)
-      })), r),
-      []
-    );
-  }
-  addFieldInterfaceGroups(t) {
-    this.collectionFieldInterfaceManager.addFieldInterfaceGroups(t);
-  }
-  addCollectionTemplates(t = []) {
-    this.collectionTemplateManager.addCollectionTemplates(t);
-  }
-  addFieldInterfaces(t = []) {
-    this.collectionFieldInterfaceManager.addFieldInterfaces(t);
-  }
-  reload() {
-    return V(this, null, function* () {
-      return yield Promise.all(
-        this.multiDataSources.map((n) => V(this, [n], function* ([t, o]) {
-          (yield t()).map((i) => this.addDataSource(o, i));
-        }))
-      ), Promise.all(this.getDataSources().map((t) => t.reload()));
-    });
-  }
-}
-const ExtendCollectionsContext = createContext(null);
-ExtendCollectionsContext.displayName = "ExtendCollectionsContext";
-const ExtendCollectionsProvider = ({ children: e, collections: t }) => {
-  const o = useExtendCollections(), n = useMemo(() => o ? [...o, ...t] : t, [o, t]), r = useDataSourceKey();
-  return /* @__PURE__ */ jsx(ExtendCollectionsContext.Provider, { value: n, children: /* @__PURE__ */ jsx(CollectionManagerProvider, { dataSource: r, children: e }) });
-};
-function useExtendCollections() {
-  return useContext(ExtendCollectionsContext);
-}
-const CollectionManagerContext = createContext(null);
-CollectionManagerContext.displayName = "CollectionManagerContext";
-const CollectionManagerProviderInner = ({ instance: e, children: t }) => {
-  const o = useDataSource(), n = useExtendCollections(), r = useMemo(() => {
-    const i = e || (o == null ? void 0 : o.collectionManager);
-    return n != null && n.length ? i.clone(n) : i;
-  }, [e, n, o]);
-  return /* @__PURE__ */ jsx(CollectionManagerContext.Provider, { value: r, children: t });
-}, CollectionManagerProvider = ({ instance: e, dataSource: t, children: o }) => /* @__PURE__ */ jsx(DataSourceProvider, { dataSource: t, children: /* @__PURE__ */ jsx(CollectionManagerProviderInner, { instance: e, children: o }) });
-function useCollectionManager() {
-  return useContext(CollectionManagerContext);
-}
-const useCollections = (e) => {
-  const t = useCollectionManager();
-  return useMemo(() => t.getCollections(e), [t, e]);
-}, useCollectionManager_deprecated = (e) => {
+const useCollectionManager_deprecated = (e) => {
   const t = useDataSourceManager(), o = useDataSource(), n = useCollectionManager(), r = e || (o == null ? void 0 : o.key) || void 0, [i, a] = useState(uid()), { refresh: l } = useSchemaComponentContext(), c = useMemo(
     () => {
       var R;
@@ -9042,200 +9237,7 @@ const DataSourceApplicationProvider = (n) => {
     "dataSourceManager"
   ]);
   return /* @__PURE__ */ jsx(DataSourceManagerProvider, { dataSourceManager: t, children: /* @__PURE__ */ jsx(CollectionManagerProvider, F(g({}, o), { children: e })) });
-}, useSourceKey = (e) => useCollectionManager().getSourceKeyByAssociation(e);
-class CollectionRecord {
-  constructor(t) {
-    P(this, "data");
-    P(this, "parentRecord");
-    P(this, "isNew");
-    const { data: o, parentRecord: n, isNew: r } = t;
-    this.isNew = r, this.data = o, this.parentRecord = n;
-  }
-  setData(t) {
-    this.data = t;
-  }
-  setParentRecord(t) {
-    this.parentRecord = t;
-  }
-}
-const CollectionRecordContext = createContext(null);
-CollectionRecordContext.displayName = "CollectionRecordContext";
-const CollectionRecordProvider = ({
-  isNew: e,
-  record: t,
-  parentRecord: o,
-  children: n
-}) => {
-  const r = useMemo(() => {
-    if (o)
-      return o instanceof CollectionRecord ? o : new CollectionRecord({ data: o });
-    if (t instanceof CollectionRecord)
-      return t.parentRecord;
-  }, [o, t]), i = useMemo(() => {
-    let a;
-    return t ? t instanceof CollectionRecord ? (a = t, a.isNew = t.isNew || e) : a = new CollectionRecord({ data: t, isNew: e }) : a = new CollectionRecord({ isNew: e }), a.setParentRecord(r), a;
-  }, [t, r, e]);
-  return /* @__PURE__ */ jsx(CollectionRecordContext.Provider, { value: i, children: n });
-};
-function useCollectionRecord() {
-  return useContext(CollectionRecordContext);
-}
-function useCollectionRecordData() {
-  const e = useCollectionRecord();
-  return e == null ? void 0 : e.data;
-}
-function useCollectionParentRecord() {
-  const e = useCollectionRecord();
-  return e == null ? void 0 : e.parentRecord;
-}
-function useCollectionParentRecordData() {
-  var t;
-  const e = useCollectionRecord();
-  return (t = e == null ? void 0 : e.parentRecord) == null ? void 0 : t.data;
-}
-const HEADERS_DATA_SOURCE_KEY = "x-data-source", isTitleField = (e, t) => {
-  var o;
-  return (o = e.collectionFieldInterfaceManager.getFieldInterface(t.interface)) == null ? void 0 : o.titleUsable;
-}, useDataSourceHeaders = (e) => useMemo(() => {
-  if (e && e !== DEFAULT_DATA_SOURCE_KEY)
-    return { [HEADERS_DATA_SOURCE_KEY]: e };
-}, [e]), getDataSourceHeaders = (e) => e && e !== DEFAULT_DATA_SOURCE_KEY ? { [HEADERS_DATA_SOURCE_KEY]: e } : {}, DataBlockResourceContext = createContext(null);
-DataBlockResourceContext.displayName = "DataBlockResourceContext";
-const DataBlockResourceProvider = ({ children: e }) => {
-  const t = useDataBlockProps(), o = useCollectionManager(), { association: n, collection: r, dataSource: i, sourceId: a, parentRecord: l } = t, c = useAPIClient(), u = useDataSourceHeaders(i), d = useMemo(() => typeof r == "string" ? r : r == null ? void 0 : r.name, [r]), p = useMemo(() => {
-    if (a)
-      return a;
-    if (n && l) {
-      const h = o.getSourceKeyByAssociation(n);
-      return (l instanceof CollectionRecord ? l.data : l)[h];
-    }
-  }, [n, a, l]), m = useMemo(() => n ? c.resource(n, p, u) : c.resource(d, void 0, u), [c, n, r, p, u]);
-  return /* @__PURE__ */ jsx(DataBlockResourceContext.Provider, { value: m, children: e });
-};
-function useDataBlockResource() {
-  const e = useContext(DataBlockResourceContext);
-  if (!e)
-    throw new Error("useDataBlockResource() must be used within a DataBlockResourceProvider");
-  return e;
-}
-const BlockRequestContext = createContext(null);
-BlockRequestContext.displayName = "BlockRequestContext";
-function useCurrentRequest(e) {
-  const t = useDataLoadingMode(), o = useDataBlockResource(), { action: n, params: r = {}, record: i, requestService: a, requestOptions: l } = e, c = useMemo(() => a || ((d) => {
-    if (i)
-      return Promise.resolve({ data: i });
-    if (!n)
-      throw new Error(
-        "[nocobase]: The 'action' parameter is missing in the 'DataBlockRequestProvider' component"
-      );
-    const p = r.filterByTk === void 0 ? _.omit(r, "filterByTk") : r;
-    return o[n](g(g({}, p), d)).then((m) => m.data);
-  }), [o, n, JSON.stringify(r), JSON.stringify(i), a]);
-  return useRequest(c, F(g({}, l), {
-    manual: t === "manual",
-    ready: !!n,
-    refreshDeps: [n, JSON.stringify(r), JSON.stringify(i), o]
-  }));
-}
-function requestParentRecordData(a) {
-  return V(this, arguments, function* ({
-    sourceId: e,
-    association: t,
-    parentRecord: o,
-    api: n,
-    headers: r,
-    sourceKey: i
-  }) {
-    if (o)
-      return Promise.resolve({ data: o });
-    if (!t || !i || !e)
-      return Promise.resolve({ data: void 0 });
-    const c = `${t.split(".")[0]}:get?filter[${i}]=${e}`;
-    return (yield n.request({ url: c, headers: r })).data;
-  });
-}
-function useParentRequest(e) {
-  const { sourceId: t, association: o, parentRecord: n } = e, r = useAPIClient(), i = useDataBlockProps(), a = useDataSourceHeaders(i.dataSource), l = useSourceKey(o);
-  return useRequest(
-    () => requestParentRecordData({ sourceId: t, association: o, parentRecord: n, api: r, headers: a, sourceKey: l }),
-    {
-      refreshDeps: [o, n, t]
-    }
-  );
-}
-const BlockRequestProvider = ({ children: e }) => {
-  var x, C;
-  const t = useDataBlockProps(), {
-    action: o,
-    filterByTk: n,
-    sourceId: r,
-    params: i = {},
-    association: a,
-    collection: l,
-    record: c,
-    parentRecord: u,
-    requestOptions: d,
-    requestService: p
-  } = t, m = useCurrentRequest({
-    action: o,
-    sourceId: r,
-    record: c,
-    association: a,
-    collection: l,
-    requestOptions: d,
-    requestService: p,
-    params: F(g({}, i), {
-      filterByTk: n || i.filterByTk
-    })
-  }), h = useParentRequest({
-    sourceId: r,
-    association: a,
-    parentRecord: u
-  }), f = useMemo(() => {
-    var S, b;
-    return ((S = h.data) == null ? void 0 : S.data) && new CollectionRecord({ isNew: !1, data: (b = h.data) == null ? void 0 : b.data });
-  }, [(x = h.data) == null ? void 0 : x.data]);
-  return /* @__PURE__ */ jsx(BlockRequestContext.Provider, { value: m, children: o !== "list" ? /* @__PURE__ */ jsx(
-    CollectionRecordProvider,
-    {
-      isNew: o == null,
-      record: (C = m.data) == null ? void 0 : C.data,
-      parentRecord: f,
-      children: e
-    }
-  ) : /* @__PURE__ */ jsx(CollectionRecordProvider, { isNew: !1, record: null, parentRecord: f, children: e }) });
-}, useDataBlockRequest = () => useContext(BlockRequestContext), DataBlockContext = createContext({});
-DataBlockContext.displayName = "DataBlockContext";
-const AssociationOrCollectionProvider = (e) => {
-  const { collection: t, association: o, allowNull: n = !1 } = e, r = useMemo(() => o ? {
-    Component: AssociationProvider,
-    name: o
-  } : {
-    Component: SanitizedCollectionProvider,
-    name: t
-  }, [t, o]);
-  return /* @__PURE__ */ jsx(r.Component, { name: r.name, allowNull: n, children: e.children });
-}, DataBlockProvider = withDynamicSchemaProps(
-  (e) => {
-    const c = e, { collection: t, association: o, dataSource: n, children: r, hidden: i } = c, a = H(c, ["collection", "association", "dataSource", "children", "hidden"]), { dn: l } = useDesignable();
-    return i ? null : /* @__PURE__ */ jsx(
-      DataBlockContext.Provider,
-      {
-        value: {
-          dn: l,
-          props: F(g({}, a), { collection: t, association: o, dataSource: n })
-        },
-        children: /* @__PURE__ */ jsx(CollectionManagerProvider, { dataSource: n, children: /* @__PURE__ */ jsx(AssociationOrCollectionProvider, { collection: t, association: o, children: /* @__PURE__ */ jsx(ACLCollectionProvider, { children: /* @__PURE__ */ jsx(DataBlockResourceProvider, { children: /* @__PURE__ */ jsx(BlockRequestProvider, { children: r }) }) }) }) })
-      }
-    );
-  },
-  { displayName: "DataBlockProvider" }
-), useDataBlock = () => {
-  const e = useContext(DataBlockContext);
-  if (!e)
-    throw new Error("useDataBlock() must be used within a DataBlockProvider");
-  return e;
-}, useDataBlockProps = () => useDataBlock().props, DesignableSwitch = () => {
+}, DesignableSwitch = () => {
   const { designable: e, setDesignable: t } = useDesignable(), { t: o } = useTranslation(), { token: n } = useToken$1(), r = {};
   return e && (r.backgroundColor = "var(--colorSettings)"), useHotkeys("Ctrl+Shift+U", () => t(!e), [e]), /* @__PURE__ */ jsx(Tooltip, { title: o("UI Editor"), children: /* @__PURE__ */ jsx(
     Button,
@@ -12338,7 +12340,7 @@ function SchemaSettingsBlockTitleItem() {
 }
 const getTargetKey = (e) => (e == null ? void 0 : e.targetKey) || "id";
 function SchemaSettingsConnectDataBlocks(e) {
-  const { type: t, emptyDescription: o } = e, n = useFieldSchema(), { dn: r } = useDesignable(), { t: i } = useTranslation(), a = useCollection_deprecated(), { inProvider: l } = useFilterBlock(), c = useSupportedBlocks(t);
+  const { type: t, emptyDescription: o } = e, n = useFieldSchema(), { dn: r } = useDesignable(), { t: i } = useTranslation(), a = useCollection(), { inProvider: l } = useFilterBlock(), c = useSupportedBlocks(t);
   let { targets: u = [], uid: d } = findFilterTargets(n);
   const p = useCompile(), { getAllCollectionsInheritChain: m } = useCollectionManager_deprecated();
   if (!l)
@@ -16467,8 +16469,8 @@ const useFormItemInitializerFields = (e) => {
     exists: !!c,
     remove() {
       r == null || r(c.name), i == null || i.query(new RegExp(`${c.parent.name}.${c.name}$`)).forEach((u) => {
-        var d;
-        (d = u.setValue) == null || d.call(u, void 0);
+        var d, p;
+        (d = u.setValue) == null || d.call(u, void 0), (p = u.setInitialValue) == null || p.call(u, void 0);
       }), c && n(c, l);
     }
   };
@@ -19014,8 +19016,8 @@ const SchemaSettingsProvider = (e) => {
                 breakRemoveOn: n
               };
               l != null && l.required && (l.required = !1, c.required = !1), i && i.uid === c["x-uid"] && (u != null && u.dn) ? yield u == null ? void 0 : u.dn.remove(null, x) : yield r.remove(null, x), yield (C = t == null ? void 0 : t.onOk) == null ? void 0 : C.call(t), delete d.values[c.name], m == null || m(c.name), d == null || d.query(new RegExp(`${c.parent.name}.${c.name}$`)).forEach((S) => {
-                var b;
-                (b = S.setValue) == null || b.call(S, void 0);
+                var b, y;
+                (b = S.setValue) == null || b.call(S, void 0), (y = S.setInitialValue) == null || y.call(S, void 0);
               }), h(c["x-uid"]);
             });
           }
@@ -30288,7 +30290,7 @@ function flatData$1(e, t) {
   return o;
 }
 function getCurrentOptions(e, t, o) {
-  const n = flatData$1(t, o), r = castArray(e).filter((a) => a != null).map((a) => isPlainObject(a) ? a[o.value] : a);
+  const n = flatData$1(t, o), r = castArray(e).map((a) => isPlainObject(a) ? a[o.value] : a);
   function i(a) {
     if (!a)
       return [];
@@ -30307,13 +30309,8 @@ function getCurrentOptions(e, t, o) {
 const ReadPretty$c = observer$1(
   (e) => {
     var a;
-    const t = g(g({}, defaultFieldNames$1), e.fieldNames), o = useField();
-    if (!isValid(e.value))
-      return /* @__PURE__ */ jsx("div", {});
-    if (isArrayField(o) && ((a = o == null ? void 0 : o.value) == null ? void 0 : a.length) === 0)
-      return /* @__PURE__ */ jsx("div", {});
-    const n = useCollectionField(), r = o.dataSource || e.options || (n == null ? void 0 : n.uiSchema.enum) || [], i = getCurrentOptions(o.value, r, t);
-    return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: e.ellipsis, children: i.map((l, c) => /* @__PURE__ */ jsx(Tag, { color: l[t.color], icon: l.icon, children: l[t.label] }, c)) }) });
+    const t = g(g({}, defaultFieldNames$1), e.fieldNames), o = useField(), n = useCollectionField(), r = o.dataSource || e.options || (n == null ? void 0 : n.uiSchema.enum) || [], i = getCurrentOptions(o.value, r, t);
+    return !isValid(e.value) && !i.length ? /* @__PURE__ */ jsx("div", {}) : isArrayField(o) && ((a = o == null ? void 0 : o.value) == null ? void 0 : a.length) === 0 ? /* @__PURE__ */ jsx("div", {}) : /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(EllipsisWithTooltip, { ellipsis: e.ellipsis, children: i.map((l, c) => /* @__PURE__ */ jsx(Tag, { color: l[t.color], icon: l.icon, children: l[t.label] }, c)) }) });
   },
   { displayName: "ReadPretty" }
 ), isEmptyObject = (e) => !isValid(e) || typeof e == "object" && Object.keys(e).length === 0, ObjectSelect = (e) => {
@@ -30871,7 +30868,11 @@ function getSubscriber(e, t, o, n, r) {
       let a = t.stateOfLinkageRules[i];
       a = yield Promise.all(a), a = a.filter((u) => u.condition);
       const l = a[a.length - 1];
-      i === "value" ? a.length > 1 && (t.value = l.value) : (t[i] = l == null ? void 0 : l.value, i === "display" && (l == null ? void 0 : l.value) === "none" && (t.value = null)), t.stateOfLinkageRules[i] = null;
+      i === "value" ? a.length > 1 && (t.value = l.value) : (t[i] = l == null ? void 0 : l.value, requestAnimationFrame(() => {
+        t.setState((u) => {
+          u[i] = l == null ? void 0 : l.value;
+        });
+      }), i === "display" && (l == null ? void 0 : l.value) === "none" && (t.value = null)), t.stateOfLinkageRules[i] = null;
     }));
   };
 }
@@ -34566,9 +34567,9 @@ const useTableColumns$1 = (e) => {
           initialInView: Z || !1 || X.length <= 10,
           skip: Z || !1
         });
-        return /* @__PURE__ */ jsx("td", F(g({}, ee), { ref: ne, className: cls(ee.className, cellClass), children: ie || Z ? ee.children : /* @__PURE__ */ jsx(Skeleton.Button, { style: { height: "100%" } }) }));
+        return /* @__PURE__ */ jsx("td", F(g({}, ee), { ref: ne, className: cls(ee.className, cellClass), children: S.isSubTable || ie || Z ? ee.children : /* @__PURE__ */ jsx(Skeleton.Button, { style: { height: "100%" } }) }));
       },
-      [X.length]
+      [X.length, S.isSubTable]
     ), te = useMemo(() => ({
       header: {
         wrapper: HeaderWrapperComponent,
@@ -45248,7 +45249,7 @@ const string = [
     ];
     return useEffect(() => {
       const u = {
-        autoGenId: !0,
+        autoGenId: !1,
         createdAt: !0,
         createdBy: !0,
         updatedAt: !0,
@@ -45286,7 +45287,7 @@ const string = [
           onChange: (u, d) => {
             var h;
             const p = getDefaultCollectionFields(d, o.values), m = {
-              autoGenId: !!p.find((f) => f.name === "id"),
+              autoGenId: !1,
               createdAt: !!p.find((f) => f.name === "createdAt"),
               createdBy: !!p.find((f) => f.name === "createdBy"),
               updatedAt: !!p.find((f) => f.name === "updatedAt"),
@@ -49301,7 +49302,7 @@ const useBlockContext = () => useContext(BlockContext), useCompatDataBlockParent
     var m;
     return (m = e.params) != null && m.appends ? g(g({}, e.params), a) : g(F(g({}, e.params), { appends: c }), a);
   }, [c, a, e.params]), p = useMemo(() => ({ name: t }), [t]);
-  return /* @__PURE__ */ jsx(BlockContext.Provider, { value: p, children: /* @__PURE__ */ jsx(DataBlockProvider, F(g({}, e), { params: d, parentRecord: r || i, children: /* @__PURE__ */ jsx(BlockRequestProvider_deprecated, F(g({}, e), { updateAssociationValues: u, params: d, children: /* @__PURE__ */ jsx(DataBlockCollector, F(g({}, e), { params: d, children: e.children })) })) })) });
+  return /* @__PURE__ */ jsx(BlockContext.Provider, { value: p, children: /* @__PURE__ */ jsx(DataBlockProvider, F(g({}, e), { params: d, parentRecord: r || i, children: /* @__PURE__ */ jsx(BlockRequestProvider_deprecated, F(g({}, e), { updateAssociationValues: u, params: d, children: e.children })) })) });
 }, useBlockAssociationContext = () => {
   const { association: e } = useDataBlockProps();
   return useContext(BlockAssociationContext) || e;