amis-ui 6.2.2 → 6.4.0

package/lib/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -141,8 +141,9 @@ var CustomDaysView = /** @class */ (function (_super) {
             return content;
         };
         _this.renderDay = function (props, currentDate) {
+            var _a;
             var todayActiveStyle = props.todayActiveStyle; /** 只有today才会传入这个属性 */
-            var _a = _this.props, cx = _a.classnames, __ = _a.translate; _a.env;
+            var _b = _this.props, cx = _b.classnames, __ = _b.translate, testIdBuilder = _b.testIdBuilder;
             var injectedProps = omit__default["default"](props, ['todayActiveStyle']);
             /** 某些情况下需要用inline style覆盖动态class，需要hack important的样式 */
             var todayDomRef = function (node) {
@@ -267,10 +268,10 @@ var CustomDaysView = /** @class */ (function (_super) {
                 }
             }
             return (_J$X_("td", tslib.__assign({}, injectedProps),
-                _J$X_("span", { style: todayActiveStyle, ref: todayDomRef }, currentDate.date())));
+                _J$X_("span", tslib.__assign({ style: todayActiveStyle, ref: todayDomRef }, (_a = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key)) === null || _a === void 0 ? void 0 : _a.getTestId()), currentDate.date())));
         };
         _this.renderTimes = function () {
-            var _a = _this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate, cx = _a.classnames;
+            var _a = _this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate, cx = _a.classnames, testIdBuilder = _a.testIdBuilder;
             var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
             var inputs = [];
             var timeConstraints = _this.timeConstraints;
@@ -299,20 +300,21 @@ var CustomDaysView = /** @class */ (function (_super) {
                                 return _this.setTime(type, Math.max(min_1, Math.min(parseInt(e.currentTarget.value.replace(/\D/g, ''), 10) || 0, max_1)));
                             }
                         });
+                        var itemTIB = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(type);
                         return (_J$X_("div", { className: cx('CalendarInputWrapper', 'CalendarInputWrapperMT') },
                             _J$X_("div", { className: cx('CalendarInput-sugs', type === 'hours'
                                     ? 'CalendarInput-sugsHours'
                                     : 'CalendarInput-sugsTimes'), id: "".concat(_this.state.uniqueTag, "-").concat(i, "-input") }, options_1.map(function (option) {
-                                var _a;
-                                return (_J$X_("div", { key: option.value, className: cx('CalendarInput-sugsItem', {
+                                var _a, _b;
+                                return (_J$X_("div", tslib.__assign({ key: option.value, className: cx('CalendarInput-sugsItem', {
                                         'is-highlight': selectedDate
                                             ? option.value === date.format(formatMap_1[type])
                                             : option.value === ((_a = options_1 === null || options_1 === void 0 ? void 0 : options_1[0]) === null || _a === void 0 ? void 0 : _a.value)
-                                    }), onClick: function () {
+                                    }) }, (_b = itemTIB === null || itemTIB === void 0 ? void 0 : itemTIB.getChild(option.value)) === null || _b === void 0 ? void 0 : _b.getTestId(), { onClick: function () {
                                         _this.setTime(type, parseInt(option.value, 10));
                                         _this.scrollToTop(type, parseInt(option.value, 10), i);
                                         closeMenu();
-                                    } }, option.value));
+                                    } }), option.value));
                             }))));
                     }));
                     inputs.push(_J$X_("span", { key: i + 'divider' }));
