@tachybase/client 1.6.20 → 1.6.22

package/es/api-client/APIClient.d.ts

@@ -1,6 +1,6 @@
 import { APIClient as APIClientSDK } from '@tego/client';
 import { Result } from 'ahooks/es/useRequest/src/types';
-import { Application } from '../application';
+import type { Application } from '../application';
 export declare class APIClient extends APIClientSDK {
     services: Record<string, Result<any, any>>;
     silence: boolean;
@@ -11,6 +11,7 @@ export declare class APIClient extends APIClientSDK {
     getHeaders(): {};
     service(uid: string): Result<any, any>;
     interceptors(): void;
+    reloadLocation(): void;
     toErrMessages(error: any): any;
     handleNotificationError(error: any): Promise<any>;
     useNotificationMiddleware(): void;

package/es/api-client/APIClient.mjs

@@ -1,7 +1,7 @@
 import react from "react";
 import { APIClient } from "@tego/client";
 import { notification as external_antd_notification } from "antd";
-import { i18n } from "../index.mjs";
+import { i18n } from "../i18n/index.mjs";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -104,16 +104,19 @@ class APIClient_APIClient extends APIClient {
             const errs = this.toErrMessages(error);
             if (errs.find((error)=>'ROLE_NOT_FOUND_ERR' === error.code)) {
                 this.auth.setRole(null);
-                window.location.reload();
+                this.reloadLocation();
             }
             if (errs.find((error)=>'TOKEN_INVALID' === error.code || 'USER_LOCKED' === error.code)) this.auth.setToken(null);
             if (errs.find((error)=>'ROLE_NOT_FOUND_FOR_USER' === error.code)) {
                 this.auth.setRole(null);
-                window.location.reload();
+                this.reloadLocation();
             }
             throw error;
         });
     }
