iglooform 2.4.9 → 2.4.13

package/lib/upload-photo/index.js

@@ -53,13 +53,15 @@ var _tools = require("../utils/tools");
 
 var _media2 = _interopRequireDefault(require("./media"));
 
+var _formContext = _interopRequireDefault(require("../form-context"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+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); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -71,10 +73,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -89,31 +87,79 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 var useBreakpoint = _grid.default.useBreakpoint;
 var prefix = 'igloo-upload-photo';
 
-var UploadPhoto = function UploadPhoto(_ref) {
+var UploadPhoto = function UploadPhoto(props) {
   var _classnames3, _classnames4;
 
-  var _ref$value = _ref.value,
-      value = _ref$value === void 0 ? [] : _ref$value,
-      limit = _ref.limit,
-      limitErrorMessage = _ref.limitErrorMessage,
-      descriptions = _ref.descriptions,
-      buttonText = _ref.buttonText,
-      _ref$samples = _ref.samples,
-      samples = _ref$samples === void 0 ? [] : _ref$samples,
-      onChange = _ref.onChange,
-      handleUpload = _ref.handleUpload,
-      setFieldError = _ref.setFieldError,
-      className = _ref.className,
-      id = _ref.id,
-      validateField = _ref.validateField;
   var limitNumError = (0, _react.useRef)();
   var DomRef = (0, _react.useRef)();
 
-  var _useContext = (0, _react.useContext)(_locale.LocaleContext),
-      formatMessage = _useContext.formatMessage;
+  var _useContext = (0, _react.useContext)(_formContext.default),
+      uploadApi = _useContext.uploadApi;
+
+  (0, _invariant.default)(typeof props.handleUpload === 'function' || uploadApi, '"handleUpload" should be a function. Or uploadApi should be set at Form/FreeForm');
+  (0, _invariant.default)(!uploadApi || props.bizKey, '"bizKey" should be set if Upload is used with uploadApi');
+  var _props$value = props.value,
+      value = _props$value === void 0 ? [] : _props$value,
+      limit = props.limit,
+      limitErrorMessage = props.limitErrorMessage,
+      descriptions = props.descriptions,
+      buttonText = props.buttonText,
+      _props$samples = props.samples,
+      samples = _props$samples === void 0 ? [] : _props$samples,
+      onChange = props.onChange,
+      bizKey = props.bizKey,
+      _props$handleUpload = props.handleUpload,
+      handleUpload = _props$handleUpload === void 0 ? /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(file) {
+      var formData, response, rst;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              formData = new FormData();
+              formData.append('file', file);
+              formData.append('biz_key', bizKey);
+              _context.next = 5;
+              return fetch(uploadApi, {
+                method: 'post',
+                body: formData
+              });
+
+            case 5:
+              response = _context.sent;
+              _context.next = 8;
+              return response.json();
+
+            case 8:
+              rst = _context.sent;
+              return _context.abrupt("return", rst.url);
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }() : _props$handleUpload,
+      setFieldError = props.setFieldError,
+      className = props.className,
+      id = props.id,
+      validateField = props.validateField;
+
+  var _useContext2 = (0, _react.useContext)(_locale.LocaleContext),
+      formatMessage = _useContext2.formatMessage;
 
   var _useState = (0, _react.useState)((0, _agentDetect.isMobileAgent)()),
       _useState2 = _slicedToArray(_useState, 1),
@@ -156,7 +202,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
   }, []);
   (0, _react.useEffect)(function () {
     var removeLimitMsg = function removeLimitMsg(e) {
-      if (!DomRef.current.contains(e.target) && limitNumError.current) {
+      if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
         limitNumError.current = undefined;
 
         if (files && files.length) {
@@ -197,7 +243,6 @@ var UploadPhoto = function UploadPhoto(_ref) {
       sampleSpan = _useMemo.sampleSpan,
       descriptionSpan = _useMemo.descriptionSpan;
 
-  (0, _invariant.default)(typeof handleUpload === 'function', '"handleUpload" should be a function.');
   (0, _invariant.default)(limit === undefined || limit > 0, "\"limit\" should be a pasitive number.");
 
   var onUpload = function onUpload(e) {
@@ -220,12 +265,12 @@ var UploadPhoto = function UploadPhoto(_ref) {
   };
 
   var uploadFile = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(file, currentIndex) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file, currentIndex) {
       var uid, dataUrl, name, size, mimeType, type, errorMsg, _errorMsg;
 
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               uid = ++uploadIndex.current;
               dataUrl = URL.createObjectURL(file);
@@ -233,7 +278,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
               type = (0, _tools.classifyType)(mimeType);
 
               if (!(type === 'unknown')) {
-                _context.next = 9;
+                _context2.next = 9;
                 break;
               }
 
@@ -242,11 +287,11 @@ var UploadPhoto = function UploadPhoto(_ref) {
               });
               limitNumError.current = errorMsg;
               setFieldError && setFieldError(errorMsg);
-              return _context.abrupt("return", Promise.reject(errorMsg));
+              return _context2.abrupt("return", Promise.reject(errorMsg));
 
             case 9:
               if (!(limit && currentIndex > limit)) {
-                _context.next = 14;
+                _context2.next = 14;
                 break;
               }
 
@@ -258,7 +303,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
               });
               limitNumError.current = _errorMsg;
               setFieldError && setFieldError(_errorMsg);
-              return _context.abrupt("return", Promise.reject(_errorMsg));
+              return _context2.abrupt("return", Promise.reject(_errorMsg));
 
             case 14:
               limitNumError.current = undefined;
@@ -273,7 +318,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
                   uid: uid
                 }]);
               });
