antd-mobile 5.2.1 → 5.3.1

package/2x/cjs/components/avatar/avatar.js

@@ -32,6 +32,7 @@ const Avatar = p => {
     placeholder: props.fallback,
     alt: props.alt,
     lazy: props.lazy,
+    fit: props.fit,
     onClick: props.onClick,
     onError: props.onError
   }));

package/2x/cjs/components/calendar/calendar.js

@@ -50,7 +50,29 @@ const Calendar = (0, _react.forwardRef)((p, ref) => {
     if (item) markItems.unshift(item);
   }
 
-  const [current, setCurrent] = (0, _react.useState)(() => (0, _dayjs.default)().date(1));
+  const dateRange = (0, _react.useMemo)(() => {
+    var _a, _b, _c, _d;
+
+    if (props.selectionMode === 'single') {
+      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
+      return [value, value];
+    } else if (props.selectionMode === 'range') {
+      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
+    } else {
+      return [null, null];
+    }
+  }, [props.selectionMode, props.value, props.defaultValue]);
+  const [begin, setBegin] = (0, _react.useState)(null);
+  const [end, setEnd] = (0, _react.useState)(null);
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
+    setBegin(dateRange[0] ? (0, _dayjs.default)(dateRange[0]) : null);
+    setEnd(dateRange[1] ? (0, _dayjs.default)(dateRange[1]) : null);
+  }, [dateRange[0], dateRange[1]]);
+  const [current, setCurrent] = (0, _react.useState)(() => {
+    var _a;
+
+    return (0, _dayjs.default)((_a = dateRange[0]) !== null && _a !== void 0 ? _a : today).date(1);
+  });
   (0, _ahooks.useUpdateEffect)(() => {
     var _a;
 
@@ -102,25 +124,6 @@ const Calendar = (0, _react.forwardRef)((p, ref) => {
     }
   }, _react.default.createElement(_arrowLeftDouble.ArrowLeftDouble, null)));
 
-  const dateRange = (0, _react.useMemo)(() => {
-    var _a, _b, _c, _d;
-
-    if (props.selectionMode === 'single') {
-      const value = (_b = (_a = props.value) !== null && _a !== void 0 ? _a : props.defaultValue) !== null && _b !== void 0 ? _b : null;
-      return [value, value];
-    } else if (props.selectionMode === 'range') {
-      return (_d = (_c = props.value) !== null && _c !== void 0 ? _c : props.defaultValue) !== null && _d !== void 0 ? _d : [null, null];
-    } else {
-      return [null, null];
-    }
-  }, [props.selectionMode, props.value, props.defaultValue]);
-  const [begin, setBegin] = (0, _react.useState)(null);
-  const [end, setEnd] = (0, _react.useState)(null);
-  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
-    setBegin(dateRange[0] ? (0, _dayjs.default)(dateRange[0]) : null);
-    setEnd(dateRange[1] ? (0, _dayjs.default)(dateRange[1]) : null);
-  }, [dateRange[0], dateRange[1]]);
-
   function renderCells() {
     var _a;
 

package/2x/cjs/components/date-picker/date-picker.js

@@ -50,14 +50,10 @@ const DatePicker = p => {
   });
   const now = (0, _react.useMemo)(() => new Date(), []);
   const pickerValue = (0, _react.useMemo)(() => {
-    let date = value;
-
-    if (date === null) {
-      date = new Date((0, _bound.bound)(now.getDate(), props.min.getDate(), props.max.getDate()));
-    }
-
+    let date = value !== null && value !== void 0 ? value : now;
+    date = new Date((0, _bound.bound)(date.getTime(), props.min.getTime(), props.max.getTime()));
     return (0, _datePickerUtils.convertDateToStringArray)(date, props.precision);
-  }, [value, props.precision]);
+  }, [value, props.precision, props.min, props.max]);
   const onConfirm = (0, _react.useCallback)(val => {
     setValue((0, _datePickerUtils.convertStringArrayToDate)(val, props.precision));
   }, [setValue, props.precision]);

package/2x/cjs/components/dialog/dialog.css

@@ -18,7 +18,7 @@
   transform: translate(-50%, -50%);
 }
 
-.adm-dialog-main {
+.adm-dialog-body {
   width: 100%;
   max-height: 70vh;
   font-size: 28px;
@@ -29,35 +29,39 @@
   flex-direction: column;
 }
 
-.adm-dialog-main > * {
+.adm-dialog-body > * {
   flex: none;
 }
 
-.adm-dialog-main > .adm-dialog-image-container {
+.adm-dialog-body > .adm-dialog-content {
   flex: auto;
 }
 
-.adm-dialog-main > .adm-dialog-image-container + .adm-dialog-body {
-  padding-top: 24px;
+.adm-dialog-body:not(.adm-dialog-with-image) {
+  padding-top: 40px;
 }
 
-.adm-dialog-main .adm-dialog-body {
-  padding: 40px 24px;
+.adm-dialog-body .adm-dialog-image-container {
+  margin-bottom: 24px;
+  max-height: 40vh;
 }
 
-.adm-dialog-main .adm-dialog-body-header-wrapper {
-  display: flex;
-  justify-content: center;
+.adm-dialog-body .adm-dialog-header {
+  margin-bottom: 16px;
+  padding: 0 24px;
 }
 
-.adm-dialog-main .adm-dialog-body-title {
+.adm-dialog-body .adm-dialog-title {
+  margin-bottom: 16px;
+  padding: 0 24px;
   font-weight: bold;
   font-size: 36px;
   line-height: 50px;
   text-align: center;
 }
 
-.adm-dialog-main .adm-dialog-body-content {
+.adm-dialog-body .adm-dialog-content {
+  padding: 0 24px 40px;
   max-height: 70vh;
   overflow-x: hidden;
   overflow-y: auto;
@@ -66,21 +70,26 @@
   color: #333;
 }
 
-.adm-dialog-main .adm-dialog-footer {
+.adm-dialog-body .adm-dialog-content-empty {
+  padding: 0;
+  height: 24px;
+}
+
+.adm-dialog-body .adm-dialog-footer {
   user-select: none;
 }
 
-.adm-dialog-main .adm-dialog-footer .adm-dialog-action-row {
+.adm-dialog-body .adm-dialog-footer .adm-dialog-action-row {
   display: flex;
   align-items: stretch;
   border-top: 1px solid var(--adm-border-color);
 }
 
-.adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > * {
+.adm-dialog-body .adm-dialog-footer .adm-dialog-action-row > * {
   flex: 1;
 }
 
-.adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button {
+.adm-dialog-body .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button {
   padding: 20px;
   font-size: 36px;
   line-height: 50px;
@@ -88,11 +97,11 @@
   border-right: solid 1px var(--adm-border-color);
 }
 
-.adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button-bold {
+.adm-dialog-body .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button-bold {
   font-weight: bold;
 }
 
-.adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button:last-child {
+.adm-dialog-body .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button:last-child {
   border-right: none;
 }
 

package/2x/cjs/components/dialog/dialog.js

@@ -21,8 +21,6 @@ var _dialogActionButton = require("./dialog-action-button");
 
 var _image = _interopRequireDefault(require("../image"));
 
-var _space = _interopRequireDefault(require("../space"));
-
 var _renderToContainer = require("../../utils/render-to-container");
 
 var _withStopPropagation = require("../../utils/with-stop-propagation");
@@ -39,7 +37,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-const classPrefix = `adm-dialog`;
 const defaultProps = {
   visible: false,
   actions: [],
@@ -78,51 +75,28 @@ const Dialog = p => {
     }
   });
   const [active, setActive] = (0, _react.useState)(props.visible);
-  const node = (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix,
-    style: {
-      display: active ? 'unset' : 'none'
-    }
-  }, _react.default.createElement(_mask.default, {
-    visible: props.visible,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: (0, _classnames.default)(`${classPrefix}-mask`, props.maskClassName)
-  }), _react.default.createElement("div", {
-    className: `${classPrefix}-wrap`,
-    style: {
-      pointerEvents: props.visible ? 'unset' : 'none'
-    }
-  }, _react.default.createElement(_web.animated.div, {
-    style: Object.assign({}, style),
-    onClick: e => e.stopPropagation(),
-    className: `${classPrefix}-main`
+
+  const body = _react.default.createElement("div", {
+    className: (0, _classnames.default)(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    style: props.bodyStyle
   }, !!props.image && _react.default.createElement("div", {
-    className: `${classPrefix}-image-container`
+    className: cls('image-container')
   }, _react.default.createElement(_image.default, {
     src: props.image,
     alt: 'dialog header image',
     width: '100%'
-  })), _react.default.createElement("div", {
-    style: props.bodyStyle,
-    className: (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName)
-  }, _react.default.createElement(_space.default, {
-    direction: 'vertical',
-    block: true
-  }, !!props.header && _react.default.createElement("div", {
-    className: `${classPrefix}-body-header-wrapper`
-  }, _react.default.createElement("div", {
-    className: `${classPrefix}-body-header`
-  }, props.header)), !!props.title && _react.default.createElement("div", {
-    className: `${classPrefix}-body-title`
-  }, props.title), !!props.content && _react.default.createElement("div", {
-    className: `${classPrefix}-body-content`
-  }, typeof props.content === 'string' ? _react.default.createElement(_autoCenter.default, null, props.content) : props.content))), _react.default.createElement("div", {
-    className: `${classPrefix}-footer`
+  })), !!props.header && _react.default.createElement("div", {
+    className: cls('header')
+  }, _react.default.createElement(_autoCenter.default, null, props.header)), !!props.title && _react.default.createElement("div", {
+    className: cls('title')
+  }, props.title), _react.default.createElement("div", {
+    className: (0, _classnames.default)(cls('content'), !props.content && cls('content-empty'))
+  }, typeof props.content === 'string' ? _react.default.createElement(_autoCenter.default, null, props.content) : props.content), _react.default.createElement("div", {
+    className: cls('footer')
   }, props.actions.map((row, index) => {
     const actions = Array.isArray(row) ? row : [row];
     return _react.default.createElement("div", {
-      className: `${classPrefix}-action-row`,
+      className: cls('action-row'),
       key: index
     }, actions.map((action, index) => _react.default.createElement(_dialogActionButton.DialogActionButton, {
       key: action.key,
@@ -137,8 +111,31 @@ const Dialog = p => {
         }
       })
     })));
-  }))))));
+  })));
+
+  const node = (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+    className: cls(),
+    style: {
+      display: active ? 'unset' : 'none'
+    }
+  }, _react.default.createElement(_mask.default, {
+    visible: props.visible,
+    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
+    style: props.maskStyle,
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+  }), _react.default.createElement("div", {
+    className: cls('wrap'),
+    style: {
+      pointerEvents: props.visible ? 'unset' : 'none'
+    }
+  }, _react.default.createElement(_web.animated.div, {
+    style: style
+  }, body))));
   return (0, _renderToContainer.renderToContainer)(props.getContainer, (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, node));
 };
 
-exports.Dialog = Dialog;
+exports.Dialog = Dialog;
+
+function cls(name = '') {
+  return 'adm-dialog' + (name && '-') + name;
+}

package/2x/cjs/components/dropdown/dropdown.css

@@ -4,10 +4,11 @@
 
 .adm-dropdown .adm-dropdown-nav {
   display: flex;
+  border-bottom: 2px solid transparent;
 }
 
 .adm-dropdown-open .adm-dropdown-nav {
-  border-bottom: 2px solid var(--adm-border-color);
+  border-bottom-color: var(--adm-border-color);
 }
 
 .adm-dropdown-item {

package/2x/cjs/components/ellipsis/ellipsis.d.ts

@@ -1,10 +1,12 @@
 import { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
+import { PropagationEvent } from '../../utils/with-stop-propagation';
 export declare type EllipsisProps = {
     content: string;
     direction?: 'start' | 'end' | 'middle';
     rows?: number;
     expandText?: string;
     collapseText?: string;
+    stopPropagationForActionButtons?: PropagationEvent[];
 } & NativeProps;
 export declare const Ellipsis: FC<EllipsisProps>;

package/2x/cjs/components/ellipsis/ellipsis.js

@@ -15,6 +15,8 @@ var _useResizeEffect = require("../../utils/use-resize-effect");
 
 var _ahooks = require("ahooks");
 
+var _withStopPropagation = require("../../utils/with-stop-propagation");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (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; }
@@ -24,7 +26,8 @@ const defaultProps = {
   direction: 'end',
   rows: 1,
   expandText: '',
-  collapseText: ''
+  collapseText: '',
+  stopPropagationForActionButtons: []
 };
 
 const Ellipsis = p => {
@@ -134,16 +137,16 @@ const Ellipsis = p => {
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     calcEllipsised();
   }, [props.content, props.direction, props.rows, props.expandText, props.collapseText]);
-  const expandActionElement = exceeded && props.expandText ? _react.default.createElement("a", {
+  const expandActionElement = exceeded && props.expandText ? (0, _withStopPropagation.withStopPropagation)(props.stopPropagationForActionButtons, _react.default.createElement("a", {
     onClick: () => {
       setExpanded(true);
     }
-  }, props.expandText) : null;
-  const collapseActionElement = exceeded && props.expandText ? _react.default.createElement("a", {
+  }, props.expandText)) : null;
+  const collapseActionElement = exceeded && props.expandText ? (0, _withStopPropagation.withStopPropagation)(props.stopPropagationForActionButtons, _react.default.createElement("a", {
     onClick: () => {
       setExpanded(false);
     }
-  }, props.collapseText) : null;
+  }, props.collapseText)) : null;
 
   const renderContent = () => {
     if (!exceeded) {

package/2x/cjs/components/form/context.d.ts

@@ -4,8 +4,9 @@ import type { Meta, InternalNamePath } from 'rc-field-form/lib/interface';
 export declare type FormContextType = {
     hasFeedback: boolean;
     layout: FormLayout;
+    requiredMarkStyle: 'asterisk' | 'text-required' | 'text-optional';
 };
-export declare const DEFAULT_FORM_CONTEXT: FormContextType;
+export declare const defaultFormContext: FormContextType;
 export declare const FormContext: React.Context<FormContextType>;
 export declare type OnSubMetaChange = (meta: Meta & {
     destroy?: boolean;

package/2x/cjs/components/form/context.js

@@ -3,19 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.NoStyleItemContext = exports.FormContext = exports.DEFAULT_FORM_CONTEXT = void 0;
+exports.defaultFormContext = exports.NoStyleItemContext = exports.FormContext = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const DEFAULT_FORM_CONTEXT = {
+const defaultFormContext = {
   hasFeedback: true,
-  layout: 'vertical'
+  layout: 'vertical',
+  requiredMarkStyle: 'asterisk'
 };
-exports.DEFAULT_FORM_CONTEXT = DEFAULT_FORM_CONTEXT;
+exports.defaultFormContext = defaultFormContext;
 
-const FormContext = _react.default.createContext(DEFAULT_FORM_CONTEXT);
+const FormContext = _react.default.createContext(defaultFormContext);
 
 exports.FormContext = FormContext;
 

package/2x/cjs/components/form/form-item.css

@@ -11,7 +11,7 @@
   color: #666666;
 }
 
-.adm-form-item-label-required {
+.adm-form-item-label .adm-form-item-required-asterisk {
   position: absolute;
   left: -0.6em;
   top: 0;
@@ -20,8 +20,34 @@
   user-select: none;
 }
 
+.adm-form-item-label .adm-form-item-required-text {
+  margin-left: 8px;
+  color: var(--adm-color-weak);
+}
+
 .adm-form-item-label-help {
   margin-left: 8px;
+  cursor: pointer;
+}
+
+.adm-form-item-child {
+  display: flex;
+}
+
+.adm-form-item-child-position-normal {
+  justify-content: normal;
+}
+
+.adm-form-item-child-position-normal > * {
+  flex: auto;
+}
+
+.adm-form-item-child-position-right {
+  justify-content: right;
+}
+
+.adm-form-item-child-position-right > * {
+  flex: none;
 }
 
 .adm-form-item-footer {

package/2x/cjs/components/form/form-item.d.ts

@@ -16,6 +16,7 @@ export declare type FormItemProps = Pick<RcFieldProps, 'dependencies' | 'valuePr
     disabled?: boolean;
     hidden?: boolean;
     layout?: FormLayout;
+    childElementPosition?: 'normal' | 'right';
     children: ChildrenType;
 } & NativeProps;
 export declare const FormItem: FC<FormItemProps>;

package/2x/cjs/components/form/form-item.js

@@ -27,6 +27,8 @@ var _popover = _interopRequireDefault(require("../popover"));
 
 var _antdMobileIcons = require("antd-mobile-icons");
 
+var _configProvider = require("../config-provider");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -54,18 +56,47 @@ const FormItemLayout = props => {
     hidden,
     errors,
     arrow,
-    description
+    description,
+    childElementPosition = 'normal'
   } = props;
   const context = (0, _react.useContext)(_context.FormContext);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
   const hasFeedback = props.hasFeedback !== undefined ? props.hasFeedback : context.hasFeedback;
   const layout = props.layout || context.layout;
   const feedback = hasFeedback && errors && errors.length > 0 ? errors[0] : null;
+
+  const requiredMark = (() => {
+    const {
+      requiredMarkStyle
+    } = context;
+
+    switch (requiredMarkStyle) {
+      case 'asterisk':
+        return required && _react.default.createElement("span", {
+          className: `${classPrefix}-required-asterisk`
+        }, "*");
+
+      case 'text-required':
+        return required && _react.default.createElement("span", {
+          className: `${classPrefix}-required-text`
+        }, "(", locale.Form.required, ")");
+
+      case 'text-optional':
+        return !required && _react.default.createElement("span", {
+          className: `${classPrefix}-required-text`
+        }, "(", locale.Form.optional, ")");
+
+      default:
+        return null;
+    }
+  })();
+
   const labelElement = label ? _react.default.createElement("label", {
     className: `${classPrefix}-label`,
     htmlFor: htmlFor
-  }, label, required && _react.default.createElement("span", {
-    className: `${classPrefix}-label-required`
-  }, "*"), help && _react.default.createElement("span", {
+  }, label, requiredMark, help && _react.default.createElement("span", {
     className: `${classPrefix}-label-help`
   }, _react.default.createElement(_popover.default, {
     content: help,
@@ -87,7 +118,11 @@ const FormItemLayout = props => {
     disabled: disabled,
     onClick: props.onClick,
     arrow: arrow
-  }, children);
+  }, _react.default.createElement("div", {
+    className: (0, _classnames.default)(`${classPrefix}-child`, `${classPrefix}-child-position-${childElementPosition}`)
+  }, _react.default.createElement("div", {
+    className: (0, _classnames.default)(`${classPrefix}-child-inner`)
+  }, children)));
 };
 
 const FormItem = props => {
@@ -105,6 +140,7 @@ const FormItem = props => {
     noStyle,
     hidden,
     layout,
+    childElementPosition,
     description,
     // Field 相关
     disabled,
@@ -118,7 +154,7 @@ const FormItem = props => {
     dependencies,
     arrow
   } = props,
-        fieldProps = (0, _tslib.__rest)(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
+        fieldProps = (0, _tslib.__rest)(props, ["className", "style", "label", "help", "extra", "hasFeedback", "name", "required", "noStyle", "hidden", "layout", "childElementPosition", "description", "disabled", "rules", "children", "messageVariables", "trigger", "validateTrigger", "onClick", "shouldUpdate", "dependencies", "arrow"]);
 
   const {
     validateTrigger: contextValidateTrigger
@@ -179,6 +215,7 @@ const FormItem = props => {
       onClick: onClick,
       hidden: hidden,
       layout: layout,
+      childElementPosition: childElementPosition,
       arrow: arrow
     }, _react.default.createElement(_context.NoStyleItemContext.Provider, {
       value: onSubMetaChange
@@ -221,13 +258,7 @@ const FormItem = props => {
     messageVariables: Variables
   }), (control, meta, context) => {
     let childNode = null;
-    const isRequired = required !== undefined ? required : !!(rules && rules.some(rule => {
-      if (rule && typeof rule === 'object' && rule.required) {
-        return true;
-      }
-
-      return false;
-    }));
+    const isRequired = required !== undefined ? required : rules && rules.some(rule => !!(rule && typeof rule === 'object' && rule.required));
     const fieldId = ((0, _utils.toArray)(name).length && meta ? meta.name : []).join('_');
 
     if (shouldUpdate && dependencies) {

package/2x/cjs/components/form/form.js

@@ -21,6 +21,10 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _header = require("./header");
 
+var _configProvider = require("../config-provider");
+
+var _merge = _interopRequireDefault(require("lodash/merge"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -28,10 +32,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 const classPrefix = 'adm-form';
-const defaultProps = {
-  hasFeedback: true,
-  layout: 'vertical'
-};
+const defaultProps = _context.defaultFormContext;
 const Form = (0, _react.forwardRef)((p, ref) => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const {
@@ -41,9 +42,14 @@ const Form = (0, _react.forwardRef)((p, ref) => {
     children,
     layout,
     footer,
-    mode
+    mode,
+    requiredMarkStyle
   } = props,
-        formProps = (0, _tslib.__rest)(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode"]);
+        formProps = (0, _tslib.__rest)(props, ["className", "style", "hasFeedback", "children", "layout", "footer", "mode", "requiredMarkStyle"]);
+  const {
+    locale
+  } = (0, _configProvider.useConfig)();
+  const validateMessages = (0, _react.useMemo)(() => (0, _merge.default)({}, locale.Form.defaultValidateMessages, formProps.validateMessages), [locale.Form.defaultValidateMessages, formProps.validateMessages]);
   const lists = [];
   let currentHeader = null;
   let items = [];
@@ -74,10 +80,13 @@ const Form = (0, _react.forwardRef)((p, ref) => {
     className: (0, _classnames.default)(classPrefix, className),
     style: style,
     ref: ref
-  }, formProps), _react.default.createElement(_context.FormContext.Provider, {
+  }, formProps, {
+    validateMessages: validateMessages
+  }), _react.default.createElement(_context.FormContext.Provider, {
     value: {
-      hasFeedback: hasFeedback,
-      layout
+      hasFeedback,
+      layout,
+      requiredMarkStyle
     }
   }, lists), footer && _react.default.createElement("div", {
     className: `${classPrefix}-footer`