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

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

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

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

@@ -41,7 +41,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 var FilterGroup = (0, _react.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 = (0, _react.useField)();
   var remove = (0, _react2.useContext)(_context.RemoveConditionContext);
 
@@ -56,6 +57,7 @@ var FilterGroup = (0, _react.connect)(function (props) {
     field.value = _defineProperty({}, value, _toConsumableArray(obj[logic] || []));
   };
 
+  var mergedDisabled = disabled || field.disabled;
   return /*#__PURE__*/_react2.default.createElement(_context.FilterLogicContext.Provider, {
     value: logic
   }, /*#__PURE__*/_react2.default.createElement("div", {
@@ -68,7 +70,7 @@ var FilterGroup = (0, _react.connect)(function (props) {
       position: 'relative',
       marginBottom: 8
     }
-  }, remove && /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
+  }, remove && !mergedDisabled && /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
     style: {
       position: 'absolute',
       right: 10,
@@ -96,8 +98,9 @@ var FilterGroup = (0, _react.connect)(function (props) {
     value: '$or'
   }, "Any")), ' conditions in the group')), /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_react.ArrayField, {
     name: logic,
-    component: [_FilterItems.FilterItems]
-  })), /*#__PURE__*/_react2.default.createElement(_antd.Space, {
+    component: [_FilterItems.FilterItems],
+    disabled: mergedDisabled
+  })), !mergedDisabled && /*#__PURE__*/_react2.default.createElement(_antd.Space, {
     size: 16,
     style: {
       marginTop: 8,

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

@@ -27,7 +27,7 @@ var _DynamicComponent = require("./DynamicComponent");
 
 var _useValues2 = require("./useValues");
 
-var _templateObject;
+var _templateObject, _templateObject2;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -72,6 +72,7 @@ var FilterItem = (0, _react.observer)(function (props) {
     },
     placeholder: t('Select Field')
   }), /*#__PURE__*/_react2.default.createElement(_antd.Select, {
+    className: (0, _css.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) {
@@ -84,7 +85,7 @@ var FilterItem = (0, _react.observer)(function (props) {
     onChange: function onChange(value) {
       setValue(value);
     }
-  }), /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
+  }), !props.disabled && /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
     onClick: function onClick() {
       return remove();
     },

package/lib/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/lib/schema-component/antd/filter/useValues.js

@@ -11,6 +11,8 @@ var _shared = require("@formily/shared");
 
 var _flat = _interopRequireDefault(require("flat"));
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 var _get = _interopRequireDefault(require("lodash/get"));
 
 var _react2 = require("react");
@@ -75,6 +77,7 @@ var useValues = function useValues() {
   var value2data = function value2data() {
     var _operators$find;
 
+    field.data = field.data || {};
     var values = (0, _flat.default)(field.value);
     var path = Object.keys(values).shift() || '';
 
@@ -84,8 +87,10 @@ 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),
@@ -97,7 +102,6 @@ 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;
@@ -105,9 +109,7 @@ var useValues = function useValues() {
     field.data.value = (0, _get.default)(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
   };
 
-  (0, _react2.useEffect)(function () {
-    value2data();
-  }, [logic]);
+  (0, _react2.useEffect)(value2data, [logic]);
   return _objectSpread(_objectSpread({
     fields: options
   }, field.data), {}, {
@@ -119,11 +121,12 @@ 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 = (0, _shared.merge)(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
+      var s1 = (0, _cloneDeep.default)(option === null || option === void 0 ? void 0 : option.schema);
+      var s2 = (0, _cloneDeep.default)(operator === null || operator === void 0 ? void 0 : operator.schema);
+      field.data.schema = (0, _shared.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;
@@ -132,15 +135,16 @@ var useValues = function useValues() {
         return item.value === operatorValue;
       });
       field.data.operator = operator;
-      field.data.schema = (0, _shared.merge)(field.data.schema, operator.schema);
+      var option = findOption(field.data.dataIndex, options);
+      var s1 = (0, _cloneDeep.default)(option === null || option === void 0 ? void 0 : option.schema);
+      var s2 = (0, _cloneDeep.default)(operator === null || operator === void 0 ? void 0 : operator.schema);
+      field.data.schema = (0, _shared.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/lib/schema-component/antd/form/Form.js

@@ -28,7 +28,7 @@ var _schemaSettings = require("../../../schema-settings");
 var _schemaTemplates = require("../../../schema-templates");
 
 var _excluded = ["form", "children"],
-    _excluded2 = ["form", "children"],
+    _excluded2 = ["form", "children", "disabled"],
     _excluded3 = ["request", "effects", "initialValue", "useValues"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -80,6 +80,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 = (0, _react.useField)();
@@ -89,7 +90,12 @@ var FormDecorator = function FormDecorator(props) {
     basePath: ''
   })));
   var Component = (0, _.useComponent)(fieldSchema['x-component'], Def);
-  return /*#__PURE__*/_react2.default.createElement(_react.FieldContext.Provider, {
+  (0, _react2.useEffect)(function () {
+    form.disabled = disabled || field.disabled;
+  }, [disabled, field.disabled]);
+  return /*#__PURE__*/_react2.default.createElement(_antd2.ConfigProvider, {
+    componentDisabled: disabled
+  }, /*#__PURE__*/_react2.default.createElement(_react.FieldContext.Provider, {
     value: undefined
   }, /*#__PURE__*/_react2.default.createElement(_react.FormContext.Provider, {
     value: form
@@ -101,7 +107,7 @@ var FormDecorator = function FormDecorator(props) {
     basePath: f.address,
     schema: fieldSchema,
     onlyRenderProperties: true
-  }))))));
+  })))))));
 };
 
 var useRequestProps = function useRequestProps(props) {

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

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,7 +17,7 @@ var _shared = require("@formily/shared");
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
-var _react2 = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
@@ -35,6 +37,10 @@ var _shared2 = require("../input/shared");
 
 var _templateObject;
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -59,8 +65,17 @@ var divWrap = function divWrap(schema) {
   };
 };
 
