amis-ui 6.0.0 → 6.2.0

package/esm/components/formula/Picker.js

@@ -1,10 +1,10 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __awaiter, __generator, __assign, __rest, __read, __decorate, __metadata } from 'tslib';
-import { parse, noop, autobind, themeable, localeable, uncontrollable, isExpression, resolveVariableAndFilterForAsync } from 'amis-core';
+import { anyChanged, parse, noop, autobind, themeable, localeable, uncontrollable, isExpression, resolveVariableAndFilterForAsync } from 'amis-core';
 import React__default from 'react';
 import Editor, { FormulaEditor } from './Editor.js';
 import ResultBox from '../ResultBox.js';
@@ -37,14 +37,63 @@ var FormulaPicker = /** @class */ (function (_super) {
         };
         return _this;
     }
+    FormulaPicker.prototype.componentDidMount = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, variables, data, list, result;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, variables = _a.variables, data = _a.data;
+                        if (!(typeof variables === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, variables(this.props)];
+                    case 1:
+                        list = _b.sent();
+                        this.setState({ variables: list });
+                        return [3 /*break*/, 4];
+                    case 2:
+                        if (!(typeof variables === 'string' && isExpression(variables))) return [3 /*break*/, 4];
+                        return [4 /*yield*/, resolveVariableAndFilterForAsync(variables, data, '|raw')];
+                    case 3:
+                        result = _b.sent();
+                        this.setState({ variables: result });
+                        _b.label = 4;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     FormulaPicker.prototype.componentDidUpdate = function (prevProps) {
-        var value = this.props.value;
-        if (value !== prevProps.value) {
-            this.setState({
-                value: typeof value === 'string' || !this.isTextInput() ? value : '',
-                editorValue: this.value2EditorValue(this.props)
+        return __awaiter(this, void 0, void 0, function () {
+            var value, _a, variables, data, list, result;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        value = this.props.value;
+                        if (value !== prevProps.value) {
+                            this.setState({
+                                value: typeof value === 'string' || !this.isTextInput() ? value : '',
+                                editorValue: this.value2EditorValue(this.props)
+                            });
+                        }
+                        if (!anyChanged(['variables', 'data'], this.props, prevProps)) return [3 /*break*/, 4];
+                        _a = this.props, variables = _a.variables, data = _a.data;
+                        if (!(typeof variables === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, variables(this.props)];
+                    case 1:
+                        list = _b.sent();
+                        this.setState({ variables: list });
+                        return [3 /*break*/, 4];
+                    case 2:
+                        if (!(typeof variables === 'string' && isExpression(variables))) return [3 /*break*/, 4];
+                        return [4 /*yield*/, resolveVariableAndFilterForAsync(variables, data, '|raw')];
+                    case 3:
+                        result = _b.sent();
+                        this.setState({ variables: result });
+                        _b.label = 4;
+                    case 4: return [2 /*return*/];
+                }
             });
-        }
+        });
     };
     FormulaPicker.prototype.value2EditorValue = function (props) {
         var value = props.value;
@@ -150,28 +199,14 @@ var FormulaPicker = /** @class */ (function (_super) {
     FormulaPicker.prototype.handleClick = function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var _c, variables, data, list, result, state, _d;
+            var _c, state, _d;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        _c = this.props, variables = _c.variables, data = _c.data;
-                        if (!(typeof variables === 'function')) return [3 /*break*/, 2];
-                        return [4 /*yield*/, variables(this.props)];
-                    case 1:
-                        list = _e.sent();
-                        this.setState({ variables: list });
-                        return [3 /*break*/, 4];
-                    case 2:
-                        if (!(typeof variables === 'string' && isExpression(variables))) return [3 /*break*/, 4];
-                        return [4 /*yield*/, resolveVariableAndFilterForAsync(variables, data, '|raw')];
-                    case 3:
-                        result = _e.sent();
-                        this.setState({ variables: result });
-                        _e.label = 4;
-                    case 4:
+                        _c = this.props, _c.variables, _c.data;
                         _d = [{}];
                         return [4 /*yield*/, ((_b = (_a = this.props).onPickerOpen) === null || _b === void 0 ? void 0 : _b.call(_a, this.props))];
-                    case 5:
+                    case 1:
                         state = __assign.apply(void 0, [__assign.apply(void 0, _d.concat([(_e.sent())])), { editorValue: this.value2EditorValue(this.props), isOpened: true }]);
                         this.setState(state);
                         return [2 /*return*/];

package/esm/components/formula/VariableList.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __read, __assign } from 'tslib';

package/esm/components/formula/plugin.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign, __read } from 'tslib';

package/esm/components/icons.d.ts

@@ -51,7 +51,7 @@ export interface IconCheckedSchemaNew {
     type: 'icon';
     icon: IconCheckedSchema;
 }
-export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, onMouseEnter, onMouseLeave, style }: {
+export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, onMouseEnter, onMouseLeave, onMouseOver, onMouseOut, onMouseDown, onMouseUp, onMouseMove, onBlur, onFocus, onTouchStart, onTouchMove, onTouchEnd, onTouchCancel, style }: {
     icon: string;
     iconContent?: string;
 } & React.ComponentProps<any>): React.JSX.Element | null;

