npm - @tachybase/client - Versions diffs - 1.3.9 → 1.3.11 - Mend

@tachybase/client 1.3.9 → 1.3.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1995) hide show

package/es/block-provider/hooks/index.mjs CHANGED Viewed

@@ -1,30 +1,30 @@
-import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
-import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schema";
-import * as __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__ from "@tachybase/utils/client";
-import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
-import * as __WEBPACK_EXTERNAL_MODULE_flat__ from "flat";
-import * as __WEBPACK_EXTERNAL_MODULE_lodash__ from "lodash";
-import * as __WEBPACK_EXTERNAL_MODULE_lodash_get__ from "lodash/get";
-import * as __WEBPACK_EXTERNAL_MODULE_lodash_omit__ from "lodash/omit";
-import * as __WEBPACK_EXTERNAL_MODULE_react_i18next__ from "react-i18next";
-import * as __WEBPACK_EXTERNAL_MODULE_react_router_dom__ from "react-router-dom";
-import * as __WEBPACK_EXTERNAL_MODULE_react_to_print__ from "react-to-print";
-import * as __WEBPACK_EXTERNAL_MODULE__index_mjs__ from "../../index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__ from "../../api-client/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__built_in_dynamic_page_utils_mjs__ from "../../built-in/dynamic-page/utils.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__ from "../../collection-manager/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__filter_provider_FilterProvider_mjs__ from "../../filter-provider/FilterProvider.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__ from "../../filter-provider/utils.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__record_provider_index_mjs__ from "../../record-provider/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__ from "../../schema-component/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_util_mjs__ from "../../schema-component/antd/association-field/util.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__user_index_mjs__ from "../../user/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__ from "../../variables/index.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__variables_utils_isVariable_mjs__ from "../../variables/utils/isVariable.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__variables_utils_transformVariableValue_mjs__ from "../../variables/utils/transformVariableValue.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__ from "../BlockProvider.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__DetailsBlockProvider_mjs__ from "../DetailsBlockProvider.mjs";
-import * as __WEBPACK_EXTERNAL_MODULE__TableFieldProvider_mjs__ from "../TableFieldProvider.mjs";
+import { useCallback, useEffect } from "react";
+import { untracked, useField, useFieldSchema, useForm } from "@tachybase/schema";
+import { isURL, parse } from "@tachybase/utils/client";
+import { App } from "antd";
+import flat from "flat";
+import lodash from "lodash";
+import get from "lodash/get";
+import omit from "lodash/omit";
+import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import { useReactToPrint } from "react-to-print";
+import { AssociationFilter, useCollection, useCollectionRecord, useDataSourceHeaders, useFormActiveFields, useFormBlockContext } from "../../index.mjs";
+import { useAPIClient, useRequest } from "../../api-client/index.mjs";
+import { PathHandler } from "../../built-in/dynamic-page/utils.mjs";
+import { useCollectionManager_deprecated, useCollection_deprecated } from "../../collection-manager/index.mjs";
+import { useFilterBlock } from "../../filter-provider/FilterProvider.mjs";
+import { mergeFilter as utils_mjs_mergeFilter, transformToFilter } from "../../filter-provider/utils.mjs";
+import { useRecord } from "../../record-provider/index.mjs";
+import { getCustomCondition, removeNullCondition, useActionContext, useCompile, useDesignable } from "../../schema-component/index.mjs";
+import { isSubMode } from "../../schema-component/antd/association-field/util.mjs";
+import { useCurrentUserContext } from "../../user/index.mjs";
+import { useLocalVariables, useVariables } from "../../variables/index.mjs";
+import { isVariable } from "../../variables/utils/isVariable.mjs";
+import { transformVariableValue } from "../../variables/utils/transformVariableValue.mjs";
+import { useBlockRequestContext, useFilterByTk, useParamsFromRecord } from "../BlockProvider.mjs";
+import { useDetailsBlockContext } from "../DetailsBlockProvider.mjs";
+import { TableFieldResource } from "../TableFieldProvider.mjs";
 export * from "./useFormActiveFields.mjs";
 export * from "./useParsedFilter.mjs";
 export * from "./useDataBlockSourceId.mjs";
@@ -32,11 +32,11 @@ export * from "./useIsMobile.mjs";
 function renderTemplate(str, data) {
     const re = /\{\{\s*((\w+\.?)+)\s*\}\}/g;
     return str.replace(re, function(_, key) {
-        return (0, __WEBPACK_EXTERNAL_MODULE_lodash_get__["default"])(data, key) || '';
+        return get(data, key) || '';
     });
 }
 function filterByCleanedFields(mergeFilter) {
-    const items = (0, __WEBPACK_EXTERNAL_MODULE_flat__["default"])(mergeFilter);
+    const items = flat(mergeFilter);
     const result = {};
     const seen = new Set();
     for(const key in items){
@@ -54,7 +54,7 @@ function filterByCleanedFields(mergeFilter) {
             result[key] = value;
         }
     }
-    return __WEBPACK_EXTERNAL_MODULE_flat__["default"].unflatten(result);
+    return flat.unflatten(result);
 }
 function getFormValues(param) {
     let { filterByTk, field, form, fieldNames, getField, resource, actionFields } = param;
@@ -69,7 +69,7 @@ function getFormValues(param) {
                     'belongsToMany'
                 ].includes(null == f ? void 0 : f.type);
             });
