amis 2.3.2-beta.1 → 2.4.1-beta.0

package/esm/renderers/Form/Switch.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,6 +7,7 @@ import { __extends, __awaiter, __generator, __decorate, __metadata } from 'tslib
 import React from 'react';
 import { resolveEventData, isObject, generateIcon, autobind, FormItem } from 'amis-core';
 import { Switch } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var SwitchControl = /** @class */ (function (_super) {
     __extends(SwitchControl, _super);
@@ -32,18 +33,34 @@ var SwitchControl = /** @class */ (function (_super) {
             });
         });
     };
-    SwitchControl.prototype.render = function () {
-        var _a = this.props, size = _a.size, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, onText = _a.onText, offText = _a.offText, option = _a.option; _a.onChange; var disabled = _a.disabled, optionAtLeft = _a.optionAtLeft;
+    SwitchControl.prototype.getResult = function () {
+        var _a = this.props, cx = _a.classnames, onText = _a.onText, offText = _a.offText;
         var on = isObject(onText)
             ? generateIcon(cx, onText.icon, 'Switch-icon')
             : onText;
         var off = isObject(offText)
             ? generateIcon(cx, offText.icon, 'Switch-icon')
             : offText;
-        return (React.createElement("div", { className: cx("SwitchControl", className) },
-            optionAtLeft ? (React.createElement("span", { className: cx('Switch-option') }, option)) : null,
-            React.createElement(Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange, size: size }),
-            optionAtLeft ? null : (React.createElement("span", { className: cx('Switch-option') }, option))));
+        return { on: on, off: off };
+    };
+    SwitchControl.prototype.renderBody = function (children) {
+        var _a = this.props, cx = _a.classnames, option = _a.option, optionAtLeft = _a.optionAtLeft;
+        var Option = React.createElement("span", { className: cx('Switch-option') }, option);
+        return (React.createElement(React.Fragment, null,
+            optionAtLeft ? Option : null,
+            children,
+            optionAtLeft ? null : Option));
+    };
+    SwitchControl.prototype.renderStatic = function () {
+        var _a = this.props, value = _a.value, trueValue = _a.trueValue;
+        var _b = this.getResult(), _c = _b.on, on = _c === void 0 ? '开' : _c, _d = _b.off, off = _d === void 0 ? '关' : _d;
+        var body = React.createElement("span", null, value === trueValue ? on : off);
+        return this.renderBody(body);
+    };
+    SwitchControl.prototype.render = function () {
+        var _a = this.props, size = _a.size, className = _a.className, ns = _a.classPrefix, cx = _a.classnames, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue; _a.onChange; var disabled = _a.disabled;
+        var _b = this.getResult(), on = _b.on, off = _b.off;
+        return (React.createElement("div", { className: cx("SwitchControl", className) }, this.renderBody(React.createElement(Switch, { classPrefix: ns, value: value, trueValue: trueValue, falseValue: falseValue, onText: on, offText: off, disabled: disabled, onChange: this.handleChange, size: size }))));
     };
     SwitchControl.defaultProps = {
         trueValue: true,
@@ -56,6 +73,12 @@ var SwitchControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", Promise)
     ], SwitchControl.prototype, "handleChange", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], SwitchControl.prototype, "render", null);
     return SwitchControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/TabsTransfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,6 +9,7 @@ import React from 'react';
 import find from 'lodash/find';
 import { Selection, TabsTransfer, Spinner } from 'amis-ui';
 import { BaseTransferRenderer } from './Transfer.js';
