amis-ui 6.11.0-beta.8 → 6.11.0

package/lib/components/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */
 
@@ -44,7 +44,9 @@ var Pagination = /** @class */ (function (_super) {
         }
     };
     Pagination.prototype.componentWillReceiveProps = function (nextProps) {
-        if (this.props.mode === 'simple' &&
+        if (
+        // 原本作用在simple上的样式和部分方法变成了normal的，这里需要重置内部状态
+        this.props.mode !== 'simple' &&
             nextProps.activePage !== Number(this.state.internalPageNum)) {
             this.setState({ internalPageNum: String(nextProps.activePage) });
         }
@@ -198,40 +200,38 @@ var Pagination = /** @class */ (function (_super) {
     };
     Pagination.prototype.render = function () {
         var _this = this;
-        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, mobileUI = _a.mobileUI, size = _a.size, __ = _a.translate, testIdBuilder = _a.testIdBuilder;
+        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; _a.hasNext; var popOverContainer = _a.popOverContainer, popOverContainerSelector = _a.popOverContainerSelector, mobileUI = _a.mobileUI, size = _a.size, __ = _a.translate, buttonType = _a.buttonType, testIdBuilder = _a.testIdBuilder;
         var maxButtons = this.props.maxButtons;
         var _b = this.state, pageNum = _b.pageNum, perPage = _b.perPage, internalPageNum = _b.internalPageNum;
         var lastPage = this.getLastPage();
-        var simplePager = null;
-        // 简洁模式
-        if (mode === 'simple') {
-            simplePager = (_J$X_("li", { className: cx('Pagination-simplego'), key: "simple-go" },
+        var basePager = null;
+        // 非简洁模式
+        if ((mode !== 'simple' && mobileUI) || (mode === 'simple' && !mobileUI)) {
+            basePager = (_J$X_("li", { className: cx('Pagination-simplego'), key: "simple-go" },
                 _J$X_("input", tslib.__assign({ className: cx('Pagination-simplego-input'), key: "simple-input", type: "text", disabled: disabled, onChange: this.handleSimpleKeyUp, onKeyUp: this.handleSimpleKeyUp, onBlur: this.handleSimpleBlur, value: internalPageNum }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('simple-input').getTestId())),
                 "/",
                 _J$X_("span", { className: cx('Pagination-simplego-right'), key: "go-right" }, lastPage)));
             return (_J$X_("div", tslib.__assign({ className: cx('Pagination-wrap', "Pagination-wrap-size--".concat(size), 'Pagination-simple', { disabled: disabled }, className), style: style }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId()),
                 _J$X_("ul", { key: "pager-items", className: cx('Pagination', 'Pagination--sm', 'Pagination-pager-items', 'Pagination-item') },
                     _J$X_("li", { className: cx('Pagination-prev', {
-                            'is-disabled': activePage < 2
+                            'is-disabled': Number(internalPageNum) < 2
                         }), onClick: function (e) {
-                            if (activePage < 2) {
+                            if (Number(internalPageNum) < 2) {
                                 return e.preventDefault();
                             }
                             return _this.handlePageNumChange(activePage - 1, undefined, 'backward');
                         }, key: "prev" },
-                        _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("go-prev").getTestId()),
-                            _J$X_(icons.Icon, { icon: "left-arrow", className: "icon" }))),
-                    simplePager,
+                        _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("go-prev").getTestId()), buttonType === 'icon' ? (_J$X_(icons.Icon, { icon: "left-arrow", className: "icon" })) : buttonType === 'text' ? ('上一页') : null)),
+                    basePager,
                     _J$X_("li", { className: cx('Pagination-next', {
-                            'is-disabled': !hasNext
+                            'is-disabled': Number(internalPageNum) >= lastPage
                         }), onClick: function (e) {
-                            if (!hasNext) {
+                            if (Number(internalPageNum) === lastPage) {
                                 return e.preventDefault();
                             }
                             return _this.handlePageNumChange(activePage + 1, perPage, 'forward');
                         }, key: "next" },
-                        _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("go-next").getTestId()),
-                            _J$X_(icons.Icon, { icon: "right-arrow", className: "icon" }))))));
+                        _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("go-next").getTestId()), buttonType === 'icon' ? (_J$X_(icons.Icon, { icon: "right-arrow", className: "icon" })) : buttonType === 'text' ? ('下一页') : null)))));
         }
         var pageButtons = [];
         var layoutList = Array.isArray(layout)