-              return _context.abrupt("return", handleUploadPromise(file, function (url) {
+              return _context2.abrupt("return", handleUploadPromise(file, function (url) {
                 var urls = [];
                 setFiles(function (files) {
                   return files.map(function (f) {
@@ -336,63 +381,63 @@ var UploadPhoto = function UploadPhoto(_ref) {
 
             case 17:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function uploadFile(_x, _x2) {
+    return function uploadFile(_x2, _x3) {
       return _ref3.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file, onSuccess, onFailed) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file, onSuccess, onFailed) {
       var rst, errorMsg;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              _context3.prev = 0;
+              _context3.next = 3;
               return handleUpload(file);
 
             case 3:
-              rst = _context2.sent;
+              rst = _context3.sent;
               onSuccess(rst);
-              return _context2.abrupt("return", Promise.resolve(rst));
+              return _context3.abrupt("return", Promise.resolve(rst));
 
             case 8:
-              _context2.prev = 8;
-              _context2.t0 = _context2["catch"](0);
-              errorMsg = _typeof(_context2.t0) === 'object' ? _context2.t0.message : _context2.t0;
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](0);
+              errorMsg = _typeof(_context3.t0) === 'object' ? _context3.t0.message : _context3.t0;
               onFailed(errorMsg);
-              return _context2.abrupt("return", Promise.reject(errorMsg));
+              return _context3.abrupt("return", Promise.reject(errorMsg));
 
             case 13:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[0, 8]]);
+      }, _callee3, null, [[0, 8]]);
     }));
 
-    return function handleUploadPromise(_x3, _x4, _x5) {
+    return function handleUploadPromise(_x4, _x5, _x6) {
       return _ref4.apply(this, arguments);
     };
   }();
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(index) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
       var arr, hasError, rst;
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               limitNumError.current = null;
               arr = files;
-              _context3.next = 4;
+              _context4.next = 4;
               return setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
@@ -402,7 +447,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
               });
 
             case 4:
-              _context3.next = 6;
+              _context4.next = 6;
               return setMasks(function (masks) {
                 return masks.filter(function (_, i) {
                   return i !== index;
@@ -416,7 +461,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
               });
 
               if (!hasError) {
-                _context3.next = 10;
+                _context4.next = 10;
                 break;
               }
 
@@ -429,7 +474,7 @@ var UploadPhoto = function UploadPhoto(_ref) {
 
                 return f.url;
               });
-              return _context3.abrupt("return", typeof onChange === 'function' && onChange(rst));
+              return _context4.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 10:
               typeof onChange === 'function' && onChange(arr.map(function (_ref6) {
@@ -439,36 +484,36 @@ var UploadPhoto = function UploadPhoto(_ref) {
 
             case 11:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
 
-    return function handleDelete(_x6) {
+    return function handleDelete(_x7) {
       return _ref5.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               _files$index = files[index], originFile = _files$index.originFile, reUpUid = _files$index.uid;
 
               if (originFile) {
-                _context4.next = 3;
+                _context5.next = 3;
                 break;
               }
 
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
 
             case 3:
-              _context4.next = 5;
+              _context5.next = 5;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
@@ -477,14 +522,14 @@ var UploadPhoto = function UploadPhoto(_ref) {
               });
 
             case 5:
-              _context4.prev = 5;
-              _context4.next = 8;
+              _context5.prev = 5;
+              _context5.next = 8;
               return handleUpload(originFile);
 
             case 8:
-              rst = _context4.sent;
+              rst = _context5.sent;
               latestFiles = [];
-              _context4.next = 12;
+              _context5.next = 12;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
@@ -512,19 +557,19 @@ var UploadPhoto = function UploadPhoto(_ref) {
                 return url;
               });
               onChange && onChange(fileListWithError);
-              _context4.next = 23;
+              _context5.next = 23;
               break;
 
             case 16:
-              _context4.prev = 16;
-              _context4.t0 = _context4["catch"](5);
+              _context5.prev = 16;
+              _context5.t0 = _context5["catch"](5);
               newList = [];
-              _context4.next = 21;
+              _context5.next = 21;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
-                newFiles[index].errorMsg = _context4.t0;
+                newFiles[index].errorMsg = _context5.t0;
                 newList = newFiles;
                 return newFiles;
               });
@@ -555,13 +600,13 @@ var UploadPhoto = function UploadPhoto(_ref) {
 
             case 24:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, null, [[5, 16]]);
+      }, _callee5, null, [[5, 16]]);
     }));
 