+    reloadLocation() {
+        window.location.reload();
+    }
     toErrMessages(error) {
         var _error_response, _error_response_data, _error_response1, _error_response_data1, _error_response2, _error_response3;
         if ('string' == typeof (null == error ? void 0 : null == (_error_response = error.response) ? void 0 : _error_response.data)) {

package/es/application/Plugin.d.ts

@@ -9,8 +9,8 @@ export declare class Plugin<T = any> {
     get router(): import("./RouterManager").RouterManager;
     get systemSettingsManager(): import("./SystemSettingsManager").SystemSettingsManager;
     get userSettingsManager(): import("./UserSettingsManager").UserSettingsManager;
-    get schemaInitializerManager(): import("./schema-initializer").SchemaInitializerManager;
-    get schemaSettingsManager(): import("./schema-settings").SchemaSettingsManager;
+    get schemaInitializerManager(): import("..").SchemaInitializerManager;
+    get schemaSettingsManager(): import("..").SchemaSettingsManager;
     get dataSourceManager(): import("..").DataSourceManager;
     get AttachmentPreviewManager(): import("./AttachmentPreviewManager").AttachmentPreviewManager;
     afterAdd(): Promise<void>;

package/es/application/hoc/withDynamicSchemaProps.mjs

@@ -2,7 +2,7 @@ import { jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { useExpressionScope } from "@tachybase/schema";
 import lodash from "lodash";
-import { useDesignable } from "../../schema-component/index.mjs";
+import { useDesignable } from "../../schema-component/hooks/useDesignable.mjs";
 const useDefaultSchemaProps = ()=>void 0;
 function withDynamicSchemaProps(Component) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};

package/es/application/schema-initializer/hooks/index.mjs

@@ -115,7 +115,10 @@ InitializerComponent.displayName = 'InitializerComponent';
 function useSchemaInitializerRender(name, options) {
     const app = useApp();
     const renderCache = react.useRef({});
-    const initializer = useMemo(()=>app.schemaInitializerManager.get(name), [
+    const initializer = useMemo(()=>{
+        var _app_schemaInitializerManager;
+        return null == (_app_schemaInitializerManager = app.schemaInitializerManager) ? void 0 : _app_schemaInitializerManager.get(name);
+    }, [
         app.schemaInitializerManager,
         name
     ]);

package/es/application/schema-settings/components/SchemaSettingsChildren.mjs

@@ -4,19 +4,19 @@ import { useFieldComponentName } from "../../../common/useFieldComponentName.mjs
 import { useFindComponent } from "../../../schema-component/index.mjs";
 import { SchemaSettingsActionModalItem, SchemaSettingsCascaderItem, SchemaSettingsDivider, SchemaSettingsItem, SchemaSettingsItemGroup, SchemaSettingsModalItem, SchemaSettingsPopupItem, SchemaSettingsRemove, SchemaSettingsSelectItem, SchemaSettingsSubMenu, SchemaSettingsSwitchItem, useSchemaSettings } from "../../../schema-settings/SchemaSettings.mjs";
 import { SchemaSettingItemContext } from "../context/index.mjs";
-const typeComponentMap = {
-    item: SchemaSettingsItem,
-    itemGroup: SchemaSettingsItemGroup,
-    subMenu: SchemaSettingsSubMenu,
-    divider: SchemaSettingsDivider,
-    remove: SchemaSettingsRemove,
-    select: SchemaSettingsSelectItem,
-    cascader: SchemaSettingsCascaderItem,
-    switch: SchemaSettingsSwitchItem,
-    popup: SchemaSettingsPopupItem,
-    actionModal: SchemaSettingsActionModalItem,
-    modal: SchemaSettingsModalItem
-};
+const getTypeComponentMap = ()=>({
+        item: SchemaSettingsItem,
+        itemGroup: SchemaSettingsItemGroup,
+        subMenu: SchemaSettingsSubMenu,
+        divider: SchemaSettingsDivider,
+        remove: SchemaSettingsRemove,
+        select: SchemaSettingsSelectItem,
+        cascader: SchemaSettingsCascaderItem,
+        switch: SchemaSettingsSwitchItem,
+        popup: SchemaSettingsPopupItem,
+        actionModal: SchemaSettingsActionModalItem,
+        modal: SchemaSettingsModalItem
+    });
 const SchemaSettingsChildren = (props)=>{
     const { children } = props;
     const { visible } = useSchemaSettings();
@@ -65,7 +65,7 @@ const SchemaSettingsChild = /*#__PURE__*/ memo((props)=>{
         children
     ]);
     const visibleResult = useVisible();
-    const ComponentValue = useMemo(()=>!Component && type && typeComponentMap[type] ? typeComponentMap[type] : Component, [
+    const ComponentValue = useMemo(()=>!Component && type ? getTypeComponentMap()[type] : Component, [
         type,
         Component
     ]);

package/es/application/utils/clientModuleRegistry.d.ts

@@ -0,0 +1,2 @@
+export declare function registerTachybaseClientExports(exports: unknown): void;
+export declare function getTachybaseClientExports(): unknown;

package/es/application/utils/clientModuleRegistry.mjs

@@ -0,0 +1,9 @@
+let tachybaseClientExports;
+function registerTachybaseClientExports(exports) {
+    tachybaseClientExports = exports;
+}
+function getTachybaseClientExports() {
+    if (null == tachybaseClientExports) throw new Error('@tachybase/client exports have not been registered. Ensure the package root entry is loaded first.');
+    return tachybaseClientExports;
+}
+export { getTachybaseClientExports, registerTachybaseClientExports };

package/es/application/utils/globalDeps.mjs

@@ -4,15 +4,16 @@ import dayjs from "dayjs";
 import lodash from "lodash";
 import react_dom from "react-dom";
 import jsx_runtime from "react/jsx-runtime";
+import { getTachybaseClientExports } from "./clientModuleRegistry.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE_react_i18next_05dede28__ from "react-i18next";
 import * as __WEBPACK_EXTERNAL_MODULE__tego_client_7f3175c1__ from "@tego/client";
 import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
 import * as __WEBPACK_EXTERNAL_MODULE_ahooks__ from "ahooks";
 import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema_532e17e1__ from "@tachybase/schema";
 import * as __WEBPACK_EXTERNAL_MODULE_react_router_dom_5358f3fe__ from "react-router-dom";
-import * as __WEBPACK_EXTERNAL_MODULE_antd_style_1dcbd21e__ from "antd-style";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons_a8184985__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__emotion_css_bfcd1b5d__ from "@emotion/css";
+import * as __WEBPACK_EXTERNAL_MODULE_antd_style_1dcbd21e__ from "antd-style";
 import * as __WEBPACK_EXTERNAL_MODULE_i18next__ from "i18next";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_cssinjs_c619260f__ from "@ant-design/cssinjs";
 import * as __WEBPACK_EXTERNAL_MODULE__dnd_kit_accessibility_682092eb__ from "@dnd-kit/accessibility";
@@ -22,7 +23,6 @@ import * as __WEBPACK_EXTERNAL_MODULE__dnd_kit_sortable_a8361dd8__ from "@dnd-ki
 import * as __WEBPACK_EXTERNAL_MODULE__dnd_kit_utilities_3c8eb4c2__ from "@dnd-kit/utilities";
 import * as __WEBPACK_EXTERNAL_MODULE__floating_ui_react_3ddd630a__ from "@floating-ui/react";
 import * as __WEBPACK_EXTERNAL_MODULE_react_router_65608a1a__ from "react-router";
-import * as __WEBPACK_EXTERNAL_MODULE__index_mjs_52ce5380__ from "../../index.mjs";
 function defineGlobalDeps(requirejs) {
     requirejs.define('react', ()=>react);
     requirejs.define('react-dom', ()=>react_dom);
@@ -36,7 +36,7 @@ function defineGlobalDeps(requirejs) {
     requirejs.define('i18next', ()=>__WEBPACK_EXTERNAL_MODULE_i18next__);
     requirejs.define('react-i18next', ()=>__WEBPACK_EXTERNAL_MODULE_react_i18next_05dede28__);
     requirejs.define('@tego/client', ()=>__WEBPACK_EXTERNAL_MODULE__tego_client_7f3175c1__);
-    requirejs.define('@tachybase/client', ()=>__WEBPACK_EXTERNAL_MODULE__index_mjs_52ce5380__);
+    requirejs.define('@tachybase/client', ()=>getTachybaseClientExports());
     requirejs.define('@tachybase/schema', ()=>__WEBPACK_EXTERNAL_MODULE__tachybase_schema_532e17e1__);
     requirejs.define('@tachybase/utils/client', ()=>__WEBPACK_EXTERNAL_MODULE__tego_client_7f3175c1__);
     requirejs.define('@dnd-kit/accessibility', ()=>__WEBPACK_EXTERNAL_MODULE__dnd_kit_accessibility_682092eb__);

package/es/block-provider/BlockProvider.d.ts

@@ -1,23 +1,10 @@
 import React from 'react';
-import { GeneralField } from '@tachybase/schema';
+export { BlockRequestContext_deprecated, useBlockRequestContext } from './BlockRequestContext';
 /**
  * @deprecated
  */
 export declare const BlockResourceContext: React.Context<any>;
 export declare const BlockAssociationContext: React.Context<any>;
-/**
- * @deprecated
- */
-export declare const BlockRequestContext_deprecated: React.Context<{
-    block?: string;
-    props?: any;
-    field?: GeneralField;
-    service?: any;
-    resource?: any;
-    allowedActions?: any;
-    __parent?: any;
-    updateAssociationValues?: any[];
-}>;
 export declare const useBlockResource: () => any;
 export declare const MaybeCollectionProvider: (props: any) => any;
 /**
@@ -26,19 +13,6 @@ export declare const MaybeCollectionProvider: (props: any) => any;
  * @returns
  */
 export declare const BlockRequestProvider_deprecated: (props: any) => import("react/jsx-runtime").JSX.Element;
-/**
- * @deprecated
- */
-export declare const useBlockRequestContext: () => {
-    block?: string;
-    props?: any;
-    field?: GeneralField;
-    service?: any;
-    resource?: any;
-    allowedActions?: any;
-    __parent?: any;
-    updateAssociationValues?: any[];
-};
 export declare const RenderChildrenWithAssociationFilter: React.FC<any>;
 export declare const useBlockContext: () => {
     /** 用以区分卡片的标识 */

package/es/block-provider/BlockProvider.mjs

@@ -11,6 +11,7 @@ import { CollectionProvider_deprecated, useCollectionManager_deprecated, useColl
 import { DataBlockCollector, useFilterBlock } from "../filter-provider/FilterProvider.mjs";
 import { mergeIncomingFiltersFromSourceBlocks } from "../filter-provider/incomingFilterFromSources.mjs";
 import { RecordProvider, useRecordIndex } from "../record-provider/index.mjs";
+import { BlockRequestContext_deprecated, useBlockRequestContext } from "./BlockRequestContext.mjs";
 import { useAssociationNames } from "./hooks/index.mjs";
 import { useDataBlockParentRecord } from "./hooks/useDataBlockSourceId.mjs";
 function _tagged_template_literal(strings, raw) {
@@ -61,8 +62,6 @@ const BlockResourceContext = /*#__PURE__*/ createContext(null);
 BlockResourceContext.displayName = 'BlockResourceContext';
 const BlockAssociationContext = /*#__PURE__*/ createContext(null);
 BlockAssociationContext.displayName = 'BlockAssociationContext';
-const BlockRequestContext_deprecated = /*#__PURE__*/ createContext({});
-BlockRequestContext_deprecated.displayName = 'BlockRequestContext_deprecated';
 const useBlockResource = ()=>{
     const resource = useDataBlockResource();
     return useContext(BlockResourceContext) || resource;
@@ -111,7 +110,6 @@ const BlockRequestProvider_deprecated = (props)=>{
         })
     });
 };
-const useBlockRequestContext = ()=>useContext(BlockRequestContext_deprecated);
 const useStyles = createStyles((param)=>{
     let { css } = param;
     return {

package/es/block-provider/BlockRequestContext.d.ts

@@ -0,0 +1,27 @@
+import type { GeneralField } from '@tachybase/schema';
+/**
+ * @deprecated
+ */
+export declare const BlockRequestContext_deprecated: import("react").Context<{
+    block?: string;
+    props?: any;
+    field?: GeneralField;
+    service?: any;
+    resource?: any;
+    allowedActions?: any;
+    __parent?: any;
+    updateAssociationValues?: any[];
+}>;
+/**
+ * @deprecated
+ */
+export declare const useBlockRequestContext: () => {
+    block?: string;
+    props?: any;
+    field?: GeneralField;
+    service?: any;
+    resource?: any;
+    allowedActions?: any;
+    __parent?: any;
+    updateAssociationValues?: any[];
+};

package/es/block-provider/BlockRequestContext.mjs

@@ -0,0 +1,5 @@
+import { createContext, useContext } from "react";
+const BlockRequestContext_deprecated = createContext({});
+BlockRequestContext_deprecated.displayName = 'BlockRequestContext_deprecated';
+const useBlockRequestContext = ()=>useContext(BlockRequestContext_deprecated);
+export { BlockRequestContext_deprecated, useBlockRequestContext };

package/es/block-provider/FormBlockContext.d.ts

@@ -0,0 +1,32 @@
+import type { CollectionRecord } from '../data-source';
+export declare const FormBlockContext: import("react").Context<{
+    [key: string]: any;
+    form?: any;
+    type?: "update" | "create";
+    action?: string;
+    field?: any;
+    service?: any;
+    resource?: any;
+    updateAssociationValues?: any;
+    formBlockRef?: any;
+    collectionName?: string;
+    params?: any;
+    formRecord?: CollectionRecord;
+}>;
+/**
+ * @internal
+ */
+export declare const useFormBlockContext: () => {
+    [key: string]: any;
+    form?: any;
+    type?: "update" | "create";
+    action?: string;
+    field?: any;
+    service?: any;
+    resource?: any;
+    updateAssociationValues?: any;
+    formBlockRef?: any;
+    collectionName?: string;
+    params?: any;
+    formRecord?: CollectionRecord;
+};

package/es/block-provider/FormBlockContext.mjs

@@ -0,0 +1,5 @@
+import { createContext, useContext } from "react";
+const FormBlockContext = createContext({});
+FormBlockContext.displayName = 'FormBlockContext';
+const useFormBlockContext = ()=>useContext(FormBlockContext);
+export { FormBlockContext, useFormBlockContext };

package/es/block-provider/FormBlockProvider.d.ts

@@ -1,20 +1,6 @@
 import React from 'react';
 import { Schema } from '@tachybase/schema';
-import { CollectionRecord } from '../data-source';
-export declare const FormBlockContext: React.Context<{
-    [key: string]: any;
-    form?: any;
-    type?: "update" | "create";
-    action?: string;
-    field?: any;
-    service?: any;
-    resource?: any;
-    updateAssociationValues?: any;
-    formBlockRef?: any;
-    collectionName?: string;
-    params?: any;
-    formRecord?: CollectionRecord;
-}>;
+export { FormBlockContext, useFormBlockContext } from './FormBlockContext';
 /**
  * @internal
  * 获取表单卡片的类型：update 表示是表单编辑卡片，create 表示是表单新增卡片
@@ -25,24 +11,6 @@ export declare const useFormBlockType: () => {
 };
 export declare const useIsDetailBlock: () => boolean;
 export declare const FormBlockProvider: React.FunctionComponent<any>;
-/**
- * @internal
- * @returns
- */
-export declare const useFormBlockContext: () => {
-    [key: string]: any;
-    form?: any;
-    type?: "update" | "create";
-    action?: string;
-    field?: any;
-    service?: any;
-    resource?: any;
-    updateAssociationValues?: any;
-    formBlockRef?: any;
-    collectionName?: string;
-    params?: any;
-    formRecord?: CollectionRecord;
-};
 /**
  * @internal
  */

package/es/block-provider/FormBlockProvider.mjs

@@ -1,16 +1,16 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import react, { createContext, useContext, useEffect, useMemo, useRef } from "react";
+import react, { useEffect, useMemo, useRef } from "react";
 import { RecursionField, createForm, useField, useFieldSchema } from "@tachybase/schema";
 import { Spin } from "antd";
 import { withDynamicSchemaProps } from "../application/hoc/withDynamicSchemaProps.mjs";
 import { useCollectionManager, useCollectionParentRecordData, useCollectionRecord } from "../data-source/index.mjs";
 import { RecordProvider, useRecord } from "../record-provider/index.mjs";
-import { useActionContext, useDesignable } from "../schema-component/index.mjs";
+import { useActionContext } from "../schema-component/antd/action/hooks.mjs";
 import { Templates } from "../schema-component/antd/form-v2/Templates.mjs";
+import { useDesignable } from "../schema-component/hooks/useDesignable.mjs";
 import { BlockProvider, useBlockRequestContext } from "./BlockProvider.mjs";
+import { FormBlockContext, useFormBlockContext } from "./FormBlockContext.mjs";
 import { FormActiveFieldsProvider } from "./hooks/useFormActiveFields.mjs";
-const FormBlockContext = /*#__PURE__*/ createContext({});
-FormBlockContext.displayName = 'FormBlockContext';
 const InternalFormBlockProvider = (props)=>{
     var _Object_keys, _record_parentRecord;
     const cm = useCollectionManager();
@@ -101,7 +101,6 @@ const FormBlockProvider = withDynamicSchemaProps((props)=>{
         })
     });
 });
-const useFormBlockContext = ()=>useContext(FormBlockContext);
 const useFormBlockProps = function() {
     arguments.length > 0 && void 0 !== arguments[0] && arguments[0];
     var _fieldSchema_xcomponentprops, _ctx_service;

package/es/built-in/acl/ACLCollectionFieldProvider.d.ts

@@ -0,0 +1 @@
+export declare const ACLCollectionFieldProvider: (props: any) => import("react/jsx-runtime").JSX.Element;

package/es/built-in/acl/ACLCollectionFieldProvider.mjs

@@ -0,0 +1,42 @@
+import { Fragment, jsx } from "react/jsx-runtime";
+import { useEffect, useRef } from "react";
+import { useField, useFieldSchema } from "@tachybase/schema";
+import { useACLFieldWhitelist } from "./ACLContext.mjs";
+import { useACLRoleContext } from "./ACLProvider.mjs";
+const ACLCollectionFieldProvider = (props)=>{
+    const fieldSchema = useFieldSchema();
+    const field = useField();
+    const { allowAll } = useACLRoleContext();
+    const { whitelist } = useACLFieldWhitelist();
+    const [name] = fieldSchema.name.split('.');
+    const allowed = !fieldSchema['x-acl-ignore'] && whitelist.length > 0 ? whitelist.includes(name) : true;
+    const originalFieldStateRef = useRef();
+    useEffect(()=>{
+        var _originalFieldStateRef;
+        (_originalFieldStateRef = originalFieldStateRef).current || (_originalFieldStateRef.current = {
+            required: field.required,
+            display: field.display
+        });
+        if (allowed) {
+            field.required = originalFieldStateRef.current.required;
+            field.display = originalFieldStateRef.current.display;
+        } else {
+            field.required = false;
+            field.display = 'hidden';
+        }
+    }, [
+        allowed,
+        field
+    ]);
+    if (allowAll) return /*#__PURE__*/ jsx(Fragment, {
+        children: props.children
+    });
+    if (!fieldSchema['x-collection-field']) return /*#__PURE__*/ jsx(Fragment, {
+        children: props.children
+    });
+    if (!allowed) return null;
+    return /*#__PURE__*/ jsx(Fragment, {
+        children: props.children
+    });
+};
+export { ACLCollectionFieldProvider };

package/es/built-in/acl/ACLContext.d.ts

@@ -0,0 +1,9 @@
+import { Schema } from '@tachybase/schema';
+export declare const ACLContext: import("react").Context<any>;
+export declare const useACLContext: () => any;
+export declare const ACLActionParamsContext: import("react").Context<any>;
+export declare const useACLActionParamsContext: () => any;
+export declare const useACLFieldWhitelist: () => {
+    whitelist: any[];
+    schemaInWhitelist(fieldSchema: Schema, isSkip?: any): boolean;
+};

package/es/built-in/acl/ACLContext.mjs

@@ -0,0 +1,24 @@
+import { createContext, useContext } from "react";
+const ACLContext = createContext({});
+ACLContext.displayName = 'ACLContext';
+const useACLContext = ()=>useContext(ACLContext);
+const ACLActionParamsContext = createContext({});
+ACLActionParamsContext.displayName = 'ACLActionParamsContext';
+const useACLActionParamsContext = ()=>useContext(ACLActionParamsContext);
+const useACLFieldWhitelist = ()=>{
+    const context = useContext(ACLActionParamsContext);
+    const params = (null == context ? void 0 : context.params) || context;
+    const whitelist = [].concat((null == params ? void 0 : params.whitelist) || []).concat((null == params ? void 0 : params.fields) || []).concat((null == params ? void 0 : params.appends) || []);
+    return {
+        whitelist,
+        schemaInWhitelist (fieldSchema, isSkip) {
+            if (isSkip) return true;
+            if (0 === whitelist.length) return true;
+            if (!fieldSchema) return true;
+            if (!fieldSchema['x-collection-field']) return true;
+            const [key1, key2] = fieldSchema['x-collection-field'].split('.');
+            return null == whitelist ? void 0 : whitelist.includes(key2 || key1);
+        }
+    };
+};
+export { ACLActionParamsContext, ACLContext, useACLActionParamsContext, useACLContext, useACLFieldWhitelist };

package/es/built-in/acl/ACLPlugin.mjs

@@ -1,5 +1,6 @@
 import { Plugin } from "../../application/Plugin.mjs";
-import { ACLActionProvider, ACLCollectionFieldProvider, ACLCollectionProvider, ACLMenuItemProvider } from "./ACLProvider.mjs";
+import { ACLCollectionFieldProvider } from "./ACLCollectionFieldProvider.mjs";
+import { ACLActionProvider, ACLCollectionProvider, ACLMenuItemProvider } from "./ACLProvider.mjs";
 class ACLPlugin extends Plugin {
     async load() {
         this.app.addComponents({

package/es/built-in/acl/ACLProvider.d.ts

@@ -1,11 +1,6 @@
-import React from 'react';
-import { Schema } from '@tachybase/schema';
-export declare const ACLContext: React.Context<any>;
 export declare const ACLProvider: (props: any) => import("react/jsx-runtime").JSX.Element;
 export declare const ACLRolesCheckProvider: (props: any) => import("react/jsx-runtime").JSX.Element;
 export declare const useRoleRecheck: () => () => void;
-export declare const useACLContext: () => any;
-export declare const ACLActionParamsContext: React.Context<any>;
 export declare const useACLRolesCheck: () => {
     data: any;
     getActionAlias: (actionPath: string) => any;
@@ -15,12 +10,6 @@ export declare const useACLRolesCheck: () => {
 };
 export declare function useACLRoleContext(): any;
 export declare const ACLCollectionProvider: (props: any) => any;
-export declare const useACLActionParamsContext: () => any;
 export declare const useRecordPkValue: () => any;
 export declare const ACLActionProvider: (props: any) => import("react/jsx-runtime").JSX.Element;
-export declare const useACLFieldWhitelist: () => {
-    whitelist: any[];
-    schemaInWhitelist(fieldSchema: Schema, isSkip?: any): boolean;
-};
-export declare const ACLCollectionFieldProvider: (props: any) => import("react/jsx-runtime").JSX.Element;
 export declare const ACLMenuItemProvider: (props: any) => import("react/jsx-runtime").JSX.Element;

package/es/built-in/acl/ACLProvider.mjs

@@ -1,6 +1,6 @@
 import { Fragment, jsx } from "react/jsx-runtime";
-import { createContext, useContext, useEffect } from "react";
-import { useField, useFieldSchema } from "@tachybase/schema";
+import { useContext } from "react";
+import { useFieldSchema } from "@tachybase/schema";
 import { omit } from "lodash";
 import { Navigate } from "react-router-dom";
 import { useAPIClient, useRequest } from "../../api-client/index.mjs";
@@ -11,11 +11,11 @@ import { useResourceActionContext } from "../../collection-manager/ResourceActio
 import { useDataSourceKey } from "../../data-source/data-source/DataSourceProvider.mjs";
 import { useRecord } from "../../record-provider/index.mjs";
 import { SchemaComponentOptions, useDesignable } from "../../schema-component/index.mjs";
-const ACLContext = /*#__PURE__*/ createContext({});
-ACLContext.displayName = 'ACLContext';
+import { ACLCollectionFieldProvider } from "./ACLCollectionFieldProvider.mjs";
+import { ACLActionParamsContext, ACLContext } from "./ACLContext.mjs";
 const ACLProvider = (props)=>/*#__PURE__*/ jsx(SchemaComponentOptions, {
         components: {
-            ACLCollectionFieldProvider,
+            ACLCollectionFieldProvider: ACLCollectionFieldProvider,
             ACLActionProvider,
             ACLMenuItemProvider,
             ACLCollectionProvider
@@ -63,9 +63,6 @@ const useRoleRecheck = ()=>{
         ctx.refresh();
     };
 };
-const useACLContext = ()=>useContext(ACLContext);
-const ACLActionParamsContext = /*#__PURE__*/ createContext({});
-ACLActionParamsContext.displayName = 'ACLActionParamsContext';
 const useACLRolesCheck = ()=>{
     var _ctx_data, _ctx_data1;
     const ctx = useContext(ACLContext);
@@ -176,7 +173,6 @@ const ACLCollectionProvider = (props)=>{
         children: props.children
     });
 };
-const useACLActionParamsContext = ()=>useContext(ACLActionParamsContext);
 const useRecordPkValue = ()=>{
     const { getPrimaryKey } = useCollection_deprecated();
     const record = useRecord();
@@ -224,47 +220,6 @@ const ACLActionProvider = (props)=>{
         children: props.children
     });
 };
-const useACLFieldWhitelist = ()=>{
-    const params = useContext(ACLActionParamsContext);
-    const whitelist = [].concat((null == params ? void 0 : params.whitelist) || []).concat((null == params ? void 0 : params.fields) || []).concat((null == params ? void 0 : params.appends) || []);
-    return {
-        whitelist,
-        schemaInWhitelist (fieldSchema, isSkip) {
-            if (isSkip) return true;
-            if (0 === whitelist.length) return true;
-            if (!fieldSchema) return true;
-            if (!fieldSchema['x-collection-field']) return true;
-            const [key1, key2] = fieldSchema['x-collection-field'].split('.');
-            return null == whitelist ? void 0 : whitelist.includes(key2 || key1);
-        }
-    };
-};
-const ACLCollectionFieldProvider = (props)=>{
-    const fieldSchema = useFieldSchema();
-    const field = useField();
-    const { allowAll } = useACLRoleContext();
-    const { whitelist } = useACLFieldWhitelist();
-    const [name] = fieldSchema.name.split('.');
-    const allowed = !fieldSchema['x-acl-ignore'] && whitelist.length > 0 ? whitelist.includes(name) : true;
-    useEffect(()=>{
-        if (!allowed) {
-            field.required = false;
-            field.display = 'hidden';
-        }
-    }, [
-        allowed
-    ]);
-    if (allowAll) return /*#__PURE__*/ jsx(Fragment, {
-        children: props.children
-    });
-    if (!fieldSchema['x-collection-field']) return /*#__PURE__*/ jsx(Fragment, {
-        children: props.children
-    });
-    if (!allowed) return null;
-    return /*#__PURE__*/ jsx(Fragment, {
-        children: props.children
-    });
-};
 const ACLMenuItemProvider = (props)=>{
     const { allowAll, allowMenuItemIds = [], snippets } = useACLRoleContext();
     const fieldSchema = useFieldSchema();
@@ -279,4 +234,4 @@ const ACLMenuItemProvider = (props)=>{
     });
     return null;
 };
-export { ACLActionParamsContext, ACLActionProvider, ACLCollectionFieldProvider, ACLCollectionProvider, ACLContext, ACLMenuItemProvider, ACLProvider, ACLRolesCheckProvider, useACLActionParamsContext, useACLContext, useACLFieldWhitelist, useACLRoleContext, useACLRolesCheck, useRecordPkValue, useRoleRecheck };
+export { ACLActionProvider, ACLCollectionProvider, ACLMenuItemProvider, ACLProvider, ACLRolesCheckProvider, useACLRoleContext, useACLRolesCheck, useRecordPkValue, useRoleRecheck };

package/es/built-in/acl/index.d.ts

@@ -1,4 +1,6 @@
 export * from './ACLProvider';
+export * from './ACLContext';
+export * from './ACLCollectionFieldProvider';
 export * from './ACLShortcut';
 export * from './Configuration';
 export * from './ACLPlugin';

package/es/built-in/acl/index.mjs

@@ -1,4 +1,6 @@
 export * from "./ACLProvider.mjs";
+export * from "./ACLContext.mjs";
+export * from "./ACLCollectionFieldProvider.mjs";
 export * from "./ACLShortcut.mjs";
 export * from "./Configuration/index.mjs";
 export * from "./ACLPlugin.mjs";

package/es/collection-manager/hooks/useCollectionManager_deprecated.mjs

@@ -5,7 +5,8 @@ import { useCollectionManager } from "../../data-source/collection/CollectionMan
 import { DEFAULT_DATA_SOURCE_KEY } from "../../data-source/data-source/DataSourceManager.mjs";
 import { useDataSourceManager } from "../../data-source/data-source/DataSourceManagerProvider.mjs";
 import { useDataSource } from "../../data-source/data-source/DataSourceProvider.mjs";
-import { useCompile, useSchemaComponentContext } from "../../schema-component/index.mjs";
+import { useCompile } from "../../schema-component/hooks/useCompile.mjs";
+import { useSchemaComponentContext } from "../../schema-component/hooks/useSchemaComponentContext.mjs";
 const useCollectionManager_deprecated = (dataSourceName)=>{
     const dm = useDataSourceManager();
     const dataSource = useDataSource();