-            return (0, __WEBPACK_EXTERNAL_MODULE_lodash_omit__["default"])({
+            return omit({
                 ...form.values
             }, keys);
         }
@@ -77,23 +77,23 @@ function getFormValues(param) {
     return form.values;
 }
 function useCollectValuesToSubmit() {
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const { field, resource } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { fields, getField, getTreeParentField, name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
+    const form = useForm();
+    const filterByTk = useFilterByTk();
+    const { field, resource } = useBlockRequestContext();
+    const { fields, getField, getTreeParentField, name } = useCollection_deprecated();
     const fieldNames = fields.map((field)=>field.name);
-    const { fieldSchema } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const { getActiveFieldsName } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormActiveFields)() || {};
-    const variables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useVariables)();
-    const localVariables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useLocalVariables)({
+    const { fieldSchema } = useActionContext();
+    const { getActiveFieldsName } = useFormActiveFields() || {};
+    const variables = useVariables();
+    const localVariables = useLocalVariables({
         currentForm: form
     });
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const currentRecord = (0, __WEBPACK_EXTERNAL_MODULE__record_provider_index_mjs__.useRecord)();
-    return (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)(async ()=>{
+    const actionSchema = useFieldSchema();
+    const currentRecord = useRecord();
+    return useCallback(async ()=>{
         var _fieldSchema_xcomponentprops;
         var _actionSchema_xactionsettings;
-        const { assignedValues: originalAssignedValues = {}, overwriteValues } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+        const { assignedValues: originalAssignedValues = {}, overwriteValues } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
         const values = getFormValues({
             filterByTk,
             field,
@@ -107,24 +107,24 @@ function useCollectValuesToSubmit() {
         const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
             const value = originalAssignedValues[key];
             const collectionField = getField(key);
-            if ((0, __WEBPACK_EXTERNAL_MODULE__variables_utils_isVariable_mjs__.isVariable)(value)) {
+            if (isVariable(value)) {
                 const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                if (result) assignedValues[key] = (0, __WEBPACK_EXTERNAL_MODULE__variables_utils_transformVariableValue_mjs__.transformVariableValue)(result, {
+                if (result) assignedValues[key] = transformVariableValue(result, {
                     targetCollectionField: collectionField
                 });
             } else if (null != value && '' !== value) assignedValues[key] = value;
         });
         await Promise.all(waitList);
-        const addChild = null == fieldSchema ? void 0 : null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : _fieldSchema_xcomponentprops.addChild;
+        const addChild = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.addChild;
         if (addChild) {
-            var _currentRecord___parent;
+            var _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey, _currentRecord___parent;
             const treeParentField = getTreeParentField();
             var _treeParentField_name;
-            values[null !== (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) && void 0 !== _treeParentField_name ? _treeParentField_name : 'parent'] = (0, __WEBPACK_EXTERNAL_MODULE_lodash_omit__["default"])(null == currentRecord ? void 0 : currentRecord.__parent, [
+            values[null != (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) ? _treeParentField_name : 'parent'] = omit(null == currentRecord ? void 0 : currentRecord.__parent, [
                 'children'
             ]);
-            var _treeParentField_foreignKey;
-            values[null !== (_treeParentField_foreignKey = null == treeParentField ? void 0 : treeParentField.foreignKey) && void 0 !== _treeParentField_foreignKey ? _treeParentField_foreignKey : 'parentId'] = null == currentRecord ? void 0 : null === (_currentRecord___parent = currentRecord.__parent) || void 0 === _currentRecord___parent ? void 0 : _currentRecord___parent.id;
+            var _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field;
+            values[null != (_treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field = null == treeParentField ? void 0 : null == (_treeParentField_collection_model_rawAttributes_treeParentField_foreignKey = treeParentField.collection.model.rawAttributes[null == treeParentField ? void 0 : treeParentField.foreignKey]) ? void 0 : _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey.field) ? _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field : 'parentId'] = null == currentRecord ? void 0 : null == (_currentRecord___parent = currentRecord.__parent) ? void 0 : _currentRecord___parent.id;
         }
         return {
             ...values,
@@ -177,22 +177,22 @@ const viewerSchema = {
     }
 };
 const useInsertSchema = ()=>{
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const { insertAfterBegin } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();
-    const insert = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((ss)=>{
+    const fieldSchema = useFieldSchema();
+    const { insertAfterBegin } = useDesignable();
+    const insert = useCallback((ss)=>{
         const schema = fieldSchema.reduceProperties((buf, s)=>{
             if (s['x-component'] === pageDetailsViewer) return s;
             return buf;
         }, null);
-        if (!schema) insertAfterBegin(__WEBPACK_EXTERNAL_MODULE_lodash__["default"].cloneDeep(ss));
+        if (!schema) insertAfterBegin(lodash.cloneDeep(ss));
     }, [
         pageDetailsViewer
     ]);
     return insert;
 };
 const useCancelActionProps = ()=>{
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const ctx = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
+    const form = useForm();
+    const ctx = useActionContext();
     return {
         async onClick () {
             ctx.setVisible(false);
@@ -201,18 +201,18 @@ const useCancelActionProps = ()=>{
     };
 };
 const useJumpDetails = ()=>{
-    const collection = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useCollection)();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const dn = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();
+    const collection = useCollection();
+    const fieldSchema = useFieldSchema();
+    const dn = useDesignable();
     const insert = useInsertSchema();
-    const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router_dom__.useNavigate)();
+    const navigate = useNavigate();
     return (filterByTk)=>{
         if (dn.designable) insert(viewerSchema);
         const targetSchema = fieldSchema.reduceProperties((buf, s)=>{
             if (s['x-component'] === pageDetailsViewer) return s;
             return buf;
         });
-        if (targetSchema) navigate("../".concat(targetSchema['x-uid'], "/").concat(__WEBPACK_EXTERNAL_MODULE__built_in_dynamic_page_utils_mjs__.PathHandler.getInstance().toWildcardPath({
+        if (targetSchema) navigate("../".concat(targetSchema['x-uid'], "/").concat(PathHandler.getInstance().toWildcardPath({
             collection: collection.name,
             filterByTk
         })));
@@ -234,25 +234,25 @@ function getBeforeWorkflows(triggerWorkflows) {
 }
 const useCreateActionProps = ()=>{
     var _actionField_componentProps_filterKeys;
-    const record = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useCollectionRecord)();
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const { field, resource, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
+    const record = useCollectionRecord();
+    const form = useForm();
+    const { field, resource, __parent } = useBlockRequestContext();
     const jumpDetails = useJumpDetails();
-    const { setVisible } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router_dom__.useNavigate)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-    const { modal, message } = __WEBPACK_EXTERNAL_MODULE_antd__.App.useApp();
-    const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
-    const { updateAssociationValues } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormBlockContext)();
+    const { setVisible } = useActionContext();
+    const navigate = useNavigate();
+    const actionSchema = useFieldSchema();
+    const actionField = useField();
+    const compile = useCompile();
+    const { modal, message } = App.useApp();
+    const { t } = useTranslation();
+    const { updateAssociationValues } = useFormBlockContext();
     const collectValues = useCollectValuesToSubmit();
     const action = record.isNew ? actionField.componentProps.saveMode || 'create' : 'update';
-    const filterKeys = (null === (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) || void 0 === _actionField_componentProps_filterKeys ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
+    const filterKeys = (null == (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
     return {
         async onClick () {
             var _actionSchema_xactionsettings;
-            const { onSuccess, skipValidator, triggerWorkflows, pageMode } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+            const { onSuccess, skipValidator, triggerWorkflows, pageMode } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
             if (!skipValidator) await form.submit();
             actionField.data = field.data || {};
             actionField.data.loading = true;
@@ -267,11 +267,11 @@ const useCreateActionProps = ()=>{
                 });
                 actionField.data.loading = false;
                 actionField.data.data = data;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 if (pageMode) {
                     var _data_data_data, _data_data;
                     await resetFormCorrectly(form);
-                    jumpDetails(null == data ? void 0 : null === (_data_data = data.data) || void 0 === _data_data ? void 0 : null === (_data_data_data = _data_data.data) || void 0 === _data_data_data ? void 0 : _data_data_data.id);
+                    jumpDetails(null == data ? void 0 : null == (_data_data = data.data) ? void 0 : null == (_data_data_data = _data_data.data) ? void 0 : _data_data_data.id);
                     return;
                 }
                 const successMessage = (null == onSuccess ? void 0 : onSuccess.successMessage) ? compile(null == onSuccess ? void 0 : onSuccess.successMessage) : t('Saved successfully');
@@ -279,19 +279,15 @@ const useCreateActionProps = ()=>{
                     title: successMessage,
                     onOk: async ()=>{
                         await resetFormCorrectly(form);
-                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                            if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                            else navigate(onSuccess.redirectTo);
-                        }
+                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                        else navigate(onSuccess.redirectTo);
                     }
                 });
                 else {
                     message.success(successMessage);
                     await resetFormCorrectly(form);
-                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                        if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                        else navigate(onSuccess.redirectTo);
-                    }
+                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                    else navigate(onSuccess.redirectTo);
                 }
                 if (!(null == onSuccess ? void 0 : onSuccess.popupClose)) {
                     await resetFormCorrectly(form);
@@ -306,37 +302,37 @@ const useCreateActionProps = ()=>{
 };
 const useAssociationCreateActionProps = ()=>{
     var _actionField_componentProps_filterKeys;
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const { field, resource, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { setVisible, fieldSchema } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const { message } = __WEBPACK_EXTERNAL_MODULE_antd__.App.useApp();
-    const { fields, getField, getTreeParentField, name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
-    const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const currentRecord = (0, __WEBPACK_EXTERNAL_MODULE__record_provider_index_mjs__.useRecord)();
-    const variables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useVariables)();
-    const localVariables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useLocalVariables)({
+    const form = useForm();
+    const { field, resource, __parent } = useBlockRequestContext();
+    const { setVisible, fieldSchema } = useActionContext();
+    const actionSchema = useFieldSchema();
+    const actionField = useField();
+    const { message } = App.useApp();
+    const { fields, getField, getTreeParentField, name } = useCollection_deprecated();
+    const compile = useCompile();
+    const filterByTk = useFilterByTk();
+    const currentRecord = useRecord();
+    const variables = useVariables();
+    const localVariables = useLocalVariables({
         currentForm: form
     });
-    const { getActiveFieldsName } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormActiveFields)() || {};
+    const { getActiveFieldsName } = useFormActiveFields() || {};
     const action = actionField.componentProps.saveMode || 'create';
-    const filterKeys = (null === (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) || void 0 === _actionField_componentProps_filterKeys ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
+    const filterKeys = (null == (_actionField_componentProps_filterKeys = actionField.componentProps.filterKeys) ? void 0 : _actionField_componentProps_filterKeys.checked) || [];
     return {
         async onClick () {
             var _fieldSchema_xcomponentprops;
             const fieldNames = fields.map((field)=>field.name);
             var _actionSchema_xactionsettings;
-            const { assignedValues: originalAssignedValues = {}, onSuccess, overwriteValues, skipValidator, triggerWorkflows } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
-            const addChild = null == fieldSchema ? void 0 : null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : _fieldSchema_xcomponentprops.addChild;
+            const { assignedValues: originalAssignedValues = {}, onSuccess, overwriteValues, skipValidator, triggerWorkflows } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
+            const addChild = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.addChild;
             const assignedValues = {};
             const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                 const value = originalAssignedValues[key];
                 const collectionField = getField(key);
-                if ((0, __WEBPACK_EXTERNAL_MODULE__variables_utils_isVariable_mjs__.isVariable)(value)) {
+                if (isVariable(value)) {
                     const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                    if (result) assignedValues[key] = (0, __WEBPACK_EXTERNAL_MODULE__variables_utils_transformVariableValue_mjs__.transformVariableValue)(result, {
+                    if (result) assignedValues[key] = transformVariableValue(result, {
                         targetCollectionField: collectionField
                     });
                 } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -353,11 +349,12 @@ const useAssociationCreateActionProps = ()=>{
                 actionFields: (null == getActiveFieldsName ? void 0 : getActiveFieldsName('form')) || []
             });
             if (addChild) {
+                var _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey;
                 const treeParentField = getTreeParentField();
                 var _treeParentField_name;
-                values[null !== (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) && void 0 !== _treeParentField_name ? _treeParentField_name : 'parent'] = currentRecord;
-                var _treeParentField_foreignKey;
-                values[null !== (_treeParentField_foreignKey = null == treeParentField ? void 0 : treeParentField.foreignKey) && void 0 !== _treeParentField_foreignKey ? _treeParentField_foreignKey : 'parentId'] = currentRecord.id;
+                values[null != (_treeParentField_name = null == treeParentField ? void 0 : treeParentField.name) ? _treeParentField_name : 'parent'] = currentRecord;
+                var _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field;
+                values[null != (_treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field = null == treeParentField ? void 0 : null == (_treeParentField_collection_model_rawAttributes_treeParentField_foreignKey = treeParentField.collection.model.rawAttributes[null == treeParentField ? void 0 : treeParentField.foreignKey]) ? void 0 : _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey.field) ? _treeParentField_collection_model_rawAttributes_treeParentField_foreignKey_field : 'parentId'] = currentRecord.id;
             }
             actionField.data = field.data || {};
             actionField.data.loading = true;
@@ -375,7 +372,7 @@ const useAssociationCreateActionProps = ()=>{
                 });
                 actionField.data.loading = false;
                 actionField.data.data = data;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 null == setVisible || setVisible(false);
                 if (!(null == onSuccess ? void 0 : onSuccess.successMessage)) return;
                 message.success(compile(null == onSuccess ? void 0 : onSuccess.successMessage));
@@ -406,12 +403,12 @@ const updateFilterTargets = (fieldSchema, targets)=>{
     }
 };
 const useFilterBlockActionProps = ()=>{
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const { getDataBlocks } = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_FilterProvider_mjs__.useFilterBlock)();
-    const { name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
-    const { getCollectionJoinField } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
+    const form = useForm();
+    const actionField = useField();
+    const fieldSchema = useFieldSchema();
+    const { getDataBlocks } = useFilterBlock();
+    const { name } = useCollection_deprecated();
+    const { getCollectionJoinField } = useCollectionManager_deprecated();
     actionField.data = actionField.data || {};
     return {
         async onClick () {
@@ -423,9 +420,9 @@ const useFilterBlockActionProps = ()=>{
                     var _block_service_params, _block_service_params_, _block_service_params1, _Object_keys;
                     const target = targets.find((target)=>target.uid === block.uid);
                     if (!target) return;
-                    const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
+                    const param = (null == (_block_service_params = block.service.params) ? void 0 : _block_service_params[0]) || {};
                     for(const key in form.values)if ('object' == typeof form.values[key] && ('{}' === JSON.stringify(form.values[key]) || '[]' === JSON.stringify(form.values[key])) || !form.values[key]) delete form.values[key];
-                    const storedFilter = (null === (_block_service_params1 = block.service.params) || void 0 === _block_service_params1 ? void 0 : null === (_block_service_params_ = _block_service_params1[1]) || void 0 === _block_service_params_ ? void 0 : _block_service_params_.filters) || {};
+                    const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
                     const filter = {
                         formValues: {
                             ...form.values
@@ -433,7 +430,7 @@ const useFilterBlockActionProps = ()=>{
                         customValues: {},
                         customFilter: {}
                     };
-                    if (null === (_Object_keys = Object.keys(filter.formValues)) || void 0 === _Object_keys ? void 0 : _Object_keys.includes('__custom')) {
+                    if (null == (_Object_keys = Object.keys(filter.formValues)) ? void 0 : _Object_keys.includes('__custom')) {
                         const values = {
                             ...form.values
                         };
@@ -442,18 +439,18 @@ const useFilterBlockActionProps = ()=>{
                             ...values
                         };
                         for(const key in form.values['__custom'])if (form.values['__custom'][key]) filter.customValues[key] = form.values['__custom'][key];
-                        filter.customFilter = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.getCustomCondition)(filter.customValues, fieldSchema);
+                        filter.customFilter = getCustomCondition(filter.customValues, fieldSchema);
                     }
-                    storedFilter[uid] = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.removeNullCondition)((0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.transformToFilter)(filter.formValues, fieldSchema, getCollectionJoinField, name));
-                    const mergedFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
-                        ...Object.values(storedFilter).map((filter)=>(0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.removeNullCondition)(filter)),
+                    storedFilter[uid] = removeNullCondition(transformToFilter(filter.formValues, fieldSchema, getCollectionJoinField, name));
+                    const mergedFilter = utils_mjs_mergeFilter([
+                        ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
                         block.defaultFilter,
                         filter.customFilter,
                         prevMergedFilter
                     ]);
                     const currFilter = filterByCleanedFields(mergedFilter);
                     prevMergedFilter = currFilter;
-                    if ('manual' === block.dataLoadingMode && __WEBPACK_EXTERNAL_MODULE_lodash__["default"].isEmpty(currFilter)) return block.clearData();
+                    if ('manual' === block.dataLoadingMode && lodash.isEmpty(currFilter)) return block.clearData();
                     return block.doFilter({
                         ...param,
                         page: 1,
@@ -470,10 +467,10 @@ const useFilterBlockActionProps = ()=>{
     };
 };
 const useResetBlockActionProps = ()=>{
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const { getDataBlocks } = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_FilterProvider_mjs__.useFilterBlock)();
+    const form = useForm();
+    const actionField = useField();
+    const fieldSchema = useFieldSchema();
+    const { getDataBlocks } = useFilterBlock();
     actionField.data = actionField.data || {};
     return {
         async onClick () {
@@ -487,10 +484,10 @@ const useResetBlockActionProps = ()=>{
                     const target = targets.find((target)=>target.uid === block.uid);
                     if (!target) return;
                     if ('manual' === block.dataLoadingMode) return block.clearData();
-                    const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
-                    const storedFilter = (null === (_block_service_params1 = block.service.params) || void 0 === _block_service_params1 ? void 0 : null === (_block_service_params_ = _block_service_params1[1]) || void 0 === _block_service_params_ ? void 0 : _block_service_params_.filters) || {};
+                    const param = (null == (_block_service_params = block.service.params) ? void 0 : _block_service_params[0]) || {};
+                    const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
                     delete storedFilter[uid];
-                    const currFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
+                    const currFilter = utils_mjs_mergeFilter([
                         ...Object.values(storedFilter),
                         block.defaultFilter,
                         prevMergedFilter
@@ -513,30 +510,30 @@ const useResetBlockActionProps = ()=>{
     };
 };
 const useCustomizeUpdateActionProps = ()=>{
-    const { resource, __parent, service } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router_dom__.useNavigate)();
-    const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const { modal, message } = __WEBPACK_EXTERNAL_MODULE_antd__.App.useApp();
-    const variables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useVariables)();
-    const localVariables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useLocalVariables)({
+    const { resource, __parent, service } = useBlockRequestContext();
+    const filterByTk = useFilterByTk();
+    const actionSchema = useFieldSchema();
+    const navigate = useNavigate();
+    const compile = useCompile();
+    const form = useForm();
+    const { modal, message } = App.useApp();
+    const variables = useVariables();
+    const localVariables = useLocalVariables({
         currentForm: form
     });
-    const { name, getField } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
+    const { name, getField } = useCollection_deprecated();
     return {
         async onClick () {
             var _service_refresh;
             var _actionSchema_xactionsettings;
-            const { assignedValues: originalAssignedValues = {}, onSuccess, skipValidator, triggerWorkflows } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+            const { assignedValues: originalAssignedValues = {}, onSuccess, skipValidator, triggerWorkflows } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
             const assignedValues = {};
             const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                 const value = originalAssignedValues[key];
                 const collectionField = getField(key);
-                if ((0, __WEBPACK_EXTERNAL_MODULE__variables_utils_isVariable_mjs__.isVariable)(value)) {
+                if (isVariable(value)) {
                     const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                    if (result) assignedValues[key] = (0, __WEBPACK_EXTERNAL_MODULE__variables_utils_transformVariableValue_mjs__.transformVariableValue)(result, {
+                    if (result) assignedValues[key] = transformVariableValue(result, {
                         targetCollectionField: collectionField
                     });
                 } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -551,52 +548,48 @@ const useCustomizeUpdateActionProps = ()=>{
                 triggerWorkflows: getAfterWorkflows(triggerWorkflows),
                 beforeWorkflows: getBeforeWorkflows(triggerWorkflows)
             });
-            null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
-            if (!(resource instanceof __WEBPACK_EXTERNAL_MODULE__TableFieldProvider_mjs__.TableFieldResource)) {
+            null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
+            if (!(resource instanceof TableFieldResource)) {
                 var __parent_service_refresh, __parent_service;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
             }
             if (!(null == onSuccess ? void 0 : onSuccess.successMessage)) return;
             if (null == onSuccess ? void 0 : onSuccess.manualClose) modal.success({
                 title: compile(null == onSuccess ? void 0 : onSuccess.successMessage),
                 onOk: async ()=>{
-                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                        if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                        else navigate(onSuccess.redirectTo);
-                    }
+                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                    else navigate(onSuccess.redirectTo);
                 }
             });
             else {
                 message.success(compile(null == onSuccess ? void 0 : onSuccess.successMessage));
-                if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                    if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                    else navigate(onSuccess.redirectTo);
-                }
+                if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                else navigate(onSuccess.redirectTo);
             }
         }
     };
 };
 const useCustomizeRequestActionProps = ()=>{
     var _currentUserContext_data;
-    const apiClient = (0, __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__.useAPIClient)();
-    const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router_dom__.useNavigate)();
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const { fields, getField } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
-    const { field, resource, __parent, service } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const currentRecord = (0, __WEBPACK_EXTERNAL_MODULE__record_provider_index_mjs__.useRecord)();
-    const currentUserContext = (0, __WEBPACK_EXTERNAL_MODULE__user_index_mjs__.useCurrentUserContext)();
-    const currentUser = null == currentUserContext ? void 0 : null === (_currentUserContext_data = currentUserContext.data) || void 0 === _currentUserContext_data ? void 0 : _currentUserContext_data.data;
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const { setVisible } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const { modal, message } = __WEBPACK_EXTERNAL_MODULE_antd__.App.useApp();
-    const { getActiveFieldsName } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormActiveFields)() || {};
+    const apiClient = useAPIClient();
+    const navigate = useNavigate();
+    const filterByTk = useFilterByTk();
+    const actionSchema = useFieldSchema();
+    const compile = useCompile();
+    const form = useForm();
+    const { fields, getField } = useCollection_deprecated();
+    const { field, resource, __parent, service } = useBlockRequestContext();
+    const currentRecord = useRecord();
+    const currentUserContext = useCurrentUserContext();
+    const currentUser = null == currentUserContext ? void 0 : null == (_currentUserContext_data = currentUserContext.data) ? void 0 : _currentUserContext_data.data;
+    const actionField = useField();
+    const { setVisible } = useActionContext();
+    const { modal, message } = App.useApp();
+    const { getActiveFieldsName } = useFormActiveFields() || {};
     return {
         async onClick () {
             var _actionSchema_xactionsettings;
-            const { skipValidator, onSuccess, requestSettings } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+            const { skipValidator, onSuccess, requestSettings } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
             const xAction = null == actionSchema ? void 0 : actionSchema['x-action'];
             if (!requestSettings['url']) return;
             if (true !== skipValidator && 'customize:form:request' === xAction) await form.submit();
@@ -627,15 +620,15 @@ const useCustomizeRequestActionProps = ()=>{
                     currentUser
                 }),
                 method: requestSettings['method'],
-                headers: (0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.parse)(headers)({
+                headers: parse(headers)({
                     currentRecord,
                     currentUser
                 }),
-                params: (0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.parse)(params)({
+                params: parse(params)({
                     currentRecord,
                     currentUser
                 }),
-                data: (0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.parse)(data)({
+                data: parse(data)({
                     currentRecord,
                     currentUser
                 })
@@ -648,20 +641,18 @@ const useCustomizeRequestActionProps = ()=>{
                     ...requestBody
                 });
                 actionField.data.loading = false;
-                if (!(resource instanceof __WEBPACK_EXTERNAL_MODULE__TableFieldProvider_mjs__.TableFieldResource)) {
+                if (!(resource instanceof TableFieldResource)) {
                     var __parent_service_refresh, __parent_service;
-                    null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                    null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 }
-                null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
+                null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
                 if ('customize:form:request' === xAction) null == setVisible || setVisible(false);
                 if (!(null == onSuccess ? void 0 : onSuccess.successMessage)) return;
                 if (null == onSuccess ? void 0 : onSuccess.manualClose) modal.success({
                     title: compile(null == onSuccess ? void 0 : onSuccess.successMessage),
                     onOk: async ()=>{
-                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                            if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                            else navigate(onSuccess.redirectTo);
-                        }
+                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                        else navigate(onSuccess.redirectTo);
                     }
                 });
                 else message.success(compile(null == onSuccess ? void 0 : onSuccess.successMessage));
@@ -672,34 +663,34 @@ const useCustomizeRequestActionProps = ()=>{
     };
 };
 const useUpdateActionProps = ()=>{
-    const form = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useForm)();
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const { field, resource, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { setVisible } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router_dom__.useNavigate)();
-    const { fields, getField, name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
-    const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-    const actionField = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const { updateAssociationValues } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormBlockContext)();
-    const { modal, message } = __WEBPACK_EXTERNAL_MODULE_antd__.App.useApp();
-    const data = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useParamsFromRecord)();
-    const variables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useVariables)();
-    const localVariables = (0, __WEBPACK_EXTERNAL_MODULE__variables_index_mjs__.useLocalVariables)({
+    const form = useForm();
+    const filterByTk = useFilterByTk();
+    const { field, resource, __parent } = useBlockRequestContext();
+    const { setVisible } = useActionContext();
+    const actionSchema = useFieldSchema();
+    const navigate = useNavigate();
+    const { fields, getField, name } = useCollection_deprecated();
+    const compile = useCompile();
+    const actionField = useField();
+    const { updateAssociationValues } = useFormBlockContext();
+    const { modal, message } = App.useApp();
+    const data = useParamsFromRecord();
+    const variables = useVariables();
+    const localVariables = useLocalVariables({
         currentForm: form
     });
-    const { getActiveFieldsName } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormActiveFields)() || {};
+    const { getActiveFieldsName } = useFormActiveFields() || {};
     return {
         async onClick () {
             var _actionSchema_xactionsettings;
-            const { assignedValues: originalAssignedValues = {}, onSuccess, overwriteValues, skipValidator, triggerWorkflows, isDeltaChanged } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+            const { assignedValues: originalAssignedValues = {}, onSuccess, overwriteValues, skipValidator, triggerWorkflows, isDeltaChanged } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
             const assignedValues = {};
             const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                 const value = originalAssignedValues[key];
                 const collectionField = getField(key);
-                if ((0, __WEBPACK_EXTERNAL_MODULE__variables_utils_isVariable_mjs__.isVariable)(value)) {
+                if (isVariable(value)) {
                     const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                    if (result) assignedValues[key] = (0, __WEBPACK_EXTERNAL_MODULE__variables_utils_transformVariableValue_mjs__.transformVariableValue)(result, {
+                    if (result) assignedValues[key] = transformVariableValue(result, {
                         targetCollectionField: collectionField
                     });
                 } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -743,25 +734,21 @@ const useUpdateActionProps = ()=>{
                     beforeWorkflows: getBeforeWorkflows(triggerWorkflows)
                 });
                 actionField.data.loading = false;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 null == setVisible || setVisible(false);
                 if (!(null == onSuccess ? void 0 : onSuccess.successMessage)) return;
                 if (null == onSuccess ? void 0 : onSuccess.manualClose) modal.success({
                     title: compile(null == onSuccess ? void 0 : onSuccess.successMessage),
                     onOk: async ()=>{
                         await form.reset();
-                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                            if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                            else navigate(onSuccess.redirectTo);
-                        }
+                        if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                        else navigate(onSuccess.redirectTo);
                     }
                 });
                 else {
                     message.success(compile(null == onSuccess ? void 0 : onSuccess.successMessage));
-                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) {
-                        if ((0, __WEBPACK_EXTERNAL_MODULE__tachybase_utils_client__.isURL)(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
-                        else navigate(onSuccess.redirectTo);
-                    }
+                    if ((null == onSuccess ? void 0 : onSuccess.redirecting) && (null == onSuccess ? void 0 : onSuccess.redirectTo)) if (isURL(onSuccess.redirectTo)) window.location.href = onSuccess.redirectTo;
+                    else navigate(onSuccess.redirectTo);
                 }
             } catch (error) {
                 actionField.data.loading = false;
@@ -770,44 +757,44 @@ const useUpdateActionProps = ()=>{
     };
 };
 const useDestroyActionProps = ()=>{
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const { resource, service, block, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { setVisible } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
-    const data = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useParamsFromRecord)();
-    const actionSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const filterByTk = useFilterByTk();
+    const { resource, service, block, __parent } = useBlockRequestContext();
+    const { setVisible } = useActionContext();
+    const data = useParamsFromRecord();
+    const actionSchema = useFieldSchema();
     return {
         async onClick () {
             var _service_data;
             var _actionSchema_xactionsettings;
-            const { triggerWorkflows } = null !== (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) && void 0 !== _actionSchema_xactionsettings ? _actionSchema_xactionsettings : {};
+            const { triggerWorkflows } = null != (_actionSchema_xactionsettings = null == actionSchema ? void 0 : actionSchema['x-action-settings']) ? _actionSchema_xactionsettings : {};
             await resource.destroy({
                 filterByTk,
                 triggerWorkflows: getAfterWorkflows(triggerWorkflows),
                 beforeWorkflows: getBeforeWorkflows(triggerWorkflows),
                 ...data
             });
-            const { count = 0, page = 0, pageSize = 0 } = (null == service ? void 0 : null === (_service_data = service.data) || void 0 === _service_data ? void 0 : _service_data.meta) || {};
+            const { count = 0, page = 0, pageSize = 0 } = (null == service ? void 0 : null == (_service_data = service.data) ? void 0 : _service_data.meta) || {};
             if (count % pageSize === 1 && 1 !== page) {
                 var _service_params;
                 service.run({
-                    ...null == service ? void 0 : null === (_service_params = service.params) || void 0 === _service_params ? void 0 : _service_params[0],
+                    ...null == service ? void 0 : null == (_service_params = service.params) ? void 0 : _service_params[0],
                     page: page - 1
                 });
             } else {
                 var _service_refresh;
-                null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
+                null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
             }
             if (block && 'TableField' !== block) {
                 var __parent_service_refresh, __parent_service;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 null == setVisible || setVisible(false);
             }
         }
     };
 };
 const useRemoveActionProps = (associationName)=>{
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const api = (0, __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__.useAPIClient)();
+    const filterByTk = useFilterByTk();
+    const api = useAPIClient();
     const resource = api.resource(associationName, filterByTk);
     return {
         async onClick (value) {
@@ -820,9 +807,9 @@ const useRemoveActionProps = (associationName)=>{
     };
 };
 const useDisassociateActionProps = ()=>{
-    const filterByTk = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useFilterByTk)();
-    const { resource, service, block, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { setVisible } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useActionContext)();
+    const filterByTk = useFilterByTk();
+    const { resource, service, block, __parent } = useBlockRequestContext();
+    const { setVisible } = useActionContext();
     return {
         async onClick () {
             var _service_data;
@@ -831,28 +818,28 @@ const useDisassociateActionProps = ()=>{
                     filterByTk
                 ]
             });
-            const { count = 0, page = 0, pageSize = 0 } = (null == service ? void 0 : null === (_service_data = service.data) || void 0 === _service_data ? void 0 : _service_data.meta) || {};
+            const { count = 0, page = 0, pageSize = 0 } = (null == service ? void 0 : null == (_service_data = service.data) ? void 0 : _service_data.meta) || {};
             if (count % pageSize === 1 && 1 !== page) {
                 var _service_params;
                 service.run({
-                    ...null == service ? void 0 : null === (_service_params = service.params) || void 0 === _service_params ? void 0 : _service_params[0],
+                    ...null == service ? void 0 : null == (_service_params = service.params) ? void 0 : _service_params[0],
                     page: page - 1
                 });
             } else {
                 var _service_refresh;
-                null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
+                null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
             }
             if (block && 'TableField' !== block) {
                 var __parent_service_refresh, __parent_service;
-                null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 null == setVisible || setVisible(false);
             }
         }
     };
 };
 const useDetailPrintActionProps = ()=>{
-    const { formBlockRef } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useFormBlockContext)();
-    const printHandler = (0, __WEBPACK_EXTERNAL_MODULE_react_to_print__.useReactToPrint)({
+    const { formBlockRef } = useFormBlockContext();
+    const printHandler = useReactToPrint({
         content: ()=>formBlockRef.current,
         pageStyle: "@media print {\n      * {\n        margin: 0;\n      }\n      :not(.ant-formily-item-control-content-component) > div.ant-formily-layout>div:first-child {\n        overflow: hidden; height: 0;\n      }\n    }"
     });
@@ -863,46 +850,46 @@ const useDetailPrintActionProps = ()=>{
     };
 };
 const useBulkDestroyActionProps = ()=>{
-    const { field } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const { resource, service } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
+    const { field } = useBlockRequestContext();
+    const { resource, service } = useBlockRequestContext();
     return {
         async onClick () {
             var _field_data_selectedRowKeys, _field_data, _field_data1, _service_params_, _service_data_meta, _service_data, _service_refresh;
-            if (!(null == field ? void 0 : null === (_field_data = field.data) || void 0 === _field_data ? void 0 : null === (_field_data_selectedRowKeys = _field_data.selectedRowKeys) || void 0 === _field_data_selectedRowKeys ? void 0 : _field_data_selectedRowKeys.length)) return;
+            if (!(null == field ? void 0 : null == (_field_data = field.data) ? void 0 : null == (_field_data_selectedRowKeys = _field_data.selectedRowKeys) ? void 0 : _field_data_selectedRowKeys.length)) return;
             await resource.destroy({
-                filterByTk: null === (_field_data1 = field.data) || void 0 === _field_data1 ? void 0 : _field_data1.selectedRowKeys
+                filterByTk: null == (_field_data1 = field.data) ? void 0 : _field_data1.selectedRowKeys
             });
             field.data.selectedRowKeys = [];
-            const currentPage = null === (_service_params_ = service.params[0]) || void 0 === _service_params_ ? void 0 : _service_params_.page;
-            const totalPage = null === (_service_data = service.data) || void 0 === _service_data ? void 0 : null === (_service_data_meta = _service_data.meta) || void 0 === _service_data_meta ? void 0 : _service_data_meta.totalPage;
+            const currentPage = null == (_service_params_ = service.params[0]) ? void 0 : _service_params_.page;
+            const totalPage = null == (_service_data = service.data) ? void 0 : null == (_service_data_meta = _service_data.meta) ? void 0 : _service_data_meta.totalPage;
             if (currentPage === totalPage) service.params[0].page = currentPage - 1;
-            null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
+            null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
         }
     };
 };
 const useRefreshActionProps = ()=>{
-    const { service } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
+    const { service } = useBlockRequestContext();
     return {
         async onClick () {
             var _service_refresh;
-            null == service || null === (_service_refresh = service.refresh) || void 0 === _service_refresh || _service_refresh.call(service);
+            null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
         }
     };
 };
 const useDetailsPaginationProps = ()=>{
     var _ctx_service_data_meta, _ctx_service_data, _ctx_service, _ctx_service_data_meta1, _ctx_service_data1, _ctx_service1;
-    const ctx = (0, __WEBPACK_EXTERNAL_MODULE__DetailsBlockProvider_mjs__.useDetailsBlockContext)();
-    const count = (null === (_ctx_service = ctx.service) || void 0 === _ctx_service ? void 0 : null === (_ctx_service_data = _ctx_service.data) || void 0 === _ctx_service_data ? void 0 : null === (_ctx_service_data_meta = _ctx_service_data.meta) || void 0 === _ctx_service_data_meta ? void 0 : _ctx_service_data_meta.count) || 0;
+    const ctx = useDetailsBlockContext();
+    const count = (null == (_ctx_service = ctx.service) ? void 0 : null == (_ctx_service_data = _ctx_service.data) ? void 0 : null == (_ctx_service_data_meta = _ctx_service_data.meta) ? void 0 : _ctx_service_data_meta.count) || 0;
     return {
         simple: true,
         hidden: count <= 1,
-        current: (null === (_ctx_service1 = ctx.service) || void 0 === _ctx_service1 ? void 0 : null === (_ctx_service_data1 = _ctx_service1.data) || void 0 === _ctx_service_data1 ? void 0 : null === (_ctx_service_data_meta1 = _ctx_service_data1.meta) || void 0 === _ctx_service_data_meta1 ? void 0 : _ctx_service_data_meta1.page) || 1,
+        current: (null == (_ctx_service1 = ctx.service) ? void 0 : null == (_ctx_service_data1 = _ctx_service1.data) ? void 0 : null == (_ctx_service_data_meta1 = _ctx_service_data1.meta) ? void 0 : _ctx_service_data_meta1.page) || 1,
         total: count,
         pageSize: 1,
         showSizeChanger: false,
         async onChange (page) {
             var _ctx_service_params, _ctx_service;
-            const params = null === (_ctx_service = ctx.service) || void 0 === _ctx_service ? void 0 : null === (_ctx_service_params = _ctx_service.params) || void 0 === _ctx_service_params ? void 0 : _ctx_service_params[0];
+            const params = null == (_ctx_service = ctx.service) ? void 0 : null == (_ctx_service_params = _ctx_service.params) ? void 0 : _ctx_service_params[0];
             ctx.service.run({
                 ...params,
                 page
@@ -916,16 +903,16 @@ const useDetailsPaginationProps = ()=>{
 };
 const useAssociationFilterProps = ()=>{
     var _cm_getCollection, _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops, _field_componentProps, _field_componentProps1;
-    const collectionField = __WEBPACK_EXTERNAL_MODULE__index_mjs__.AssociationFilter.useAssociationField();
-    const { service, props: blockProps } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-    const cm = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
-    const valueKey = (null == collectionField ? void 0 : collectionField.target) ? null === (_cm_getCollection = cm.getCollection(collectionField.target)) || void 0 === _cm_getCollection ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
-    const labelKey = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) || void 0 === _fieldSchema_xcomponentprops_fieldNames ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
-    const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
+    const collectionField = AssociationFilter.useAssociationField();
+    const { service, props: blockProps } = useBlockRequestContext();
+    const fieldSchema = useFieldSchema();
+    const cm = useCollectionManager_deprecated();
+    const valueKey = (null == collectionField ? void 0 : collectionField.target) ? null == (_cm_getCollection = cm.getCollection(collectionField.target)) ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
+    const labelKey = (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : null == (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
+    const field = useField();
     const collectionFieldName = collectionField.name;
-    const headers = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
-    const { data, params, run } = (0, __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__.useRequest)({
+    const headers = useDataSourceHeaders(null == blockProps ? void 0 : blockProps.dataSource);
+    const { data, params, run } = useRequest({
         headers,
         resource: collectionField.target,
         action: 'list',
@@ -936,31 +923,31 @@ const useAssociationFilterProps = ()=>{
             ],
             pageSize: 200,
             page: 1,
-            ...null === (_field_componentProps = field.componentProps) || void 0 === _field_componentProps ? void 0 : _field_componentProps.params
+            ...null == (_field_componentProps = field.componentProps) ? void 0 : _field_componentProps.params
         }
     }, {
         refreshDeps: [
             labelKey,
             valueKey,
-            JSON.stringify((null === (_field_componentProps1 = field.componentProps) || void 0 === _field_componentProps1 ? void 0 : _field_componentProps1.params) || {})
+            JSON.stringify((null == (_field_componentProps1 = field.componentProps) ? void 0 : _field_componentProps1.params) || {})
         ],
         debounceWait: 300
     });
     const list = (null == data ? void 0 : data.data) || [];
     const onSelected = (value)=>{
         var _service_params_, _service_params, _service_params1, _blockProps_params;
-        const filters = (null === (_service_params = service.params) || void 0 === _service_params ? void 0 : null === (_service_params_ = _service_params[1]) || void 0 === _service_params_ ? void 0 : _service_params_.filters) || {};
+        const filters = (null == (_service_params = service.params) ? void 0 : null == (_service_params_ = _service_params[1]) ? void 0 : _service_params_.filters) || {};
         if (value.length) filters["af.".concat(collectionFieldName)] = {
             ["".concat(collectionFieldName, ".").concat(valueKey, ".$in")]: value
         };
         else delete filters["af.".concat(collectionFieldName)];
         service.run({
-            ...null === (_service_params1 = service.params) || void 0 === _service_params1 ? void 0 : _service_params1[0],
+            ...null == (_service_params1 = service.params) ? void 0 : _service_params1[0],
             pageSize: 200,
             page: 1,
-            filter: (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
+            filter: utils_mjs_mergeFilter([
                 ...Object.values(filters),
-                null == blockProps ? void 0 : null === (_blockProps_params = blockProps.params) || void 0 === _blockProps_params ? void 0 : _blockProps_params.filter
+                null == blockProps ? void 0 : null == (_blockProps_params = blockProps.params) ? void 0 : _blockProps_params.filter
             ])
         }, {
             filters
@@ -983,7 +970,7 @@ const useAssociationFilterProps = ()=>{
     };
 };
 const useOptionalFieldList = ()=>{
-    const { currentFields = [] } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
+    const { currentFields = [] } = useCollection_deprecated();
     return currentFields.filter((field)=>isOptionalField(field) && field.uiSchema.enum);
 };
 const isOptionalField = (field)=>{
@@ -998,19 +985,19 @@ const isOptionalField = (field)=>{
 };
 const useAssociationFilterBlockProps = ()=>{
     var _cm_getCollection, _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops, _field_componentProps, _field_componentProps1;
-    const collectionField = __WEBPACK_EXTERNAL_MODULE__index_mjs__.AssociationFilter.useAssociationField();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const collectionField = AssociationFilter.useAssociationField();
+    const fieldSchema = useFieldSchema();
     const optionalFieldList = useOptionalFieldList();
-    const { getDataBlocks } = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_FilterProvider_mjs__.useFilterBlock)();
+    const { getDataBlocks } = useFilterBlock();
     const collectionFieldName = null == collectionField ? void 0 : collectionField.name;
-    const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-    const { props: blockProps } = (0, __WEBPACK_EXTERNAL_MODULE__BlockProvider_mjs__.useBlockRequestContext)();
-    const headers = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
-    const cm = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
+    const field = useField();
+    const { props: blockProps } = useBlockRequestContext();
+    const headers = useDataSourceHeaders(null == blockProps ? void 0 : blockProps.dataSource);
+    const cm = useCollectionManager_deprecated();
     let list, handleSearchInput, params, run, data, valueKey, labelKey, filterKey;
-    valueKey = (null == collectionField ? void 0 : collectionField.target) ? null === (_cm_getCollection = cm.getCollection(collectionField.target)) || void 0 === _cm_getCollection ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
-    labelKey = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) || void 0 === _fieldSchema_xcomponentprops_fieldNames ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
-    ({ data, params, run } = (0, __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__.useRequest)({
+    valueKey = (null == collectionField ? void 0 : collectionField.target) ? null == (_cm_getCollection = cm.getCollection(collectionField.target)) ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
+    labelKey = (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : null == (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) ? void 0 : _fieldSchema_xcomponentprops_fieldNames.label) || valueKey;
+    ({ data, params, run } = useRequest({
         headers,
         resource: null == collectionField ? void 0 : collectionField.target,
         action: 'list',
@@ -1021,18 +1008,18 @@ const useAssociationFilterBlockProps = ()=>{
             ],
             pageSize: 200,
             page: 1,
-            ...null === (_field_componentProps = field.componentProps) || void 0 === _field_componentProps ? void 0 : _field_componentProps.params
+            ...null == (_field_componentProps = field.componentProps) ? void 0 : _field_componentProps.params
         }
     }, {
         manual: true,
         debounceWait: 300
     }));
-    (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
+    useEffect(()=>{
         if (!isOptionalField(fieldSchema)) run();
     }, [
         labelKey,
         valueKey,
-        JSON.stringify((null === (_field_componentProps1 = field.componentProps) || void 0 === _field_componentProps1 ? void 0 : _field_componentProps1.params) || {}),
+        JSON.stringify((null == (_field_componentProps1 = field.componentProps) ? void 0 : _field_componentProps1.params) || {}),
         isOptionalField(fieldSchema)
     ]);
     if (!collectionField) return {};
@@ -1045,7 +1032,7 @@ const useAssociationFilterBlockProps = ()=>{
             checkbox: '$in',
             checkboxGroup: '$anyOf'
         };
-        const _list = (null == field ? void 0 : null === (_field_uiSchema = field.uiSchema) || void 0 === _field_uiSchema ? void 0 : _field_uiSchema.enum) || [];
+        const _list = (null == field ? void 0 : null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.enum) || [];
         valueKey = 'value';
         labelKey = 'label';
         list = _list;
@@ -1079,8 +1066,8 @@ const useAssociationFilterBlockProps = ()=>{
             const target = targets.find((target)=>target.uid === block.uid);
             if (!target) return;
             const key = "".concat(uid).concat(fieldSchema.name);
-            const param = (null === (_block_service_params = block.service.params) || void 0 === _block_service_params ? void 0 : _block_service_params[0]) || {};
-            const storedFilter = (null === (_block_service_params1 = block.service.params) || void 0 === _block_service_params1 ? void 0 : null === (_block_service_params_ = _block_service_params1[1]) || void 0 === _block_service_params_ ? void 0 : _block_service_params_.filters) || {};
+            const param = (null == (_block_service_params = block.service.params) ? void 0 : _block_service_params[0]) || {};
+            const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
             if (value.length) storedFilter[key] = {
                 [filterKey]: value
             };
@@ -1088,7 +1075,7 @@ const useAssociationFilterBlockProps = ()=>{
                 if ('manual' === block.dataLoadingMode) return block.clearData();
                 delete storedFilter[key];
             }
-            const mergedFilter = (0, __WEBPACK_EXTERNAL_MODULE__filter_provider_utils_mjs__.mergeFilter)([
+            const mergedFilter = utils_mjs_mergeFilter([
                 ...Object.values(storedFilter),
                 block.defaultFilter
             ]);
@@ -1119,8 +1106,8 @@ function getAssociationPath(str) {
 const useAssociationNames = (dataSource)=>{
     let updateAssociationValues = new Set([]);
     let appends = new Set([]);
-    const { getCollectionJoinField, getCollection } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)(dataSource);
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const { getCollectionJoinField, getCollection } = useCollectionManager_deprecated(dataSource);
+    const fieldSchema = useFieldSchema();
     const _getAssociationAppends = (schema, str)=>{
         schema.reduceProperties((pre, s)=>{
             var _s_xcomponentprops, _s_xcomponentprops_fieldNames, _s_xcomponentprops1, _s_xcomponentprops2, _getCollection;
@@ -1133,17 +1120,17 @@ const useAssociationNames = (dataSource)=>{
                 'belongsTo',
                 'belongsToMany'
             ].includes(collectionField.type);
-            if (null === (_s_xcomponentprops = s['x-component-props']) || void 0 === _s_xcomponentprops ? void 0 : _s_xcomponentprops['appends']) {
+            if (null == (_s_xcomponentprops = s['x-component-props']) ? void 0 : _s_xcomponentprops['appends']) {
                 var _s_xcomponentprops3;
-                __WEBPACK_EXTERNAL_MODULE_lodash__["default"].forEach(null === (_s_xcomponentprops3 = s['x-component-props']) || void 0 === _s_xcomponentprops3 ? void 0 : _s_xcomponentprops3['appends'], (append)=>{
+                lodash.forEach(null == (_s_xcomponentprops3 = s['x-component-props']) ? void 0 : _s_xcomponentprops3['appends'], (append)=>{
                     appends.add(append);
                 });
             }
-            if (null === (_s_xcomponentprops1 = s['x-component-props']) || void 0 === _s_xcomponentprops1 ? void 0 : null === (_s_xcomponentprops_fieldNames = _s_xcomponentprops1.fieldNames) || void 0 === _s_xcomponentprops_fieldNames ? void 0 : _s_xcomponentprops_fieldNames.formula) {
+            if (null == (_s_xcomponentprops1 = s['x-component-props']) ? void 0 : null == (_s_xcomponentprops_fieldNames = _s_xcomponentprops1.fieldNames) ? void 0 : _s_xcomponentprops_fieldNames.formula) {
                 var _s_xcomponentprops_fieldNames1, _s_xcomponentprops4;
                 appends.add(s['name']);
                 const regex = /{{(.*?)}}/g;
-                const formula = null === (_s_xcomponentprops4 = s['x-component-props']) || void 0 === _s_xcomponentprops4 ? void 0 : null === (_s_xcomponentprops_fieldNames1 = _s_xcomponentprops4.fieldNames) || void 0 === _s_xcomponentprops_fieldNames1 ? void 0 : _s_xcomponentprops_fieldNames1.formula;
+                const formula = null == (_s_xcomponentprops4 = s['x-component-props']) ? void 0 : null == (_s_xcomponentprops_fieldNames1 = _s_xcomponentprops4.fieldNames) ? void 0 : _s_xcomponentprops_fieldNames1.formula;
                 let match;
                 while(match = regex.exec(formula))if (match[1].includes('.')) {
                     const matchList = match[1].split('.');
@@ -1171,13 +1158,13 @@ const useAssociationNames = (dataSource)=>{
                     collectAppends(condition);
                 });
             }
-            if (null === (_s_xcomponentprops2 = s['x-component-props']) || void 0 === _s_xcomponentprops2 ? void 0 : _s_xcomponentprops2['x-next-title']) {
+            if (null == (_s_xcomponentprops2 = s['x-component-props']) ? void 0 : _s_xcomponentprops2['x-next-title']) {
                 const pre = prefix && '' !== prefix ? prefix + '.' + s.name : s.name;
                 const title = s['x-component-props']['x-next-title'];
                 const path = pre + '.' + title.label;
                 appends.add(path);
             }
-            const isTreeCollection = isAssociationField && (null === (_getCollection = getCollection(collectionField.target, dataSource)) || void 0 === _getCollection ? void 0 : _getCollection.template) === 'tree';
+            const isTreeCollection = isAssociationField && (null == (_getCollection = getCollection(collectionField.target, dataSource)) ? void 0 : _getCollection.template) === 'tree';
             if (collectionField && (isAssociationField || isAssociationSubfield) && 'TableField' !== s['x-component']) {
                 var _s_xcomponentprops5;
                 const fieldPath = !isAssociationField && isAssociationSubfield ? getAssociationPath(s.name) : s.name;
@@ -1190,7 +1177,7 @@ const useAssociationNames = (dataSource)=>{
                     'Nester',
                     'SubTable',
                     'PopoverNester'
-                ].includes(null === (_s_xcomponentprops5 = s['x-component-props']) || void 0 === _s_xcomponentprops5 ? void 0 : _s_xcomponentprops5.mode)) {
+                ].includes(null == (_s_xcomponentprops5 = s['x-component-props']) ? void 0 : _s_xcomponentprops5.mode)) {
                     updateAssociationValues.add(path);
                     const bufPrefix = prefix && '' !== prefix ? prefix + '.' + s.name : s.name;
                     _getAssociationAppends(s, bufPrefix);
@@ -1239,16 +1226,16 @@ function getTargetField(obj) {
         return keys;
     }
     const keys = getAllKeys(obj);
-    const index = __WEBPACK_EXTERNAL_MODULE_lodash__["default"].findIndex(keys, (key, index)=>{
+    const index = lodash.findIndex(keys, (key, index)=>{
         if (key.includes('$') && index > 0) return true;
     });
     const result = keys.slice(0, index);
     return result;
 }
 async function resetFormCorrectly(form) {
-    (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.untracked)(()=>{
+    untracked(()=>{
         Object.keys(form.fields).forEach((key)=>{
-            if ((0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_util_mjs__.isSubMode)(form.fields[key])) form.fields[key].initialValue = null;
+            if (isSubMode(form.fields[key])) form.fields[key].initialValue = null;
         });
     });
     await form.reset();