-    return function handleReUpload(_x7) {
+    return function handleReUpload(_x8) {
       return _ref7.apply(this, arguments);
     };
   }();

package/lib/utils/form-utils.d.ts

@@ -45,6 +45,7 @@ export declare const calcFormItemProps: (config: FormItemConfig, extraProps: For
         messageVariables: {
             label: string;
         };
+        dependencies: NamePath[] | undefined;
     };
     elementProps: {
         [key: string]: any;

package/lib/utils/form-utils.js

@@ -13,16 +13,16 @@ var _typography = _interopRequireDefault(require("../typography"));
 
 var _formattedMessage = _interopRequireDefault(require("../locale/formatted-message"));
 
-var _excluded = ["type", "name", "required", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 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; } } }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 
@@ -49,7 +49,7 @@ var calcNamePath = function calcNamePath(parentName, name) {
     names.push(parentName);
   }
 
-  if (name) {
+  if (name !== undefined) {
     names.push(name);
   }
 
@@ -61,9 +61,8 @@ exports.calcNamePath = calcNamePath;
 var testAssert = function testAssert(form, assert) {
   var field = assert.field,
       value = assert.value,
-      _assert$operation = assert.operation,
-      operation = _assert$operation === void 0 ? 'eq' : _assert$operation;
-  var v = form.getFieldValue(field);
+      operation = assert.operation;
+  var v = form.getFieldValue(typeof field === 'string' ? field.split('.') : field);
 
   switch (operation) {
     case 'ne':
@@ -102,9 +101,15 @@ var testAssert = function testAssert(form, assert) {
       if (v === undefined || v < value) return false;
       break;
 
+    case 'filled':
+      return v !== undefined;
+
     case 'eq':
+      return v === value;
+
     default:
-      if (v !== value) return false;
+      if (value !== undefined) return v === value;
+      return v !== undefined;
   }
 
   return true;
@@ -112,11 +117,25 @@ var testAssert = function testAssert(form, assert) {
 
 exports.testAssert = testAssert;
 
+var calcRequired = function calcRequired() {
+  var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var form = arguments.length > 1 ? arguments[1] : undefined;
+  var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (Array.isArray(requiredAsserts)) {
+    return requiredAsserts.every(function (assert) {
+      return form && testAssert(form, assert);
+    });
+  }
+
+  return required;
+};
+
 var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
   var type = config.type,
       nameProp = config.name,
-      _config$required = config.required,
-      required = _config$required === void 0 ? true : _config$required,
+      required = config.required,
+      requiredAsserts = config.requiredAsserts,
       _config$showOptional = config.showOptional,
       showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
       _config$rules = config.rules,
@@ -149,6 +168,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       ignore = config.ignore,
       shouldRender = config.shouldRender,
       valueFormater = config.valueFormater,
+      antdDependencies = config.antdDependencies,
       rest = _objectWithoutProperties(config, _excluded);
 
   (0, _invariant.default)(nameProp || type === 'Divider' || type === 'Section' || !type, "name property is required for form item config (type: ".concat(type, ")"));
@@ -180,7 +200,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       className = extraProps.className,
       extraRest = _objectWithoutProperties(extraProps, _excluded2);
 
-  var rules = required === true && extraRequired ? [{
+  var rules = calcRequired(required, form, requiredAsserts) ? [{
     required: true,
     message: requiredMessage || extraRequiredMessage
   }].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
@@ -256,7 +276,8 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       valuePropName: valuePropName || extraValuePropName,
       messageVariables: _objectSpread({
         label: label
-      }, messageVariables || extraMessageVariables)
+      }, messageVariables || extraMessageVariables),
+      dependencies: antdDependencies
     },
     elementProps: elementProps,
     display: !ignore && calcShouldRender(dependencies, asserts, shouldRender, form),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.4.9",
+  "version": "2.4.13",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",

package/es/free-form/context.d.ts

@@ -1,19 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd/es/form';
-import { FormItemName } from '@/types';
-declare const _default: React.Context<{
-    form?: FormInstance<any> | undefined;
-    onCancel?(): void;
-    cancelText?: string | undefined;
-    submitText?: string | undefined;
-    previewText?: string | undefined;
-    nextText?: string | undefined;
-    continueText?: string | undefined;
-    validateMessages?: Object | undefined;
-    submitting?: boolean | undefined;
-    requiredMark?: boolean | undefined;
-    showSubmitButton?: boolean | undefined;
-    getScrollContainer: () => HTMLElement | Window | null;
-    registerDependencies: (name: FormItemName | FormItemName[], updater: Function) => void;
-}>;
-export default _default;

package/es/free-form/context.js

@@ -1,7 +0,0 @@
-import React from 'react';
-export default /*#__PURE__*/React.createContext({
-  getScrollContainer: function getScrollContainer() {
-    return window;
-  },
-  registerDependencies: function registerDependencies() {}
-});

package/lib/free-form/context.d.ts

@@ -1,19 +0,0 @@
-import React from 'react';
-import { FormInstance } from 'antd/es/form';
-import { FormItemName } from '@/types';
-declare const _default: React.Context<{
-    form?: FormInstance<any> | undefined;
-    onCancel?(): void;
-    cancelText?: string | undefined;
-    submitText?: string | undefined;
-    previewText?: string | undefined;
-    nextText?: string | undefined;
-    continueText?: string | undefined;
-    validateMessages?: Object | undefined;
-    submitting?: boolean | undefined;
-    requiredMark?: boolean | undefined;
-    showSubmitButton?: boolean | undefined;
-    getScrollContainer: () => HTMLElement | Window | null;
-    registerDependencies: (name: FormItemName | FormItemName[], updater: Function) => void;
-}>;
-export default _default;

package/lib/free-form/context.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var _default = /*#__PURE__*/_react.default.createContext({
-  getScrollContainer: function getScrollContainer() {
-    return window;
-  },
-  registerDependencies: function registerDependencies() {}
-});
-
-exports.default = _default;