amis-ui 3.2.0 → 3.3.0

package/lib/components/Range.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,11 +26,9 @@ var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var difference__default = /*#__PURE__*/_interopDefaultLegacy(difference);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/**
- * @file Range
- * @description
- * @author fex
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 // 小数或者整数
 var MARKS_REG = /^[0-9]+(\.?[0-9]+)?%$/;
 /**
@@ -146,15 +144,15 @@ var HandleItem = /** @class */ (function (_super) {
             zIndex: isDrag ? 2 : 1
         };
         var mobileUI = useMobileUI && amisCore.isMobile();
-        return disabled ? (React__default["default"].createElement("div", { className: cx('InputRange-handle'), style: style },
-            React__default["default"].createElement("div", { className: cx('InputRange-handle-icon') },
-                React__default["default"].createElement(icons.Icon, { icon: "slider-handle", className: "icon" })))) : (React__default["default"].createElement("div", { className: cx('InputRange-handle', {
+        return disabled ? (_J$X_("div", { className: cx('InputRange-handle'), style: style },
+            _J$X_("div", { className: cx('InputRange-handle-icon') },
+                _J$X_(icons.Icon, { icon: "slider-handle", className: "icon" })))) : (_J$X_("div", { className: cx('InputRange-handle', {
                 'is-mobile': mobileUI
             }), style: style, ref: this.handleRef },
-            React__default["default"].createElement("div", { className: cx(isDrag ? 'InputRange-handle-drage' : 'InputRange-handle-icon'), onMouseDown: this.onMouseDown, onMouseEnter: this.onMouseEnter, onMouseLeave: this.onMouseLeave, onTouchStart: this.onTouchStart, onTouchMove: this.onTouchMove, onTouchEnd: this.onTouchEnd },
-                React__default["default"].createElement(icons.Icon, { icon: "slider-handle", className: "icon" })),
-            React__default["default"].createElement(amisCore.Overlay, { placement: tooltipPlacement, target: function () { return ReactDOM.findDOMNode(_this); }, container: function () { return ReactDOM.findDOMNode(_this); }, rootClose: false, show: true },
-                React__default["default"].createElement(Label, { show: labelActive, classPrefix: this.props.classPrefix, classnames: cx, value: value, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, placement: tooltipPlacement }))));
+            _J$X_("div", { className: cx(isDrag ? 'InputRange-handle-drage' : 'InputRange-handle-icon'), onMouseDown: this.onMouseDown, onMouseEnter: this.onMouseEnter, onMouseLeave: this.onMouseLeave, onTouchStart: this.onTouchStart, onTouchMove: this.onTouchMove, onTouchEnd: this.onTouchEnd },
+                _J$X_(icons.Icon, { icon: "slider-handle", className: "icon" })),
+            _J$X_(amisCore.Overlay, { placement: tooltipPlacement, target: function () { return ReactDOM.findDOMNode(_this); }, container: function () { return ReactDOM.findDOMNode(_this); }, rootClose: false, show: true },
+                _J$X_(Label, { show: labelActive, classPrefix: this.props.classPrefix, classnames: cx, value: value, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, placement: tooltipPlacement }))));
     };
     tslib.__decorate([
         amisCore.autobind,
@@ -230,10 +228,10 @@ var Label = /** @class */ (function (_super) {
                 ? tipFormatter(value)
                 : tooltipVisible
             : show;
-        return (React__default["default"].createElement("div", { className: cx('InputRange-label', "pos-".concat(amisCore.camel(placement)), {
+        return (_J$X_("div", { className: cx('InputRange-label', "pos-".concat(amisCore.camel(placement)), {
                 'InputRange-label-visible': isShow
             }) },
-            React__default["default"].createElement("span", null, value + unit)));
+            _J$X_("span", null, value + unit)));
     };
     return Label;
 }(React__default["default"].Component));
@@ -311,9 +309,9 @@ var Range = /** @class */ (function (_super) {
         var result = 0;
         // 余数 >= 步长一半 -> 向上取
         // 余数 <  步长一半 -> 向下取
-        var _value = surplus >= step / 2 ? value : value - step;
+        var _value = surplus >= step / 2 ? value : amisCore.safeSub(value, step);
         while (result <= _value) {
-            result += step;
+            result = amisCore.safeAdd(result, step);
         }
         return result;
     };
@@ -355,7 +353,7 @@ var Range = /** @class */ (function (_super) {
         var partLengthList = Array.isArray(parts)
             ? parts.map(function (item) { return item - min; })
             : range__default["default"](steps - 1).map(function (item) { return (item + 1) * partLength; });
-        return (isShowSteps && (React__default["default"].createElement("div", null, partLengthList.map(function (item) { return (React__default["default"].createElement("span", { key: item, className: cx('InputRange-track-dot'), style: { left: (item * 100) / (max - min) + '%' } })); }))));
+        return (isShowSteps && (_J$X_("div", null, partLengthList.map(function (item) { return (_J$X_("span", { key: item, className: cx('InputRange-track-dot'), style: { left: (item * 100) / (max - min) + '%' } })); }))));
     };
     /**
      * 双滑块改变最大值、最小值
@@ -437,19 +435,19 @@ var Range = /** @class */ (function (_super) {
                     _this.getOffsetLeft(b, true);
             })
             : [];
-        return (React__default["default"].createElement("div", { className: cx('InputRange-wrap') },
-            React__default["default"].createElement("div", { ref: this.trackRef, className: cx('InputRange-track', 'InputRange-track--background'), onClick: this.onClickTrack },
-                React__default["default"].createElement("div", { className: cx('InputRange-track-active'), style: traceActiveStyle }),
+        return (_J$X_("div", { className: cx('InputRange-wrap') },
+            _J$X_("div", { ref: this.trackRef, className: cx('InputRange-track', 'InputRange-track--background'), onClick: this.onClickTrack },
+                _J$X_("div", { className: cx('InputRange-track-active'), style: traceActiveStyle }),
                 this.renderSteps(),
-                multiple ? (['min', 'max'].map(function (type) { return (React__default["default"].createElement(HandleItem, { key: type, value: _this.multipleValue[type], type: type, min: min, max: max, classPrefix: _this.props.classPrefix, classnames: cx, disabled: disabled, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, useMobileUI: useMobileUI, tooltipPlacement: tooltipPlacement, onAfterChange: onAfterChange, onChange: _this.onGetChangeValue.bind(_this) })); })) : (React__default["default"].createElement(HandleItem, { value: +value, min: min, max: max, classPrefix: this.props.classPrefix, classnames: cx, disabled: disabled, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, useMobileUI: useMobileUI, tooltipPlacement: tooltipPlacement, onAfterChange: onAfterChange, onChange: this.onChange.bind(this) })),
-                marks && (React__default["default"].createElement("div", { className: cx('InputRange-marks') }, sortMaks.map(function (key) {
+                multiple ? (['min', 'max'].map(function (type) { return (_J$X_(HandleItem, { key: type, value: _this.multipleValue[type], type: type, min: min, max: max, classPrefix: _this.props.classPrefix, classnames: cx, disabled: disabled, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, useMobileUI: useMobileUI, tooltipPlacement: tooltipPlacement, onAfterChange: onAfterChange, onChange: _this.onGetChangeValue.bind(_this) })); })) : (_J$X_(HandleItem, { value: +value, min: min, max: max, classPrefix: this.props.classPrefix, classnames: cx, disabled: disabled, tooltipVisible: tooltipVisible, tipFormatter: tipFormatter, unit: unit, useMobileUI: useMobileUI, tooltipPlacement: tooltipPlacement, onAfterChange: onAfterChange, onChange: this.onChange.bind(this) })),
+                marks && (_J$X_("div", { className: cx('InputRange-marks') }, sortMaks.map(function (key) {
                     var _a, _b, _c;
                     var offsetLeft = _this.getOffsetLeft(key);
                     var markMaxWidth = _this.getMarkMaxWidth(key, marks);
                     if (MARKS_REG.test(offsetLeft)) {
-                        return (React__default["default"].createElement("div", { key: key, style: { left: offsetLeft, width: markMaxWidth } },
-                            React__default["default"].createElement(TooltipWrapper["default"], { placement: 'bottom', tooltip: ((_a = marks[key]) === null || _a === void 0 ? void 0 : _a.label) || marks[key], trigger: ['hover', 'focus'], rootClose: false },
-                                React__default["default"].createElement("span", { style: (_b = marks[key]) === null || _b === void 0 ? void 0 : _b.style }, ((_c = marks[key]) === null || _c === void 0 ? void 0 : _c.label) || marks[key]))));
+                        return (_J$X_("div", { key: key, style: { left: offsetLeft, width: markMaxWidth } },
+                            _J$X_(TooltipWrapper["default"], { placement: 'bottom', tooltip: ((_a = marks[key]) === null || _a === void 0 ? void 0 : _a.label) || marks[key], trigger: ['hover', 'focus'], rootClose: false },
+                                _J$X_("span", { style: (_b = marks[key]) === null || _b === void 0 ? void 0 : _b.style }, ((_c = marks[key]) === null || _c === void 0 ? void 0 : _c.label) || marks[key]))));
                     }
                     else {
                         return null;

package/lib/components/Rating.d.ts

@@ -72,7 +72,7 @@ export declare class Rating extends React.Component<RatingProps, any> {
     render(): React.JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+    new (props: Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
         value?: number | undefined;
         readOnly?: boolean | undefined;
         half?: boolean | undefined;
@@ -90,7 +90,7 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -104,7 +104,7 @@ declare const _default: {
             textPosition?: textPositionType | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        readonly props: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -122,7 +122,7 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -137,7 +137,7 @@ declare const _default: {
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -150,7 +150,7 @@ declare const _default: {
             } | undefined;
             textPosition?: textPositionType | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -165,7 +165,7 @@ declare const _default: {
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -178,7 +178,7 @@ declare const _default: {
             } | undefined;
             textPosition?: textPositionType | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -191,7 +191,7 @@ declare const _default: {
             } | undefined;
             textPosition?: textPositionType | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;
@@ -204,7 +204,7 @@ declare const _default: {
             } | undefined;
             textPosition?: textPositionType | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "id" | "onChange" | "disabled" | "key" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<RatingProps, keyof import("amis-core").ThemeProps>, "key" | "id" | "onChange" | "disabled" | "charClassName" | "textClassName" | "onHoverChange" | "inactiveColor" | "texts"> & {
             value?: number | undefined;
             readOnly?: boolean | undefined;
             half?: boolean | undefined;

package/lib/components/Rating.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.2.0
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,17 +11,16 @@ var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
 var icons = require('./icons.js');
-var _ = require('lodash');
+var isEmpty = require('lodash/isEmpty');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var isEmpty__default = /*#__PURE__*/_interopDefaultLegacy(isEmpty);
 
-/**
- * @file Rating
- * @description
- * @author fex
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 var Rating = /** @class */ (function (_super) {
     tslib.__extends(Rating, _super);
     function Rating(props) {
@@ -105,7 +104,7 @@ var Rating = /** @class */ (function (_super) {
             defaultColors.forEach(function (item) {
                 obj_1[item.id] = item.value;
             });
-            if (_.isEmpty(colors) && !_.isEmpty(obj_1)) {
+            if (isEmpty__default["default"](colors) && !isEmpty__default["default"](obj_1)) {
                 tempColor = obj_1;
             }
         }
@@ -298,16 +297,16 @@ var Rating = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.state, halfStar = _a.halfStar, stars = _a.stars, showColor = _a.showColor;
         var _b = this.props, inactiveColor = _b.inactiveColor, char = _b.char, half = _b.half, disabled = _b.disabled, readOnly = _b.readOnly, charClassName = _b.charClassName, cx = _b.classnames;
-        return (React__default["default"].createElement("ul", { onMouseLeave: this.mouseLeave }, stars.map(function (star, i) {
+        return (_J$X_("ul", { onMouseLeave: this.mouseLeave }, stars.map(function (star, i) {
             var isThisHalf = half && !halfStar.hidden && halfStar.at === i;
-            return (React__default["default"].createElement("li", { ref: _this.saveRef(i), className: cx('Rating-star', charClassName, {
+            return (_J$X_("li", { ref: _this.saveRef(i), className: cx('Rating-star', charClassName, {
                     'is-half': isThisHalf,
                     'is-active': star.active,
                     'is-disabled': readOnly || disabled
                 }), key: i, style: {
                     color: star.active ? showColor : inactiveColor
                 }, onMouseOver: function (e) { return _this.mouseOver(e, i); }, onMouseMove: function (e) { return _this.mouseOver(e, i); }, onClick: function (e) { return _this.handleClick(e, i); }, onMouseLeave: function (e) { return _this.handleStarMouseLeave(e, i); } },
-                isThisHalf && (React__default["default"].createElement("div", { className: cx('Rating-star-half'), style: {
+                isThisHalf && (_J$X_("div", { className: cx('Rating-star-half'), style: {
                         color: showColor
                     } }, char)),
                 char));
@@ -319,15 +318,15 @@ var Rating = /** @class */ (function (_super) {
         var _b = this.props, textClassName = _b.textClassName, textPosition = _b.textPosition, cx = _b.classnames;
         if (!showText)
             return null;
-        return (React__default["default"].createElement("span", { className: cx('Rating-text', textClassName, (_a = {},
+        return (_J$X_("span", { className: cx('Rating-text', textClassName, (_a = {},
                 _a["Rating-text--".concat(textPosition === 'left' ? 'left' : 'right')] = textPosition,
                 _a)) }, showText));
     };
     Rating.prototype.render = function () {
         var _a = this.props, className = _a.className, textPosition = _a.textPosition, cx = _a.classnames;
-        return (React__default["default"].createElement("div", { className: cx('Rating', className), ref: this.ratingRef }, textPosition === 'left' ? (React__default["default"].createElement(React__default["default"].Fragment, null,
+        return (_J$X_("div", { className: cx('Rating', className), ref: this.ratingRef }, textPosition === 'left' ? (_J$X_(React__default["default"].Fragment, null,
             this.renderText(),
-            this.renderStars())) : (React__default["default"].createElement(React__default["default"].Fragment, null,
+            this.renderStars())) : (_J$X_(React__default["default"].Fragment, null,
             this.renderStars(),
             this.renderText()))));
     };
@@ -338,7 +337,7 @@ var Rating = /** @class */ (function (_super) {
         allowClear: true,
         value: 0,
         count: 5,
-        char: React__default["default"].createElement(icons.Icon, { icon: "star", className: "icon", iconContent: "Rating-star-icon" }),
+        char: _J$X_(icons.Icon, { icon: "star", className: "icon", iconContent: "Rating-star-icon" }),
         colors: '',
         textPosition: 'right'
     };