@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.2

package/es/schema-component/antd/calendar/Calendar.Designer.js

@@ -7,45 +7,24 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useCompile, useDesignable } from '../..';
+import { useDesignable } from '../..';
 import { useCalendarBlockContext } from '../../../block-provider';
-import { useCollection } from '../../../collection-manager';
+import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { useCollectionFilterOptions } from '../../../collection-manager/action-hooks';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useSchemaTemplate } from '../../../schema-templates';
-
-var useOptions = function useOptions() {
-  var _fields$filter;
-
-  var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'string';
-  var compile = useCompile();
-
-  var _useCollection = useCollection(),
-      fields = _useCollection.fields;
-
-  var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
-    return field.type === type;
-  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
-    var _field$uiSchema;
-
-    return {
-      value: field.name,
-      label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title)
-    };
-  });
-  return options;
-};
-
 export var CalendarDesigner = function CalendarDesigner() {
   var _fieldSchema$xDecora, _fieldSchema$xDecora$, _fieldSchema$xDecora2, _fieldSchema$xDecora3;
 
   var field = useField();
   var fieldSchema = useFieldSchema();
 
-  var _useCollection2 = useCollection(),
-      name = _useCollection2.name,
-      title = _useCollection2.title,
-      fields = _useCollection2.fields;
+  var _useCollection = useCollection(),
+      name = _useCollection.name,
+      title = _useCollection.title;
+
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
 
   var dataSource = useCollectionFilterOptions(name);
 
@@ -55,8 +34,6 @@ export var CalendarDesigner = function CalendarDesigner() {
   var _useDesignable = useDesignable(),
       dn = _useDesignable.dn;
 
-  var compile = useCompile();
-
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
@@ -70,7 +47,7 @@ export var CalendarDesigner = function CalendarDesigner() {
   }, /*#__PURE__*/React.createElement(SchemaSettings.BlockTitleItem, null), /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     title: t('Title field'),
     value: fieldNames.title,
-    options: useOptions('string'),
+    options: getCollectionFieldsOptions(name, 'string'),
     onChange: function onChange(title) {
       var _schema;
 
@@ -99,10 +76,12 @@ export var CalendarDesigner = function CalendarDesigner() {
       });
       dn.refresh();
     }
-  }), /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), /*#__PURE__*/React.createElement(SchemaSettings.CascaderItem, {
     title: t('Start date field'),
     value: fieldNames.start,
-    options: useOptions('date'),
+    options: getCollectionFieldsOptions(name, 'date', {
+      association: ['o2o', 'obo', 'oho', 'm2o']
+    }),
     onChange: function onChange(start) {
       var _schema3;
 
@@ -116,10 +95,12 @@ export var CalendarDesigner = function CalendarDesigner() {
       });
       dn.refresh();
     }
-  }), /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), /*#__PURE__*/React.createElement(SchemaSettings.CascaderItem, {
     title: t('End date field'),
     value: fieldNames.end,
-    options: useOptions('date'),
+    options: getCollectionFieldsOptions(name, 'date', {
+      association: ['o2o', 'obo', 'oho', 'm2o']
+    }),
     onChange: function onChange(end) {
       var _schema4;
 

package/es/schema-component/antd/checkbox/Checkbox.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { CheckOutlined } from '@ant-design/icons';
+import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty, useField } from '@formily/react';
 import { isValid } from '@formily/shared';
 import { Checkbox as AntdCheckbox, Tag } from 'antd';
@@ -21,17 +21,18 @@ export var Checkbox = connect(function (props) {
 }, mapProps({
   value: 'checked',
   onInput: 'onChange'
-}, function (props, field) {
-  // console.log({ props, field });
-  return _objectSpread({}, props);
 }), mapReadPretty(function (props) {
-  if (!isValid(props.value)) {
-    return null;
+  if (props.value) {
+    return /*#__PURE__*/React.createElement(CheckOutlined, {
+      style: {
+        color: '#52c41a'
+      }
+    });
   }
 
-  return props.value ? /*#__PURE__*/React.createElement(CheckOutlined, {
+  return props.showUnchecked ? /*#__PURE__*/React.createElement(CloseOutlined, {
     style: {
-      color: '#52c41a'
+      color: '#ff4d4f'
     }
   }) : null;
 }));

package/es/schema-component/antd/date-picker/util.d.ts

@@ -5,4 +5,4 @@ export interface Moment2strOptions {
     picker?: 'year' | 'month' | 'week' | 'quarter';
 }
 export declare const moment2str: (value?: moment.Moment | moment.Moment[], options?: Moment2strOptions) => string | string[] | moment.Moment | moment.Moment[];
-export declare const mapDateFormat: () => (props: any) => any;
+export declare const mapDateFormat: () => (props: any, field: any) => any;

package/es/schema-component/antd/date-picker/util.js

@@ -60,7 +60,7 @@ export var moment2str = function moment2str(value) {
   return toGmtByPicker(value, picker);
 };
 export var mapDateFormat = function mapDateFormat() {
-  return function (props) {
+  return function (props, field) {
     var format = getDefaultFormat(props);
     var _onChange = props.onChange;
     return _objectSpread(_objectSpread({}, props), {}, {

package/es/schema-component/antd/filter/DynamicComponent.js

@@ -57,7 +57,8 @@ var VariableCascader = connect(function (props) {
 });
 export var DynamicComponent = function DynamicComponent(props) {
   var _useContext = useContext(FilterContext),
-      dynamicComponent = _useContext.dynamicComponent;
+      dynamicComponent = _useContext.dynamicComponent,
+      disabled = _useContext.disabled;
 
   var component = useComponent(dynamicComponent);
   var form = useMemo(function () {
@@ -65,6 +66,7 @@ export var DynamicComponent = function DynamicComponent(props) {
       values: {
         value: props.value
       },
+      disabled: disabled,
       effects: function effects() {
         onFieldValueChange('value', function (field) {
           var _props$onChange;

package/es/schema-component/antd/filter/Filter.js

@@ -46,7 +46,8 @@ export var Filter = observer(function (props) {
       field: field,
       fieldSchema: fieldSchema,
       dynamicComponent: dynamicComponent,
-      options: options || field.dataSource || []
+      options: options || field.dataSource || [],
+      disabled: props.disabled
     }
   }, /*#__PURE__*/React.createElement(FilterGroup, _objectSpread(_objectSpread({}, props), {}, {
     bordered: false

package/es/schema-component/antd/filter/FilterGroup.js

@@ -21,7 +21,8 @@ import { FilterLogicContext, RemoveConditionContext } from './context';
 import { FilterItems } from './FilterItems';
 export var FilterGroup = connect(function (props) {
   var _props$bordered = props.bordered,
-      bordered = _props$bordered === void 0 ? true : _props$bordered;
+      bordered = _props$bordered === void 0 ? true : _props$bordered,
+      disabled = props.disabled;
   var field = useField();
   var remove = useContext(RemoveConditionContext);
 
@@ -36,6 +37,7 @@ export var FilterGroup = connect(function (props) {
     field.value = _defineProperty({}, value, _toConsumableArray(obj[logic] || []));
   };
 
+  var mergedDisabled = disabled || field.disabled;
   return /*#__PURE__*/React.createElement(FilterLogicContext.Provider, {
     value: logic
   }, /*#__PURE__*/React.createElement("div", {
@@ -48,7 +50,7 @@ export var FilterGroup = connect(function (props) {
       position: 'relative',
       marginBottom: 8
     }
-  }, remove && /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+  }, remove && !mergedDisabled && /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
     style: {
       position: 'absolute',
       right: 10,
@@ -76,8 +78,9 @@ export var FilterGroup = connect(function (props) {
     value: '$or'
   }, "Any")), ' conditions in the group')), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ArrayField, {
     name: logic,
-    component: [FilterItems]
-  })), /*#__PURE__*/React.createElement(Space, {
+    component: [FilterItems],
+    disabled: mergedDisabled
+  })), !mergedDisabled && /*#__PURE__*/React.createElement(Space, {
     size: 16,
     style: {
       marginTop: 8,

package/es/schema-component/antd/filter/FilterItem.js

@@ -1,4 +1,4 @@
-var _templateObject;
+var _templateObject, _templateObject2;
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
@@ -49,6 +49,7 @@ export var FilterItem = observer(function (props) {
     },
     placeholder: t('Select Field')
   }), /*#__PURE__*/React.createElement(Select, {
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            min-width: 110px;\n          "]))),
     value: operator === null || operator === void 0 ? void 0 : operator.value,
     options: compile(operators),
     onChange: function onChange(value) {
@@ -61,7 +62,7 @@ export var FilterItem = observer(function (props) {
     onChange: function onChange(value) {
       setValue(value);
     }
-  }), /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
+  }), !props.disabled && /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(CloseCircleOutlined, {
     onClick: function onClick() {
       return remove();
     },

package/es/schema-component/antd/filter/context.d.ts

@@ -6,6 +6,7 @@ export interface FilterContextProps {
     fieldSchema?: Schema;
     dynamicComponent?: any;
     options?: any[];
+    disabled?: boolean;
 }
 export declare const RemoveConditionContext: import("react").Context<any>;
 export declare const FilterContext: import("react").Context<FilterContextProps>;

package/es/schema-component/antd/filter/useValues.js

@@ -19,6 +19,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { useField } from '@formily/react';
 import { merge } from '@formily/shared';
 import flat from 'flat';
+import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import { useContext, useEffect } from 'react';
 import { FilterContext, FilterLogicContext } from './context'; // import { useValues } from './useValues';
@@ -60,6 +61,7 @@ export var useValues = function useValues() {
   var value2data = function value2data() {
     var _operators$find;
 
+    field.data = field.data || {};
     var values = flat(field.value);
     var path = Object.keys(values).shift() || '';
 
@@ -69,8 +71,10 @@ export var useValues = function useValues() {
 
     var _path$split = path.split('.$'),
         _path$split2 = _slicedToArray(_path$split, 2),
-        fieldPath = _path$split2[0],
-        otherPath = _path$split2[1];
+        _path$split2$ = _path$split2[0],
+        fieldPath = _path$split2$ === void 0 ? '' : _path$split2$,
+        _path$split2$2 = _path$split2[1],
+        otherPath = _path$split2$2 === void 0 ? '' : _path$split2$2;
 
     var _otherPath$split = otherPath.split('.', 2),
         _otherPath$split2 = _slicedToArray(_otherPath$split, 1),
@@ -82,7 +86,6 @@ export var useValues = function useValues() {
     var operator = operators === null || operators === void 0 ? void 0 : (_operators$find = operators.find) === null || _operators$find === void 0 ? void 0 : _operators$find.call(operators, function (item) {
       return item.value === "$".concat(operatorValue);
     });
-    field.data = field.data || {};
     field.data.dataIndex = dataIndex;
     field.data.operators = operators;
     field.data.operator = operator;
@@ -90,9 +93,7 @@ export var useValues = function useValues() {
     field.data.value = get(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
   };
 
-  useEffect(function () {
-    value2data();
-  }, [logic]);
+  useEffect(value2data, [logic]);
   return _objectSpread(_objectSpread({
     fields: options
   }, field.data), {}, {
@@ -104,11 +105,12 @@ export var useValues = function useValues() {
       field.data = field.data || {};
       field.data.operators = option === null || option === void 0 ? void 0 : option.operators;
       field.data.operator = operator;
-      field.data.schema = merge(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
+      var s1 = cloneDeep(option === null || option === void 0 ? void 0 : option.schema);
+      var s2 = cloneDeep(operator === null || operator === void 0 ? void 0 : operator.schema);
+      field.data.schema = merge(s1, s2);
       field.data.dataIndex = dataIndex;
       field.data.value = null;
       data2value();
-      console.log('setDataIndex', field.data);
     },
     setOperator: function setOperator(operatorValue) {
       var _field$data3, _field$data3$operator, _field$data3$operator2;
@@ -117,15 +119,16 @@ export var useValues = function useValues() {
         return item.value === operatorValue;
       });
       field.data.operator = operator;
-      field.data.schema = merge(field.data.schema, operator.schema);
+      var option = findOption(field.data.dataIndex, options);
+      var s1 = cloneDeep(option === null || option === void 0 ? void 0 : option.schema);
+      var s2 = cloneDeep(operator === null || operator === void 0 ? void 0 : operator.schema);
+      field.data.schema = merge(s1, s2);
       field.data.value = operator.noValue ? operator.default || true : null;
       data2value();
-      console.log('setOperator', field.data);
     },
     setValue: function setValue(value) {
       field.data.value = value;
       data2value();
-      console.log('setValue', field.data);
     }
   });
 };

package/es/schema-component/antd/form/Form.js

@@ -1,5 +1,5 @@
 var _excluded = ["form", "children"],
-    _excluded2 = ["form", "children"],
+    _excluded2 = ["form", "children", "disabled"],
     _excluded3 = ["request", "effects", "initialValue", "useValues"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -19,8 +19,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { FormLayout } from '@formily/antd';
 import { createForm } from '@formily/core';
 import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
-import { Spin } from 'antd';
-import React, { createContext, useContext, useMemo } from 'react';
+import { ConfigProvider, Spin } from 'antd';
+import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useAttach, useComponent } from '../..';
 import { useRequest } from '../../../api-client';
 import { useCollection } from '../../../collection-manager';
@@ -58,6 +58,7 @@ var Def = function Def(props) {
 var FormDecorator = function FormDecorator(props) {
   var form = props.form,
       children = props.children,
+      disabled = props.disabled,
       others = _objectWithoutProperties(props, _excluded2);
 
   var field = useField();
@@ -67,7 +68,12 @@ var FormDecorator = function FormDecorator(props) {
     basePath: ''
   })));
   var Component = useComponent(fieldSchema['x-component'], Def);
-  return /*#__PURE__*/React.createElement(FieldContext.Provider, {
+  useEffect(function () {
+    form.disabled = disabled || field.disabled;
+  }, [disabled, field.disabled]);
+  return /*#__PURE__*/React.createElement(ConfigProvider, {
+    componentDisabled: disabled
+  }, /*#__PURE__*/React.createElement(FieldContext.Provider, {
     value: undefined
   }, /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: form
@@ -79,7 +85,7 @@ var FormDecorator = function FormDecorator(props) {
     basePath: f.address,
     schema: fieldSchema,
     onlyRenderProperties: true
-  }))))));
+  })))))));
 };
 
 var useRequestProps = function useRequestProps(props) {

package/es/schema-component/antd/form-item/FormItem.js

@@ -16,13 +16,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { css } from '@emotion/css';
 import { ArrayCollapse, FormItem as Item, FormLayout } from '@formily/antd';
-import { useField, useFieldSchema } from '@formily/react';
+import { observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import _ from 'lodash';
-import React from 'react';
+import React, { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
-import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
+import { BlockRequestContext, useFilterByTk, useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
@@ -37,8 +37,17 @@ var divWrap = function divWrap(schema) {
   };
 };
 
-export var FormItem = function FormItem(props) {
+export var FormItem = observer(function (props) {
   var field = useField();
+  var ctx = useContext(BlockRequestContext);
+  var schema = useFieldSchema();
+  useEffect(function () {
+    if ((ctx === null || ctx === void 0 ? void 0 : ctx.block) === 'form') {
+      ctx.field.data = ctx.field.data || {};
+      ctx.field.data.activeFields = ctx.field.data.activeFields || new Set();
+      ctx.field.data.activeFields.add(schema.name);
+    }
+  }, []);
   return /*#__PURE__*/React.createElement(ACLCollectionFieldProvider, null, /*#__PURE__*/React.createElement(BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/React.createElement(Item, _objectSpread(_objectSpread({
@@ -50,10 +59,10 @@ export var FormItem = function FormItem(props) {
       }
     }) : field.description
   }))));
-};
+});
 
 FormItem.Designer = function (props) {
-  var _interfaceConfig$vali, _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _collectionField$uiSc4, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$uiSc2, _fieldSchema$xDecora, _collectionField$uiSc4, _fieldSchema$xCompon, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = useCollectionManager(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -85,7 +94,7 @@ FormItem.Designer = function (props) {
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var validateSchema = interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$vali = interfaceConfig['validateSchema']) === null || _interfaceConfig$vali === void 0 ? void 0 : _interfaceConfig$vali.call(interfaceConfig, fieldSchema);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
-  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
+  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
   var fieldComponentOptions = useFieldComponentOptions();
   var isSubFormAssocitionField = field.address.segments.includes('__form_grid');
   var initialValue = {
@@ -491,7 +500,7 @@ FormItem.Designer = function (props) {
       });
       dn.refresh();
     }
-  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,

package/es/schema-component/antd/form-v2/Form.Designer.js

@@ -45,6 +45,8 @@ export var FormDesigner = function FormDesigner() {
     componentName: 'FormItem',
     collectionName: name,
     resourceName: defaultResource
+  }), /*#__PURE__*/React.createElement(SchemaSettings.LinkageRules, {
+    collectionName: name
   }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: {

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

@@ -1,6 +1,6 @@
 var _excluded = ["form", "children"],
-    _excluded2 = ["form", "children"],
-    _excluded3 = ["form"];
+    _excluded2 = ["form", "children", "disabled"],
+    _excluded3 = ["form", "disabled"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -13,14 +13,15 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import { FormLayout } from '@formily/antd';
-import { createForm, onFormInputChange } from '@formily/core';
+import { createForm, onFormInputChange, onFieldReact, onFieldInit, onFieldChange } from '@formily/core';
 import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Spin } from 'antd';
+import { ConfigProvider, Spin } from 'antd';
 import React, { useEffect, useMemo } from 'react';
 import { useActionContext } from '..';
 import { useAttach, useComponent } from '../..';
 import { useProps } from '../../hooks/useProps';
+import { linkageMergeAction } from './utils';
 
 var FormComponent = function FormComponent(props) {
   var form = props.form,
@@ -53,6 +54,7 @@ var Def = function Def(props) {
 var FormDecorator = function FormDecorator(props) {
   var form = props.form,
       children = props.children,
+      disabled = props.disabled,
       others = _objectWithoutProperties(props, _excluded2);
 
   var field = useField();
@@ -77,13 +79,26 @@ var FormDecorator = function FormDecorator(props) {
   }))))));
 };
 
+var getLinkageRules = function getLinkageRules(fieldSchema) {
+  var linkageRules = null;
+  fieldSchema.mapProperties(function (schema) {
+    if (schema['x-linkage-rules']) {
+      linkageRules = schema['x-linkage-rules'];
+    }
+  });
+  return linkageRules;
+};
+
 var WithForm = function WithForm(props) {
+  var _fieldSchema$parent;
+
   var form = props.form;
   var fieldSchema = useFieldSchema();
 
   var _useActionContext = useActionContext(),
       setFormValueChanged = _useActionContext.setFormValueChanged;
 
+  var linkageRules = getLinkageRules(fieldSchema) || ((_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : _fieldSchema$parent['x-linkage-rules']) || [];
   useEffect(function () {
     var id = uid();
     form.addEffects(id, function () {
@@ -91,10 +106,73 @@ var WithForm = function WithForm(props) {
         setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
       });
     });
+
+    if (props.disabled) {
+      form.disabled = props.disabled;
+    }
+
+    return function () {
+      form.removeEffects(id);
+    };
+  }, []);
+  useEffect(function () {
+    var id = uid();
+    form.addEffects(id, function () {
+      return linkageRules.map(function (v) {
+        var _v$actions;
+
+        return (_v$actions = v.actions) === null || _v$actions === void 0 ? void 0 : _v$actions.map(function (h) {
+          if (h.targetFields) {
+            var fields = h.targetFields.join(',');
+            onFieldInit("*(".concat(fields, ")"), function (field, form) {
+              field['initProperty'] = {
+                display: field.display,
+                required: field.required,
+                pattern: field.pattern,
+                value: field.value || field.initialValue
+              };
+            });
+            onFieldChange("*(".concat(fields, ")"), ['value', 'required', 'pattern', 'display'], function (field) {
+              field.linkageProperty = {};
+            });
+          }
+        });
+      });
+    });
     return function () {
       form.removeEffects(id);
     };
   }, []);
+  useEffect(function () {
+    var id = uid();
+    form.addEffects(id, function () {
+      var linkagefields = [];
+      return linkageRules.map(function (v, index) {
+        var _v$actions2;
+
+        return (_v$actions2 = v.actions) === null || _v$actions2 === void 0 ? void 0 : _v$actions2.map(function (h) {
+          if (h.targetFields) {
+            var fields = h.targetFields.join(',');
+            return onFieldReact("*(".concat(fields, ")"), function (field, form) {
+              linkagefields.push(field);
+              linkageMergeAction(h, field, v.condition, form === null || form === void 0 ? void 0 : form.values);
+
+              if (index === linkageRules.length - 1) {
+                setTimeout(function () {
+                  return linkagefields.map(function (v) {
+                    v.linkageProperty = {};
+                  });
+                });
+              }
+            });
+          }
+        });
+      });
+    });
+    return function () {
+      form.removeEffects(id);
+    };
+  }, [linkageRules]);
   return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({}, props));
 };
 
@@ -106,6 +184,7 @@ var WithoutForm = function WithoutForm(props) {
 
   var form = useMemo(function () {
     return createForm({
+      disabled: props.disabled,
       effects: function effects() {
         onFormInputChange(function (form) {
           setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
@@ -125,11 +204,19 @@ export var Form = observer(function (props) {
 
   var _useProps = useProps(props),
       form = _useProps.form,
+      disabled = _useProps.disabled,
       others = _objectWithoutProperties(_useProps, _excluded3);
 
-  return /*#__PURE__*/React.createElement("form", null, /*#__PURE__*/React.createElement(Spin, {
+  var formDisabled = disabled || field.disabled;
+  return /*#__PURE__*/React.createElement(ConfigProvider, {
+    componentDisabled: formDisabled
+  }, /*#__PURE__*/React.createElement("form", null, /*#__PURE__*/React.createElement(Spin, {
     spinning: field.loading || false
-  }, form ? /*#__PURE__*/React.createElement(WithForm, _objectSpread({
+  }, form ? /*#__PURE__*/React.createElement(WithForm, _objectSpread(_objectSpread({
     form: form
-  }, others)) : /*#__PURE__*/React.createElement(WithoutForm, _objectSpread({}, others))));
+  }, others), {}, {
+    disabled: formDisabled
+  })) : /*#__PURE__*/React.createElement(WithoutForm, _objectSpread(_objectSpread({}, others), {}, {
+    disabled: formDisabled
+  })))));
 });

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

@@ -0,0 +1,5 @@
+export declare function evaluate(expression: string, scope?: {}): any;
+export declare const linkageMergeAction: ({ operator, value }: {
+    operator: any;
+    value: any;
+}, field: any, condition: any, values: any) => any;