amis-ui 2.3.2-beta.1 → 2.4.0

package/esm/components/404.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Alert.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Alert2.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -31,7 +31,7 @@ var Alert = /** @class */ (function (_super) {
         var _a;
         var _b = this.props, cx = _b.classnames, className = _b.className, level = _b.level, children = _b.children, showCloseButton = _b.showCloseButton, title = _b.title, icon = _b.icon, showIcon = _b.showIcon, iconClassName = _b.iconClassName, closeButtonClassName = _b.closeButtonClassName;
         // 优先使用内置svg，其次使用icon库
-        var iconNode = icon ? (typeof icon === 'string' ? (getIcon(icon) ? (React__default.createElement(Icon, { icon: icon, className: cx("icon") })) : (generateIcon(cx, icon, 'icon'))) : React__default.isValidElement(icon) ? (React__default.cloneElement(icon, {
+        var iconNode = icon ? (['string', 'object'].includes(typeof icon) ? (typeof icon === 'object' ? (generateIcon(cx, icon, 'icon')) : (getIcon(icon) && React__default.createElement(Icon, { icon: icon, className: cx("icon") }))) : React__default.isValidElement(icon) ? (React__default.cloneElement(icon, {
             className: cx("Alert-icon", (_a = icon.props) === null || _a === void 0 ? void 0 : _a.className)
         })) : null) : showIcon ? (React__default.createElement(Icon, { icon: "alert-".concat(level), className: cx("icon") })) : null;
         return this.state.show ? (React__default.createElement("div", { className: cx('Alert', level ? "Alert--".concat(level) : '', title ? 'Alert-has-title' : '', className) },

package/esm/components/AnchorNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ArrayInput.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/AsideNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/AssociatedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Avatar.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="hoist-non-react-statics" />
 import * as React from 'react';
-import { ClassNamesFn, ThemeProps } from 'amis-core';
+import { ClassNamesFn, ThemeProps, IconCheckedSchema } from 'amis-core';
 /**
  * Avatar 属性
  */
@@ -17,7 +17,7 @@ interface AvatarCmptProps extends ThemeProps {
     /**
      * 图标
      */
-    icon?: string | React.ReactNode;
+    icon?: string | React.ReactNode | IconCheckedSchema;
     /**
      * 图片相对于容器的缩放方式
      */

package/esm/components/Avatar.js

@@ -1,11 +1,11 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
 import { __extends, __assign } from 'tslib';
 import * as React from 'react';
-import { themeable } from 'amis-core';
+import { generateIcon, themeable } from 'amis-core';
 
 var prefix = 'Avatar--';
 var childPrefix = prefix + 'text';
@@ -101,8 +101,8 @@ var Avatar = /** @class */ (function (_super) {
         else if (typeof text === 'string' || typeof text === 'number') {
             childrenRender = (React.createElement("span", { className: cx(childPrefix), ref: this.avatarChildrenRef, style: scaleStyle }, text));
         }
-        else if (typeof icon === 'string') {
-            childrenRender = React.createElement("i", { className: icon });
+        else if (['string', 'object'].includes(typeof icon)) {
+            childrenRender = generateIcon(cx, icon);
         }
         else if (isIconRender) {
             childrenRender = icon;

package/esm/components/Badge.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/BaiduMapPicker.d.ts

@@ -13,7 +13,7 @@ interface MapPickerProps {
         lng: number;
         city?: string;
     };
-    onChange: (value: any) => void;
+    onChange?: (value: any) => void;
 }
 interface LocationItem {
     title?: string;

package/esm/components/BaiduMapPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -207,12 +207,12 @@ var BaiduMapPicker = /** @class */ (function (_super) {
     };
     BaiduMapPicker.prototype.triggerOnChange = function (loc) {
         var _this = this;
-        var _a;
+        var _a, _b;
         var point = new BMap.Point(loc.lng, loc.lat);
         if (this.props.coordinatesType == 'gcj02') {
             this.covertPoint(point, COORDINATES_BD09, COORDINATES_GCJ02).then(function (convertedPoint) {
                 var _a;
-                (_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange({
+                (typeof ((_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange) === 'function') && _this.props.onChange({
                     address: loc.address.trim() || loc.title,
                     lat: convertedPoint.lat,
                     lng: convertedPoint.lng,
@@ -221,12 +221,12 @@ var BaiduMapPicker = /** @class */ (function (_super) {
             });
         }
         else {
-            (_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange({
+            (typeof ((_a = this.props) === null || _a === void 0 ? void 0 : _a.onChange) === 'function') && ((_b = this.props) === null || _b === void 0 ? void 0 : _b.onChange({
                 address: loc.address.trim() || loc.title,
                 lat: loc.lat,
                 lng: loc.lng,
                 city: loc.city
-            });
+            }));
         }
     };
     BaiduMapPicker.prototype.handleSugSelect = function (e) {

package/esm/components/BarCode.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Breadcrumb.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Button.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -20,7 +20,7 @@ var Button = /** @class */ (function (_super) {
     }
     Button.prototype.renderButton = function () {
         var _a, _b;
-        var _c = this.props, level = _c.level, size = _c.size, disabled = _c.disabled, className = _c.className, title = _c.title, Comp = _c.componentClass, cx = _c.classnames, children = _c.children; _c.disabledTip; var block = _c.block, type = _c.type, active = _c.active, iconOnly = _c.iconOnly, href = _c.href, loading = _c.loading, loadingClassName = _c.loadingClassName, overrideClassName = _c.overrideClassName, rest = __rest(_c, ["level", "size", "disabled", "className", "title", "componentClass", "classnames", "children", "disabledTip", "block", "type", "active", "iconOnly", "href", "loading", "loadingClassName", "overrideClassName"]);
+        var _c = this.props, level = _c.level, _d = _c.size, size = _d === void 0 ? 'default' : _d, disabled = _c.disabled, className = _c.className, title = _c.title, Comp = _c.componentClass, cx = _c.classnames, children = _c.children; _c.disabledTip; var block = _c.block, type = _c.type, active = _c.active, iconOnly = _c.iconOnly, href = _c.href, loading = _c.loading, loadingClassName = _c.loadingClassName, overrideClassName = _c.overrideClassName, rest = __rest(_c, ["level", "size", "disabled", "className", "title", "componentClass", "classnames", "children", "disabledTip", "block", "type", "active", "iconOnly", "href", "loading", "loadingClassName", "overrideClassName"]);
         if (href) {
             Comp = 'a';
         }
@@ -33,7 +33,7 @@ var Button = /** @class */ (function (_super) {
                         'Button': true
                     },
                     _a["Button--".concat(level)] = level,
-                    _a["Button--".concat(size)] = size,
+                    _a["Button--size-".concat(size)] = size,
                     _a["Button--block"] = block,
                     _a["Button--iconOnly"] = iconOnly,
                     _a['is-disabled'] = disabled,

package/esm/components/CalendarMobile.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Cascader.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
@@ -43,7 +43,7 @@ var Cascader = /** @class */ (function (_super) {
         return _this;
     }
     Cascader.prototype.componentDidMount = function () {
-        var _a = this.props, multiple = _a.multiple, options = _a.options, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, cascade = _a.cascade;
+        var _a = this.props, multiple = _a.multiple, options = _a.options, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, cascade = _a.cascade, onlyLeaf = _a.onlyLeaf;
         var selectedOptions = this.props.selectedOptions.slice();
         var parentsCount = 0;
         var parentTree = [];
@@ -64,7 +64,7 @@ var Cascader = /** @class */ (function (_super) {
                     option.children.forEach(function (option) { return (option.disabled = true); });
                 }
             }
-            return multiple
+            return multiple && !onlyLeaf
                 ? {
                     options: __spreadArray([
                         __assign(__assign({}, option), { isCheckAll: true })
@@ -100,9 +100,9 @@ var Cascader = /** @class */ (function (_super) {
     };
     Cascader.prototype.dealParentSelect = function (option, selectedOptions) {
         var _a;
-        var _b = this.props.valueField, valueField = _b === void 0 ? 'value' : _b;
+        var _b = this.props, _c = _b.valueField, valueField = _c === void 0 ? 'value' : _c, onlyLeaf = _b.onlyLeaf;
         var parentOption = this.getOptionParent(option);
-        if (parentOption) {
+        if (parentOption && !onlyLeaf) {
             var parentChildren = parentOption === null || parentOption === void 0 ? void 0 : parentOption.children;
             var equalOption = intersectionBy(selectedOptions, parentChildren, valueField);
             // 包含则选中父节点
@@ -159,9 +159,9 @@ var Cascader = /** @class */ (function (_super) {
         return count;
     };
     Cascader.prototype.dealOptionDisable = function (selectedOptions) {
-        var _a = this.props, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, options = _a.options, cascade = _a.cascade, multiple = _a.multiple, onlyChildren = _a.onlyChildren // 子节点可点击
+        var _a = this.props, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, options = _a.options, cascade = _a.cascade, multiple = _a.multiple, onlyLeaf = _a.onlyLeaf, onlyChildren = _a.onlyChildren // 子节点可点击
         ;
-        if (!multiple || cascade || onlyChildren) {
+        if (!multiple || cascade || onlyChildren || onlyLeaf) {
             return;
         }
         var selectedValues = selectedOptions.map(function (option) { return option[valueField]; });
@@ -184,26 +184,32 @@ var Cascader = /** @class */ (function (_super) {
         options.forEach(function (option) { return loop(option); });
     };
     Cascader.prototype.dealChildrenSelect = function (option, selectedOptions) {
-        var _a = this.props.valueField, valueField = _a === void 0 ? 'value' : _a;
+        var _a;
+        var _b = this.props, _c = _b.valueField, valueField = _c === void 0 ? 'value' : _c, onlyChildren = _b.onlyChildren;
         var index = selectedOptions.findIndex(function (item) { return item[valueField] === option[valueField]; });
         if (index !== -1) {
             selectedOptions.splice(index, 1);
         }
         else {
-            selectedOptions.push(option);
+            if (!(onlyChildren && ((_a = option.children) === null || _a === void 0 ? void 0 : _a.length))) {
+                selectedOptions.push(option);
+            }
         }
         function loop(option) {
             if (!option.children) {
                 return;
             }
             option.children.forEach(function (item) {
+                var _a;
                 if (index !== -1) {
                     // 删除选中节点及其子节点
                     selectedOptions = selectedOptions.filter(function (sItem) { return sItem[valueField] !== item[valueField]; });
                 }
                 else {
                     // 添加节点及其子节点
-                    selectedOptions.push(item);
+                    if (!(onlyChildren && ((_a = item.children) === null || _a === void 0 ? void 0 : _a.length))) {
+                        selectedOptions.push(item);
+                    }
                 }
                 loop(item);
             });
@@ -213,7 +219,7 @@ var Cascader = /** @class */ (function (_super) {
     };
     Cascader.prototype.onSelect = function (option, tabIndex) {
         var _this = this;
-        var _a = this.props, multiple = _a.multiple, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, cascade = _a.cascade, onlyLeaf = _a.onlyLeaf;
+        var _a = this.props, multiple = _a.multiple, _b = _a.valueField, valueField = _b === void 0 ? 'value' : _b, cascade = _a.cascade, onlyLeaf = _a.onlyLeaf, onlyChildren = _a.onlyChildren;
         var tabs = this.state.tabs.slice();
         var activeTab = this.state.activeTab;
         var selectedOptions = this.state.selectedOptions;
@@ -239,13 +245,15 @@ var Cascader = /** @class */ (function (_super) {
                         !option.children ||
                         !option.children.length) {
                         selectedOptions = this.dealChildrenSelect(option, selectedOptions);
-                        selectedOptions = this.dealParentSelect(option, selectedOptions);
+                        if (!onlyChildren) {
+                            selectedOptions = this.dealParentSelect(option, selectedOptions);
+                        }
                     }
                 }
             }
             else {
                 // 单选
-                selectedOptions = this.getParentTree(option, [option]);
+                selectedOptions = [option];
             }
         }
         this.dealOptionDisable(selectedOptions);
@@ -262,7 +270,7 @@ var Cascader = /** @class */ (function (_super) {
             }
         });
         if ((option === null || option === void 0 ? void 0 : option.children) && !option.isCheckAll) {
-            var nextTab = multiple
+            var nextTab = multiple && !onlyLeaf
                 ? {
                     options: __spreadArray([
                         __assign(__assign({}, option), { isCheckAll: true })

package/esm/components/ChainedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CityArea.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CityDB.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CodeMirror.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ColorPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ContextMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/DatePicker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/DateRangePicker.js

@@ -1,12 +1,11 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 
 import { __extends, __spreadArray, __assign, __rest } from 'tslib';
 import React__default from 'react';
 import moment from 'moment';
-import omit from 'lodash/omit';
 import kebabCase from 'lodash/kebabCase';
 import { findDOMNode } from 'react-dom';
 import { Icon } from './icons.js';
@@ -941,9 +940,6 @@ var DateRangePicker = /** @class */ (function (_super) {
     };
     DateRangePicker.prototype.renderDay = function (props, currentDate) {
         var _a = this.state, startDate = _a.startDate, endDate = _a.endDate;
-        // 剔除掉 DaysView 中传递的参数
-        props = omit(props, ['todayActiveStyle']);
-        props.className = props.className.replace('rdtActive', '');
         if (startDate &&
             endDate &&
             currentDate.isBetween(startDate, endDate, 'day', '[]')) {
@@ -1042,8 +1038,8 @@ var DateRangePicker = /** @class */ (function (_super) {
                     // isEndDate
                     isValidDate: this.checkEndIsValidDate, viewMode: viewMode, input: false, onClose: this.close, renderDay: this.renderDay, renderMonth: this.renderMonth, renderQuarter: this.renderQuarter, renderYear: this.renderYear, locale: locale, timeRangeHeader: "\u7ED3\u675F\u65F6\u95F4" }))),
             embed ? null : (React__default.createElement("div", { key: "button", className: "".concat(ns, "DateRangePicker-actions") },
-                React__default.createElement("a", { className: cx('Button', 'Button--default'), onClick: function () { return _this.close(); } }, __('cancel')),
-                React__default.createElement("a", { className: cx('Button', 'Button--primary', 'm-l-sm', {
+                React__default.createElement("a", { className: cx('Button', 'Button--default', 'Button--size-sm'), onClick: function () { return _this.close; } }, __('cancel')),
+                React__default.createElement("a", { className: cx('Button', 'Button--primary', 'Button--size-sm', 'm-l-sm', {
                         'is-disabled': isConfirmBtnDisbaled
                     }), onClick: this.confirm }, __('confirm'))))));
     };

package/esm/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/FormField.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/GroupedSelection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Html.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/ImageGallery.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/InputBox.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/InputBoxWithSuggestion.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Layout.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */
 

package/esm/components/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.3.2-beta.1
+ * amis-ui v2.4.0
  * Copyright 2018-2022 fex
  */