tdesign-react 0.27.2 → 0.28.0

package/lib/form/FormItem.js

@@ -1,5 +1,5 @@
 /**
- * tdesign v0.27.2
+ * tdesign v0.28.0
  * (c) 2022 tdesign
  * @license MIT
  */
@@ -8,68 +8,69 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var defineProperty = require('../_chunks/dep-d4780c69.js');
-var slicedToArray = require('../_chunks/dep-966008a5.js');
-var _typeof = require('../_chunks/dep-7089b727.js');
+var _typeof = require('../_chunks/dep-71e4d21e.js');
+var defineProperty = require('../_chunks/dep-8d2f3689.js');
+var slicedToArray = require('../_chunks/dep-c3b52abc.js');
 var React = require('react');
 var classNames = require('classnames');
-var isObject = require('../_chunks/dep-7f9724f7.js');
-var keysIn$1 = require('../_chunks/dep-eaf27329.js');
-var configProvider_ConfigContext = require('../_chunks/dep-66a91ad2.js');
-var _setToString = require('../_chunks/dep-2b752931.js');
-var _baseRest = require('../_chunks/dep-ee83c39e.js');
-var _baseGetTag = require('../_chunks/dep-970d5d55.js');
-var isObjectLike$1 = require('../_chunks/dep-294a4324.js');
-var toString$2 = require('../_chunks/dep-87edf3ba.js');
-var _isIndex = require('../_chunks/dep-8f00b98c.js');
-var _isIterateeCall = require('../_chunks/dep-fc96926a.js');
-var _getAllKeys = require('../_chunks/dep-a73ce995.js');
-var camelCase = require('../_chunks/dep-b960cdf8.js');
+var isObject = require('../_chunks/dep-0bc46dde.js');
+var keysIn$1 = require('../_chunks/dep-95a06c78.js');
+var configProvider_ConfigContext = require('../_chunks/dep-d1988ef8.js');
+var _setToString = require('../_chunks/dep-11f28bb0.js');
+var _baseRest = require('../_chunks/dep-2666fce8.js');
+var _baseGetTag = require('../_chunks/dep-2f77971b.js');
+var isObjectLike$1 = require('../_chunks/dep-ff62dc6c.js');
+var toString$2 = require('../_chunks/dep-6a145cca.js');
+var _isIndex = require('../_chunks/dep-35de0117.js');
+var _isIterateeCall = require('../_chunks/dep-cb7fd82c.js');
+var _getAllKeys = require('../_chunks/dep-379b3fe2.js');
+var camelCase = require('../_chunks/dep-b4bfb8c5.js');
 var tdesignIconsReact = require('tdesign-icons-react');
 var _util_useConfig = require('../_util/useConfig.js');
 var checkbox_index = require('../checkbox/index.js');
 var upload_index = require('../upload/index.js');
 var tag_index = require('../tag/index.js');
+var _util_renderTNode = require('../_util/renderTNode.js');
 var form_formModel = require('./formModel.js');
 var form_FormContext = require('./FormContext.js');
-require('../_chunks/dep-54c988d8.js');
-require('../_chunks/dep-58869e22.js');
-require('../_chunks/dep-2ee63f2f.js');
-require('../_chunks/dep-18233ff2.js');
-require('../_chunks/dep-bb11bb62.js');
-require('../_chunks/dep-12da16d1.js');
-require('../_chunks/dep-fb599a1a.js');
-require('../_chunks/dep-20f6923d.js');
+require('../_chunks/dep-65d64731.js');
+require('../_chunks/dep-8d7bb976.js');
+require('../_chunks/dep-bd4553de.js');
+require('../_chunks/dep-4e175c8d.js');
+require('../_chunks/dep-47dec67d.js');
+require('../_chunks/dep-0901df83.js');
+require('../_chunks/dep-d49ca178.js');
+require('../_chunks/dep-44b93460.js');
 require('../_common/js/global-config/locale/zh_CN.js');
 require('../config-provider/zh_CN_config.js');
-require('../_chunks/dep-3e45dc37.js');
-require('../_chunks/dep-a47a838f.js');
-require('../_chunks/dep-bc85dc8a.js');
-require('../_chunks/dep-6ac1a948.js');
-require('../_chunks/dep-3c025b2f.js');
-require('../_chunks/dep-eb057d83.js');
+require('../_chunks/dep-5d3f16ca.js');
+require('../_chunks/dep-2b5f881a.js');
+require('../_chunks/dep-7f8549d2.js');
+require('../_chunks/dep-e7da1f6b.js');
+require('../_chunks/dep-d236783a.js');
+require('../_chunks/dep-370910f8.js');
 require('../_util/forwardRefWithStatics.js');
 require('hoist-non-react-statics');
 require('../common/Check.js');
-require('../_chunks/dep-c4e5ba06.js');
+require('../_chunks/dep-fb7fc9f7.js');
 require('../_util/helper.js');
 require('../_util/useDefault.js');
 require('../_util/noop.js');
-require('../_chunks/dep-883a1165.js');
+require('../_chunks/dep-c31c68ba.js');
 require('../upload/upload.js');
