amis-ui 2.7.2 → 2.8.0

package/esm/components/NumberInput.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,7 +9,7 @@ import isInteger from 'lodash/isInteger';
 import InputNumber from 'rc-input-number';
 import getMiniDecimal, { getNumberPrecision, toFixed, num2str } from '@rc-component/mini-decimal';
 import { Icon } from './icons.js';
-import { ucFirst, autobind, themeable } from 'amis-core';
+import { ucFirst, isNumeric, autobind, themeable } from 'amis-core';
 
 var NumberInput = /** @class */ (function (_super) {
     __extends(NumberInput, _super);
@@ -30,9 +30,9 @@ var NumberInput = /** @class */ (function (_super) {
         }
     };
     NumberInput.prototype.handleChange = function (value) {
-        var _a = this.props, min = _a.min, max = _a.max, step = _a.step, precision = _a.precision, resetValue = _a.resetValue, onChange = _a.onChange;
+        var _a = this.props, min = _a.min, max = _a.max, step = _a.step, precision = _a.precision, resetValue = _a.resetValue, clearValueOnEmpty = _a.clearValueOnEmpty, onChange = _a.onChange;
         var finalPrecision = NumberInput.normalizePrecision(precision, step);
-        var result = NumberInput.normalizeValue(value, min, max, finalPrecision, resetValue, this.isBig);
+        var result = NumberInput.normalizeValue(value, min, max, finalPrecision, resetValue, clearValueOnEmpty, this.isBig);
         onChange === null || onChange === void 0 ? void 0 : onChange(result);
     };
     NumberInput.prototype.handleFocus = function (e) {
@@ -121,15 +121,15 @@ var NumberInput = /** @class */ (function (_super) {
      * @param resetValue 重置值
      * @param isBig 是否为大数模式
      */
-    NumberInput.normalizeValue = function (value, min, max, precision, resetValue, isBig) {
+    NumberInput.normalizeValue = function (value, min, max, precision, resetValue, clearValueOnEmpty, isBig) {
         /**
          * 输入不合法时重置为resetValue
-         * 若resetValue为非数字，则直接重置
+         * 若resetValue为不合法数字，直接清空输入
          * 若resetValue为数字，则需要处理max，min，precision，保证抛出的值满足条件
          */
-        if (value == null) {
-            if (typeof resetValue !== 'number') {
-                return resetValue !== null && resetValue !== void 0 ? resetValue : '';
+        if (!isNumeric(value)) {
+            if (!isNumeric(resetValue)) {
+                return clearValueOnEmpty ? undefined : '';
             }
             value = resetValue;
         }

package/esm/components/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Picker.js

@@ -1,9 +1,9 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
-import { __assign, __spreadArray } from 'tslib';
+import { __read, __assign, __spreadArray } from 'tslib';
 import React__default, { memo, useState, useEffect } from 'react';
 import { themeable, localeable, uncontrollable } from 'amis-core';
 import Button from './Button.js';
@@ -18,7 +18,7 @@ function fixToArray(data) {
 var Picker = memo(function (props) {
     var title = props.title, labelField = props.labelField, valueField = props.valueField, _a = props.visibleItemCount, visibleItemCount = _a === void 0 ? 5 : _a, _b = props.value, value = _b === void 0 ? [] : _b, _c = props.swipeDuration, swipeDuration = _c === void 0 ? 1000 : _c, _d = props.columns, columns = _d === void 0 ? [] : _d, _e = props.itemHeight, itemHeight = _e === void 0 ? 48 : _e, _f = props.showToolbar, showToolbar = _f === void 0 ? true : _f, _g = props.className, className = _g === void 0 ? '' : _g, cx = props.classnames, ns = props.classPrefix, __ = props.translate;
     var _columns = fixToArray(columns);
-    var _h = useState(fixToArray(props.value === undefined ? props.defaultValue || [] : value)), innerValue = _h[0], setInnerValue = _h[1];
+    var _h = __read(useState(fixToArray(props.value === undefined ? props.defaultValue || [] : value)), 2), innerValue = _h[0], setInnerValue = _h[1];
     useEffect(function () {
         if (value === innerValue)
             return;
@@ -35,7 +35,7 @@ var Picker = memo(function (props) {
         }
     };
     var onChange = function (itemValue, columnIndex, confirm) {
-        var nextInnerValue = __spreadArray([], innerValue, true);
+        var nextInnerValue = __spreadArray([], __read(innerValue), false);
         nextInnerValue[columnIndex] = itemValue;
         setInnerValue(nextInnerValue);
         if (props.onChange) {

package/esm/components/PickerColumn.js

@@ -1,9 +1,9 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
-import { __assign } from 'tslib';
+import { __read, __assign } from 'tslib';
 import React__default, { forwardRef, useRef, useMemo, useCallback, useEffect, useImperativeHandle } from 'react';
 import isObject from 'lodash/isObject';
 import cloneDeep from 'lodash/cloneDeep';
@@ -75,12 +75,12 @@ var PickerColumn = forwardRef(function (props, ref) {
         }
         return null;
     };
-    var _g = useSetState({
+    var _g = __read(useSetState({
         index: adjustIndex(defaultIndex) || 0,
         offset: 0,
         duration: 0,
         options: cloneDeep(options)
-    }), state = _g[0], updateState = _g[1];
+    }), 2), state = _g[0], updateState = _g[1];
     /**
      *
      * @param index 索引

package/esm/components/PickerContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/PopOverContainer.d.ts

@@ -1,4 +1,9 @@
 import React from 'react';
+export type OverlayAlignType = 'left' | 'center' | 'right';
+export interface PopOverOverlay {
+    width?: string | number;
+    align?: OverlayAlignType;
+}
 export interface PopOverContainerProps {
     children: (props: {
         onClick: (e: React.MouseEvent) => void;
@@ -12,6 +17,9 @@ export interface PopOverContainerProps {
     popOverClassName?: string;
     useMobileUI?: boolean;
     placement?: string;
+    overlayWidth?: number | string;
+    overlayWidthField?: 'minWidth' | 'width';
+    align?: OverlayAlignType;
     /** Popover层隐藏前触发的事件 */
     onBeforeHide?: () => void;
     /** Popover层隐藏后触发的事件 */
@@ -21,6 +29,11 @@ export interface PopOverContainerState {
     isOpened: boolean;
 }
 export declare class PopOverContainer extends React.Component<PopOverContainerProps, PopOverContainerState> {
+    static alignPlacementMap: {
+        left: string;
+        right: string;
+        center: string;
+    };
     state: PopOverContainerState;
     target: any;
     targetRef(target: any): void;
@@ -28,6 +41,11 @@ export declare class PopOverContainer extends React.Component<PopOverContainerPr
     close(): void;
     getTarget(): any;
     getParent(): any;
+    static calcOverlayWidth(overlay?: PopOverOverlay): string | number | undefined;
+    static alignToPlacement(overlay?: PopOverOverlay): string;
+    getOverlayStyle(): {
+        [x: string]: string | number;
+    };
     render(): JSX.Element;
 }
 export default PopOverContainer;

package/esm/components/PopOverContainer.js

@@ -1,11 +1,11 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
-import { isMobile, Overlay, PopOver, autobind } from 'amis-core';
+import { toNumber, isMobile, Overlay, PopOver, autobind } from 'amis-core';
 import PopUp from './PopUp.js';
 import { findDOMNode } from 'react-dom';
 
@@ -45,8 +45,40 @@ var PopOverContainer = /** @class */ (function (_super) {
         var _a;
         return (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.parentElement;
     };
+    PopOverContainer.calcOverlayWidth = function (overlay) {
+        var overlayWidth = overlay && overlay.width;
+        if (!overlayWidth)
+            return;
+        // 数字字符串需要转化下，否则不生效
+        if (typeof overlayWidth === 'number' || /^\d+$/.test(overlayWidth)) {
+            return toNumber(overlayWidth);
+        }
+        // 带单位，如: 80%、200px、30vw、5rem
+        if (/^\d+(px|%|rem|em|vw)$/.test(overlayWidth)) {
+            return overlayWidth;
+        }
+        // 带单位的相对值
+        // 如: -100px 代表 100% - 100px。+10vw 代表 100% + 10vw
+        if (/^(\+|\-)\d+(px|%|rem|em|vw)$/.test(overlayWidth)) {
+            return overlayWidth.replace(/^(\+|\-)(.*)/, 'calc(100% $1 $2)');
+        }
+        return;
+    };
+    PopOverContainer.alignToPlacement = function (overlay) {
+        var align = overlay && overlay.align;
+        return (align && PopOverContainer.alignPlacementMap[align]) || 'auto';
+    };
+    // 可以自定义下拉框宽度
+    PopOverContainer.prototype.getOverlayStyle = function () {
+        var _a;
+        var _b = this.props, overlayWidth = _b.overlayWidth, overlayWidthField = _b.overlayWidthField;
+        return _a = {},
+            _a[overlayWidthField || 'minWidth'] = PopOverContainer.calcOverlayWidth({ width: overlayWidth }) ||
+                (this.target ? Math.max(this.target.offsetWidth, 100) : 'auto'),
+            _a;
+    };
     PopOverContainer.prototype.render = function () {
-        var _a = this.props, useMobileUI = _a.useMobileUI, children = _a.children, popOverContainer = _a.popOverContainer, popOverClassName = _a.popOverClassName, dropdownRender = _a.popOverRender, placement = _a.placement;
+        var _a = this.props, useMobileUI = _a.useMobileUI, children = _a.children, popOverContainer = _a.popOverContainer, popOverClassName = _a.popOverClassName, dropdownRender = _a.popOverRender, placement = _a.placement, align = _a.align;
         var mobileUI = useMobileUI && isMobile();
         return (React__default.createElement(React__default.Fragment, null,
             children({
@@ -54,12 +86,13 @@ var PopOverContainer = /** @class */ (function (_super) {
                 onClick: this.handleClick,
                 ref: this.targetRef
             }),
-            mobileUI ? (React__default.createElement(PopUp, { isShow: this.state.isOpened, container: popOverContainer, className: popOverClassName, onHide: this.close }, dropdownRender({ onClose: this.close }))) : (React__default.createElement(Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || 'auto', show: this.state.isOpened },
-                React__default.createElement(PopOver, { overlay: true, className: popOverClassName, style: {
-                        minWidth: this.target
-                            ? Math.max(this.target.offsetWidth, 100)
-                            : 'auto'
-                    }, onHide: this.close }, dropdownRender({ onClose: this.close }))))));
+            mobileUI ? (React__default.createElement(PopUp, { isShow: this.state.isOpened, container: popOverContainer, className: popOverClassName, onHide: this.close }, dropdownRender({ onClose: this.close }))) : (React__default.createElement(Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened },
+                React__default.createElement(PopOver, { overlay: true, className: popOverClassName, style: this.getOverlayStyle(), onHide: this.close }, dropdownRender({ onClose: this.close }))))));
+    };
+    PopOverContainer.alignPlacementMap = {
+        left: 'left-bottom-left-top',
+        right: 'right-bottom-right-top',
+        center: 'center-bottom-center-top'
     };
     __decorate([
         autobind,

package/esm/components/PopUp.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Progress.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/PullRefresh.js

@@ -1,13 +1,13 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 
+import { __read } from 'tslib';
 import React__default, { forwardRef, useEffect } from 'react';
 import { themeable } from 'amis-core';
 import useSetState from '../hooks/use-set-state.js';
 import useTouch from '../hooks/use-touch.js';
-import 'tslib';
 import 'lodash/pick';
 import { Icon } from './icons.js';
 
@@ -35,10 +35,10 @@ var PullRefresh = forwardRef(function (props, ref) {
             loadSuccess();
         }
     }, [props.loading]);
-    var _a = useSetState({
+    var _a = __read(useSetState({
         status: 'normal',
         offsetY: 0
-    }), state = _a[0], updateState = _a[1];
+    }), 2), state = _a[0], updateState = _a[1];
     var isTouchable = function () {
         return (!props.disabled &&
             state.status !== 'loading' &&

package/esm/components/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Range.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/Rating.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.7.2
+ * amis-ui v2.8.0
  * Copyright 2018-2023 fex
  */