-var FormItem = function FormItem(props) {
+var FormItem = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
+  var ctx = (0, _react2.useContext)(_blockProvider.BlockRequestContext);
+  var schema = (0, _react.useFieldSchema)();
+  (0, _react2.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__*/_react2.default.createElement(_ACLProvider.ACLCollectionFieldProvider, null, /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormItem, _objectSpread(_objectSpread({
@@ -72,12 +87,11 @@ var FormItem = function FormItem(props) {
       }
     }) : field.description
   }))));
-};
-
+});
 exports.FormItem = FormItem;
 
 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 = (0, _collectionManager.useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields,
@@ -109,7 +123,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 = (0, _hooks.useFieldComponentOptions)();
   var isSubFormAssocitionField = field.address.segments.includes('__form_grid');
   var initialValue = {
@@ -515,7 +529,7 @@ FormItem.Designer = function (props) {
       });
       dn.refresh();
     }
-  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,

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

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

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

@@ -25,9 +25,11 @@ var _2 = require("../..");
 
 var _useProps2 = require("../../hooks/useProps");
 
+var _utils = require("./utils");
+
 var _excluded = ["form", "children"],
-    _excluded2 = ["form", "children"],
-    _excluded3 = ["form"];
+    _excluded2 = ["form", "children", "disabled"],
+    _excluded3 = ["form", "disabled"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -74,6 +76,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 = (0, _react.useField)();
@@ -98,13 +101,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 = (0, _react.useFieldSchema)();
 
   var _useActionContext = (0, _.useActionContext)(),
       setFormValueChanged = _useActionContext.setFormValueChanged;
 
+  var linkageRules = getLinkageRules(fieldSchema) || ((_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : _fieldSchema$parent['x-linkage-rules']) || [];
   (0, _react2.useEffect)(function () {
     var id = (0, _shared.uid)();
     form.addEffects(id, function () {
@@ -112,10 +128,69 @@ var WithForm = function WithForm(props) {
         setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
       });
     });
+    form.disabled = props.disabled;
     return function () {
       form.removeEffects(id);
     };
   }, []);
+  (0, _react2.useEffect)(function () {
+    var id = (0, _shared.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(',');
+            (0, _core.onFieldInit)("*(".concat(fields, ")"), function (field, form) {
+              field['initProperty'] = {
+                display: field.display,
+                required: field.required,
+                pattern: field.pattern,
+                value: field.value || field.initialValue
+              };
+            });
+            (0, _core.onFieldChange)("*(".concat(fields, ")"), ['value', 'required', 'pattern', 'display'], function (field) {
+              field.linkageProperty = {};
+            });
+          }
+        });
+      });
+    });
+    return function () {
+      form.removeEffects(id);
+    };
+  }, []);
+  (0, _react2.useEffect)(function () {
+    var id = (0, _shared.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 (0, _core.onFieldReact)("*(".concat(fields, ")"), function (field, form) {
+              linkagefields.push(field);
+              (0, _utils.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__*/_react2.default.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/_react2.default.createElement(FormComponent, _objectSpread({}, props));
 };
 
@@ -127,6 +202,7 @@ var WithoutForm = function WithoutForm(props) {
 
   var form = (0, _react2.useMemo)(function () {
     return (0, _core.createForm)({
+      disabled: props.disabled,
       effects: function effects() {
         (0, _core.onFormInputChange)(function (form) {
           setFormValueChanged === null || setFormValueChanged === void 0 ? void 0 : setFormValueChanged(true);
@@ -146,12 +222,20 @@ var Form = (0, _react.observer)(function (props) {
 
   var _useProps = (0, _useProps2.useProps)(props),
       form = _useProps.form,
+      disabled = _useProps.disabled,
       others = _objectWithoutProperties(_useProps, _excluded3);
 
-  return /*#__PURE__*/_react2.default.createElement("form", null, /*#__PURE__*/_react2.default.createElement(_antd2.Spin, {
+  var formDisabled = disabled || field.disabled;
+  return /*#__PURE__*/_react2.default.createElement(_antd2.ConfigProvider, {
+    componentDisabled: formDisabled
+  }, /*#__PURE__*/_react2.default.createElement("form", null, /*#__PURE__*/_react2.default.createElement(_antd2.Spin, {
     spinning: field.loading || false
-  }, form ? /*#__PURE__*/_react2.default.createElement(WithForm, _objectSpread({
+  }, form ? /*#__PURE__*/_react2.default.createElement(WithForm, _objectSpread(_objectSpread({
     form: form
-  }, others)) : /*#__PURE__*/_react2.default.createElement(WithoutForm, _objectSpread({}, others))));
+  }, others), {}, {
+    disabled: formDisabled
+  })) : /*#__PURE__*/_react2.default.createElement(WithoutForm, _objectSpread(_objectSpread({}, others), {}, {
+    disabled: formDisabled
+  })))));
 });
 exports.Form = Form;

package/lib/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;

package/lib/schema-component/antd/form-v2/utils.js

@@ -0,0 +1,181 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.evaluate = evaluate;
+exports.linkageMergeAction = void 0;
+
+var _lodash = require("lodash");
+
+var functions = _interopRequireWildcard(require("@formulajs/formulajs"));
+
+var _uitls = require("../../common/utils/uitls");
+
+var _type = require("../../../schema-settings/LinkageRules/type");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
+function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function now() {
+  return new Date();
+}
+
+var fnNames = Object.keys(functions).filter(function (key) {
+  return key !== 'default';
+});
+var fns = fnNames.map(function (key) {
+  return functions[key];
+});
+
+function formula(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  try {
+    var fn = _construct(Function, _toConsumableArray(fnNames).concat(_toConsumableArray(Object.keys(scope)), ["return ".concat(expression)]));
+
+    var result = fn.apply(void 0, _toConsumableArray(fns).concat(_toConsumableArray(Object.values(scope))));
+
+    if (typeof result === 'number') {
+      if (Number.isNaN(result) || !Number.isFinite(result)) {
+        return null;
+      }
+
+      return functions.ROUND(result, 9);
+    }
+
+    if (typeof result === 'function') {
+      return result();
+    }
+
+    return result;
+  } catch (error) {
+    return undefined;
+  }
+}
+
+function evaluate(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var mergeScope = _objectSpread(_objectSpread({}, scope), {}, {
+    now: now
+  });
+
+  var exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, function (_, v) {
+    var item = (0, _lodash.get)(scope, v);
+    var key = v.replace(/\.(\d+)/g, '["$1"]');
+    return " ".concat(typeof item === 'function' ? item() : key, " ");
+  });
+  return formula(exp, mergeScope);
+}
+
+var linkageMergeAction = function linkageMergeAction(_ref, field, condition, values) {
+  var _field$linkagePropert, _field$initProperty, _field$linkagePropert2, _field$initProperty2, _field$linkagePropert3, _field$initProperty3, _field$linkagePropert4, _field$initProperty4, _field$linkagePropert5, _field$linkagePropert6, _field$linkagePropert7;
+
+  var operator = _ref.operator,
+      value = _ref.value;
+  var requiredResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert = field.linkageProperty) === null || _field$linkagePropert === void 0 ? void 0 : _field$linkagePropert.required) || [(field === null || field === void 0 ? void 0 : (_field$initProperty = field.initProperty) === null || _field$initProperty === void 0 ? void 0 : _field$initProperty.required) || false];
+  var displayResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert2 = field.linkageProperty) === null || _field$linkagePropert2 === void 0 ? void 0 : _field$linkagePropert2.display) || [field === null || field === void 0 ? void 0 : (_field$initProperty2 = field.initProperty) === null || _field$initProperty2 === void 0 ? void 0 : _field$initProperty2.display];
+  var patternResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert3 = field.linkageProperty) === null || _field$linkagePropert3 === void 0 ? void 0 : _field$linkagePropert3.pattern) || [field === null || field === void 0 ? void 0 : (_field$initProperty3 = field.initProperty) === null || _field$initProperty3 === void 0 ? void 0 : _field$initProperty3.pattern];
+  var valueResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert4 = field.linkageProperty) === null || _field$linkagePropert4 === void 0 ? void 0 : _field$linkagePropert4.value) || [field.value || (field === null || field === void 0 ? void 0 : (_field$initProperty4 = field.initProperty) === null || _field$initProperty4 === void 0 ? void 0 : _field$initProperty4.value)];
+
+  switch (operator) {
+    case _type.ActionType.Required:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        requiredResult.push(true);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = (0, _lodash.last)((_field$linkagePropert5 = field.linkageProperty) === null || _field$linkagePropert5 === void 0 ? void 0 : _field$linkagePropert5.required);
+      break;
+
+    case _type.ActionType.InRequired:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        requiredResult.push(false);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = (0, _lodash.last)((_field$linkagePropert6 = field.linkageProperty) === null || _field$linkagePropert6 === void 0 ? void 0 : _field$linkagePropert6.required);
+      break;
+
+    case _type.ActionType.Visible:
+    case _type.ActionType.None:
+    case _type.ActionType.Hidden:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        displayResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        display: displayResult
+      });
+      field.display = (0, _lodash.last)((_field$linkagePropert7 = field.linkageProperty) === null || _field$linkagePropert7 === void 0 ? void 0 : _field$linkagePropert7.display);
+      break;
+
+    case _type.ActionType.Editable:
+    case _type.ActionType.ReadOnly:
+    case _type.ActionType.ReadPretty:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        patternResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        pattern: patternResult
+      });
+      field.pattern = (0, _lodash.last)(field.linkageProperty.pattern);
+      break;
+
+    case _type.ActionType.Value:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        if ((value === null || value === void 0 ? void 0 : value.mode) === 'express') {
+          var result = evaluate(value.result || value.value, values);
+          valueResult.push(result);
+        } else {
+          valueResult.push((value === null || value === void 0 ? void 0 : value.value) || value);
+        }
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        value: valueResult
+      });
+      setTimeout(function () {
+        return field.value = (0, _lodash.last)(valueResult) === undefined ? field.value : (0, _lodash.last)(valueResult);
+      });
+      break;
+
+    default:
+      return null;
+  }
+};
+
+exports.linkageMergeAction = linkageMergeAction;