-require('../_chunks/dep-e808a005.js');
-require('../_chunks/dep-afebaf15.js');
-require('../_chunks/dep-6c32e38a.js');
-require('../_chunks/dep-3fff0864.js');
-require('../_chunks/dep-083bef0a.js');
-require('../_chunks/dep-c54cbc49.js');
-require('../_chunks/dep-9dd5189a.js');
-require('../_chunks/dep-65e40b52.js');
-require('../_chunks/dep-69e5c80a.js');
-require('../_chunks/dep-6984609c.js');
+require('../_chunks/dep-16f57fd2.js');
+require('../_chunks/dep-da451f3b.js');
+require('../_chunks/dep-f13e42f8.js');
+require('../_chunks/dep-2322df0f.js');
+require('../_chunks/dep-b738a380.js');
+require('../_chunks/dep-cbb89a09.js');
+require('../_chunks/dep-215b525a.js');
+require('../_chunks/dep-a49e4831.js');
+require('../_chunks/dep-33d435f0.js');
+require('../_chunks/dep-3202f2a6.js');
 require('../dialog/index.js');
 require('../dialog/Dialog.js');
-require('../_chunks/dep-db0608d9.js');
+require('../_chunks/dep-10608f6b.js');
 require('../locale/LocalReceiver.js');
 require('../button/index.js');
 require('../button/Button.js');
@@ -116,33 +117,6 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 
-/**
- * Checks if `value` is `null` or `undefined`.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is nullish, else `false`.
- * @example
- *
- * _.isNil(null);
- * // => true
- *
- * _.isNil(void 0);
- * // => true
- *
- * _.isNil(NaN);
- * // => false
- */
-
-function isNil(value) {
-  return value == null;
-}
-
-var isNil_1 = isNil;
-
 var copyObject = keysIn$1._copyObject,
     createAssigner = configProvider_ConfigContext._createAssigner,
     keysIn = keysIn$1.keysIn_1;
