@tachybase/client 1.6.21 → 1.6.22

package/es/schema-component/antd/form-item/SchemaSettingOptions.mjs

@@ -11,33 +11,7 @@ import { isPatternDisabled } from "../../../schema-settings/isPatternDisabled.mj
 import { useCompile, useDesignable, useFieldModeOptions } from "../../hooks/index.mjs";
 import { useOperatorList } from "../filter/useOperators.mjs";
 import { isFileCollection } from "./FormItem.mjs";
-const findFilterOperators = (schema)=>{
-    while(schema){
-        if (schema['x-filter-operators']) return {
-            operators: schema['x-filter-operators'],
-            uid: schema['x-uid']
-        };
-        schema = schema.parent;
-    }
-    return {};
-};
-const getSchemaFilterComponent = (schema)=>{
-    var _schema_xcomponentprops;
-    return (null == schema ? void 0 : null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : _schema_xcomponentprops.component) || (null == schema ? void 0 : schema['x-component']);
-};
-const getDefaultFilterOperatorValue = function(schema) {
-    let operatorList = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : [];
-    var _operatorList_find, _operatorList_;
-    const component = getSchemaFilterComponent(schema);
-    if (component) {
-        const matched = operatorList.find((item)=>{
-            var _item_schema;
-            return (null == item ? void 0 : null == (_item_schema = item.schema) ? void 0 : _item_schema['x-component']) === component;
-        });
-        if (null == matched ? void 0 : matched.value) return matched.value;
-    }
-    return (null == (_operatorList_find = operatorList.find((item)=>null == item ? void 0 : item.selected)) ? void 0 : _operatorList_find.value) || (null == (_operatorList_ = operatorList[0]) ? void 0 : _operatorList_.value);
-};
+import { findFilterOperators, getDefaultFilterOperatorValue, useEnsureOperatorsValid } from "./operatorUtils.mjs";
 const EditTitle = ()=>{
     var _collectionField_uiSchema;
     const { getCollectionJoinField } = useCollectionManager_deprecated();
@@ -441,12 +415,6 @@ const EditPattern = ()=>{
         }
     }, "pattern");
 };
