iglooform 3.1.5 → 3.2.0

package/lib/utils/form-utils.js

@@ -4,14 +4,15 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testAssert = exports.getRuleValidation = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = void 0;
+exports.testAssert = exports.getRuleValidation = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = exports.calcAddableSectionAssertField = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var _typography = _interopRequireDefault(require("../typography"));
 var _formattedMessage = _interopRequireDefault(require("../locale/formatted-message"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _lodash = require("lodash");
 var _jsxRuntime = require("react/jsx-runtime");
-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", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode", "shouldRenderCode"],
+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", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "validationCode", "shouldRenderCode", "disabledCode"],
   _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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -179,6 +180,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
     _config$validationCod = config.validationCode,
     validationCode = _config$validationCod === void 0 ? [] : _config$validationCod,
     shouldRenderCode = config.shouldRenderCode,
+    disabledCode = config.disabledCode,
     rest = _objectWithoutProperties(config, _excluded);
   (0, _invariant.default)(nameProp !== undefined || type === 'Divider' || type === 'Section' || type === 'Typography' || type === 'OCR' || !type, "name property is required for form item config (type: ".concat(type, ")"));
   (0, _invariant.default)(!previewFormater || typeof previewFormater === 'function', 'previewFormater property should be a function');
@@ -230,7 +232,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
   Object.keys(_objectSpread(_objectSpread({}, extraRest), rest)).forEach(function (key) {
     elementProps[key.replace('element-', '')] = rest[key];
   });
-  elementProps.disabled = calcDisabled(disabled, form) || copiedValue.disabled || selectedValue.disabled;
+  elementProps.disabled = calcDisabled(disabled, form, disabledCode, name, parentName) || copiedValue.disabled || selectedValue.disabled;
   if (dateLimitationType) {
     var rangeStart;
     var rangeEnd;
@@ -311,8 +313,12 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
             var fn = eval(code);
             var formValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
             var _result2 = fn(value, formValues, {
-              moment: _dayjs.default
-            }, validationCodeExtraParams);
+              moment: _dayjs.default,
+              get: _lodash.get
+            }, _objectSpread({
+              name: name,
+              parentName: parentName
+            }, validationCodeExtraParams));
             return _result2 ? Promise.resolve() : Promise.reject(errorMessage);
           } catch (_unused) {
             return Promise.reject(errorMessage);
@@ -374,13 +380,32 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       dependencies: antdDependencies
     },
     elementProps: elementProps,
-    display: !ignore && calcShouldRender(name, dependencies, asserts, shouldRender, shouldRenderCode, form),
+    display: !ignore && calcShouldRender(name, parentName, dependencies, asserts, shouldRender, shouldRenderCode, form),
     previewFormater: previewFormater || extraPreviewFormater
   };
 };
 exports.calcFormItemProps = calcFormItemProps;
-var calcDisabled = function calcDisabled(disabled, form) {
-  if (!form || !disabled) return false;
+var calcDisabled = function calcDisabled(disabled, form, disabledCode, name, parentName) {
+  if (!form) return false;
+  if (disabledCode) {
+    var fn = eval(disabledCode);
+    if (typeof fn === 'function') {
+      try {
+        var value = form.getFieldValue(name);
+        var values = form.getFieldsValue(true);
+        return fn(value, values, {
+          moment: _dayjs.default,
+          get: _lodash.get
+        }, {
+          name: name,
+          parentName: parentName
+        });
+      } catch (_unused2) {
+        return false;
+      }
+    }
+  }
+  if (!disabled) return false;
   if (typeof disabled === 'boolean') return disabled;
   if (Array.isArray(disabled)) {
     var _iterator = _createForOfIteratorHelper(disabled),
@@ -455,12 +480,12 @@ var calcSelectValue = function calcSelectValue(selectValue, form) {
   };
 };
 exports.calcSelectValue = calcSelectValue;
-var calcShouldRender = function calcShouldRender(name) {
-  var dependencies = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var asserts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  var shouldRender = arguments.length > 3 ? arguments[3] : undefined;
-  var shouldRenderCode = arguments.length > 4 ? arguments[4] : undefined;
-  var form = arguments.length > 5 ? arguments[5] : undefined;
+var calcShouldRender = function calcShouldRender(name, parentName) {
+  var dependencies = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var asserts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var shouldRender = arguments.length > 4 ? arguments[4] : undefined;
+  var shouldRenderCode = arguments.length > 5 ? arguments[5] : undefined;
+  var form = arguments.length > 6 ? arguments[6] : undefined;
   if (!form) return true;
   var _iterator3 = _createForOfIteratorHelper(dependencies),
     _step3;
@@ -486,9 +511,13 @@ var calcShouldRender = function calcShouldRender(name) {
         var value = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
         return fn(value, values, {
-          moment: _dayjs.default
+          moment: _dayjs.default,
+          get: _lodash.get
+        }, {
+          name: name,
+          parentName: parentName
         });
-      } catch (_unused2) {
+      } catch (_unused3) {
         return false;
       }
     }
@@ -570,4 +599,44 @@ var getRuleValidation = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
-exports.getRuleValidation = getRuleValidation;
+exports.getRuleValidation = getRuleValidation;
+var isAddableSectionInnerField = function isAddableSectionInnerField(name, field, elements) {
+  var start = 0;
+  var hit = false;
+  while (start < name.length && start < field.length) {
+    if (name[start] === field[start]) {
+      hit = true;
+      start++;
+    } else {
+      if (hit) return false;
+      break;
+    }
+  }
+  if (start === name.length) return true;
+  var restField = field.slice(start);
+  var _elements = elements;
+  var index = 0;
+  var isReactElement = elements.some(_react.default.isValidElement);
+  while (index < restField.length) {
+    var found = _elements.find(function (item) {
+      return (isReactElement ? item.props.name : item.name).toString() === restField[index];
+    });
+    if (!found) return false;
+    index++;
+    _elements = (isReactElement ? found.props.children : found.elements) || [];
+  }
+  return true;
+};
+
+// 暂时不考虑AddableSection嵌套的场景
+var calcAddableSectionAssertField = function calcAddableSectionAssertField(name, field, index, elements) {
+  var _field = typeof field === 'string' ? field.split('.') : field;
+  if (!isAddableSectionInnerField(name, _field, elements)) return field;
+  if (!_field.join().startsWith(name.join())) return [].concat(_toConsumableArray(name), [index], _toConsumableArray(_field));
+  var _index = _field.findIndex(function (item) {
+    return item === name[name.length - 1];
+  });
+  if (_index === -1) return field;
+  return [].concat(_toConsumableArray(name), [index], _toConsumableArray(_field.slice(_index + 1)));
+};
+exports.calcAddableSectionAssertField = calcAddableSectionAssertField;

package/package.json

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