amis-ui 6.2.2 → 6.4.0

package/lib/components/Pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -70,12 +70,12 @@ var Pagination = /** @class */ (function (_super) {
      */
     Pagination.prototype.renderPageItem = function (page) {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, activePage = _a.activePage;
+        var _a = this.props, cx = _a.classnames, activePage = _a.activePage, testIdBuilder = _a.testIdBuilder;
         var perPage = this.state.perPage;
         return (_J$X_("li", { onClick: function () { return _this.handlePageNumChange(page, perPage); }, key: page, className: cx('Pagination-pager-item', {
                 'is-active': page === activePage
             }) },
-            _J$X_("a", { role: "button" }, page)));
+            _J$X_("a", tslib.__assign({ role: "button" }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("page-".concat(page)).getTestId()), page)));
     };
     /**
      * 渲染...
@@ -85,7 +85,7 @@ var Pagination = /** @class */ (function (_super) {
      */
     Pagination.prototype.renderEllipsis = function (key) {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, activePage = _a.activePage, ellipsisPageGap = _a.ellipsisPageGap;
+        var _a = this.props, cx = _a.classnames, activePage = _a.activePage, ellipsisPageGap = _a.ellipsisPageGap, testIdBuilder = _a.testIdBuilder;
         var perPage = this.state.perPage;
         var lastPage = this.getLastPage();
         var gap = isNaN(Number(ellipsisPageGap)) || Number(ellipsisPageGap) < 1
@@ -96,9 +96,9 @@ var Pagination = /** @class */ (function (_super) {
         var jumpPage = isPrevEllipsis
             ? Math.max(1, activePage - gap)
             : Math.min(lastPage, activePage + gap);
-        return (_J$X_("li", { key: key, className: cx('Pagination-ellipsis'), onClick: function (e) {
+        return (_J$X_("li", tslib.__assign({ key: key, className: cx('Pagination-ellipsis'), onClick: function (e) {
                 return _this.handlePageNumChange(jumpPage, perPage, isPrevEllipsis ? 'backward' : 'forward');
-            } },
+            } }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(key).getTestId()),
             _J$X_("a", { role: "button" }, "..."),
             _J$X_("span", { className: "icon" }, jumpContent)));
     };
@@ -198,7 +198,7 @@ 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;
+        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 maxButtons = this.props.maxButtons;
         var _b = this.state, pageNum = _b.pageNum, perPage = _b.perPage, internalPageNum = _b.internalPageNum;
         var lastPage = this.getLastPage();
@@ -206,10 +206,10 @@ var Pagination = /** @class */ (function (_super) {
         // 简洁模式
         if (mode === 'simple') {
             simplePager = (_J$X_("li", { className: cx('Pagination-simplego'), key: "simple-go" },
-                _J$X_("input", { className: cx('Pagination-simplego-input'), key: "simple-input", type: "text", disabled: disabled, onChange: this.handleSimpleKeyUp, onKeyUp: this.handleSimpleKeyUp, onBlur: this.handleSimpleBlur, value: internalPageNum }),
+                _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", { className: cx('Pagination-wrap', "Pagination-wrap-size--".concat(size), 'Pagination-simple', { disabled: disabled }, className), style: style },
+            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
@@ -219,7 +219,7 @@ var Pagination = /** @class */ (function (_super) {
                             }
                             return _this.handlePageNumChange(activePage - 1, undefined, 'backward');
                         }, key: "prev" },
-                        _J$X_("span", null,
+                        _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_("li", { className: cx('Pagination-next', {
@@ -230,7 +230,7 @@ var Pagination = /** @class */ (function (_super) {
                             }
                             return _this.handlePageNumChange(activePage + 1, perPage, 'forward');
                         }, key: "next" },
-                        _J$X_("span", null,
+                        _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" }))))));
         }
         var pageButtons = [];
@@ -285,7 +285,7 @@ var Pagination = /** @class */ (function (_super) {
                 }
                 return _this.handlePageNumChange(activePage - 1, perPage);
             }, key: "prev" },
-            _J$X_("span", null,
+            _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" }))));
         pageButtons.push(_J$X_("li", { className: cx('Pagination-next', {
                 'is-disabled': activePage === lastPage
@@ -295,7 +295,7 @@ var Pagination = /** @class */ (function (_super) {
                 }
                 return _this.handlePageNumChange(activePage + 1, perPage);
             }, key: "next" },
-            _J$X_("span", null,
+            _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" }))));
         if (mobileUI) {
             pageButtons = [
@@ -306,36 +306,36 @@ var Pagination = /** @class */ (function (_super) {
         }
         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,
-            _J$X_("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) {
+            _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') {
                         return;
                     }
                     _this.setState({ pageNum: '' });
                     _this.handlePageNumChange(v, perPage);
-                }, value: pageNum }),
-            _J$X_("span", { className: cx('Pagination-inputGroup-right'), key: "go-right", onClick: function (e) {
+                }, value: pageNum }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go-input').getTestId())),
+            _J$X_("span", tslib.__assign({ className: cx('Pagination-inputGroup-right'), key: "go-right", onClick: function (e) {
                     if (!pageNum) {
                         return;
                     }
                     _this.setState({ pageNum: '' });
                     _this.handlePageNumChange(+pageNum, perPage);
-                } }, __('Pagination.go'))));
+                } }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('go').getTestId()), __('Pagination.go'))));
         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"], { 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 = (_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: ''
                 });
                 _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
             ? __('Pagination.totalCount', { total: total })
             : __('Pagination.totalPage', { lastPage: lastPage })));
-        return (_J$X_("div", { className: cx('Pagination-wrap', "Pagination-wrap-size--".concat(size), { disabled: disabled }, className) }, layoutList.map(function (layoutItem) {
+        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) {
             if (layoutItem === "pager" /* PaginationWidget.Pager */) {
                 return (_J$X_("ul", { key: "pager-items", className: cx('Pagination', 'Pagination--sm', 'Pagination-item') }, pageButtons));
             }

package/lib/components/PdfViewer.d.ts

@@ -0,0 +1,49 @@
+/**
+ * @file PdfViewer.tsx PDF 预览
+ *
+ * @created: 2024/02/26
+ */
+/// <reference types="hoist-non-react-statics" />
+import React from 'react';
+import { ThemeProps } from 'amis-core';
+export interface PdfViewerProps extends ThemeProps {
+    file?: ArrayBuffer;
+    width?: number;
+    height?: number;
+    background?: string;
+    loading: boolean;
+}
+declare const _default: {
+    new (props: Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): React.JSX.Element;
+        context: unknown;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<PdfViewerProps, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<React.FC<PdfViewerProps>>;
+} & import("hoist-non-react-statics").NonReactStatics<React.FC<PdfViewerProps>, {}> & {
+    ComposedComponent: React.FC<PdfViewerProps>;
+};
+export default _default;

package/lib/components/PdfViewer.js

@@ -0,0 +1,91 @@
+/**
+ * amis-ui v6.4.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var amisCore = require('amis-core');
+var reactPdf = require('react-pdf');
+var icons = require('./icons.js');
+var Input = require('./Input.js');
+var Spinner = require('./Spinner.js');
+var pdf_worker_min = require('../node_modules/pdfjs-dist/build/pdf.worker.min.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+reactPdf.pdfjs.GlobalWorkerOptions.workerSrc = pdf_worker_min["default"];
+var PdfViewer = function (props) {
+    var cx = props.classnames, className = props.className, loading = props.loading, _a = props.width, width = _a === void 0 ? 300 : _a;
+    var _b = tslib.__read(React__default["default"].useState(props.file), 2), file = _b[0], setFile = _b[1];
+    var _c = tslib.__read(React__default["default"].useState(false), 2), loaded = _c[0], setLoaded = _c[1];
+    var _d = tslib.__read(React__default["default"].useState(1), 2), page = _d[0], setPage = _d[1];
+    var _e = tslib.__read(React__default["default"].useState(1), 2), scale = _e[0], setScale = _e[1];
+    var _f = tslib.__read(React__default["default"].useState(1), 2), total = _f[0], setTotal = _f[1];
+    var wrapper = React__default["default"].useRef(null);
+    var inputRef = React__default["default"].useRef();
+    React__default["default"].useEffect(function () {
+        if (props.file instanceof ArrayBuffer && props.file.byteLength > 0) {
+            setFile(props.file);
+        }
+        else {
+            setFile(undefined);
+        }
+    }, [props.file]);
+    function handleLoadSuccess(_a) {
+        var numPages = _a.numPages;
+        setLoaded(true);
+        setTotal(numPages);
+    }
+    function handleChangePage(idx) {
+        var newPage = page + idx;
+        if (newPage <= 0 || newPage > total) {
+            return;
+        }
+        setPage(newPage);
+    }
+    function handlePageBlur(event) {
+        var newPage = +event.target.value;
+        if (isNaN(newPage) || newPage <= 0 || newPage > total) {
+            if (inputRef.current) {
+                inputRef.current.value = page + '';
+            }
+            return;
+        }
+        setPage(newPage);
+    }
+    function handleChangeScale(t) {
+        setScale(scale * t);
+    }
+    function renderLoading() {
+        return (_J$X_("div", { className: cx('PdfViewer-Loading') },
+            _J$X_(Spinner["default"], null)));
+    }
+    function renderTool() {
+        return (_J$X_("div", { className: cx('PdfViewer-Tool') },
+            _J$X_(icons.Icon, { className: "icon", icon: "prev", onClick: function () { return handleChangePage(-1); } }),
+            _J$X_(Input["default"], { className: "page-input", value: page, onBlur: handlePageBlur, ref: inputRef }),
+            _J$X_("span", { className: "gap" }, "/"),
+            _J$X_("span", null, total),
+            _J$X_(icons.Icon, { className: "icon", icon: "next", onClick: function () { return handleChangePage(1); } }),
+            _J$X_(icons.Icon, { className: "icon", icon: "zoom-in", onClick: function () { return handleChangeScale(1.2); } }),
+            _J$X_(icons.Icon, { className: "icon", icon: "zoom-out", onClick: function () { return handleChangeScale(0.8); } })));
+    }
+    return (_J$X_("div", { className: cx(className, 'PdfViewer'), ref: wrapper }, !file || loading ? (renderLoading()) : (_J$X_(React__default["default"].Fragment, null,
+        _J$X_("div", { className: cx('PdfViewer-Content', { 'is-loaded': loaded }) },
+            _J$X_(reactPdf.Document, { file: file, onLoadSuccess: handleLoadSuccess, loading: renderLoading() },
+                _J$X_(reactPdf.Page, { className: cx('PdfViewer-Content-Page'), pageNumber: page, width: width, height: props.height, loading: renderLoading(), noData: _J$X_("div", null, "No PDF data"), scale: scale, renderTextLayer: false, renderAnnotationLayer: false }))),
+        loaded ? renderTool() : null))));
+};
+var PdfViewer$1 = amisCore.themeable(PdfViewer);
+
+exports["default"] = PdfViewer$1;

package/lib/components/Picker.d.ts

@@ -18,6 +18,7 @@ export interface PickerProps extends ThemeProps, LocaleProps {
     value?: PickerValue[];
     swipeDuration?: number;
     visibleItemCount?: number;
+    highlightTxt?: string;
     itemHeight?: number;
     columns: PickerColumnItem[] | PickerColumnItem;
     onChange?: (value?: PickerValue[], index?: number, confirm?: boolean) => void;

package/lib/components/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -23,9 +23,9 @@ function fixToArray(data) {
     return data;
 }
 var Picker = React.memo(function (props) {
-    var title = props.title, labelField = props.labelField, valueField = props.valueField, _a = props.visibleItemCount, visibleItemCount = _a === void 0 ? 5 : _a, _b = props.value, value = _b === void 0 ? [] : _b, _c = props.swipeDuration, swipeDuration = _c === void 0 ? 1000 : _c, _d = props.columns, columns = _d === void 0 ? [] : _d, _e = props.itemHeight, itemHeight = _e === void 0 ? 48 : _e, _f = props.showToolbar, showToolbar = _f === void 0 ? true : _f, _g = props.className, className = _g === void 0 ? '' : _g, cx = props.classnames, ns = props.classPrefix, __ = props.translate;
+    var title = props.title, labelField = props.labelField, valueField = props.valueField, _a = props.visibleItemCount, visibleItemCount = _a === void 0 ? 5 : _a, _b = props.value, value = _b === void 0 ? [] : _b, _c = props.swipeDuration, swipeDuration = _c === void 0 ? 1000 : _c, _d = props.columns, columns = _d === void 0 ? [] : _d, _e = props.itemHeight, itemHeight = _e === void 0 ? 48 : _e, _f = props.showToolbar, showToolbar = _f === void 0 ? true : _f, _g = props.className, className = _g === void 0 ? '' : _g, _h = props.highlightTxt, highlightTxt = _h === void 0 ? '' : _h, cx = props.classnames, ns = props.classPrefix, __ = props.translate;
     var _columns = fixToArray(columns);
-    var _h = tslib.__read(React.useState(fixToArray(props.value === undefined ? props.defaultValue || [] : value)), 2), innerValue = _h[0], setInnerValue = _h[1];
+    var _j = tslib.__read(React.useState(fixToArray(props.value === undefined ? props.defaultValue || [] : value)), 2), innerValue = _j[0], setInnerValue = _j[1];
     React.useEffect(function () {
         if (value === innerValue)
             return;
@@ -50,7 +50,7 @@ var Picker = React.memo(function (props) {
         }
     };
     var renderColumnItem = function (item, index) {
-        return (_J$X_(PickerColumn["default"], tslib.__assign({}, item, { classnames: cx, classPrefix: ns, labelField: labelField || item.labelField, valueField: valueField || item.valueField, itemHeight: itemHeight, swipeDuration: swipeDuration, visibleItemCount: visibleItemCount, value: innerValue[index], onChange: function (val, i, confirm) {
+        return (_J$X_(PickerColumn["default"], tslib.__assign({}, item, { highlightTxt: highlightTxt, classnames: cx, classPrefix: ns, labelField: labelField || item.labelField, valueField: valueField || item.valueField, itemHeight: itemHeight, swipeDuration: swipeDuration, visibleItemCount: visibleItemCount, value: innerValue[index], onChange: function (val, i, confirm) {
                 onChange(val, index, confirm);
             }, key: "column".concat(index) })));
     };

package/lib/components/PickerColumn.d.ts

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

package/lib/components/PickerColumn.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -42,7 +42,7 @@ function isOptionDisabled(option) {
     return isObject__default["default"](option) && option.disabled;
 }
 var PickerColumn = React.forwardRef(function (props, ref) {
-    var _a = props.visibleItemCount, visibleItemCount = _a === void 0 ? 5 : _a, _b = props.itemHeight, itemHeight = _b === void 0 ? 48 : _b, value = props.value, _c = props.valueField, valueField = _c === void 0 ? 'value' : _c, _d = props.swipeDuration, swipeDuration = _d === void 0 ? 1000 : _d, _e = props.labelField, labelField = _e === void 0 ? 'text' : _e, _f = props.options, options = _f === void 0 ? [] : _f; props.classnames;
+    var _a = props.visibleItemCount, visibleItemCount = _a === void 0 ? 5 : _a, _b = props.itemHeight, itemHeight = _b === void 0 ? 48 : _b, value = props.value, _c = props.valueField, valueField = _c === void 0 ? 'value' : _c, _d = props.swipeDuration, swipeDuration = _d === void 0 ? 1000 : _d, _e = props.labelField, labelField = _e === void 0 ? 'text' : _e, _f = props.highlightTxt, highlightTxt = _f === void 0 ? '' : _f, _g = props.options, options = _g === void 0 ? [] : _g, cx = props.classnames;
     var root = React.useRef(null);
     var menuItemRef = React.useRef(null);
     var wrapper = React.useRef(null);
@@ -87,12 +87,12 @@ var PickerColumn = React.forwardRef(function (props, ref) {
         }
         return null;
     };
-    var _g = tslib.__read(useSetState["default"]({
+    var _h = tslib.__read(useSetState["default"]({
         index: adjustIndex(defaultIndex) || 0,
         offset: 0,
         duration: 0,
         options: cloneDeep__default["default"](options)
-    }), 2), state = _g[0], updateState = _g[1];
+    }), 2), state = _h[0], updateState = _h[1];
     /**
      *
      * @param index 索引
@@ -236,7 +236,9 @@ var PickerColumn = React.forwardRef(function (props, ref) {
             };
             var childData = {
                 className: 'text-ellipsis',
-                children: text
+                children: (highlightTxt
+                    ? amisCore.highlight(text, highlightTxt, cx('Select-option-hl'))
+                    : text)
             };
             return (_J$X_("li", tslib.__assign({}, data, { ref: menuItemRef }), props.optionRender ? (props.optionRender(option, { index: index, checked: state.index === index })) : (_J$X_("div", tslib.__assign({}, childData)))));
         });

package/lib/components/PickerContainer.d.ts

@@ -29,12 +29,11 @@ export interface PickerContainerState {
 }
 export declare class PickerContainer extends React.Component<PickerContainerProps, PickerContainerState> {
     state: PickerContainerState;
-    bodyRef: React.RefObject<any>;
     componentDidUpdate(prevProps: PickerContainerProps): void;
     handleClick(): Promise<void>;
     close(e?: any, callback?: () => void): void;
     handleChange(value: any): void;
-    confirm(): Promise<any>;
+    beforeConfirm(form?: any): Promise<any>;
     updateState(state?: any): void;
     render(): React.JSX.Element;
 }

package/lib/components/PickerContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -27,7 +27,6 @@ var PickerContainer = /** @class */ (function (_super) {
             isOpened: false,
             value: _this.props.value
         };
-        _this.bodyRef = React__default["default"].createRef();
         return _this;
     }
     PickerContainer.prototype.componentDidUpdate = function (prevProps) {
@@ -75,17 +74,25 @@ var PickerContainer = /** @class */ (function (_super) {
             value: value
         });
     };
-    PickerContainer.prototype.confirm = function () {
+    PickerContainer.prototype.beforeConfirm = function (form) {
+        var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onConfirm, beforeConfirm, ret, state;
-            var _this = this;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _c, onConfirm, beforeConfirm, ret, _d, state;
+            return tslib.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _a = this.props, onConfirm = _a.onConfirm, beforeConfirm = _a.beforeConfirm;
-                        return [4 /*yield*/, (beforeConfirm === null || beforeConfirm === void 0 ? void 0 : beforeConfirm(this.bodyRef.current))];
+                        _c = this.props, onConfirm = _c.onConfirm, beforeConfirm = _c.beforeConfirm;
+                        if (!beforeConfirm) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (beforeConfirm === null || beforeConfirm === void 0 ? void 0 : beforeConfirm(form))];
                     case 1:
-                        ret = _b.sent();
+                        _d = _e.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, ((_a = form === null || form === void 0 ? void 0 : form.submit) === null || _a === void 0 ? void 0 : _a.call(form))];
+                    case 3:
+                        _d = _e.sent();
+                        _e.label = 4;
+                    case 4:
+                        ret = _d;
                         state = {
                             isOpened: false
                         };
@@ -96,7 +103,10 @@ var PickerContainer = /** @class */ (function (_super) {
                         else if (amisCore.isObject(ret)) {
                             state.value = ret;
                         }
-                        this.setState(state, function () { return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(_this.state.value); });
+                        return [4 /*yield*/, (onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm((_b = state.value) !== null && _b !== void 0 ? _b : this.state.value))];
+                    case 5:
+                        _e.sent();
+                        this.setState(state);
                         return [2 /*return*/];
                 }
             });
@@ -116,9 +126,9 @@ var PickerContainer = /** @class */ (function (_super) {
                 onClick: this.handleClick,
                 setState: this.updateState
             }),
-            _J$X_(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, className: className, showFooter: showFooter, beforeConfirm: this.confirm, popOverContainer: popOverContainer, mobileUI: mobileUI, disabled: disabled }, function (_a) {
-                var popOverContainer = _a.popOverContainer, loading = _a.loading;
-                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, loading: loading }));
+            _J$X_(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, className: className, showFooter: showFooter, beforeConfirm: this.beforeConfirm, popOverContainer: popOverContainer, mobileUI: mobileUI, disabled: disabled }, function (_a) {
+                var popOverContainer = _a.popOverContainer, loading = _a.loading, onConfirm = _a.onConfirm, bodyRef = _a.bodyRef;
+                return popOverRender(tslib.__assign(tslib.__assign({}, _this.state), { ref: bodyRef, setState: _this.updateState, onClose: _this.close, onChange: _this.handleChange, onConfirm: onConfirm, popOverContainer: popOverContainer, loading: loading }));
             })));
     };
     tslib.__decorate([
@@ -142,9 +152,9 @@ var PickerContainer = /** @class */ (function (_super) {
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:paramtypes", [Object]),
         tslib.__metadata("design:returntype", Promise)
-    ], PickerContainer.prototype, "confirm", null);
+    ], PickerContainer.prototype, "beforeConfirm", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/components/PopOverContainer.d.ts

@@ -5,6 +5,7 @@ export interface PopOverOverlay {
     align?: OverlayAlignType;
 }
 export interface PopOverContainerProps {
+    show?: boolean;
     children: (props: {
         disabled?: boolean;
         onClick: (e: React.MouseEvent) => void;

package/lib/components/PopOverContainer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -101,12 +101,12 @@ var PopOverContainer = /** @class */ (function (_super) {
         var _a = this.props, mobileUI = _a.mobileUI, children = _a.children, popOverContainer = _a.popOverContainer, popOverClassName = _a.popOverClassName, dropdownRender = _a.popOverRender, placement = _a.placement, align = _a.align, showConfirm = _a.showConfirm; _a.onConfirm; var disabled = _a.disabled;
         return (_J$X_(React__default["default"].Fragment, null,
             children({
-                isOpened: this.state.isOpened,
+                isOpened: this.state.isOpened && this.props.show !== false,
                 onClick: this.handleClick,
                 ref: this.targetRef,
                 disabled: disabled
             }),
-            mobileUI ? (_J$X_(PopUp["default"], { isShow: this.state.isOpened, container: document.body, className: popOverClassName, showConfirm: showConfirm, onHide: this.close, onConfirm: this.onConfirm }, dropdownRender({ onClose: this.close }))) : (_J$X_(amisCore.Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened },
+            mobileUI ? (_J$X_(PopUp["default"], { isShow: this.state.isOpened && this.props.show !== false, container: popOverContainer, className: popOverClassName, showConfirm: showConfirm, onHide: this.close, onConfirm: this.onConfirm }, dropdownRender({ onClose: this.close }))) : (_J$X_(amisCore.Overlay, { container: popOverContainer || this.getParent, target: this.getTarget, placement: placement || PopOverContainer.alignToPlacement({ align: align }), show: this.state.isOpened && this.props.show !== false },
                 _J$X_(amisCore.PopOver, { overlay: true, className: popOverClassName, style: this.getOverlayStyle(), onHide: this.close }, dropdownRender({ onClose: this.close }))))));
     };
     PopOverContainer.alignPlacementMap = {