amis-ui 3.1.0 → 3.2.0

package/lib/components/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.0
+ * amis-ui v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -129,9 +129,11 @@ var Pagination = /** @class */ (function (_super) {
     };
     Pagination.prototype.render = function () {
         var _this = this;
-        var _a = this.props, layout = _a.layout, maxButtons = _a.maxButtons, mode = _a.mode, activePage = _a.activePage, total = _a.total, showPerPage = _a.showPerPage, perPageAvailable = _a.perPageAvailable, cx = _a.classnames, showPageInput = _a.showPageInput, className = _a.className, style = _a.style, disabled = _a.disabled, hasNext = _a.hasNext, popOverContainer = _a.popOverContainer, popOverContainerSelector = _a.popOverContainerSelector, __ = _a.translate;
+        var _a = this.props, layout = _a.layout, mode = _a.mode, activePage = _a.activePage, total = _a.total, showPerPage = _a.showPerPage, perPageAvailable = _a.perPageAvailable, cx = _a.classnames, showPageInput = _a.showPageInput, className = _a.className, style = _a.style, disabled = _a.disabled, hasNext = _a.hasNext, popOverContainer = _a.popOverContainer, popOverContainerSelector = _a.popOverContainerSelector, useMobileUI = _a.useMobileUI, __ = _a.translate;
+        var maxButtons = this.props.maxButtons;
         var _b = this.state, pageNum = _b.pageNum, perPage = _b.perPage;
         var lastPage = this.getLastPage();
+        var mobileUI = useMobileUI && amisCore.isMobile();
         // 简易模式
         if (mode === 'simple') {
             return (React__default["default"].createElement("div", { className: cx('Pagination-wrap', 'Pagination-simple', { disabled: disabled }, className), style: style },
@@ -221,8 +223,15 @@ var Pagination = /** @class */ (function (_super) {
             }, key: "next" },
             React__default["default"].createElement("span", null,
                 React__default["default"].createElement(icons.Icon, { icon: "right-arrow", className: "icon" }))));
+        if (mobileUI) {
+            pageButtons = [
+                pageButtons[0],
+                this.renderPageItem(activePage),
+                pageButtons[pageButtons.length - 1]
+            ];
+        }
         var go = (React__default["default"].createElement("div", { className: cx('Pagination-inputGroup Pagination-item'), key: "go" },
-            React__default["default"].createElement("span", { className: cx('Pagination-inputGroup-left'), key: "go-left" }, __('Pagination.goto')),
+            !mobileUI ? (React__default["default"].createElement("span", { className: cx('Pagination-inputGroup-left'), key: "go-left" }, __('Pagination.goto'))) : null,
             React__default["default"].createElement("input", { className: cx('Pagination-inputGroup-input'), key: "go-input", type: "text", disabled: disabled, onChange: this.handlePageChange, onFocus: function (e) { return e.currentTarget.select(); }, onKeyUp: function (e) {
                     var v = parseInt(e.currentTarget.value, 10);
                     if (!v || e.code != 'Enter') {

package/lib/components/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.0
+ * amis-ui v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -64,9 +64,9 @@ var Picker = React.memo(function (props) {
     var hasHeader = showToolbar || title;
     return (React__default["default"].createElement("div", { className: cx(className, 'PickerColumns', 'PickerColumns-popOver') },
         hasHeader && (React__default["default"].createElement("div", { className: cx('PickerColumns-header') },
-            showToolbar && (React__default["default"].createElement(Button["default"], { className: "PickerColumns-cancel", level: "default", onClick: close }, __('cancel'))),
+            showToolbar && (React__default["default"].createElement(Button["default"], { className: "PickerColumns-cancel", level: "link", onClick: close }, __('cancel'))),
             title && React__default["default"].createElement("div", { className: cx('PickerColumns-title') }, title),
-            showToolbar && (React__default["default"].createElement(Button["default"], { className: "PickerColumns-confirm", level: "primary", onClick: confirm }, __('confirm'))))),
+            showToolbar && (React__default["default"].createElement(Button["default"], { className: "PickerColumns-confirm", level: "link", onClick: confirm }, __('confirm'))))),
         React__default["default"].createElement("div", { className: cx('PickerColumns-columns'), style: columnsStyle },
             _columns.map(function (column, index) {
                 return renderColumnItem(column, index);

package/lib/components/PickerColumn.d.ts

@@ -14,7 +14,7 @@ export interface PickerColumnItem {
     visibleItemCount?: number;
     itemHeight?: number;
     options?: PickerOption[];
-    optionRender?: (option: string | object | PickerOption) => React.ReactNode;
+    optionRender?: (...params: any) => React.ReactNode;
     onChange?: (value?: PickerOption | string, index?: number, confirm?: boolean) => void;
 }
 export interface PickerColumnProps extends PickerColumnItem, ThemeProps {

package/lib/components/PickerColumn.js

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

package/lib/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/lib/components/PickerContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.0
+ * amis-ui v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -106,15 +106,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["default"].createElement(React__default["default"].Fragment, null,
             children({
                 isOpened: this.state.isOpened,
                 onClick: this.handleClick,
                 setState: this.updateState
             }),
-            React__default["default"].createElement(ConfirmBox["default"], { 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(tslib.__assign(tslib.__assign({}, _this.state), { ref: _this.bodyRef, setState: _this.updateState, onClose: _this.close, onChange: _this.handleChange, onConfirm: _this.confirm }));
+            React__default["default"].createElement(ConfirmBox["default"], { 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(tslib.__assign(tslib.__assign({}, _this.state), { ref: _this.bodyRef, setState: _this.updateState, onClose: _this.close, onChange: _this.handleChange, onConfirm: _this.confirm, popOverContainer: popOverContainer }));
             })));
     };
     tslib.__decorate([

package/lib/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/lib/components/PopOverContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.1.0
+ * amis-ui v3.2.0
  * Copyright 2018-2023 fex
  */
 
@@ -55,6 +55,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__default["default"](targetWidth) || targetWidth < 1)
@@ -89,7 +94,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 && amisCore.isMobile();
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
             children({
@@ -97,7 +102,7 @@ var PopOverContainer = /** @class */ (function (_super) {
                 onClick: this.handleClick,
                 ref: this.targetRef
             }),
-            mobileUI ? (React__default["default"].createElement(PopUp["default"], { isShow: this.state.isOpened, container: popOverContainer, className: popOverClassName, onHide: this.close }, dropdownRender({ onClose: this.close }))) : (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened },
+            mobileUI ? (React__default["default"].createElement(PopUp["default"], { isShow: this.state.isOpened, container: document.body, className: popOverClassName, showConfirm: showConfirm, onHide: this.close, onConfirm: this.onConfirm }, dropdownRender({ onClose: this.close }))) : (React__default["default"].createElement(amisCore.Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened },
                 React__default["default"].createElement(amisCore.PopOver, { overlay: true, className: popOverClassName, style: this.getOverlayStyle(), onHide: this.close }, dropdownRender({ onClose: this.close }))))));
     };
     PopOverContainer.alignPlacementMap = {
@@ -135,6 +140,12 @@ var PopOverContainer = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], PopOverContainer.prototype, "getParent", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], PopOverContainer.prototype, "onConfirm", null);
     return PopOverContainer;
 }(React__default["default"].Component));