amis 2.8.0 → 2.9.0

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -40,7 +40,7 @@ var CardRenderer = /** @class */ (function (_super) {
         return href || itemAction || onCheck || (checkOnItemClick && checkable);
     };
     CardRenderer.prototype.handleClick = function (e) {
-        var _a = this.props, item = _a.item, href = _a.href, data = _a.data, env = _a.env, blank = _a.blank, itemAction = _a.itemAction, onAction = _a.onAction, onCheck = _a.onCheck, selectable = _a.selectable;
+        var _a = this.props, item = _a.item, href = _a.href, data = _a.data, env = _a.env, blank = _a.blank, itemAction = _a.itemAction, onAction = _a.onAction, onCheck = _a.onCheck, selectable = _a.selectable, checkOnItemClick = _a.checkOnItemClick;
         if (href) {
             env.jumpTo(amisCore.filter(href, data), {
                 type: 'button',
@@ -53,13 +53,18 @@ var CardRenderer = /** @class */ (function (_super) {
             onAction && onAction(e, itemAction, (item === null || item === void 0 ? void 0 : item.data) || data);
             return;
         }
-        selectable && (onCheck === null || onCheck === void 0 ? void 0 : onCheck(item));
+        selectable && checkOnItemClick && (onCheck === null || onCheck === void 0 ? void 0 : onCheck(item));
     };
     CardRenderer.prototype.handleAction = function (e, action, ctx) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
         onAction && onAction(e, action, ctx || item.data);
     };
-    CardRenderer.prototype.handleCheck = function (e) {
+    CardRenderer.prototype.handleCheck = function () {
+        // 因为如果 checkOnItemClick 开启
+        // 会把状态标记为选中，如果这里继续执行则又会改回来
+        if (this.props.checkOnItemClick) {
+            return;
+        }
         var item = this.props.item;
         this.props.onCheck && this.props.onCheck(item);
     };
@@ -72,7 +77,7 @@ var CardRenderer = /** @class */ (function (_super) {
             onQuickChange(item, values, saveImmediately, savePristine, options);
     };
     CardRenderer.prototype.renderToolbar = function () {
-        var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, checkOnItemClick = _a.checkOnItemClick, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
+        var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
         var toolbars = [];
         if (header) {
             var highlightClassName = header.highlightClassName, highlight = header.highlight;
@@ -83,7 +88,7 @@ var CardRenderer = /** @class */ (function (_super) {
             }
         }
         if (selectable && !hideCheckToggler) {
-            toolbars.push(React__default["default"].createElement(amisUi.Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck }));
+            toolbars.push(React__default["default"].createElement(amisUi.Checkbox, { key: "check", className: cx('Card-checkbox'), type: multiple !== false ? 'checkbox' : 'radio', disabled: !checkable, checked: selected, onChange: this.handleCheck }));
         }
         if (Array.isArray(toolbar)) {
             toolbar.forEach(function (action, index) {

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Carousel.d.ts

@@ -59,6 +59,23 @@ export interface CarouselSchema extends BaseSchema {
      * 配置固定值
      */
     options?: Array<any>;
+    /**
+     * 是否一直显示箭头
+     */
+    alwaysShowArrow?: boolean;
+    /**
+     * 多图模式配置项
+     */
+    multiple?: {
+        count: number;
+    };
+    /**
+     * 自定义箭头图标
+     */
+    icons?: {
+        prev?: SchemaCollection;
+        next?: SchemaCollection;
+    };
 }
 export interface CarouselProps extends RendererProps, Omit<CarouselSchema, 'className'> {
     value?: any;
@@ -72,12 +89,13 @@ export declare class Carousel extends React.Component<CarouselProps, CarouselSta
     wrapperRef: React.RefObject<HTMLDivElement>;
     intervalTimeout: NodeJS.Timer | number;
     durationTimeout: NodeJS.Timer | number;
-    static defaultProps: Pick<CarouselProps, 'auto' | 'interval' | 'duration' | 'controlsTheme' | 'animation' | 'controls' | 'placeholder'>;
+    static defaultProps: Pick<CarouselProps, 'auto' | 'interval' | 'duration' | 'controlsTheme' | 'animation' | 'controls' | 'placeholder' | 'multiple' | 'alwaysShowArrow'>;
     state: {
         current: number;
         options: any;
         nextAnimation: string;
     };
+    loading: boolean;
     componentDidMount(): void;
     componentDidUpdate(prevProps: CarouselProps): void;
     componentWillUnmount(): void;
@@ -94,6 +112,7 @@ export declare class Carousel extends React.Component<CarouselProps, CarouselSta
     renderArrows(): JSX.Element;
     handleMouseEnter(): void;
     handleMouseLeave(): void;
+    getNewOptions(options: any, count?: number): any[];
     render(): JSX.Element;
 }
 export declare class CarouselRenderer extends Carousel {

package/lib/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 
@@ -44,6 +44,7 @@ var Carousel = /** @class */ (function (_super) {
             options: _this.props.options || amisCore.getPropValue(_this.props) || [],
             nextAnimation: ''
         };
+        _this.loading = false;
         return _this;
     }
     Carousel.prototype.componentDidMount = function () {
@@ -150,9 +151,17 @@ var Carousel = /** @class */ (function (_super) {
         }
     };
     Carousel.prototype.next = function () {
+        var multiple = this.props.multiple;
+        if (this.loading && multiple && multiple.count > 1) {
+            return;
+        }
         this.autoSlide('next');
     };
     Carousel.prototype.prev = function () {
+        var multiple = this.props.multiple;
+        if (this.loading && multiple && multiple.count > 1) {
+            return;
+        }
         this.autoSlide('prev');
     };
     Carousel.prototype.clearAutoTimeout = function () {
@@ -161,12 +170,15 @@ var Carousel = /** @class */ (function (_super) {
     };
     Carousel.prototype.changeSlide = function (index) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var current, _a, dispatchEvent, data, rendererEvent;
+            var current, _a, dispatchEvent, data, multiple, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         current = this.state.current;
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, multiple = _a.multiple;
+                        if (this.loading && multiple && multiple.count > 1) {
+                            return [2 /*return*/];
+                        }
                         return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
                                 activeIndex: index,
                                 prevIndex: current
@@ -199,46 +211,106 @@ var Carousel = /** @class */ (function (_super) {
                 React__default["default"].createElement(amisUi.Icon, { icon: "right-arrow", className: "icon" }))));
     };
     Carousel.prototype.handleMouseEnter = function () {
+        var multiple = this.props.multiple;
+        if (multiple && multiple.count > 1) {
+            return;
+        }
         this.clearAutoTimeout();
     };
     Carousel.prototype.handleMouseLeave = function () {
+        var multiple = this.props.multiple;
+        if (multiple && multiple.count > 1) {
+            return;
+        }
         this.prepareAutoSlide();
     };
+    // 处理options
+    Carousel.prototype.getNewOptions = function (options, count) {
+        if (count === void 0) { count = 1; }
+        var newOptions = options;
+        if (Array.isArray(options) && options.length) {
+            newOptions = new Array(options.length);
+            for (var i = 0; i < options.length; i++) {
+                newOptions[i] = new Array(count);
+                for (var j = 0; j < count; j++) {
+                    newOptions[i][j] = options[(i + j) % options.length];
+                }
+            }
+        }
+        return newOptions;
+    };
     Carousel.prototype.render = function () {
+        var _a;
         var _this = this;
-        var _a = this.props, render = _a.render, className = _a.className, style = _a.style, cx = _a.classnames, itemSchema = _a.itemSchema, animation = _a.animation, width = _a.width, height = _a.height, controls = _a.controls, controlsTheme = _a.controlsTheme, placeholder = _a.placeholder, data = _a.data, name = _a.name;
-        var _b = this.state, options = _b.options, current = _b.current, nextAnimation = _b.nextAnimation;
+        var _b = this.props, render = _b.render, className = _b.className, style = _b.style, cx = _b.classnames, itemSchema = _b.itemSchema, animation = _b.animation, width = _b.width, height = _b.height, controls = _b.controls, controlsTheme = _b.controlsTheme, placeholder = _b.placeholder, data = _b.data, name = _b.name, duration = _b.duration, multiple = _b.multiple, alwaysShowArrow = _b.alwaysShowArrow, icons = _b.icons;
+        var _c = this.state, options = _c.options, current = _c.current, nextAnimation = _c.nextAnimation;
         var body = null;
         var carouselStyles = style || {};
         width ? (carouselStyles.width = width + 'px') : '';
         height ? (carouselStyles.height = height + 'px') : '';
-        var _c = tslib.__read([
+        var _d = tslib.__read([
             controls.indexOf('dots') > -1,
             controls.indexOf('arrows') > -1
-        ], 2), dots = _c[0], arrows = _c[1];
+        ], 2), dots = _d[0], arrows = _d[1];
         var animationName = nextAnimation || animation;
         if (Array.isArray(options) && options.length) {
-            body = (React__default["default"].createElement("div", { ref: this.wrapperRef, className: cx('Carousel-container'), onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }, options.map(function (option, key) { return (React__default["default"].createElement(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, in: key === current, timeout: 500, key: key }, function (status) {
+            var multipleCount_1 = 1;
+            if (multiple && typeof multiple.count === 'number' && multiple.count >= 2) {
+                multipleCount_1 = Math.floor(multiple.count) < options.length ? Math.floor(multiple.count) : options.length;
+            }
+            var newOptions_1 = this.getNewOptions(options, multipleCount_1);
+            var transitionDuration_1 = multipleCount_1 > 1 && typeof duration === 'number'
+                ? "".concat(duration, "ms") : (duration || '500ms');
+            var timeout_1 = multipleCount_1 > 1 && typeof duration === 'number' ? duration : 500;
+            body = (React__default["default"].createElement("div", { ref: this.wrapperRef, className: cx('Carousel-container'), onMouseEnter: this.handleMouseEnter, onMouseLeave: this.handleMouseLeave }, options.map(function (option, key) { return (React__default["default"].createElement(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, in: key === current, timeout: timeout_1, key: key }, function (status) {
                 var _a;
                 if (status === Transition.ENTERING) {
                     _this.wrapperRef.current &&
                         _this.wrapperRef.current.childNodes.forEach(function (item) { return item.offsetHeight; });
                 }
-                return (React__default["default"].createElement("div", { className: cx('Carousel-item', animationName, animationStyles[status]) }, render("".concat(current, "/body"), itemSchema ? itemSchema : defaultSchema, {
-                    thumbMode: _this.props.thumbMode,
-                    data: amisCore.createObject(data, amisCore.isObject(option)
-                        ? option
-                        : (_a = { item: option }, _a[name] = option, _a))
-                })));
+                if (multipleCount_1 > 1) {
+                    if ((status === Transition.ENTERING || status === Transition.EXITING) && !_this.loading) {
+                        _this.loading = true;
+                    }
+                    else if ((status === Transition.ENTERED || status === Transition.EXITED) && _this.loading) {
+                        _this.loading = false;
+                    }
+                }
+                var transformStyles = (_a = {},
+                    _a[Transition.ENTERING] = 0,
+                    _a[Transition.ENTERED] = 0,
+                    _a[Transition.EXITING] = animationName === 'slideRight' ? 100 / multipleCount_1 : -100 / multipleCount_1,
+                    _a[Transition.EXITED] = animationName === 'slideRight' ? -100 / multipleCount_1 : 100 / multipleCount_1,
+                    _a);
+                var itemStyle = multipleCount_1 > 1 ? tslib.__assign({ transitionTimingFunction: 'linear', transitionDuration: transitionDuration_1 }, (animation === 'slide' ? { transform: "translateX(".concat(transformStyles[status], "%)") } : {})) : {};
+                var itemRender = function (option) {
+                    var _a;
+                    return render("".concat(current, "/body"), itemSchema ? itemSchema : defaultSchema, {
+                        thumbMode: _this.props.thumbMode,
+                        data: amisCore.createObject(data, amisCore.isObject(option)
+                            ? option
+                            : (_a = { item: option }, _a[name] = option, _a))
+                    });
+                };
+                return (React__default["default"].createElement("div", { className: cx('Carousel-item', animationName, animationStyles[status]), style: itemStyle },
+                    multipleCount_1 === 1 ? itemRender(option) : null,
+                    multipleCount_1 > 1 ?
+                        newOptions_1[key].map(function (option, index) { return (React__default["default"].createElement("div", { key: index, style: {
+                                width: 100 / multipleCount_1 + '%',
+                                height: '100%',
+                                float: 'left'
+                            } }, itemRender(option))); }) : null));
             })); })));
         }
-        return (React__default["default"].createElement("div", { className: cx("Carousel Carousel--".concat(controlsTheme), className), style: carouselStyles },
+        return (React__default["default"].createElement("div", { className: cx("Carousel Carousel--".concat(controlsTheme), (_a = {}, _a['Carousel-arrow--always'] = !!alwaysShowArrow, _a), className), style: carouselStyles },
             body ? body : placeholder,
             dots ? this.renderDots() : null,
-            arrows ? (React__default["default"].createElement("div", { className: cx('Carousel-leftArrow'), onClick: this.prev },
-                React__default["default"].createElement(amisUi.Icon, { icon: "left-arrow", className: "icon" }))) : null,
-            arrows ? (React__default["default"].createElement("div", { className: cx('Carousel-rightArrow'), onClick: this.next },
-                React__default["default"].createElement(amisUi.Icon, { icon: "right-arrow", className: "icon" }))) : null));
+            arrows ? (React__default["default"].createElement("div", { className: cx('Carousel-leftArrow'), onClick: this.prev }, icons && icons.prev
+                ? React__default["default"].isValidElement(icons.prev) ? icons.prev : render('arrow-prev', icons.prev)
+                : (React__default["default"].createElement(amisUi.Icon, { icon: "left-arrow", className: "icon" })))) : null,
+            arrows ? (React__default["default"].createElement("div", { className: cx('Carousel-rightArrow'), onClick: this.next }, icons && icons.next
+                ? React__default["default"].isValidElement(icons.next) ? icons.next : render('arrow-next', icons.next)
+                : (React__default["default"].createElement(amisUi.Icon, { icon: "right-arrow", className: "icon" })))) : null));
     };
     Carousel.defaultProps = {
         auto: true,
@@ -247,7 +319,9 @@ var Carousel = /** @class */ (function (_super) {
         controlsTheme: 'light',
         animation: 'fade',
         controls: ['dots', 'arrows'],
-        placeholder: '-'
+        placeholder: '-',
+        multiple: { count: 1 },
+        alwaysShowArrow: false
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/DateRange.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v2.9.0
  * Copyright 2018-2023 baidu
  */