amis-ui 3.1.1 → 3.3.0

package/esm/components/PickerColumn.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -226,7 +226,7 @@ var PickerColumn = forwardRef(function (props, ref) {
                 className: 'text-ellipsis',
                 children: text
             };
-            return (React__default.createElement("li", __assign({}, data, { ref: menuItemRef }), props.optionRender ? (props.optionRender(option)) : (React__default.createElement("div", __assign({}, childData)))));
+            return (React__default.createElement("li", __assign({}, data, { ref: menuItemRef }), props.optionRender ? (props.optionRender(option, { index: index, checked: state.index === index })) : (React__default.createElement("div", __assign({}, childData)))));
         });
     };
     var setValue = function (value) {

package/esm/components/PickerContainer.d.ts

@@ -20,6 +20,7 @@ export interface PickerContainerProps extends ThemeProps, LocaleProps, Omit<Conf
     onClose?: () => void;
     onPickerOpen?: (props: PickerContainerProps) => any;
     popOverContainer?: any;
+    useMobileUI?: boolean;
 }
 export interface PickerContainerState {
     isOpened: boolean;

package/esm/components/PickerContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -98,15 +98,15 @@ var PickerContainer = /** @class */ (function (_super) {
     };
     PickerContainer.prototype.render = function () {
         var _this = this;
-        var _a = this.props, children = _a.children, popOverRender = _a.bodyRender, title = _a.title, showTitle = _a.showTitle, headerClassName = _a.headerClassName, bodyClassName = _a.bodyClassName, __ = _a.translate, size = _a.size, showFooter = _a.showFooter, closeOnEsc = _a.closeOnEsc, popOverContainer = _a.popOverContainer;
+        var _a = this.props, children = _a.children, popOverRender = _a.bodyRender, title = _a.title, showTitle = _a.showTitle, headerClassName = _a.headerClassName, bodyClassName = _a.bodyClassName, __ = _a.translate, size = _a.size, showFooter = _a.showFooter, closeOnEsc = _a.closeOnEsc, popOverContainer = _a.popOverContainer, useMobileUI = _a.useMobileUI;
         return (React__default.createElement(React__default.Fragment, null,
             children({
                 isOpened: this.state.isOpened,
                 onClick: this.handleClick,
                 setState: this.updateState
             }),
-            React__default.createElement(ConfirmBox, { type: "dialog", size: size, closeOnEsc: closeOnEsc, show: this.state.isOpened, onCancel: this.close, title: title || __('Select.placeholder'), showTitle: showTitle, headerClassName: headerClassName, bodyClassName: bodyClassName, showFooter: showFooter, beforeConfirm: this.confirm, popOverContainer: popOverContainer }, function () {
-                return popOverRender(__assign(__assign({}, _this.state), { ref: _this.bodyRef, setState: _this.updateState, onClose: _this.close, onChange: _this.handleChange, onConfirm: _this.confirm }));
+            React__default.createElement(ConfirmBox, { type: "dialog", size: size, closeOnEsc: closeOnEsc, show: this.state.isOpened, onCancel: this.close, title: title || __('Select.placeholder'), showTitle: showTitle, headerClassName: headerClassName, bodyClassName: bodyClassName, showFooter: showFooter, beforeConfirm: this.confirm, popOverContainer: popOverContainer, useMobileUI: useMobileUI }, function () {
+                return popOverRender(__assign(__assign({}, _this.state), { ref: _this.bodyRef, setState: _this.updateState, onClose: _this.close, onChange: _this.handleChange, onConfirm: _this.confirm, popOverContainer: popOverContainer }));
             })));
     };
     __decorate([

package/esm/components/PopOverContainer.d.ts

@@ -19,11 +19,13 @@ export interface PopOverContainerProps {
     placement?: string;
     overlayWidth?: number | string;
     overlayWidthField?: 'minWidth' | 'width';
+    showConfirm?: boolean;
     align?: OverlayAlignType;
     /** Popover层隐藏前触发的事件 */
     onBeforeHide?: () => void;
     /** Popover层隐藏后触发的事件 */
     onAfterHide?: () => void;
+    onConfirm?: () => void;
 }
 export interface PopOverContainerState {
     isOpened: boolean;
@@ -41,6 +43,7 @@ export declare class PopOverContainer extends React.Component<PopOverContainerPr
     close(): void;
     getTarget(): any;
     getParent(): any;
+    onConfirm(): void;
     static calcOverlayWidth(overlay: PopOverOverlay, targetWidth: number): string | number | undefined;
     static alignToPlacement(overlay?: PopOverOverlay): string;
     getOverlayStyle(): {

package/esm/components/PopOverContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.1
+ * amis-ui v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -46,6 +46,11 @@ var PopOverContainer = /** @class */ (function (_super) {
         var _a;
         return (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.parentElement;
     };
+    PopOverContainer.prototype.onConfirm = function () {
+        var _a, _b;
+        (_b = (_a = this.props).onConfirm) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.close();
+    };
     PopOverContainer.calcOverlayWidth = function (overlay, targetWidth) {
         var overlayWidth = overlay && overlay.width;
         if (!overlayWidth || !isNumber(targetWidth) || targetWidth < 1)
@@ -80,7 +85,7 @@ var PopOverContainer = /** @class */ (function (_super) {
             _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, align = _a.align;
+        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, showConfirm = _a.showConfirm; _a.onConfirm;
         var mobileUI = useMobileUI && isMobile();
         return (React__default.createElement(React__default.Fragment, null,
             children({
@@ -88,7 +93,7 @@ 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 || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened },
+            mobileUI ? (React__default.createElement(PopUp, { isShow: this.state.isOpened, container: document.body, className: popOverClassName, showConfirm: showConfirm, onHide: this.close, onConfirm: this.onConfirm }, 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 = {
@@ -126,6 +131,12 @@ var PopOverContainer = /** @class */ (function (_super) {
         __metadata("design:paramtypes", []),
         __metadata("design:returntype", void 0)
     ], PopOverContainer.prototype, "getParent", null);
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], PopOverContainer.prototype, "onConfirm", null);
     return PopOverContainer;
 }(React__default.Component));