@@ -723,8 +697,8 @@ function getDefaultInitialData(children, initialData) {
   React__default["default"].Children.forEach(children, function (child) {
     if (!child) return;
 
-    if (_typeof._typeof(child.type) === "object") {
-      defaultInitialData = initialDataMap.get(child.type) || initialData;
+    if ( /*#__PURE__*/React__default["default"].isValidElement(child) && typeof initialData === "undefined") {
+      defaultInitialData = initialDataMap.get(child.type);
     }
   });
   return defaultInitialData;
@@ -736,27 +710,13 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useConfig = _util_useConfig["default"](),
       classPrefix = _useConfig.classPrefix;
 
-  var children = props.children,
-      label = props.label,
-      name = props.name,
-      help = props.help,
-      statusIconFromProp = props.statusIcon,
-      rulesFromProp = props.rules,
-      labelWidth = props.labelWidth,
-      labelAlign = props.labelAlign,
-      initialData = props.initialData,
-      requiredMark = props.requiredMark,
-      successBorder = props.successBorder,
-      className = props.className,
-      formItemStyle = props.style;
-
   var _useFormContext = form_FormContext.useFormContext(),
       colon = _useFormContext.colon,
-      requiredMarkFromContext = _useFormContext.requiredMark,
       layout = _useFormContext.layout,
+      requiredMarkFromContext = _useFormContext.requiredMark,
       labelAlignFromContext = _useFormContext.labelAlign,
       labelWidthFromContext = _useFormContext.labelWidth,
-      showErrorMessage = _useFormContext.showErrorMessage,
+      showErrorMessageFromContext = _useFormContext.showErrorMessage,
       disabledFromContext = _useFormContext.disabled,
       resetTypeFromContext = _useFormContext.resetType,
       rulesFromContext = _useFormContext.rules,
@@ -765,6 +725,27 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       formItemsRef = _useFormContext.formItemsRef,
       onFormItemValueChange = _useFormContext.onFormItemValueChange;
 
+  var children = props.children,
+      style = props.style,
+      label = props.label,
+      name = props.name,
+      help = props.help,
+      initialData = props.initialData,
+      className = props.className,
+      successBorder = props.successBorder,
+      _props$statusIcon = props.statusIcon,
+      statusIcon = _props$statusIcon === void 0 ? statusIconFromContext : _props$statusIcon,
+      _props$rules = props.rules,
+      innerRules = _props$rules === void 0 ? (rulesFromContext === null || rulesFromContext === void 0 ? void 0 : rulesFromContext[name]) || [] : _props$rules,
+      _props$labelWidth = props.labelWidth,
+      labelWidth = _props$labelWidth === void 0 ? labelWidthFromContext : _props$labelWidth,
+      _props$labelAlign = props.labelAlign,
+      labelAlign = _props$labelAlign === void 0 ? labelAlignFromContext : _props$labelAlign,
+      _props$requiredMark = props.requiredMark,
+      requiredMark = _props$requiredMark === void 0 ? requiredMarkFromContext : _props$requiredMark,
+      _props$showErrorMessa = props.showErrorMessage,
+      showErrorMessage = _props$showErrorMessa === void 0 ? showErrorMessageFromContext : _props$showErrorMessa;
+
   var _useState = React.useState([]),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       errorList = _useState2[0],
@@ -801,14 +782,10 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var innerFormItemsRef = React.useRef([]);
   var shouldValidate = React.useRef(null);
   var isMounted = React.useRef(false);
-  var innerRules = rulesFromContext && rulesFromContext[name] || rulesFromProp || [];
-  var innerLabelWidth = isNil_1(labelWidth) ? labelWidthFromContext : labelWidth;
-  var innerLabelAlign = isNil_1(labelAlign) ? labelAlignFromContext : labelAlign;
-  var innerRequiredMark = isNil_1(requiredMark) ? requiredMarkFromContext : requiredMark;
   var formItemClass = classNames__default["default"](className, "".concat(classPrefix, "-form__item"), (_classNames = {}, defineProperty._defineProperty(_classNames, "".concat(classPrefix, "-form-item__").concat(name), name), defineProperty._defineProperty(_classNames, "".concat(classPrefix, "-form__item-with-help"), help), defineProperty._defineProperty(_classNames, "".concat(classPrefix, "-form__item-with-extra"), renderTipsInfo()), _classNames));
-  var formItemLabelClass = classNames__default["default"]("".concat(classPrefix, "-form__label"), (_classNames2 = {}, defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--required"), innerRequiredMark && innerRules.filter(function (rule) {
+  var formItemLabelClass = classNames__default["default"]("".concat(classPrefix, "-form__label"), (_classNames2 = {}, defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--required"), requiredMark && innerRules.filter(function (rule) {
     return rule.required;
-  }).length > 0), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--colon"), colon && label), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--top"), innerLabelAlign === "top" || !innerLabelWidth), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--left"), innerLabelAlign === "left" && innerLabelWidth), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--right"), innerLabelAlign === "right" && innerLabelWidth), _classNames2));
+  }).length > 0), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--colon"), colon && label), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--top"), labelAlign === "top" || !labelWidth), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--left"), labelAlign === "left" && labelWidth), defineProperty._defineProperty(_classNames2, "".concat(classPrefix, "-form__label--right"), labelAlign === "right" && labelWidth), _classNames2));
 
   var contentClass = function contentClass() {
     var _classNames4;
@@ -830,20 +807,20 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var labelStyle = {};
   var contentStyle = {};
 
-  if (innerLabelWidth && innerLabelAlign !== "top") {
-    if (typeof innerLabelWidth === "number") {
+  if (labelWidth && labelAlign !== "top") {
+    if (typeof labelWidth === "number") {
       labelStyle = {
-        width: "".concat(innerLabelWidth, "px")
+        width: "".concat(labelWidth, "px")
       };
       contentStyle = {
-        marginLeft: layout !== "inline" ? "".concat(innerLabelWidth, "px") : ""
+        marginLeft: layout !== "inline" ? "".concat(labelWidth, "px") : ""
       };
     } else {
       labelStyle = {
-        width: innerLabelWidth
+        width: labelWidth
       };
       contentStyle = {
-        marginLeft: layout !== "inline" ? innerLabelWidth : ""
+        marginLeft: layout !== "inline" ? labelWidth : ""
       };
     }
   }
@@ -852,7 +829,7 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var helpNode = null;
     if (help) helpNode = /* @__PURE__ */React__default["default"].createElement("div", {
       className: "".concat(classPrefix, "-form__help")
-    }, help);
+    }, _util_renderTNode["default"](help));
     var list = errorList;
 
     if (showErrorMessage && list && list[0] && list[0].message) {
@@ -871,7 +848,7 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }
 
   var renderSuffixIcon = function renderSuffixIcon() {
-    if (statusIconFromProp === false) return null;
+    if (statusIcon === false) return null;
 
     var resultIcon = function resultIcon(iconSlot) {
       return /* @__PURE__ */React__default["default"].createElement("span", {
@@ -906,22 +883,18 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return null;
     };
 
-    if ( /*#__PURE__*/React__default["default"].isValidElement(statusIconFromProp)) {
-      return resultIcon( /*#__PURE__*/React__default["default"].cloneElement(statusIconFromProp, _objectSpread({
+    if ( /*#__PURE__*/React__default["default"].isValidElement(statusIcon)) {
+      return resultIcon( /*#__PURE__*/React__default["default"].cloneElement(statusIcon, _objectSpread({
         style: {
           color: "unset"
         }
-      }, statusIconFromProp.props)));
+      }, statusIcon.props)));
     }
 
-    if (statusIconFromContext === true) {
+    if (statusIcon === true) {
       return getDefaultIcon();
     }
 
-    if ( /*#__PURE__*/React__default["default"].isValidElement(statusIconFromContext)) {
-      return resultIcon(statusIconFromProp);
-    }
-
     return null;
   };
 
@@ -1104,7 +1077,7 @@ var FormItem = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   return /* @__PURE__ */React__default["default"].createElement("div", {
     className: formItemClass,
-    style: formItemStyle,
+    style: style,
     ref: ref
   }, label && /* @__PURE__ */React__default["default"].createElement("div", {
     className: formItemLabelClass,