@@ -285,8 +285,7 @@ var Pagination = /** @class */ (function (_super) {
                 }
                 return _this.handlePageNumChange(activePage - 1, perPage);
             }, key: "prev" },
-            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go-prev').getTestId()),
-                _J$X_(icons.Icon, { icon: "left-arrow", className: "icon" }))));
+            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go-prev').getTestId()), buttonType === 'icon' ? (_J$X_(icons.Icon, { icon: "left-arrow", className: "icon" })) : buttonType === 'text' ? ('上一页') : null)));
         pageButtons.push(_J$X_("li", { className: cx('Pagination-next', {
                 'is-disabled': activePage === lastPage
             }), onClick: function (e) {
@@ -295,17 +294,16 @@ var Pagination = /** @class */ (function (_super) {
                 }
                 return _this.handlePageNumChange(activePage + 1, perPage);
             }, key: "next" },
-            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go-next').getTestId()),
-                _J$X_(icons.Icon, { icon: "right-arrow", className: "icon" }))));
+            _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go-next').getTestId()), buttonType === 'icon' ? (_J$X_(icons.Icon, { icon: "right-arrow", className: "icon" })) : buttonType === 'text' ? ('下一页') : null)));
         if (mobileUI) {
             pageButtons = [
                 pageButtons[0],
-                this.renderPageItem(activePage),
+                // this.renderPageItem(activePage),
                 pageButtons[pageButtons.length - 1]
             ];
         }
-        var go = (_J$X_("div", { className: cx('Pagination-inputGroup Pagination-item'), key: "go" },
-            !mobileUI ? (_J$X_("span", { className: cx('Pagination-inputGroup-left'), key: "go-left" }, __('Pagination.goto'))) : null,
+        var go = mobileUI ? null : (_J$X_("div", { className: cx('Pagination-inputGroup Pagination-item'), key: "go" },
+            _J$X_("span", { className: cx('Pagination-inputGroup-left'), key: "go-left" }, __('Pagination.goto')),
             _J$X_("input", tslib.__assign({ 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') {
@@ -324,7 +322,7 @@ var Pagination = /** @class */ (function (_super) {
         var selection = perPageAvailable
             .filter(function (v) { return !!v; })
             .map(function (v) { return ({ label: __('Pagination.select', { count: v }), value: v }); });
-        var perPageEle = (_J$X_(Select["default"], tslib.__assign({ key: "perpage", className: cx('Pagination-perpage', 'Pagination-item'), clearable: false, disabled: disabled, value: perPage, options: selection, popOverContainer: popOverContainer, popOverContainerSelector: popOverContainerSelector, onChange: function (p) {
+        var perPageEle = mobileUI ? null : (_J$X_(Select["default"], tslib.__assign({ key: "perpage", className: cx('Pagination-perpage', 'Pagination-item'), clearable: false, disabled: disabled, value: perPage, options: selection || [], popOverContainer: popOverContainer, popOverContainerSelector: popOverContainerSelector, onChange: function (p) {
                 _this.setState({
                     perPage: p.value,
                     pageNum: ''
@@ -332,7 +330,7 @@ var Pagination = /** @class */ (function (_super) {
                 _this.handlePageNumChange(1, p.value);
             } }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('perpage').getTestId())));
         // total或者lastpage不存在，不渲染总数
-        var totalPage = !(total || lastPage) ? null : (_J$X_("div", { className: cx('Pagination-total Pagination-item'), key: "total" }, total || total === 0
+        var totalPage = !(total || lastPage) || mobileUI ? null : (_J$X_("div", { className: cx('Pagination-total Pagination-item'), key: "total" }, total || total === 0
             ? __('Pagination.totalCount', { total: total })
             : __('Pagination.totalPage', { lastPage: lastPage })));
         return (_J$X_("div", tslib.__assign({ className: cx('Pagination-wrap', "Pagination-wrap-size--".concat(size), { disabled: disabled }, className) }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getTestId()), layoutList.map(function (layoutItem) {
@@ -361,7 +359,8 @@ var Pagination = /** @class */ (function (_super) {
         perPage: 10,
         perPageAvailable: [10, 20, 50, 100],
         ellipsisPageGap: 5,
-        size: 'md'
+        size: 'md',
+        buttonType: 'icon'
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/components/PdfViewer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/PickerColumn.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/PickerContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/PopOverContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.8
+ * amis-ui v6.11.0
  * Copyright 2018-2025 fex
  */