package/esm/components/icons.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';
@@ -258,7 +258,7 @@ registerIcon('scale-origin', SvgScaleOrigin);
 registerIcon('if', SvgIf);
 function Icon(_a) {
     var _b;
-    var icon = _a.icon, className = _a.className, _c = _a.classPrefix, classPrefix = _c === void 0 ? '' : _c, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, _d = _a.onClick, onClick = _d === void 0 ? function () { } : _d, _e = _a.onMouseEnter, onMouseEnter = _e === void 0 ? function () { } : _e, _f = _a.onMouseLeave, onMouseLeave = _f === void 0 ? function () { } : _f, style = _a.style;
+    var icon = _a.icon, className = _a.className, _c = _a.classPrefix, classPrefix = _c === void 0 ? '' : _c, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, onClick = _a.onClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, onMouseOver = _a.onMouseOver, onMouseOut = _a.onMouseOut, onMouseDown = _a.onMouseDown, onMouseUp = _a.onMouseUp, onMouseMove = _a.onMouseMove, onBlur = _a.onBlur, onFocus = _a.onFocus, onTouchStart = _a.onTouchStart, onTouchMove = _a.onTouchMove, onTouchEnd = _a.onTouchEnd, onTouchCancel = _a.onTouchCancel, style = _a.style;
     var cx$1 = iconCx || cx;
     if (typeof jest !== 'undefined' && icon) {
         iconContent = '';
@@ -266,9 +266,26 @@ function Icon(_a) {
     if (!icon) {
         return null;
     }
+    // 支持的事件
+    var events = {
+        onClick: onClick,
+        onMouseEnter: onMouseEnter,
+        onMouseLeave: onMouseLeave,
+        onMouseOver: onMouseOver,
+        onMouseOut: onMouseOut,
+        onMouseDown: onMouseDown,
+        onMouseUp: onMouseUp,
+        onMouseMove: onMouseMove,
+        onBlur: onBlur,
+        onFocus: onFocus,
+        onTouchStart: onTouchStart,
+        onTouchMove: onTouchMove,
+        onTouchEnd: onTouchEnd,
+        onTouchCancel: onTouchCancel
+    };
     // 直接的icon dom
     if (React__default.isValidElement(icon)) {
-        return React__default.cloneElement(icon, __assign(__assign({}, (icon.props || {})), { className: cx(cx$1(className, classNameProp), icon.props.className), style: style, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }));
+        return React__default.cloneElement(icon, __assign(__assign(__assign({}, events), (icon.props || {})), { className: cx(cx$1(className, classNameProp), icon.props.className), style: style }));
     }
     if (iconContent) {
         // 从css变量中获取icon
@@ -288,14 +305,14 @@ function Icon(_a) {
                 }
             }
         };
-        return (React__default.createElement("div", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style }));
+        return (React__default.createElement("div", __assign({}, events, { className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style })));
     }
     // 获取注册的icon
     var Component = getIcon(icon);
     if (Component) {
-        return (React__default.createElement(Component, { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(className, "icon-".concat(icon), classNameProp), 
+        return (React__default.createElement(Component, __assign({}, events, { className: cx$1(className, "icon-".concat(icon), classNameProp), 
             // @ts-ignore
-            icon: icon, style: style }));
+            icon: icon, style: style })));
     }
     // 符合schema的icon
     if (isObject(icon) &&
@@ -314,28 +331,20 @@ function Icon(_a) {
             icon = (_b = svg.svg) === null || _b === void 0 ? void 0 : _b.replace(/'/g, '');
         }
         else {
-            return (React__default.createElement("svg", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1('icon', 'icon-object', className, classNameProp), style: style },
+            return (React__default.createElement("svg", __assign({}, events, { className: cx$1('icon', 'icon-object', className, classNameProp), style: style }),
                 React__default.createElement("use", { xlinkHref: '#' + id })));
         }
     }
     // 直接传入svg字符串
     if (typeof icon === 'string' && icon.startsWith('<svg')) {
         var svgStr = /<svg .*?>(.*?)<\/svg>/.exec(icon);
-        var svgHTML = createElement('svg', {
-            onClick: onClick,
-            onMouseEnter: onMouseEnter,
-            onMouseLeave: onMouseLeave,
-            className: cx$1('icon', className, classNameProp),
-            style: style,
-            dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' },
-            viewBox: '0 0 16 16'
-        });
+        var svgHTML = createElement('svg', __assign(__assign({}, events), { className: cx$1('icon', className, classNameProp), style: style, dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' }, viewBox: '0 0 16 16' }));
         return svgHTML;
     }
     // icon是链接
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
     if (isURLIcon) {
-        return (React__default.createElement("img", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style }));
+        return (React__default.createElement("img", __assign({}, events, { className: cx$1("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style })));
     }
     // icon是普通字符串
     var isIconfont = typeof icon === 'string';
@@ -352,7 +361,7 @@ function Icon(_a) {
         iconPrefix = icon;
     }
     if (isIconfont) {
-        return (React__default.createElement("i", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(icon, className, classNameProp, iconPrefix), style: style }));
+        return (React__default.createElement("i", __assign({}, events, { className: cx$1(icon, className, classNameProp, iconPrefix), style: style })));
     }
     // 没有合适的图标
     return React__default.createElement("span", { className: "text-danger" },

package/esm/components/json-schema/Array.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __read, __assign } from 'tslib';

package/esm/components/json-schema/Item.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/components/json-schema/Object.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __values, __read, __assign } from 'tslib';

package/esm/components/json-schema/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __assign } from 'tslib';

package/esm/components/menu/MenuContext.js

@@ -1,6 +1,6 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { createContext } from 'react';

package/esm/components/menu/MenuItem.d.ts

@@ -20,6 +20,7 @@ export interface MenuItemProps extends Omit<NavigationItem, 'children'>, RcMenuI
     tooltipContainer?: HTMLElement | (() => HTMLElement);
     tooltipTrigger?: Trigger | Array<Trigger>;
     renderLink: Function;
+    testid?: string;
     extra?: React.ReactNode;
 }
 export declare class MenuItem extends React.Component<MenuItemProps> {

package/esm/components/menu/MenuItem.js

@@ -1,13 +1,13 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign } from 'tslib';
 import React__default from 'react';
 import pick from 'lodash/pick';
 import { Item } from 'rc-menu';
-import { createObject, themeable } from 'amis-core';
+import { createObject, buildTestId, themeable } from 'amis-core';
 import { Badge } from '../Badge.js';
 import { getIcon } from '../icons.js';
 import TooltipWrapper from '../TooltipWrapper.js';
@@ -51,7 +51,7 @@ var MenuItem = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var _e, _f;
         var _g = this.context, collapsed = _g.collapsed, draggable = _g.draggable, stacked = _g.stacked, mode = _g.mode, onDragStart = _g.onDragStart;
-        var _h = this.props, cx = _h.classnames, icon = _h.icon, label = _h.label, labelExtra = _h.labelExtra, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, renderLink = _h.renderLink, extra = _h.extra, disabled = _h.disabled, id = _h.id, defaultData = _h.data;
+        var _h = this.props, cx = _h.classnames, icon = _h.icon, label = _h.label, labelExtra = _h.labelExtra, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, renderLink = _h.renderLink, extra = _h.extra, disabled = _h.disabled, testid = _h.testid, id = _h.id, defaultData = _h.data;
         var isCollapsedNode = collapsed && depth === 1;
         var iconNode = icon ? (typeof icon === 'string' ? (this.isImgPath(icon) ? (React__default.createElement("div", { className: cx("Nav-Menu-item-icon") },
             React__default.createElement("img", { width: "14px", src: icon }))) : (React__default.createElement("i", { className: cx("Nav-Menu-item-icon", icon, (_a = {},
@@ -77,7 +77,7 @@ var MenuItem = /** @class */ (function (_super) {
         return (React__default.createElement("div", { className: cx('Nav-Menu-item-wrap') },
             React__default.createElement(Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
                     ? __assign(__assign({}, badge), { className: badgeClassName }) : null, data: createObject(defaultData, link) },
-                React__default.createElement("a", { className: cx('Nav-Menu-item-link'), title: typeof (link === null || link === void 0 ? void 0 : link.label) === 'string' ? link === null || link === void 0 ? void 0 : link.label : undefined, "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, isCollapsedNode ? (React__default.createElement(React__default.Fragment, null, iconNode || labelNode)) : (React__default.createElement(React__default.Fragment, null,
+                React__default.createElement("a", __assign({ className: cx('Nav-Menu-item-link'), title: typeof (link === null || link === void 0 ? void 0 : link.label) === 'string' ? link === null || link === void 0 ? void 0 : link.label : undefined, "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, buildTestId(testid, link)), isCollapsedNode ? (React__default.createElement(React__default.Fragment, null, iconNode || labelNode)) : (React__default.createElement(React__default.Fragment, null,
                     dragNode,
                     iconNode,
                     labelNode,

package/esm/components/menu/SubMenu.d.ts

@@ -54,7 +54,6 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        /** 检查icon参数值是否为文件路径 */
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<SubMenuProps, keyof import("amis-core").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<SubMenuProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOuterProps>;

package/esm/components/menu/SubMenu.js

@@ -1,13 +1,13 @@
 /**
- * amis-ui v6.0.0
- * Copyright 2018-2023 fex
+ * amis-ui v6.2.0
+ * Copyright 2018-2024 fex
  */
 
 import { __extends, __assign, __decorate, __metadata } from 'tslib';
 import React__default from 'react';
 import pick from 'lodash/pick';
 import { SubMenu as SubMenu$2 } from 'rc-menu';
-import { createObject, autobind, themeable } from 'amis-core';
+import { createObject, buildTestId, autobind, themeable } from 'amis-core';
 import { getIcon, Icon } from '../icons.js';
 import { Badge } from '../Badge.js';
 import { MenuContext } from './MenuContext.js';
@@ -63,7 +63,7 @@ var SubMenu = /** @class */ (function (_super) {
         var _a, _b, _c, _d;
         var _e, _f;
         var _g = this.context, collapsed = _g.collapsed, stacked = _g.stacked, mode = _g.mode, draggable = _g.draggable, onDragStart = _g.onDragStart;
-        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, labelExtra = _h.labelExtra, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, renderLink = _h.renderLink;
+        var _h = this.props, cx = _h.classnames, id = _h.id, label = _h.label, labelExtra = _h.labelExtra, icon = _h.icon, path = _h.path, depth = _h.depth, badge = _h.badge, badgeClassName = _h.badgeClassName, disabled = _h.disabled, defaultData = _h.data, extra = _h.extra, testid = _h.testid, renderLink = _h.renderLink;
         var isCollapsedNode = collapsed && depth === 1;
         var link = renderLink && typeof renderLink === 'function'
             ? renderLink(this.props)
@@ -99,7 +99,7 @@ var SubMenu = /** @class */ (function (_super) {
         return (React__default.createElement("div", { className: cx('Nav-Menu-item-wrap') },
             React__default.createElement(Badge, { classnames: cx, badge: badge && !isCollapsedNode // 收起模式下 不展示角标
                     ? __assign(__assign({}, badge), { className: badgeClassName }) : null, data: createObject(defaultData, link) },
-                React__default.createElement("a", { className: cx("Nav-Menu-item-link"), "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, renderContent())),
+                React__default.createElement("a", __assign({ className: cx("Nav-Menu-item-link"), "data-id": (link === null || link === void 0 ? void 0 : link.__id) || id, "data-depth": depth, onDragStart: onDragStart === null || onDragStart === void 0 ? void 0 : onDragStart(link) }, buildTestId(testid, link)), renderContent())),
             extra ? (React__default.createElement("div", { className: cx('Nav-Menu-item-extra') }, extra)) : null));
     };
     SubMenu.prototype.render = function () {