-const useEnsureOperatorsValid = ()=>{
-    const fieldSchema = useFieldSchema();
-    const operatorList = useOperatorList();
-    const { operators: storedOperators } = findFilterOperators(fieldSchema);
-    if (storedOperators && operatorList.length && !storedOperators[fieldSchema.name]) storedOperators[fieldSchema.name] = getDefaultFilterOperatorValue(fieldSchema, operatorList);
-};
 const EditOperator = ()=>{
     const compile = useCompile();
     const fieldSchema = useFieldSchema();

package/es/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.mjs

@@ -3,10 +3,11 @@ import { useField, useFieldSchema, useForm } from "@tachybase/schema";
 import { nextTick } from "@tego/client";
 import lodash from "lodash";
 import { useAssociationNames } from "../../../../block-provider/hooks/index.mjs";
-import { useCollectionManager_deprecated, useCollection_deprecated } from "../../../../collection-manager/index.mjs";
+import { useCollection_deprecated } from "../../../../collection-manager/hooks/useCollection_deprecated.mjs";
+import { useCollectionManager_deprecated } from "../../../../collection-manager/hooks/useCollectionManager_deprecated.mjs";
 import { useCollectionRecordData } from "../../../../data-source/collection-record/CollectionRecordProvider.mjs";
-import { useFlag } from "../../../../flag-provider/index.mjs";
-import { useVariables } from "../../../../variables/index.mjs";
+import { useFlag } from "../../../../flag-provider/hooks/useFlag.mjs";
+import useVariables from "../../../../variables/hooks/useVariables.mjs";
 import { transformVariableValue } from "../../../../variables/utils/transformVariableValue.mjs";
 import { useSubFormValue } from "../../association-field/hooks.mjs";
 import { isDisplayField } from "../utils.mjs";

package/es/schema-component/antd/form-item/hooks/useParseDefaultValue.mjs

@@ -3,10 +3,12 @@ import { reaction, useField, useFieldSchema } from "@tachybase/schema";
 import { getValuesByPath } from "@tego/client";
 import lodash from "lodash";
 import { useRecordIndex } from "../../../../record-provider/index.mjs";
-import { useCollection_deprecated } from "../../../../collection-manager/index.mjs";
+import { useCollection_deprecated } from "../../../../collection-manager/hooks/useCollection_deprecated.mjs";
 import { useCollectionRecord } from "../../../../data-source/collection-record/CollectionRecordProvider.mjs";
-import { useFlag } from "../../../../flag-provider/index.mjs";
-import { DEBOUNCE_WAIT, useLocalVariables, useVariables } from "../../../../variables/index.mjs";
+import { useFlag } from "../../../../flag-provider/hooks/useFlag.mjs";
+import { DEBOUNCE_WAIT } from "../../../../variables/constants.mjs";
+import useLocalVariables from "../../../../variables/hooks/useLocalVariables.mjs";
+import useVariables from "../../../../variables/hooks/useVariables.mjs";
 import { getPath } from "../../../../variables/utils/getPath.mjs";
 import { getVariableName } from "../../../../variables/utils/getVariableName.mjs";
 import { isVariable } from "../../../../variables/utils/isVariable.mjs";

package/es/schema-component/antd/form-item/operatorUtils.d.ts

@@ -0,0 +1,14 @@
+import { Schema } from '@tachybase/schema';
+export declare const findFilterOperators: (schema: Schema) => {
+    operators: any;
+    uid: any;
+} | {
+    operators?: undefined;
+    uid?: undefined;
+};
+export declare const getDefaultFilterOperatorValue: (schema: Schema, operatorList?: any[]) => any;
+/**
+ * 如果用户没有手动设置过 operator，那么在筛选的时候 operator 会是空的，
+ * 该方法确保 operator 一定有值（需要在 FormItem 中调用）
+ */
+export declare const useEnsureOperatorsValid: () => void;

package/es/schema-component/antd/form-item/operatorUtils.mjs

@@ -0,0 +1,36 @@
+import { useFieldSchema } from "@tachybase/schema";
+import { useOperatorList } from "../filter/useOperators.mjs";
+const findFilterOperators = (schema)=>{
+    while(schema){
+        if (schema['x-filter-operators']) return {
+            operators: schema['x-filter-operators'],
+            uid: schema['x-uid']
+        };
+        schema = schema.parent;
+    }
+    return {};
+};
+const getSchemaFilterComponent = (schema)=>{
+    var _schema_xcomponentprops;
+    return (null == schema ? void 0 : null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : _schema_xcomponentprops.component) || (null == schema ? void 0 : schema['x-component']);
+};
+const getDefaultFilterOperatorValue = function(schema) {
+    let operatorList = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : [];
+    var _operatorList_find, _operatorList_;
+    const component = getSchemaFilterComponent(schema);
+    if (component) {
+        const matched = operatorList.find((item)=>{
+            var _item_schema;
+            return (null == item ? void 0 : null == (_item_schema = item.schema) ? void 0 : _item_schema['x-component']) === component;
+        });
+        if (null == matched ? void 0 : matched.value) return matched.value;
+    }
+    return (null == (_operatorList_find = operatorList.find((item)=>null == item ? void 0 : item.selected)) ? void 0 : _operatorList_find.value) || (null == (_operatorList_ = operatorList[0]) ? void 0 : _operatorList_.value);
+};
+const useEnsureOperatorsValid = ()=>{
+    const fieldSchema = useFieldSchema();
+    const operatorList = useOperatorList();
+    const { operators: storedOperators } = findFilterOperators(fieldSchema);
+    if (storedOperators && operatorList.length && !storedOperators[fieldSchema.name]) storedOperators[fieldSchema.name] = getDefaultFilterOperatorValue(fieldSchema, operatorList);
+};
+export { findFilterOperators, getDefaultFilterOperatorValue, useEnsureOperatorsValid };

package/es/schema-component/antd/form-v2/Form.mjs

@@ -1,20 +1,14 @@
 import { jsx } from "react/jsx-runtime";
-import { useEffect, useMemo } from "react";
-import { FieldContext, FormContext, RecursionField, createForm, observer, onFieldInit, onFormInputChange, reaction, uid, useField, useFieldSchema } from "@tachybase/schema";
-import { FormLayout, getValuesByPath } from "@tego/client";
+import react, { useEffect, useMemo } from "react";
+import { FieldContext, FormContext, RecursionField, createForm, observer, onFormInputChange, uid, useField, useFieldSchema } from "@tachybase/schema";
+import { FormLayout } from "@tego/client";
 import { ConfigProvider, Spin } from "antd";
 import { createStyles } from "antd-style";
-import { useActionContext } from "../index.mjs";
-import { useAttach, useComponent } from "../../index.mjs";
 import { withDynamicSchemaProps } from "../../../application/hoc/withDynamicSchemaProps.mjs";
-import { ActionType } from "../../../schema-settings/LinkageRules/type.mjs";
-import { useLocalVariables, useVariables } from "../../../variables/index.mjs";
-import { getPath } from "../../../variables/utils/getPath.mjs";
-import { getVariableName } from "../../../variables/utils/getVariableName.mjs";
-import { REGEX_OF_VARIABLE, isVariable } from "../../../variables/utils/isVariable.mjs";
-import { getInnermostKeyAndValue, getTargetField } from "../../common/utils/uitls.mjs";
+import { useAttach } from "../../hooks/useAttach.mjs";
+import { useComponent } from "../../hooks/useComponent.mjs";
 import { useProps } from "../../hooks/useProps.mjs";
-import { collectFieldStateOfLinkageRules, getTempFieldState } from "./utils.mjs";
+import { useActionContext } from "../action/hooks.mjs";
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
     return Object.freeze(Object.defineProperties(strings, {
@@ -32,6 +26,9 @@ function _templateObject() {
     };
     return data;
 }
+const LazyFormLinkageRules = /*#__PURE__*/ react.lazy(()=>import("./FormLinkageRules.mjs").then((module)=>({
+            default: module.FormLinkageRules
+        })));
 const useStyles = createStyles((param)=>{
     let { css } = param;
     return {
@@ -102,15 +99,14 @@ const getLinkageRules = (fieldSchema)=>{
     return linkageRules;
 };
 const WithForm = (props)=>{
-    var _this, _fieldSchema_parent;
+    var _fieldSchema_parent;
     const { form } = props;
     const fieldSchema = useFieldSchema();
     const { setFormValueChanged } = useActionContext();
-    const variables = useVariables();
-    const localVariables = useLocalVariables({
-        currentForm: form
-    });
-    const linkageRules = (null == (_this = getLinkageRules(fieldSchema) || (null == (_fieldSchema_parent = fieldSchema.parent) ? void 0 : _fieldSchema_parent['x-linkage-rules'])) ? void 0 : _this.filter((k)=>!k.disabled)) || [];
+    const rawLinkageRules = getLinkageRules(fieldSchema) || (null == (_fieldSchema_parent = fieldSchema.parent) ? void 0 : _fieldSchema_parent['x-linkage-rules']);
+    const linkageRules = useMemo(()=>(null == rawLinkageRules ? void 0 : rawLinkageRules.filter((rule)=>!rule.disabled)) || [], [
+        rawLinkageRules
+    ]);
     useEffect(()=>{
         const id = uid();
         form.addEffects(id, ()=>{
@@ -127,71 +123,28 @@ const WithForm = (props)=>{
         props.disabled,
         setFormValueChanged
     ]);
-    useEffect(()=>{
-        const id = uid();
-        const disposes = [];
-        form.addEffects(id, ()=>{
-            linkageRules.forEach((rule)=>{
-                var _rule_actions;
-                null == (_rule_actions = rule.actions) || _rule_actions.forEach((action)=>{
-                    var _action_targetFields;
-                    if (null == (_action_targetFields = action.targetFields) ? void 0 : _action_targetFields.length) {
-                        const fields = action.targetFields.join(',');
-                        onFieldInit("*(".concat(fields, ")"), (field, form)=>{
-                            var _field_initStateOfLinkageRules, _field_initStateOfLinkageRules1, _field_initStateOfLinkageRules2, _field_initStateOfLinkageRules3;
-                            field['initStateOfLinkageRules'] = {
-                                display: (null == (_field_initStateOfLinkageRules = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules.display) || getTempFieldState(true, field.display),
-                                required: (null == (_field_initStateOfLinkageRules1 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules1.required) || getTempFieldState(true, field.required || false),
-                                pattern: (null == (_field_initStateOfLinkageRules2 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules2.pattern) || getTempFieldState(true, field.pattern),
-                                value: (null == (_field_initStateOfLinkageRules3 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules3.value) || getTempFieldState(true, field.value || field.initialValue)
-                            };
-                            disposes.push(reaction(()=>{
-                                const fieldValuesInCondition = getFieldValuesInCondition({
-                                    linkageRules,
-                                    formValues: form.values
-                                });
-                                const variableValuesInCondition = getVariableValuesInCondition({
-                                    linkageRules,
-                                    localVariables
-                                });
-                                const variableValuesInExpression = getVariableValuesInExpression({
-                                    action,
-                                    localVariables
-                                });
-                                const result = [
-                                    fieldValuesInCondition,
-                                    variableValuesInCondition,
-                                    variableValuesInExpression
-                                ].map((item)=>JSON.stringify(item)).join(',');
-                                return result;
-                            }, getSubscriber(action, field, rule, variables, localVariables), {
-                                fireImmediately: true
-                            }));
-                        });
-                    }
-                });
-            });
-        });
-        return ()=>{
-            form.removeEffects(id);
-            disposes.forEach((dispose)=>{
-                dispose();
-            });
-        };
-    }, [
-        linkageRules
-    ]);
-    return 'FormV2' === fieldSchema['x-decorator'] ? /*#__PURE__*/ jsx(FormDecorator, {
+    const formElement = 'FormV2' === fieldSchema['x-decorator'] ? /*#__PURE__*/ jsx(FormDecorator, {
         ...props
     }) : /*#__PURE__*/ jsx(FormComponent, {
         ...props
     });
+    if (!linkageRules.length) return formElement;
+    return /*#__PURE__*/ jsx(react.Suspense, {
+        fallback: formElement,
+        children: /*#__PURE__*/ jsx(LazyFormLinkageRules, {
+            form: form,
+            linkageRules: linkageRules,
+            children: formElement
+        })
+    });
 };
 const WithoutForm = (props)=>{
     const fieldSchema = useFieldSchema();
     const { setFormValueChanged } = useActionContext();
     const form = useMemo(()=>createForm({
             disabled: props.disabled,
+            initialValues: props.initialValues,
+            values: props.initialValues,
             effects () {
                 onFormInputChange((form)=>{
                     null == setFormValueChanged || setFormValueChanged(true);
@@ -232,98 +185,4 @@ const Form = withDynamicSchemaProps(observer((props)=>{
 }), {
     displayName: 'Form'
 });
-function getSubscriber(action, field, rule, variables, localVariables) {
-    return ()=>{
-        collectFieldStateOfLinkageRules({
-            operator: action.operator,
-            value: action.value,
-            field,
-            condition: rule.condition,
-            variables,
-            localVariables
-        });
-        setTimeout(async ()=>{
-            var _field_stateOfLinkageRules;
-            const fieldName = getFieldNameByOperator(action.operator);
-            if (!(null == (_field_stateOfLinkageRules = field.stateOfLinkageRules) ? void 0 : _field_stateOfLinkageRules[fieldName])) return;
-            let stateList = field.stateOfLinkageRules[fieldName];
-            stateList = await Promise.all(stateList);
-            stateList = stateList.filter((v)=>v.condition);
-            const lastState = stateList[stateList.length - 1];
-            if ('value' === fieldName) {
-                if (stateList.length > 1) field.value = lastState.value;
-            } else {
-                field[fieldName] = null == lastState ? void 0 : lastState.value;
-                if ('display' === fieldName && (null == lastState ? void 0 : lastState.value) === 'none') field.value = void 0;
-            }
-            field.stateOfLinkageRules[fieldName] = null;
-        });
-    };
-}
-function getFieldNameByOperator(operator) {
-    switch(operator){
-        case ActionType.Required:
-        case ActionType.InRequired:
-            return 'required';
-        case ActionType.Visible:
-        case ActionType.None:
-        case ActionType.Hidden:
-            return 'display';
-        case ActionType.Editable:
-        case ActionType.ReadOnly:
-        case ActionType.ReadPretty:
-            return 'pattern';
-        case ActionType.Value:
-            return 'value';
-        default:
-            return null;
-    }
-}
-function getFieldValuesInCondition(param) {
-    let { linkageRules, formValues } = param;
-    return linkageRules.map((rule)=>{
-        const run = (condition)=>{
-            const type = Object.keys(condition)[0] || '$and';
-            const conditions = condition[type];
-            return conditions.map((condition)=>{
-                if ('$and' in condition || '$or' in condition) return run(condition);
-                const path = getTargetField(condition).join('.');
-                return getValuesByPath(formValues, path);
-            }).filter(Boolean);
-        };
-        return run(rule.condition);
-    });
-}
-function getVariableValuesInCondition(param) {
-    let { linkageRules, localVariables } = param;
-    return linkageRules.map((rule)=>{
-        const type = Object.keys(rule.condition)[0] || '$and';
-        const conditions = rule.condition[type];
-        return conditions.map((condition)=>{
-            const jsonlogic = getInnermostKeyAndValue(condition);
-            if (!jsonlogic) return null;
-            if (isVariable(jsonlogic.value)) return getVariableValue(jsonlogic.value, localVariables);
-            return jsonlogic.value;
-        }).filter(Boolean);
-    });
-}
-function getVariableValuesInExpression(param) {
-    let { action, localVariables } = param;
-    var _value_match;
-    const actionValue = action.value;
-    const mode = null == actionValue ? void 0 : actionValue.mode;
-    const value = (null == actionValue ? void 0 : actionValue.value) || (null == actionValue ? void 0 : actionValue.result);
-    if ('express' !== mode) return;
-    if (null == value) return;
-    return null == (_value_match = value.match(REGEX_OF_VARIABLE)) ? void 0 : _value_match.map((variableString)=>getVariableValue(variableString, localVariables)).filter(Boolean);
-}
-function getVariableValue(variableString, localVariables) {
-    var _localVariables_find;
-    if (!isVariable(variableString)) return;
-    const variableName = getVariableName(variableString);
-    const ctx = {
-        [variableName]: null == (_localVariables_find = localVariables.find((item)=>item.name === variableName)) ? void 0 : _localVariables_find.ctx
-    };
-    return getValuesByPath(ctx, getPath(variableString));
-}
 export { Form };

package/es/schema-component/antd/form-v2/FormLinkageRules.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import { Form as FormilyForm } from '@tachybase/schema';
+interface FormLinkageRulesProps {
+    children: React.ReactNode;
+    form: FormilyForm;
+    linkageRules: any[];
+}
+export declare const FormLinkageRules: ({ children, form, linkageRules }: FormLinkageRulesProps) => import("react/jsx-runtime").JSX.Element;
+export {};

package/es/schema-component/antd/form-v2/FormLinkageRules.mjs

@@ -0,0 +1,191 @@
+import { Fragment, jsx } from "react/jsx-runtime";
+import { useEffect, useRef } from "react";
+import { onFieldInit, reaction, uid } from "@tachybase/schema";
+import { getValuesByPath } from "@tego/client";
+import { ActionType } from "../../../schema-settings/LinkageRules/type.mjs";
+import useLocalVariables from "../../../variables/hooks/useLocalVariables.mjs";
+import useVariables from "../../../variables/hooks/useVariables.mjs";
+import { getPath } from "../../../variables/utils/getPath.mjs";
+import { getVariableName } from "../../../variables/utils/getVariableName.mjs";
+import { REGEX_OF_VARIABLE, isVariable } from "../../../variables/utils/isVariable.mjs";
+import { getInnermostKeyAndValue, getTargetField } from "../../common/utils/uitls.mjs";
+import { collectFieldStateOfLinkageRules, getTempFieldState } from "./utils.mjs";
+const FormLinkageRules = (param)=>{
+    let { children, form, linkageRules } = param;
+    const variables = useVariables();
+    const localVariables = useLocalVariables({
+        currentForm: form
+    });
+    const variablesRef = useRef(variables);
+    const localVariablesRef = useRef(localVariables);
+    variablesRef.current = variables;
+    localVariablesRef.current = localVariables;
+    useEffect(()=>{
+        const id = uid();
+        const disposes = [];
+        const timers = new Set();
+        let disposed = false;
+        form.addEffects(id, ()=>{
+            linkageRules.forEach((rule)=>{
+                var _rule_actions;
+                null == (_rule_actions = rule.actions) || _rule_actions.forEach((action)=>{
+                    var _action_targetFields;
+                    if (null == (_action_targetFields = action.targetFields) ? void 0 : _action_targetFields.length) {
+                        const fields = action.targetFields.join(',');
+                        onFieldInit("*(".concat(fields, ")"), (field, form)=>{
+                            var _field_initStateOfLinkageRules, _field_initStateOfLinkageRules1, _field_initStateOfLinkageRules2, _field_initStateOfLinkageRules3;
+                            field['initStateOfLinkageRules'] = {
+                                display: (null == (_field_initStateOfLinkageRules = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules.display) || getTempFieldState(true, field.display),
+                                required: (null == (_field_initStateOfLinkageRules1 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules1.required) || getTempFieldState(true, field.required || false),
+                                pattern: (null == (_field_initStateOfLinkageRules2 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules2.pattern) || getTempFieldState(true, field.pattern),
+                                value: (null == (_field_initStateOfLinkageRules3 = field.initStateOfLinkageRules) ? void 0 : _field_initStateOfLinkageRules3.value) || getTempFieldState(true, field.value || field.initialValue)
+                            };
+                            disposes.push(reaction(()=>{
+                                const latestLocalVariables = localVariablesRef.current;
+                                const fieldValuesInCondition = getFieldValuesInCondition({
+                                    linkageRules,
+                                    formValues: form.values
+                                });
+                                const variableValuesInCondition = getVariableValuesInCondition({
+                                    linkageRules,
+                                    localVariables: latestLocalVariables
+                                });
+                                const variableValuesInExpression = getVariableValuesInExpression({
+                                    action,
+                                    localVariables: latestLocalVariables
+                                });
+                                return [
+                                    fieldValuesInCondition,
+                                    variableValuesInCondition,
+                                    variableValuesInExpression
+                                ].map((item)=>JSON.stringify(item)).join(',');
+                            }, getSubscriber(action, field, rule, variablesRef, localVariablesRef, {
+                                timers,
+                                isDisposed: ()=>disposed
+                            }), {
+                                fireImmediately: true
+                            }));
+                        });
+                    }
+                });
+            });
+        });
+        return ()=>{
+            disposed = true;
+            form.removeEffects(id);
+            disposes.forEach((dispose)=>{
+                dispose();
+            });
+            timers.forEach((timer)=>{
+                clearTimeout(timer);
+            });
+            timers.clear();
+        };
+    }, [
+        form,
+        linkageRules
+    ]);
+    return /*#__PURE__*/ jsx(Fragment, {
+        children: children
+    });
+};
+function getSubscriber(action, field, rule, variablesRef, localVariablesRef, scheduler) {
+    return ()=>{
+        if (scheduler.isDisposed()) return;
+        collectFieldStateOfLinkageRules({
+            operator: action.operator,
+            value: action.value,
+            field,
+            condition: rule.condition,
+            variables: variablesRef.current,
+            localVariables: localVariablesRef.current
+        });
+        const timer = setTimeout(async ()=>{
+            var _field_stateOfLinkageRules;
+            scheduler.timers.delete(timer);
+            if (scheduler.isDisposed()) return;
+            const fieldName = getFieldNameByOperator(action.operator);
+            if (!(null == (_field_stateOfLinkageRules = field.stateOfLinkageRules) ? void 0 : _field_stateOfLinkageRules[fieldName])) return;
+            let stateList = field.stateOfLinkageRules[fieldName];
+            stateList = await Promise.all(stateList);
+            if (scheduler.isDisposed()) return;
+            stateList = stateList.filter((v)=>v.condition);
+            const lastState = stateList[stateList.length - 1];
+            if ('value' === fieldName) {
+                if (stateList.length > 1) field.value = lastState.value;
+            } else {
+                field[fieldName] = null == lastState ? void 0 : lastState.value;
+                if ('display' === fieldName && (null == lastState ? void 0 : lastState.value) === 'none') field.value = void 0;
+            }
+            field.stateOfLinkageRules[fieldName] = null;
+        });
+        scheduler.timers.add(timer);
+    };
+}
+function getFieldNameByOperator(operator) {
+    switch(operator){
+        case ActionType.Required:
+        case ActionType.InRequired:
+            return 'required';
+        case ActionType.Visible:
+        case ActionType.None:
+        case ActionType.Hidden:
+            return 'display';
+        case ActionType.Editable:
+        case ActionType.ReadOnly:
+        case ActionType.ReadPretty:
+            return 'pattern';
+        case ActionType.Value:
+            return 'value';
+        default:
+            return null;
+    }
+}
+function getFieldValuesInCondition(param) {
+    let { linkageRules, formValues } = param;
+    return linkageRules.map((rule)=>{
+        const run = (condition)=>{
+            const type = Object.keys(condition)[0] || '$and';
+            const conditions = condition[type];
+            return conditions.map((condition)=>{
+                if ('$and' in condition || '$or' in condition) return run(condition);
+                const path = getTargetField(condition).join('.');
+                return getValuesByPath(formValues, path);
+            }).filter(Boolean);
+        };
+        return run(rule.condition);
+    });
+}
+function getVariableValuesInCondition(param) {
+    let { linkageRules, localVariables } = param;
+    return linkageRules.map((rule)=>{
+        const type = Object.keys(rule.condition)[0] || '$and';
+        const conditions = rule.condition[type];
+        return conditions.map((condition)=>{
+            const jsonlogic = getInnermostKeyAndValue(condition);
+            if (!jsonlogic) return null;
+            if (isVariable(jsonlogic.value)) return getVariableValue(jsonlogic.value, localVariables);
+            return jsonlogic.value;
+        }).filter(Boolean);
+    });
+}
+function getVariableValuesInExpression(param) {
+    let { action, localVariables } = param;
+    var _value_match;
+    const actionValue = action.value;
+    const mode = null == actionValue ? void 0 : actionValue.mode;
+    const value = (null == actionValue ? void 0 : actionValue.value) || (null == actionValue ? void 0 : actionValue.result);
+    if ('express' !== mode) return;
+    if (null == value) return;
+    return null == (_value_match = value.match(REGEX_OF_VARIABLE)) ? void 0 : _value_match.map((variableString)=>getVariableValue(variableString, localVariables)).filter(Boolean);
+}
+function getVariableValue(variableString, localVariables) {
+    var _localVariables_find;
+    if (!isVariable(variableString)) return;
+    const variableName = getVariableName(variableString);
+    const ctx = {
+        [variableName]: null == (_localVariables_find = localVariables.find((item)=>item.name === variableName)) ? void 0 : _localVariables_find.ctx
+    };
+    return getValuesByPath(ctx, getPath(variableString));
+}
+export { FormLinkageRules };

package/es/schema-component/antd/form-v2/Templates.mjs

@@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next";
 import { useToken } from "../__builtins__/index.mjs";
 import { useAPIClient } from "../../../api-client/index.mjs";
 import { findFormBlock } from "../../../block-provider/index.mjs";
-import { useFormBlockContext } from "../../../block-provider/FormBlockProvider.mjs";
+import { useFormBlockContext } from "../../../block-provider/FormBlockContext.mjs";
 import { useCollectionManager_deprecated } from "../../../collection-manager/index.mjs";
 import { compatibleDataId } from "../../../schema-settings/DataTemplates/FormDataTemplates.mjs";
 import { RemoteSelect } from "../remote-select/index.mjs";

package/es/schema-component/antd/grid/Grid.mjs

@@ -2,13 +2,15 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import react, { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { RecursionField, Schema, observer, uid, useField, useFieldSchema } from "@tachybase/schema";
 import { TinyColor } from "@ctrl/tinycolor";
-import { useDndContext, useDndMonitor, useDraggable, useDroppable } from "@dnd-kit/core";
+import { DndContext, useDndContext, useDndMonitor, useDraggable, useDroppable } from "@dnd-kit/core";
 import classnames from "classnames";
 import lodash from "lodash";
 import { useToken } from "../__builtins__/index.mjs";
-import { SchemaComponent, useDesignable, useFormBlockContext, useSchemaInitializerRender } from "../../../index.mjs";
-import { useFormBlockType } from "../../../block-provider/index.mjs";
-import { DndContext } from "../../common/dnd-context/index.mjs";
+import { useSchemaInitializerRender } from "../../../application/schema-initializer/hooks/index.mjs";
+import { useFormBlockContext } from "../../../block-provider/FormBlockContext.mjs";
+import { useFormBlockType } from "../../../block-provider/FormBlockProvider.mjs";
+import { SchemaComponent } from "../../core/SchemaComponent.mjs";
+import { useDesignable } from "../../hooks/useDesignable.mjs";
 import Grid_style from "./Grid.style.mjs";
 const GridRowContext = /*#__PURE__*/ createContext({});
 GridRowContext.displayName = 'GridRowContext';

package/es/schema-component/antd/grid-card/GridCard.Item.mjs

@@ -3,11 +3,11 @@ import "react";
 import { useField, useFieldSchema } from "@tachybase/schema";
 import { Card } from "antd";
 import { createStyles } from "antd-style";
-import { useNavigate } from "react-router-dom";
 import { withDynamicSchemaProps } from "../../../application/hoc/withDynamicSchemaProps.mjs";
 import { useCollection } from "../../../data-source/index.mjs";
 import { useCollectionParentRecordData } from "../../../data-source/collection-record/CollectionRecordProvider.mjs";
 import { RecordProvider } from "../../../record-provider/index.mjs";
+import { useOptionalNavigate } from "../../hooks/useOptionalNavigate.mjs";
 import { useGridCustomPageUrl } from "./hooks.mjs";
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
@@ -47,7 +47,7 @@ const GridCardItem = withDynamicSchemaProps((props)=>{
     const field = useField();
     const fieldSchema = useFieldSchema();
     const parentRecordData = useCollectionParentRecordData();
-    const navigate = useNavigate();
+    const navigate = useOptionalNavigate();
     const { styles } = useStyles();
     const detailUrl = useGridCustomPageUrl({
         field,

package/es/schema-component/antd/icon-picker/IconFilterInput.mjs

@@ -1,14 +1,22 @@
 import { jsx } from "react/jsx-runtime";
+import { useEffect, useMemo } from "react";
 import { Input } from "antd";
 import lodash from "lodash";
 import { useTranslation } from "react-i18next";
 const IconFilterInput = (props)=>{
     const { changeFilterKey } = props;
     const { t } = useTranslation();
-    const onChange = lodash.debounce((e)=>{
-        const inputValue = e.target.value;
-        changeFilterKey(inputValue);
-    }, 100);
+    const onChange = useMemo(()=>lodash.debounce((e)=>{
+            const inputValue = e.target.value;
+            changeFilterKey(inputValue);
+        }, 100), [
+        changeFilterKey
+    ]);
+    useEffect(()=>()=>{
+            onChange.cancel();
+        }, [
+        onChange
+    ]);
     return /*#__PURE__*/ jsx(Input, {
         allowClear: true,
         placeholder: t("The key in Antd, such as 'ApiOutlined', ignoring case"),