@@ -502,7 +504,7 @@ var CustomDaysView = /** @class */ (function (_super) {
         }).filter(function (item) { return !!item; });
     };
     CustomDaysView.prototype.render = function () {
-        var _a = this.props, date = _a.viewDate, mobileUI = _a.mobileUI, embed = _a.embed, timeFormat = _a.timeFormat; _a.classnames;
+        var _a = this.props, date = _a.viewDate, mobileUI = _a.mobileUI, embed = _a.embed, timeFormat = _a.timeFormat; _a.classnames; var testIdBuilder = _a.testIdBuilder;
         var locale = date.localeData();
         var __ = this.props.translate;
         if (mobileUI && !embed) {
@@ -513,16 +515,16 @@ var CustomDaysView = /** @class */ (function (_super) {
                 _J$X_("tr", null,
                     _J$X_("th", { colSpan: 7 },
                         _J$X_("div", { className: "rdtHeader" },
-                            _J$X_("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') },
+                            _J$X_("a", tslib.__assign({ className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('prev-year').getTestId()),
                                 _J$X_(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow-left" })),
-                            _J$X_("a", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') },
+                            _J$X_("a", tslib.__assign({ className: "rdtPrev", onClick: this.props.subtractTime(1, 'months') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('prev-month').getTestId()),
                                 _J$X_(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow-left" })),
                             _J$X_("div", { className: "rdtCenter" },
-                                _J$X_("a", { className: "rdtSwitch", onClick: this.props.showView('years') }, date.format(__('dateformat.year'))),
-                                _J$X_("a", { className: "rdtSwitch", onClick: this.props.showView('months') }, date.format(__('MMM')))),
-                            _J$X_("a", { className: "rdtNext", onClick: this.props.addTime(1, 'months') },
+                                _J$X_("a", tslib.__assign({ className: "rdtSwitch", onClick: this.props.showView('years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('switch-years').getTestId()), date.format(__('dateformat.year'))),
+                                _J$X_("a", tslib.__assign({ className: "rdtSwitch", onClick: this.props.showView('months') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('switch-months').getTestId()), date.format(__('MMM')))),
+                            _J$X_("a", tslib.__assign({ className: "rdtNext", onClick: this.props.addTime(1, 'months') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('next-month').getTestId()),
                                 _J$X_(icons.Icon, { icon: "right-arrow", className: "icon date-icon-arrow" })),
-                            _J$X_("a", { className: "rdtNext", onClick: this.props.addTime(1, 'years') },
+                            _J$X_("a", tslib.__assign({ className: "rdtNext", onClick: this.props.addTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('next-year').getTestId()),
                                 _J$X_(icons.Icon, { icon: "right-double-arrow", className: "icon date-icon-arrow" }))),
                         _J$X_("div", { className: "header-line" }))),
                 _J$X_("tr", null, this.getDaysOfWeek(locale).map(function (day, index) { return (_J$X_("th", { key: day + index, className: "dow" }, day)); })))),

package/lib/components/calendar/MonthsView.d.ts

@@ -4,6 +4,7 @@ import React from 'react';
 import { LocaleProps } from 'amis-core';
 import { PickerOption } from '../PickerColumn';
 import { DateType } from './Calendar';
+import type { TestIdBuilder } from 'amis-core';
 export interface OtherProps {
     inputFormat?: string;
     hideHeader?: boolean;
@@ -32,6 +33,7 @@ export interface CustomMonthsViewProps extends LocaleProps {
     timeCell: (value: number, type: DateType) => string;
     getDateBoundary: (currentDate: moment.Moment) => any;
     mobileUI: boolean;
+    testIdBuilder?: TestIdBuilder;
 }
 export declare class CustomMonthsView extends React.Component<CustomMonthsViewProps> {
     maxDateObject: {

package/lib/components/calendar/MonthsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,7 +26,7 @@ var CustomMonthsView = /** @class */ (function (_super) {
     function CustomMonthsView(props) {
         var _this = _super.call(this, props) || this;
         _this.renderMonth = function (props, month, year, date) {
-            var __ = _this.props.translate;
+            var _a = _this.props, __ = _a.translate, testIdBuilder = _a.testIdBuilder;
             var localMoment = props.viewDate, rest = tslib.__rest(props, ["viewDate"]);
             var monthStr = localMoment.month(month).format(__('MMM'));
             var strLength = 3;
@@ -34,7 +34,7 @@ var CustomMonthsView = /** @class */ (function (_super) {
             // use a fixed string length for consistency
             var monthStrFixedLength = monthStr.substring(0, strLength);
             return (_J$X_("td", tslib.__assign({}, rest),
-                _J$X_("span", null, monthStrFixedLength)));
+                _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()), monthStrFixedLength)));
         };
         _this.onConfirm = function (value, types) {
             _this.props.onConfirm && _this.props.onConfirm(value, ['year', 'month']);
@@ -102,6 +102,7 @@ var CustomMonthsView = /** @class */ (function (_super) {
         return _this;
     }
     CustomMonthsView.prototype.renderMonths = function () {
+        this.props.testIdBuilder;
         var date = this.props.selectedDate; this.props.viewDate.month(); var year = this.props.viewDate.year(), rows = [], i = 0, months = [], renderer = this.props.renderMonth || this.renderMonth, isValid = this.props.isValidDate || this.alwaysValidDate, classes, props, currentMonth, isDisabled, noOfDaysInMonth, daysInMonth, validDay, 
         // Date is irrelevant because we're only interested in month
         irrelevantDate = 1;
@@ -163,6 +164,7 @@ var CustomMonthsView = /** @class */ (function (_super) {
     };
     CustomMonthsView.prototype.render = function () {
         var __ = this.props.translate;
+        var testIdBuilder = this.props.testIdBuilder;
         var showYearHead = !/^mm$/i.test(this.props.inputFormat || '') && !this.props.hideHeader;
         var canClick = /yy/i.test(this.props.inputFormat || '');
         if (this.props.mobileUI) {
@@ -172,9 +174,9 @@ var CustomMonthsView = /** @class */ (function (_super) {
             showYearHead && (_J$X_("table", { className: "headerTable" },
                 _J$X_("thead", null,
                     _J$X_("tr", null,
-                        _J$X_("th", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, "\u00AB"),
-                        canClick ? (_J$X_("th", { className: "rdtSwitch", onClick: this.props.showView('years') }, this.props.viewDate.format(__('dateformat.year')))) : (_J$X_("th", { className: "rdtSwitch" }, this.props.viewDate.format(__('dateformat.year')))),
-                        _J$X_("th", { className: "rdtNext", onClick: this.props.addTime(1, 'years') }, "\u00BB"))))),
+                        _J$X_("th", tslib.__assign({ className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('prev-year').getTestId()), "\u00AB"),
+                        canClick ? (_J$X_("th", tslib.__assign({ className: "rdtSwitch", onClick: this.props.showView('years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('switch-year').getTestId()), this.props.viewDate.format(__('dateformat.year')))) : (_J$X_("th", { className: "rdtSwitch" }, this.props.viewDate.format(__('dateformat.year')))),
+                        _J$X_("th", tslib.__assign({ className: "rdtNext", onClick: this.props.addTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('next-year').getTestId()), "\u00BB"))))),
             _J$X_("table", null,
                 _J$X_("tbody", null, this.renderMonths()))));
     };

package/lib/components/calendar/QuartersView.d.ts

@@ -2,6 +2,7 @@
 import moment from 'moment';
 import React from 'react';
 import { LocaleProps, ThemeProps } from 'amis-core';
+import type { TestIdBuilder } from 'amis-core';
 export interface QuarterViewProps extends LocaleProps, ThemeProps {
     viewDate: moment.Moment;
     selectedDate: moment.Moment;
@@ -17,6 +18,7 @@ export interface QuarterViewProps extends LocaleProps, ThemeProps {
     hideHeader?: boolean;
     onConfirm?: (value: number[], types?: string[]) => void;
     onClose?: () => void;
+    testIdBuilder?: TestIdBuilder;
 }
 export declare class QuarterView extends React.Component<QuarterViewProps> {
     state: {

package/lib/components/calendar/QuartersView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -30,8 +30,9 @@ var QuarterView = /** @class */ (function (_super) {
             pickerValue: [_this.props.viewDate.year(), _this.props.viewDate.quarter()]
         };
         _this.renderQuarter = function (props, quartar, year, date) {
+            var testIdBuilder = _this.props.testIdBuilder;
             return (_J$X_("td", tslib.__assign({}, props),
-                _J$X_("span", null,
+                _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()),
                     "Q",
                     quartar)));
         };
@@ -47,7 +48,7 @@ var QuarterView = /** @class */ (function (_super) {
         return _this;
     }
     QuarterView.prototype.renderYear = function () {
-        var __ = this.props.translate;
+        var _a = this.props, __ = _a.translate, testIdBuilder = _a.testIdBuilder;
         var showYearHead = !/^mm$/i.test(this.props.inputFormat || '');
         if (!showYearHead) {
             return null;
@@ -56,9 +57,9 @@ var QuarterView = /** @class */ (function (_super) {
         return (_J$X_("table", null,
             _J$X_("thead", null,
                 _J$X_("tr", null,
-                    _J$X_("th", { className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, "\u00AB"),
-                    canClick ? (_J$X_("th", { className: "rdtSwitch", onClick: this.props.showView('years') }, this.props.viewDate.format(__('dateformat.year')))) : (_J$X_("th", { className: "rdtSwitch" }, this.props.viewDate.format(__('dateformat.year')))),
-                    _J$X_("th", { className: "rdtNext", onClick: this.props.addTime(1, 'years') }, "\u00BB")))));
+                    _J$X_("th", tslib.__assign({ className: "rdtPrev", onClick: this.props.subtractTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('prev-year').getTestId()), "\u00AB"),
+                    canClick ? (_J$X_("th", tslib.__assign({ className: "rdtSwitch", onClick: this.props.showView('years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('switch-year').getTestId()), this.props.viewDate.format(__('dateformat.year')))) : (_J$X_("th", { className: "rdtSwitch" }, this.props.viewDate.format(__('dateformat.year')))),
+                    _J$X_("th", tslib.__assign({ className: "rdtNext", onClick: this.props.addTime(1, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('next-year').getTestId()), "\u00BB")))));
     };
     QuarterView.prototype.renderQuarters = function () {
         var date = this.props.selectedDate, quarter = this.props.viewDate.quarter(), year = this.props.viewDate.year(), rows = [], i = 1, quarters = [], renderer = this.props.renderQuarter || this.renderQuarter, isValid = this.props.isValidDate || this.alwaysValidDate, classes, props, isDisabled;

package/lib/components/calendar/TimeView.d.ts

@@ -2,6 +2,7 @@
 import moment from 'moment';
 import React from 'react';
 import { LocaleProps, ClassNamesFn } from 'amis-core';
+import type { TestIdBuilder } from 'amis-core';
 interface CustomTimeViewProps extends LocaleProps {
     viewDate: moment.Moment;
     selectedDate: moment.Moment;
@@ -26,6 +27,7 @@ interface CustomTimeViewProps extends LocaleProps {
     onChange: (value: moment.Moment) => void;
     timeConstraints?: any;
     timeRangeHeader?: string;
+    testIdBuilder?: TestIdBuilder;
 }
 interface CustomTimeViewState {
     daypart: any;

package/lib/components/calendar/TimeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -497,7 +497,7 @@ var CustomTimeView = /** @class */ (function (_super) {
     };
     CustomTimeView.prototype.render = function () {
         var _this = this;
-        var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate, cx = _a.classnames, timeRangeHeader = _a.timeRangeHeader, mobileUI = _a.mobileUI;
+        var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate, cx = _a.classnames, timeRangeHeader = _a.timeRangeHeader, mobileUI = _a.mobileUI, testIdBuilder = _a.testIdBuilder;
         var __ = this.props.translate;
         var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
         var inputs = [];
@@ -530,22 +530,23 @@ var CustomTimeView = /** @class */ (function (_super) {
                             return _this.setTime(type, Math.max(min_2, Math.min(parseInt(e.currentTarget.value.replace(/\D/g, ''), 10) || 0, max_2)));
                         }
                     });
+                    var itemTIB = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(type);
                     return (_J$X_("div", { className: cx('CalendarInputWrapper') },
                         _J$X_("div", { className: cx('CalendarInput-sugs', type === 'hours'
                                 ? 'CalendarInput-sugsHours'
                                 : 'CalendarInput-sugsTimes'), id: "".concat(_this.state.uniqueTag, "-").concat(i, "-input") }, options_1.map(function (option) {
                             var _a;
-                            return (_J$X_("div", { key: option.value, className: cx('CalendarInput-sugsItem', {
+                            return (_J$X_("div", tslib.__assign({ key: option.value, className: cx('CalendarInput-sugsItem', {
                                     'is-mobile': mobileUI,
                                     'is-highlight': selectedDate
                                         ? option.value === date.format(formatMap_1[type])
                                         : option.value === ((_a = options_1 === null || options_1 === void 0 ? void 0 : options_1[0]) === null || _a === void 0 ? void 0 : _a.value) &&
                                             !mobileUI
-                                }), onClick: function () {
+                                }) }, itemTIB === null || itemTIB === void 0 ? void 0 : itemTIB.getChild(option.value).getTestId(), { onClick: function () {
                                     _this.setTime(type, parseInt(option.value, 10));
                                     _this.scrollToTop(type, parseInt(option.value, 10), i);
                                     closeMenu();
-                                } }, option.value));
+                                } }), option.value));
                         }))));
                 }));
                 inputs.push(_J$X_("span", { key: i + 'divider' }));
@@ -553,14 +554,14 @@ var CustomTimeView = /** @class */ (function (_super) {
         });
         inputs.length && inputs.pop();
         var quickLists = [
-            _J$X_("a", { key: "select-now", onClick: this.selectNowTime }, __('TimeNow'))
+            _J$X_("a", tslib.__assign({ key: "select-now", onClick: this.selectNowTime }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('select-now').getTestId()), __('TimeNow'))
         ];
         return (_J$X_(React__default["default"].Fragment, null,
             _J$X_("div", { className: cx(timeRangeHeader ? 'TimeRangeHeaderWrapper' : null) }, timeRangeHeader),
             _J$X_("div", { className: cx('TimeContentWrapper') }, inputs),
             this.props.requiredConfirm && (_J$X_("div", { className: cx('TimeFooterWrapper') },
                 _J$X_("div", { className: cx('QuickWrapper') }, quickLists),
-                _J$X_("a", { className: cx('Button', 'Button--primary', 'Button--size-sm'), onClick: this.confirm }, __('confirm'))))));
+                _J$X_("a", tslib.__assign({ className: cx('Button', 'Button--primary', 'Button--size-sm'), onClick: this.confirm }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('confirm').getTestId()), __('confirm'))))));
     };
     CustomTimeView.defaultProps = {
         showToolbar: true

package/lib/components/calendar/YearsView.d.ts

@@ -2,6 +2,7 @@
 import moment from 'moment';
 import React from 'react';
 import { LocaleProps } from 'amis-core';
+import type { TestIdBuilder } from 'amis-core';
 interface CustomYearsViewProps extends LocaleProps {
     viewDate: moment.Moment;
     selectedDate: moment.Moment;
@@ -19,6 +20,7 @@ interface CustomYearsViewProps extends LocaleProps {
     renderYear?: (props: any, year: number) => JSX.Element;
     updateSelectedDate: (event: React.MouseEvent<any>, close?: boolean) => void;
     isValidDate?: (currentDate: moment.Moment, selected?: moment.Moment) => boolean;
+    testIdBuilder?: TestIdBuilder;
 }
 export declare class CustomYearsView extends React.Component<CustomYearsViewProps> {
     state: {

package/lib/components/calendar/YearsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,8 +26,9 @@ var CustomYearsView = /** @class */ (function (_super) {
     function CustomYearsView(props) {
         var _this = _super.call(this, props) || this;
         _this.renderYear = function (props, year, date) {
+            var testIdBuilder = _this.props.testIdBuilder;
             return (_J$X_("td", tslib.__assign({}, props),
-                _J$X_("span", null, year)));
+                _J$X_("span", tslib.__assign({}, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(props.key).getTestId()), year)));
         };
         _this.onConfirm = function (value) {
             _this.props.onConfirm && _this.props.onConfirm(value, ['year']);
@@ -112,7 +113,7 @@ var CustomYearsView = /** @class */ (function (_super) {
     CustomYearsView.prototype.render = function () {
         var year = this.props.viewDate.year();
         year = year - (year % 10);
-        var __ = this.props.translate;
+        var _a = this.props, testIdBuilder = _a.testIdBuilder, __ = _a.translate;
         if (this.props.mobileUI) {
             return _J$X_("div", { className: "rdtYears" }, this.renderYearPicker());
         }
@@ -120,9 +121,9 @@ var CustomYearsView = /** @class */ (function (_super) {
             _J$X_("table", { className: "headerTable" },
                 _J$X_("thead", null,
                     _J$X_("tr", null,
-                        _J$X_("th", { className: "rdtPrev", onClick: this.props.subtractTime(10, 'years') }, "\u00AB"),
+                        _J$X_("th", tslib.__assign({ className: "rdtPrev", onClick: this.props.subtractTime(10, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('prev-year').getTestId()), "\u00AB"),
                         _J$X_("th", { className: "rdtSwitch" }, __('year-to-year', { from: year, to: year + 9 })),
-                        _J$X_("th", { className: "rdtNext", onClick: this.props.addTime(10, 'years') }, "\u00BB")))),
+                        _J$X_("th", tslib.__assign({ className: "rdtNext", onClick: this.props.addTime(10, 'years') }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild('next-year').getTestId()), "\u00BB")))),
             _J$X_("table", null,
                 _J$X_("tbody", null, this.renderYears(year)))));
     };

package/lib/components/condition-builder/Expression.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/Field.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/Func.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/GroupOrItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/InputSwitch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/Value.d.ts

@@ -16,6 +16,7 @@ export interface ValueProps extends ThemeProps, LocaleProps {
     renderEtrValue?: any;
 }
 export declare class Value extends React.Component<ValueProps> {
+    renderCustomValue(props: any): any;
     render(): React.JSX.Element;
 }
 declare const _default: {

package/lib/components/condition-builder/Value.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -29,19 +29,32 @@ var Value = /** @class */ (function (_super) {
     function Value() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    Value.prototype.renderCustomValue = function (props) {
+        var _a = this.props, renderEtrValue = _a.renderEtrValue, data = _a.data, cx = _a.classnames;
+        var field = props.inputSettings;
+        return renderEtrValue
+            ? renderEtrValue(tslib.__assign(tslib.__assign({}, field.value), { name: 'TMP_WHATEVER_NAME' }), // name 随便输入，应该是 value 传入的为主，目前表单项内部逻辑还有问题先传一个 name
+            {
+                data: data,
+                onChange: props.onChange,
+                value: props.value,
+                inputClassName: cx(field.className, props.className)
+            })
+            : null;
+    };
     Value.prototype.render = function () {
         var _a;
-        var _b = this.props, cx = _b.classnames, field = _b.field, value = _b.value, onChange = _b.onChange, op = _b.op, __ = _b.translate, data = _b.data, disabled = _b.disabled, formula = _b.formula, popOverContainer = _b.popOverContainer, renderEtrValue = _b.renderEtrValue, mobileUI = _b.mobileUI;
+        var _b = this.props, cx = _b.classnames, field = _b.field, value = _b.value, onChange = _b.onChange, op = _b.op, __ = _b.translate, data = _b.data, disabled = _b.disabled, formula = _b.formula, popOverContainer = _b.popOverContainer, mobileUI = _b.mobileUI;
         var input = undefined;
         if (formula) {
             // 如果配置了 formula 字段，则所有的输入变为 formula 形式
             formula = tslib.__assign(tslib.__assign({}, formula), { translate: __, classnames: cx, data: data, value: value !== null && value !== void 0 ? value : field.defaultValue, onChange: onChange, disabled: disabled });
-            var inputSettings = field.type !== 'custom' && (formula === null || formula === void 0 ? void 0 : formula.inputSettings)
+            var inputSettings = (formula === null || formula === void 0 ? void 0 : formula.inputSettings)
                 ? tslib.__assign(tslib.__assign(tslib.__assign({}, formula === null || formula === void 0 ? void 0 : formula.inputSettings), field), { multiple: field.type === 'select' &&
                         op &&
                         typeof op === 'string' &&
                         ['select_any_in', 'select_not_any_in'].includes(op) }) : undefined;
-            input = _J$X_(Picker.FormulaPicker, tslib.__assign({}, formula, { inputSettings: inputSettings }));
+            input = (_J$X_(Picker.FormulaPicker, tslib.__assign({}, formula, { inputSettings: inputSettings, customInputRender: this.renderCustomValue })));
         }
         else if (field.type === 'text') {
             input = (_J$X_(InputBox["default"], { value: value !== null && value !== void 0 ? value : field.defaultValue, onChange: onChange, placeholder: __(field.placeholder), disabled: disabled, mobileUI: mobileUI }));
@@ -66,17 +79,20 @@ var Value = /** @class */ (function (_super) {
             input = (_J$X_(Switch["default"], { value: value !== null && value !== void 0 ? value : field.defaultValue, onChange: onChange, disabled: disabled }));
         }
         else if (field.type === 'custom') {
-            input = renderEtrValue
-                ? renderEtrValue(tslib.__assign(tslib.__assign({}, field.value), { name: 'TMP_WHATEVER_NAME' }), // name 随便输入，应该是 value 传入的为主，目前表单项内部逻辑还有问题先传一个 name
-                {
-                    data: data,
-                    onChange: onChange,
-                    value: value !== null && value !== void 0 ? value : field.defaultValue
-                })
-                : null;
+            input = this.renderCustomValue({
+                value: value !== null && value !== void 0 ? value : field.defaultValue,
+                onChange: onChange,
+                inputSettings: field
+            });
         }
         return _J$X_("div", { className: cx('CBValue') }, input);
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Value.prototype, "renderCustomValue", null);
     return Value;
 }(React__default["default"].Component));
 var Value$1 = amisCore.themeable(amisCore.localeable(Value));

package/lib/components/condition-builder/config.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/condition-builder/index.d.ts

@@ -43,7 +43,7 @@ export interface ConditionBuilderState {
 }
 export declare class QueryBuilder extends React.Component<ConditionBuilderProps, ConditionBuilderState> {
     config: {
-        valueTypes?: ("value" | "func" | "field")[] | undefined;
+        valueTypes?: ("value" | "field" | "func")[] | undefined;
         fields?: ConditionBuilderFields | undefined;
         funcs?: ConditionBuilderFuncs | undefined;
         maxLevel?: number | undefined;

package/lib/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.2.2
+ * amis-ui v6.4.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/formula/CodeEditor.d.ts

@@ -0,0 +1,92 @@
+/// <reference types="hoist-non-react-statics" />
+import { ThemeProps } from 'amis-core';
+import React from 'react';
+import { CodeMirrorEditorProps } from '../CodeMirror';
+import { FormulaPlugin } from './plugin';
+import type CodeMirror from 'codemirror';
+export interface VariableItem {
+    label: string;
+    value?: string;
+    path?: string;
+    children?: Array<VariableItem>;
+    type?: string;
+    tag?: string;
+    selectMode?: 'tree' | 'tabs';
+    isMember?: boolean;
+}
+export interface FuncGroup {
+    groupName: string;
+    items: Array<FuncItem>;
+}
+export interface FuncItem {
+    name: string;
+    example?: string;
+    description?: string;
+    [propName: string]: any;
+}
+export interface CodeEditorProps extends ThemeProps, Omit<CodeMirrorEditorProps, 'style' | 'editorFactory' | 'editorDidMount'> {
+    readOnly?: boolean;
+    /**
+     * 是否为单行模式，默认为 false
+     */
+    singleLine?: boolean;
+    /**
+     * evalMode 即直接就是表达式，否则
+     * 需要 ${这里面才是表达式}
+     * 默认为 true
+     */
+    evalMode?: boolean;
+    autoFocus?: boolean;
+    editorTheme?: 'dark' | 'light';
+    editorOptions?: any;
+    /**
+     * expression 即高亮表达式整体
+     * formula 即高亮表达式内部
+     */
+    highlightMode?: 'expression' | 'formula';
+    /**
+     * 用于提示的变量集合，默认为空
+     */
+    variables?: Array<VariableItem>;
+    /**
+     * 函数集合，默认不需要传，即  amis-formula 里面那个函数
+     * 如果有扩充，则需要传。
+     */
+    functions?: Array<FuncGroup>;
+    placeholder?: string;
+    editorDidMount?: (cm: typeof CodeMirror, editor: CodeMirror.Editor, plugin: FormulaPlugin) => void;
+}
+declare const _default: {
+    new (props: Omit<CodeEditorProps & React.RefAttributes<unknown>, 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<CodeEditorProps & React.RefAttributes<unknown>, 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<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, 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<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<CodeEditorProps & React.RefAttributes<unknown>, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<React.ForwardRefExoticComponent<CodeEditorProps & React.RefAttributes<unknown>>>;
+} & import("hoist-non-react-statics").NonReactStatics<React.ForwardRefExoticComponent<CodeEditorProps & React.RefAttributes<unknown>>, {}> & {
+    ComposedComponent: React.ForwardRefExoticComponent<CodeEditorProps & React.RefAttributes<unknown>>;
+};
+export default _default;