+import { supportStatic } from './StaticHoc.js';
 
 var BaseTabsTransferRenderer = /** @class */ (function (_super) {
     __extends(BaseTabsTransferRenderer, _super);
@@ -231,6 +232,12 @@ var BaseTabsTransferRenderer = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", void 0)
     ], TabsTransferRenderer.prototype, "optionItemRender", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TabsTransferRenderer.prototype, "render", null);
     TabsTransferRenderer = __decorate([
         OptionsControl({
             type: 'tabs-transfer'

package/esm/renderers/Form/TabsTransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -8,6 +8,7 @@ import { resolveEventData, createObject, autobind, OptionsControl } from 'amis-c
 import React from 'react';
 import { Selection, TabsTransferPicker, Spinner } from 'amis-ui';
 import { BaseTabsTransferRenderer } from './TabsTransfer.js';
+import { supportStatic } from './StaticHoc.js';
 
 /** @class */ ((function (_super) {
     __extends(TabsTransferPickerRenderer, _super);
@@ -63,6 +64,12 @@ import { BaseTabsTransferRenderer } from './TabsTransfer.js';
         __metadata("design:paramtypes", [Object, Object]),
         __metadata("design:returntype", void 0)
     ], TabsTransferPickerRenderer.prototype, "optionItemRender", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TabsTransferPickerRenderer.prototype, "render", null);
     TabsTransferPickerRenderer = __decorate([
         OptionsControl({
             type: 'tabs-transfer-picker'

package/esm/renderers/Form/Textarea.d.ts

@@ -63,6 +63,7 @@ export default class TextAreaControl extends React.Component<TextAreaProps, Text
     handleChange(e: React.ChangeEvent<HTMLTextAreaElement>): void;
     handleFocus(e: React.FocusEvent<HTMLTextAreaElement>): void;
     handleBlur(e: React.FocusEvent<HTMLTextAreaElement>): void;
+    renderStatic(displayValue?: string): JSX.Element;
     render(): JSX.Element;
 }
 export declare class TextAreaControlRenderer extends TextAreaControl {

package/esm/renderers/Form/Textarea.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -7,6 +7,7 @@ import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __meta
 import React from 'react';
 import { resolveEventData, autobind, FormItem } from 'amis-core';
 import { Textarea } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var TextAreaControl = /** @class */ (function (_super) {
     __extends(TextAreaControl, _super);
@@ -81,6 +82,15 @@ var TextAreaControl = /** @class */ (function (_super) {
             });
         }); });
     };
+    TextAreaControl.prototype.renderStatic = function (displayValue) {
+        if (displayValue === void 0) { displayValue = '-'; }
+        var _a = this.props, render = _a.render, _b = _a.staticSchema, staticSchema = _b === void 0 ? {} : _b;
+        return render('static-textarea', {
+            type: 'multiline-text',
+            text: displayValue,
+            maxRows: staticSchema.limit || 5
+        }, staticSchema);
+    };
     TextAreaControl.prototype.render = function () {
         var rest = __rest(this.props, []);
         return (React.createElement(Textarea, __assign({}, rest, { onFocus: this.handleFocus, onBlur: this.handleBlur, onChange: this.handleChange })));
@@ -110,6 +120,12 @@ var TextAreaControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], TextAreaControl.prototype, "handleBlur", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TextAreaControl.prototype, "render", null);
     return TextAreaControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/Transfer.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -8,6 +8,7 @@ import React from 'react';
 import find from 'lodash/find';
 import { findTreeIndex, optionValueCompare, getTree, spliceTree, resolveEventData, string2regExp, filterTree, createObject, resolveVariable, autobind, OptionsControl } from 'amis-core';
 import { Selection, ResultList, Transfer, Spinner } from 'amis-ui';
+import { supportStatic } from './StaticHoc.js';
 
 var BaseTransferRenderer = /** @class */ (function (_super) {
     __extends(BaseTransferRenderer, _super);
@@ -138,9 +139,11 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         });
     };
     BaseTransferRenderer.prototype.handleResultSearch = function (term, item) {
-        var valueField = this.props.valueField;
+        var _a = this.props, valueField = _a.valueField, labelField = _a.labelField;
         var regexp = string2regExp(term);
-        return regexp.test(item[valueField || 'value']);
+        var labelTest = item[labelField || 'label'];
+        var valueTest = item[valueField || 'value'];
+        return regexp.test(labelTest) || regexp.test(valueTest);
     };
     BaseTransferRenderer.prototype.optionItemRender = function (option, states) {
         var _a = this.props, menuTpl = _a.menuTpl, render = _a.render, data = _a.data;
@@ -162,8 +165,8 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         return ResultList.itemRender(option, states);
     };
     BaseTransferRenderer.prototype.renderCell = function (column, option, colIndex, rowIndex) {
-        var _a = this.props, render = _a.render, data = _a.data;
-        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text' }, column), {
+        var _a = this.props, render = _a.render, data = _a.data, cx = _a.classnames;
+        return render("cell/".concat(colIndex, "/").concat(rowIndex), __assign({ type: 'text', className: cx({ 'is-invalid': option === null || option === void 0 ? void 0 : option.__unmatched }) }, column), {
             value: resolveVariable(column.name, option),
             data: createObject(data, option)
         });
@@ -268,6 +271,12 @@ var BaseTransferRenderer = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Array]),
         __metadata("design:returntype", void 0)
     ], BaseTransferRenderer.prototype, "onSelectAll", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], BaseTransferRenderer.prototype, "render", null);
     return BaseTransferRenderer;
 }(React.Component));
 // ts 3.9 里面非得这样才不报错，鬼知道为何。

