antd-mobile 5.2.2 → 5.4.0

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.getTime(), props.min.getTime(), props.max.getTime()));
-    }
-
+    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/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/floating-bubble/floating-bubble.d.ts

@@ -2,5 +2,7 @@ import React, { FC } from 'react';
 import { NativeProps } from '../../utils/native-props';
 export declare type FloatingBubbleProps = {
     onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+    axis?: 'x' | 'y' | 'xy' | 'lock';
+    magnetic?: 'x' | 'y';
 } & NativeProps<'--initial-position-left' | '--initial-position-right' | '--initial-position-top' | '--initial-position-bottom' | '--z-index' | '--edge-distance' | '--size' | '--border-radius'>;
 export declare const FloatingBubble: FC<FloatingBubbleProps>;

package/2x/cjs/components/floating-bubble/floating-bubble.js

@@ -20,45 +20,72 @@ 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-floating-bubble`;
-const defaultProps = {};
+const defaultProps = {
+  axis: 'y'
+};
 
 const FloatingBubble = p => {
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const boundaryRef = (0, _react.useRef)(null);
+  const buttonRef = (0, _react.useRef)(null);
   /**
    * memoize the `to` function
    * inside a component that renders frequently
    * to prevent an unintended restart
    */
 
-  const [animationStyles, animation] = (0, _web.useSpring)(() => ({
+  const [{
+    x,
+    y,
+    opacity
+  }, api] = (0, _web.useSpring)(() => ({
+    x: 0,
     y: 0,
-    scale: 1,
     opacity: 1
   }));
   const bind = (0, _react2.useDrag)(state => {
-    if (state.down) {
-      // be movable in y axis
-      animation.start({
-        y: state.offset[1]
-      });
-    } // active status
+    let nextX = state.offset[0];
+    let nextY = state.offset[1];
+
+    if (state.last) {
+      const boundary = boundaryRef.current;
+      const button = buttonRef.current;
+      if (!boundary || !button) return;
+
+      if (props.magnetic === 'x') {
+        const compensation = x.goal - x.get();
+        const boundaryRect = boundary.getBoundingClientRect();
+        const buttonRect = button.getBoundingClientRect();
+        const leftDistance = buttonRect.left + compensation - boundaryRect.left;
+        const rightDistance = boundaryRect.right - (buttonRect.right + compensation);
 
+        if (rightDistance <= leftDistance) {
+          nextX += rightDistance;
+        } else {
+          nextX -= leftDistance;
+        }
+      }
+    }
 
-    animation.start({
-      scale: state.active ? 1.1 : 1,
+    api.start({
+      x: nextX,
+      y: nextY // immediate: !state.last,
+
+    }); // active status
+
+    api.start({
       opacity: state.active ? 0.8 : 1
     });
   }, {
-    // only trigger if a movement is detected on the specified axis.
-    axis: 'y',
+    axis: props.axis === 'xy' ? undefined : props.axis,
     pointer: {
       touch: true
     },
     // the component won't trigger drag logic if the user just clicked on the component.
     filterTaps: true,
     // set constraints to the user gesture
-    bounds: boundaryRef
+    bounds: boundaryRef,
+    from: () => [x.get(), y.get()]
   });
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
     className: classPrefix
@@ -68,9 +95,13 @@ const FloatingBubble = p => {
     className: `${classPrefix}-boundary`,
     ref: boundaryRef
   })), _react.default.createElement(_web.animated.div, Object.assign({}, bind(), {
-    style: Object.assign({}, animationStyles),
+    style: {
+      opacity,
+      transform: (0, _web.to)([x, y], (x, y) => `translate(${x}px, ${y}px)`)
+    },
     onClick: props.onClick,
-    className: `${classPrefix}-button`
+    className: `${classPrefix}-button`,
+    ref: buttonRef
   }), props.children)));
 };
 

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 = [];
@@ -60,7 +66,7 @@ const Form = (0, _react.forwardRef)((p, ref) => {
     items = [];
   }
 
-  _react.default.Children.forEach(props.children, (child, index) => {
+  _react.default.Children.forEach(props.children, child => {
     if (_react.default.isValidElement(child) && child.type === _header.Header) {
       collect();
       currentHeader = child.props.children;
@@ -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`

package/2x/cjs/components/form/index.css

@@ -32,7 +32,7 @@
   color: #666666;
 }
 
-.adm-form-item-label-required {
+.adm-form-item-label .adm-form-item-required-asterisk {
   position: absolute;
   left: -0.6em;
   top: 0;
@@ -41,8 +41,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/infinite-scroll/infinite-scroll.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.InfiniteScroll = void 0;
 
+var _tslib = require("tslib");
+
 var _withDefaultProps = require("../../utils/with-default-props");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -41,25 +43,27 @@ const InfiniteScroll = p => {
   }, p);
   const doLoadMore = (0, _ahooks.useLockFn)(() => props.loadMore());
   const elementRef = (0, _react.useRef)(null);
-  const checkTimeoutRef = (0, _react.useRef)();
-  const check = (0, _ahooks.useMemoizedFn)(() => {
-    window.clearTimeout(checkTimeoutRef.current);
-    checkTimeoutRef.current = window.setTimeout(() => {
-      if (!props.hasMore) return;
-      const element = elementRef.current;
-      if (!element) return;
-      if (!element.offsetParent) return;
-      const parent = (0, _getScrollParent.getScrollParent)(element);
-      if (!parent) return;
-      const rect = element.getBoundingClientRect();
-      const elementTop = rect.top;
-      const current = isWindow(parent) ? window.innerHeight : parent.getBoundingClientRect().bottom;
-
-      if (current >= elementTop - props.threshold) {
-        doLoadMore();
-      }
-    });
-  }); // 确保在内容不足时会自动触发加载事件
+  const [flag, setFlag] = (0, _react.useState)({});
+  const nextFlagRef = (0, _react.useRef)(flag);
+  const check = (0, _ahooks.useMemoizedFn)(() => (0, _tslib.__awaiter)(void 0, void 0, void 0, function* () {
+    if (nextFlagRef.current !== flag) return;
+    if (!props.hasMore) return;
+    const element = elementRef.current;
+    if (!element) return;
+    if (!element.offsetParent) return;
+    const parent = (0, _getScrollParent.getScrollParent)(element);
+    if (!parent) return;
+    const rect = element.getBoundingClientRect();
+    const elementTop = rect.top;
+    const current = isWindow(parent) ? window.innerHeight : parent.getBoundingClientRect().bottom;
+
+    if (current >= elementTop - props.threshold) {
+      const nextFlag = {};
+      nextFlagRef.current = nextFlag;
+      yield doLoadMore();
+      setFlag(nextFlag);
+    }
+  })); // 确保在内容不足时会自动触发加载事件
 
   (0, _react.useEffect)(() => {
     check();

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

@@ -78,7 +78,7 @@ const Input = (0, _react.forwardRef)((p, ref) => {
     let nextValue = value;
 
     if (props.type === 'number') {
-      nextValue = (0, _bound.bound)(parseFloat(nextValue), props.min, props.max).toString();
+      nextValue = nextValue && (0, _bound.bound)(parseFloat(nextValue), props.min, props.max).toString();
     }
 
     if (nextValue !== value) {
@@ -126,7 +126,7 @@ const Input = (0, _react.forwardRef)((p, ref) => {
     onKeyUp: props.onKeyUp,
     onCompositionStart: props.onCompositionStart,
     onCompositionEnd: props.onCompositionEnd
-  }), props.clearable && !!value && !props.readOnly && _react.default.createElement("div", {
+  }), props.clearable && !!value && !props.readOnly && hasFocus && _react.default.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();

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

@@ -41,7 +41,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-modal`;
 const defaultProps = {
   visible: false,
   actions: [],

package/2x/cjs/components/notice-bar/notice-bar.js

@@ -76,7 +76,7 @@ const NoticeBar = (0, _react.memo)(p => {
     delayLockRef.current = false;
     start();
   }, props.delay);
-  (0, _useResizeEffect.useResizeEffect)(text => {
+  (0, _useResizeEffect.useResizeEffect)(() => {
     start();
   }, containerRef);
   (0, _useMutationEffect.useMutationEffect)(() => {