package/esm/renderers/Form/TransferPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -8,6 +8,7 @@ import { resolveEventData, autobind, OptionsControl } from 'amis-core';
 import React from 'react';
 import { TransferPicker, Spinner } from 'amis-ui';
 import { BaseTransferRenderer } from './Transfer.js';
+import { supportStatic } from './StaticHoc.js';
 
 /** @class */ ((function (_super) {
     __extends(TransferPickerRenderer, _super);
@@ -57,6 +58,12 @@ import { BaseTransferRenderer } from './Transfer.js';
         __metadata("design:paramtypes", [String]),
         __metadata("design:returntype", void 0)
     ], TransferPickerRenderer.prototype, "dispatchEvent", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TransferPickerRenderer.prototype, "render", null);
     TransferPickerRenderer = __decorate([
         OptionsControl({
             type: 'transfer-picker'

package/esm/renderers/Form/TreeSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -11,6 +11,7 @@ import { matchSorter } from 'match-sorter';
 import debouce from 'lodash/debounce';
 import find from 'lodash/find';
 import { findDOMNode } from 'react-dom';
+import { supportStatic } from './StaticHoc.js';
 
 var TreeSelectControl = /** @class */ (function (_super) {
     __extends(TreeSelectControl, _super);
@@ -354,6 +355,12 @@ var TreeSelectControl = /** @class */ (function (_super) {
         __metadata("design:paramtypes", [Object]),
         __metadata("design:returntype", void 0)
     ], TreeSelectControl.prototype, "domRef", null);
+    __decorate([
+        supportStatic(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", void 0)
+    ], TreeSelectControl.prototype, "render", null);
     return TreeSelectControl;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/Form/UUID.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Form/UserSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Grid.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Grid2D.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/HBox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/IFrame.d.ts

@@ -39,6 +39,8 @@ export default class IFrame extends React.Component<IFrameProps, object> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: IFrameProps): void;
     componentWillUnmount(): void;
+    /** 校验URL是否合法 */
+    validateURL(url: any): boolean;
     onMessage(e: MessageEvent): void;
     onLoad(): void;
     reload(subpath?: any, query?: any): void;

package/esm/renderers/IFrame.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -37,6 +37,22 @@ var IFrame = /** @class */ (function (_super) {
     IFrame.prototype.componentWillUnmount = function () {
         window.removeEventListener('message', this.onMessage);
     };
+    /** 校验URL是否合法 */
+    IFrame.prototype.validateURL = function (url) {
+        // base64编码格式
+        if (url &&
+            typeof url === 'string' &&
+            /^data:([a-zA-Z0-9]+\/[a-zA-Z0-9]+);base64,.*/.test(url)) {
+            return true;
+        }
+        // HTTP[S]协议
+        if (url &&
+            typeof url === 'string' &&
+            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(url)) {
+            return false;
+        }
+        return true;
+    };
     IFrame.prototype.onMessage = function (e) {
         var _a;
         var _b = this.props, events = _b.events, onAction = _b.onAction, data = _b.data;
@@ -100,9 +116,7 @@ var IFrame = /** @class */ (function (_super) {
         var finalSrc = src
             ? resolveVariableAndFilter(src, data, '| raw')
             : undefined;
-        if (typeof finalSrc === 'string' &&
-            finalSrc &&
-            !/^(\.\/|\.\.\/|\/|https?\:\/\/|\/\/)/.test(finalSrc)) {
+        if (!this.validateURL(finalSrc)) {
             return React.createElement("p", null, __('Iframe.invalid'));
         }
         if (location.protocol === 'https:' &&

package/esm/renderers/Icon.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { RendererProps, IconCheckedSchema } from 'amis-core';
 import { BaseSchema, SchemaTpl } from '../Schema';
 import { BadgeObject } from 'amis-ui';
 /**
@@ -11,7 +11,7 @@ export interface IconSchema extends BaseSchema {
     /**
      * 按钮类型
      */
-    icon: SchemaTpl;
+    icon: SchemaTpl | IconCheckedSchema;
     vendor?: 'iconfont' | 'fa' | '';
     /**
      * 角标
@@ -22,7 +22,7 @@ export interface IconProps extends RendererProps, Omit<IconSchema, 'type' | 'cla
 }
 export declare class Icon extends React.Component<IconProps, object> {
     static defaultProps: Partial<IconProps>;
-    render(): JSX.Element;
+    render(): JSX.Element | undefined;
 }
 export declare class IconRenderer extends Icon {
 }

package/esm/renderers/Icon.js

@@ -1,13 +1,13 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate } from 'tslib';
 import React from 'react';
 import { filter, Renderer } from 'amis-core';
-import { withBadge } from 'amis-ui';
-import { getIcon } from 'amis-ui/lib/components/icons';
+import { getIcon, withBadge } from 'amis-ui';
+import { isObject } from 'lodash';
 
 var Icon = /** @class */ (function (_super) {
     __extends(Icon, _super);
@@ -18,6 +18,15 @@ var Icon = /** @class */ (function (_super) {
         var _a = this.props, vendor = _a.vendor, cx = _a.classnames, className = _a.className, data = _a.data;
         var icon = this.props.icon;
         icon = filter(icon, data);
+        if (typeof icon !== 'string') {
+            if (isObject(icon) &&
+                typeof icon.id === 'string' &&
+                icon.id.startsWith('svg-')) {
+                return (React.createElement("svg", { className: cx('icon', className) },
+                    React.createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
+            }
+            return;
+        }
         var CustomIcon = getIcon(icon);
         if (CustomIcon) {
             return React.createElement(CustomIcon, { className: cx(className, "icon-".concat(icon)) });

package/esm/renderers/Image.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Images.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Json.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Link.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/List.d.ts

@@ -1,16 +1,15 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
-import { SchemaNode, ActionObject } from 'amis-core';
-import { IListStore } from 'amis-core';
+import Sortable from 'sortablejs';
+import { IListStore, RendererProps, SchemaNode, ActionObject } from 'amis-core';
 import { SchemaQuickEdit } from './QuickEdit';
 import { SchemaPopOver } from './PopOver';
-import Sortable from 'sortablejs';
 import { TableCell } from './Table';
 import { SchemaCopyable } from './Copyable';
 import { BaseSchema, SchemaClassName, SchemaCollection, SchemaExpression, SchemaObject, SchemaTokenizeableString, SchemaTpl, SchemaUrlPath } from '../Schema';
 import { ActionSchema } from './Action';
 import { SchemaRemark } from './Remark';
 import type { IItem } from 'amis-core/lib/store/list';
+import type { OnEventProps } from 'amis-core/lib/utils/renderer-event';
 /**
  * 不指定类型默认就是文本
  */
@@ -142,7 +141,7 @@ export interface ListSchema extends BaseSchema {
      */
     itemDraggableOn?: SchemaExpression;
     /**
-     * 点击卡片的时候是否勾选卡片。
+     * 点击列表单行时，是否选择
      */
     checkOnItemClick?: boolean;
     /**
@@ -237,6 +236,8 @@ export interface ListItemProps extends RendererProps, Omit<ListItemSchema, 'type
     checkable?: boolean;
     checkOnItemClick?: boolean;
     itemAction?: ActionSchema;
+    onEvent?: OnEventProps['onEvent'];
+    hasClickActions?: boolean;
 }
 export declare class ListItem extends React.Component<ListItemProps> {
     static defaultProps: Partial<ListItemProps>;

package/esm/renderers/List.js

@@ -1,17 +1,17 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __decorate, __spreadArray, __rest } from 'tslib';
 import React from 'react';
 import { findDOMNode } from 'react-dom';
-import { resolveVariableAndFilter, getScrollParent, anyChanged, isPureVariable, difference, filter, Renderer, ListStore, isClickOnInput, noop, isVisible, isDisabled, resolveVariable } from 'amis-core';
-import { Icon, Button, Spinner, Checkbox } from 'amis-ui';
+import Sortable from 'sortablejs';
 import omit from 'lodash/omit';
+import { Icon, Button, Spinner, Checkbox } from 'amis-ui';
+import { resolveVariableAndFilter, getScrollParent, anyChanged, isPureVariable, createObject, difference, filter, Renderer, ListStore, isClickOnInput, noop, isVisible, isDisabled, resolveVariable } from 'amis-core';
 import { HocQuickEdit } from './QuickEdit.js';
 import { HocPopOver } from './PopOver.js';
-import Sortable from 'sortablejs';
 import './Table/index.js';
 import { HocCopyable } from './Copyable.js';
 import { TableCell } from './Table/TableCell.js';
@@ -150,9 +150,19 @@ var List = /** @class */ (function (_super) {
         return findDOMNode(this);
     };
     List.prototype.handleAction = function (e, action, ctx) {
-        var onAction = this.props.onAction;
-        // todo
-        onAction(e, action, ctx);
+        var _a;
+        var _b = this.props, data = _b.data, dispatchEvent = _b.dispatchEvent, onAction = _b.onAction, onEvent = _b.onEvent;
+        var hasClickActions = onEvent &&
+            Array.isArray((_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.itemClick) === null || _a === void 0 ? void 0 : _a.actions) &&
+            onEvent.itemClick.actions.length > 0;
+        if (hasClickActions) {
+            dispatchEvent('itemClick', createObject(data, {
+                item: ctx
+            }));
+        }
+        else {
+            onAction === null || onAction === void 0 ? void 0 : onAction(e, action, ctx);
+        }
     };
     List.prototype.handleCheck = function (item) {
         item.toggle();
@@ -378,7 +388,11 @@ var List = /** @class */ (function (_super) {
     };
     // editor重写该方法，不要改名或参数
     List.prototype.renderListItem = function (index, template, item, itemClassName) {
-        var _a = this.props, render = _a.render, multiple = _a.multiple, store = _a.store, onAction = _a.onAction, hideCheckToggler = _a.hideCheckToggler, checkOnItemClick = _a.checkOnItemClick, itemAction = _a.itemAction, cx = _a.classnames; _a.translate;
+        var _a;
+        var _b = this.props, render = _b.render, multiple = _b.multiple, store = _b.store; _b.onAction; var onEvent = _b.onEvent, hideCheckToggler = _b.hideCheckToggler, checkOnItemClick = _b.checkOnItemClick, itemAction = _b.itemAction, cx = _b.classnames; _b.translate;
+        var hasClickActions = onEvent &&
+            Array.isArray((_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.itemClick) === null || _a === void 0 ? void 0 : _a.actions) &&
+            onEvent.itemClick.actions.length > 0;
         return render("".concat(index), __assign({ type: 'list-item' }, template), {
             key: item.index,
             className: cx(itemClassName, {
@@ -394,10 +408,11 @@ var List = /** @class */ (function (_super) {
             hideCheckToggler: hideCheckToggler,
             checkOnItemClick: checkOnItemClick,
             itemAction: itemAction,
+            hasClickActions: hasClickActions,
             selected: item.checked,
             onCheck: this.handleCheck,
+            onAction: this.handleAction,
             dragging: store.dragging,
-            onAction: onAction,
             data: item.locals,
             onQuickChange: store.dragging ? null : this.handleQuickChange,
             popOverContainer: this.getPopOverContainer
@@ -482,16 +497,17 @@ var ListItem = /** @class */ (function (_super) {
         if (isClickOnInput(e)) {
             return;
         }
-        var _a = this.props, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item;
-        if (itemAction) {
-            onAction && onAction(e, itemAction, item === null || item === void 0 ? void 0 : item.data);
-            return;
+        var _a = this.props, checkable = _a.checkable, checkOnItemClick = _a.checkOnItemClick, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item, onCheck = _a.onCheck, hasClickActions = _a.hasClickActions;
+        // itemAction和itemClick事件统一交给List处理，itemClick事件会覆盖itemAction
+        onAction === null || onAction === void 0 ? void 0 : onAction(e, hasClickActions ? undefined : itemAction, hasClickActions ? item : item === null || item === void 0 ? void 0 : item.data);
+        // itemAction, itemClick事件和checkOnItemClick为互斥关系
+        if (checkable && checkOnItemClick && !hasClickActions && !itemAction) {
+            onCheck === null || onCheck === void 0 ? void 0 : onCheck(item);
         }
-        this.props.onCheck && this.props.onCheck(item);
     };
     ListItem.prototype.handleCheck = function () {
-        var item = this.props.item;
-        this.props.onCheck && this.props.onCheck(item);
+        var _a = this.props, onCheck = _a.onCheck, item = _a.item;
+        onCheck === null || onCheck === void 0 ? void 0 : onCheck(item);
     };
     ListItem.prototype.handleAction = function (e, action, ctx) {
         var _a = this.props, onAction = _a.onAction, item = _a.item;
@@ -593,15 +609,13 @@ var ListItem = /** @class */ (function (_super) {
         return this.renderChild(body, 'body');
     };
     ListItem.prototype.render = function () {
-        var _a = this.props, className = _a.className, data = _a.data, avatarTpl = _a.avatar, titleTpl = _a.title, titleClassName = _a.titleClassName, subTitleTpl = _a.subTitle, descTpl = _a.desc, avatarClassName = _a.avatarClassName, checkOnItemClick = _a.checkOnItemClick, render = _a.render, checkable = _a.checkable, cx = _a.classnames, actionsPosition = _a.actionsPosition, itemAction = _a.itemAction;
+        var _a = this.props, className = _a.className, data = _a.data, avatarTpl = _a.avatar, titleTpl = _a.title, titleClassName = _a.titleClassName, subTitleTpl = _a.subTitle, descTpl = _a.desc, avatarClassName = _a.avatarClassName, render = _a.render, cx = _a.classnames, actionsPosition = _a.actionsPosition, itemAction = _a.itemAction; _a.onEvent; var hasClickActions = _a.hasClickActions;
         var avatar = filter(avatarTpl, data);
         var title = filter(titleTpl, data);
         var subTitle = filter(subTitleTpl, data);
         var desc = filter(descTpl, data);
-        return (React.createElement("div", { onClick: (checkOnItemClick && checkable) || itemAction
-                ? this.handleClick
-                : undefined, className: cx("ListItem ListItem--actions-at-".concat(actionsPosition || 'right'), {
-                'ListItem--hasItemAction': itemAction
+        return (React.createElement("div", { onClick: this.handleClick, className: cx("ListItem ListItem--actions-at-".concat(actionsPosition || 'right'), {
+                'ListItem--hasItemAction': itemAction || hasClickActions
             }, className) },
             this.renderLeft(),
             this.renderRight(),

package/esm/renderers/Log.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Mapping.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.2-beta.1
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */