amis 2.3.1 → 2.3.2-beta.1

package/esm/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -7,7 +7,7 @@ import { __extends, __assign, __awaiter, __generator, __decorate, __metadata, __
 import React from 'react';
 import { findDOMNode } from 'react-dom';
 import cloneDeep from 'lodash/cloneDeep';
-import { guid, createObject, extendObject, anyChanged, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore, resolveVariable } from 'amis-core';
+import { guid, createObject, extendObject, anyChanged, resolveEventData, isEffectiveApi, isObjectShallowModified, evalExpression, dataMapping, filter, isObject, str2AsyncFunction, autobind, FormItem, ComboStore, resolveVariable } from 'amis-core';
 import { Tabs, Icon, Tab, Select, Alert2, Button } from 'amis-ui';
 import Sortable from 'sortablejs';
 import find from 'lodash/find';
@@ -141,18 +141,18 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.addItem = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, flat, joinValues, addattop, delimiter, scaffold, disabled, submitOnChange, data, dispatchEvent, value, rendererEvent;
+            var _a, flat, joinValues, addattop, delimiter, scaffold, disabled, submitOnChange, dispatchEvent, value, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, flat = _a.flat, joinValues = _a.joinValues, addattop = _a.addattop, delimiter = _a.delimiter, scaffold = _a.scaffold, disabled = _a.disabled, submitOnChange = _a.submitOnChange, dispatchEvent = _a.dispatchEvent;
                         if (disabled) {
                             return [2 /*return*/];
                         }
                         value = this.getValueAsArray();
-                        return [4 /*yield*/, dispatchEvent('add', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('add', resolveEventData(this.props, {
                                 value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep(value)
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -186,10 +186,13 @@ var ComboControl = /** @class */ (function (_super) {
                         }
                         value = this.getValueAsArray();
                         ctx = createObject(data, value[key]);
-                        return [4 /*yield*/, dispatchEvent('delete', createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('delete', resolveEventData(this.props, {
                                 key: key,
-                                value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep(value)
-                            }))];
+                                value: flat && joinValues
+                                    ? value.join(delimiter || ',')
+                                    : cloneDeep(value),
+                                item: value[key]
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -457,16 +460,20 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.handleTabSelect = function (key) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, store, data, dispatchEvent, rendererEvent;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, store, data, name, value, dispatchEvent, eventData, rendererEvent;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        _a = this.props, store = _a.store, data = _a.data, dispatchEvent = _a.dispatchEvent;
-                        return [4 /*yield*/, dispatchEvent('tabsChange', createObject(data, {
-                                key: key
-                            }))];
+                        _a = this.props, store = _a.store, data = _a.data, name = _a.name, value = _a.value, dispatchEvent = _a.dispatchEvent;
+                        eventData = {
+                            key: key,
+                            item: value[key]
+                        };
+                        return [4 /*yield*/, dispatchEvent('tabsChange', createObject(data, name
+                                ? __assign(__assign({}, eventData), (_b = {}, _b[name] = value, _b)) : eventData))];
                     case 1:
-                        rendererEvent = _b.sent();
+                        rendererEvent = _c.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }

package/esm/renderers/Form/ConditionBuilder.js

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

package/esm/renderers/Form/Control.js

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

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

@@ -43,12 +43,12 @@ export declare class DiffEditor extends React.Component<DiffEditorProps, any> {
     componentWillUnmount(): void;
     doAction(action: ListenerAction, args: any): void;
     focus(): void;
-    handleFocus(): void;
-    handleBlur(): void;
+    handleFocus(e: any): Promise<void>;
+    handleBlur(e: any): Promise<void>;
     componentDidUpdate(prevProps: any): void;
     editorFactory(containerElement: any, monaco: any, options: any): any;
     handleEditorMounted(editor: any, monaco: any): void;
-    handleModifiedEditorChange(): void;
+    handleModifiedEditorChange(): Promise<void>;
     prevHeight: number;
     updateContainerSize(editor: any, monaco: any): void;
     render(): JSX.Element;
@@ -109,9 +109,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
             childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
         } & {
-            /**
-             * 左侧面板的值， 支持取变量。
-             */
             hasRemoteData: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ISimpleType<boolean>, [undefined]>;
             data: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
             initedAt: import("mobx-state-tree").IType<number | undefined, number, number>;

package/esm/renderers/Form/DiffEditor.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isPureVariable, resolveVariableAndFilter, LazyComponent, bindRendererEvent, autobind, FormItem } from 'amis-core';
+import { resolveEventData, isPureVariable, resolveVariableAndFilter, LazyComponent, autobind, FormItem } from 'amis-core';
 
 function loadComponent() {
     return import('amis-ui/lib/components/Editor').then(function (item) { return item.default; });
@@ -64,14 +64,48 @@ var DiffEditor = /** @class */ (function (_super) {
         var position = (_a = this.editor) === null || _a === void 0 ? void 0 : _a.getPosition();
         (_b = this.editor) === null || _b === void 0 ? void 0 : _b.setPosition(position);
     };
-    DiffEditor.prototype.handleFocus = function () {
-        this.setState({
-            focused: true
+    DiffEditor.prototype.handleFocus = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onFocus = _a.onFocus;
+                        this.setState({
+                            focused: true
+                        });
+                        return [4 /*yield*/, dispatchEvent('focus', resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
+                        return [2 /*return*/];
+                }
+            });
         });
     };
-    DiffEditor.prototype.handleBlur = function () {
-        this.setState({
-            focused: false
+    DiffEditor.prototype.handleBlur = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onBlur = _a.onBlur;
+                        this.setState({
+                            focused: false
+                        });
+                        return [4 /*yield*/, dispatchEvent('blur', resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     DiffEditor.prototype.componentDidUpdate = function (prevProps) {
@@ -113,8 +147,24 @@ var DiffEditor = /** @class */ (function (_super) {
         });
     };
     DiffEditor.prototype.handleModifiedEditorChange = function () {
-        var onChange = this.props.onChange;
-        onChange && onChange(this.modifiedEditor.getModel().getValue());
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, onChange, dispatchEvent, value, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, onChange = _a.onChange, dispatchEvent = _a.dispatchEvent;
+                        value = this.modifiedEditor.getModel().getValue();
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onChange && onChange(value);
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     DiffEditor.prototype.updateContainerSize = function (editor, monaco) {
         var _a;
@@ -151,18 +201,6 @@ var DiffEditor = /** @class */ (function (_super) {
         },
         diffValue: ''
     };
-    __decorate([
-        bindRendererEvent('focus'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], DiffEditor.prototype, "handleFocus", null);
-    __decorate([
-        bindRendererEvent('blur'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], DiffEditor.prototype, "handleBlur", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

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

@@ -41,8 +41,9 @@ export default class EditorControl extends React.Component<EditorProps, any> {
     componentWillUnmount(): void;
     doAction(action: ListenerAction, args: any): void;
     focus(): void;
-    handleFocus(): void;
-    handleBlur(): void;
+    handleFocus(e: any): Promise<void>;
+    handleBlur(e: any): Promise<void>;
+    handleChange(e: any): Promise<void>;
     handleEditorMounted(editor: any, monaco: any): void;
     prevHeight: number;
     updateContainerSize(editor: any, monaco: any): void;
@@ -104,10 +105,6 @@ export declare class EditorControlRenderer extends EditorControl {
             path: import("mobx-state-tree").IType<string | undefined, string, string>;
             storeType: import("mobx-state-tree").ISimpleType<string>;
             disposed: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-            /**
-             * Editor 代码编辑器
-             * 文档：https://baidu.gitee.io/amis/docs/components/form/editor
-             */
             parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
             childrenIds: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>, [undefined]>;
         } & {
@@ -1604,9 +1601,6 @@ export declare class EditorControlRenderer extends EditorControl {
         } & {
             msg: import("mobx-state-tree").IType<string | undefined, string, string>;
             error: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
-            /**
-             * 编辑器大小
-             */
             fetching: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             saving: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
             busying: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;

package/esm/renderers/Form/Editor.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
-import { __extends, __assign, __decorate, __metadata } from 'tslib';
+import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { isPureVariable, resolveVariableAndFilter, LazyComponent, bindRendererEvent, autobind, FormItem } from 'amis-core';
+import { resolveEventData, isPureVariable, resolveVariableAndFilter, LazyComponent, autobind, FormItem } from 'amis-core';
 import { Editor } from 'amis-ui';
 
 var EditorControl = /** @class */ (function (_super) {
@@ -20,6 +20,7 @@ var EditorControl = /** @class */ (function (_super) {
         _this.prevHeight = 0;
         _this.handleFocus = _this.handleFocus.bind(_this);
         _this.handleBlur = _this.handleBlur.bind(_this);
+        _this.handleChange = _this.handleChange.bind(_this);
         _this.handleEditorMounted = _this.handleEditorMounted.bind(_this);
         return _this;
     }
@@ -47,14 +48,67 @@ var EditorControl = /** @class */ (function (_super) {
         var position = (_a = this.editor) === null || _a === void 0 ? void 0 : _a.getPosition();
         (_b = this.editor) === null || _b === void 0 ? void 0 : _b.setPosition(position);
     };
-    EditorControl.prototype.handleFocus = function () {
-        this.setState({
-            focused: true
+    EditorControl.prototype.handleFocus = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onFocus = _a.onFocus;
+                        this.setState({
+                            focused: true
+                        });
+                        return [4 /*yield*/, dispatchEvent('focus', resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onFocus === null || onFocus === void 0 ? void 0 : onFocus(e);
+                        return [2 /*return*/];
+                }
+            });
         });
     };
-    EditorControl.prototype.handleBlur = function () {
-        this.setState({
-            focused: false
+    EditorControl.prototype.handleBlur = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value, onBlur = _a.onBlur;
+                        this.setState({
+                            focused: false
+                        });
+                        return [4 /*yield*/, dispatchEvent('blur', resolveEventData(this.props, { value: value }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    EditorControl.prototype.handleChange = function (e) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, onChange, rendererEvent;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: e }, 'value'))];
+                    case 1:
+                        rendererEvent = _b.sent();
+                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onChange === null || onChange === void 0 ? void 0 : onChange(e);
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     EditorControl.prototype.handleEditorMounted = function (editor, monaco) {
@@ -91,7 +145,7 @@ var EditorControl = /** @class */ (function (_super) {
     };
     EditorControl.prototype.render = function () {
         var _a;
-        var _b = this.props, className = _b.className, ns = _b.classPrefix, cx = _b.classnames, value = _b.value, onChange = _b.onChange, disabled = _b.disabled, options = _b.options, editorTheme = _b.editorTheme, size = _b.size, data = _b.data, allowFullscreen = _b.allowFullscreen, placeholder = _b.placeholder;
+        var _b = this.props, className = _b.className, ns = _b.classPrefix, cx = _b.classnames, value = _b.value; _b.onChange; var disabled = _b.disabled, options = _b.options, editorTheme = _b.editorTheme, size = _b.size, data = _b.data, allowFullscreen = _b.allowFullscreen, placeholder = _b.placeholder;
         var language = this.props.language;
         var finnalValue = value;
         if (finnalValue && typeof finnalValue !== 'string') {
@@ -105,7 +159,7 @@ var EditorControl = /** @class */ (function (_super) {
                 },
                 _a["EditorControl--".concat(size)] = size,
                 _a), className) },
-            React.createElement(LazyComponent, { classPrefix: ns, component: Editor, allowFullscreen: allowFullscreen, value: finnalValue, onChange: onChange, disabled: disabled, onFocus: this.handleFocus, onBlur: this.handleBlur, language: language, editorTheme: editorTheme, editorDidMount: this.handleEditorMounted, childProps: {
+            React.createElement(LazyComponent, { classPrefix: ns, component: Editor, allowFullscreen: allowFullscreen, value: finnalValue, onChange: this.handleChange, disabled: disabled, onFocus: this.handleFocus, onBlur: this.handleBlur, language: language, editorTheme: editorTheme, editorDidMount: this.handleEditorMounted, childProps: {
                     placeholder: placeholder
                 }, options: __assign(__assign({}, options), { readOnly: disabled }) })));
     };
@@ -123,18 +177,6 @@ var EditorControl = /** @class */ (function (_super) {
             }
         }
     };
-    __decorate([
-        bindRendererEvent('focus'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], EditorControl.prototype, "handleFocus", null);
-    __decorate([
-        bindRendererEvent('blur'),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", []),
-        __metadata("design:returntype", void 0)
-    ], EditorControl.prototype, "handleBlur", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Form/FieldSet.js

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

package/esm/renderers/Form/Formula.js

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

package/esm/renderers/Form/Group.js

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

package/esm/renderers/Form/Hidden.js

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

package/esm/renderers/Form/IconPicker.js

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

package/esm/renderers/Form/IconPickerIcons.js

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

package/esm/renderers/Form/InputArray.js

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

package/esm/renderers/Form/InputCity.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __decorate, __metadata, __awaiter, __generator } from 'tslib';
 import React from 'react';
-import { autobind, themeable, localeable, createObject, isMobile, FormItem } from 'amis-core';
+import { autobind, themeable, localeable, resolveEventData, isMobile, FormItem } from 'amis-core';
 import { Select, Spinner, CityArea } from 'amis-ui';
 
 var CityPicker = /** @class */ (function (_super) {
@@ -292,14 +292,12 @@ var LocationControl = /** @class */ (function (_super) {
     };
     LocationControl.prototype.handleChange = function (value) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onChange, rendererEvent;
+            var _a, dispatchEvent, onChange, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onChange = _a.onChange;
-                        return [4 /*yield*/, dispatchEvent('change', createObject(data, {
-                                value: value
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', resolveEventData(this.props, { value: value }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/esm/renderers/Form/InputColor.js

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

package/esm/renderers/Form/InputDate.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { filterDate, resolveVariableAndFilter, anyChanged, isPureVariable, createObject, isMobile, autobind, FormItem } from 'amis-core';
+import { filterDate, resolveVariableAndFilter, anyChanged, isPureVariable, createObject, resolveEventData, isMobile, autobind, FormItem } from 'amis-core';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import { DatePicker } from 'amis-ui';
@@ -99,8 +99,8 @@ var DateControl = /** @class */ (function (_super) {
     };
     // 派发有event的事件
     DateControl.prototype.dispatchEvent = function (e) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-        dispatchEvent(e, createObject(data, { value: value }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent, value = _a.value;
+        dispatchEvent(e, resolveEventData(this.props, { value: value }, 'value'));
     };
     // 动作
     DateControl.prototype.doAction = function (action, data, throwErrors) {
@@ -117,10 +117,10 @@ var DateControl = /** @class */ (function (_super) {
     // 值的变化
     DateControl.prototype.handleChange = function (nextValue) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, dispatcher;
-            return __generator(this, function (_b) {
-                _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                dispatcher = dispatchEvent('change', createObject(data, { value: nextValue }));
+            var dispatchEvent, dispatcher;
+            return __generator(this, function (_a) {
+                dispatchEvent = this.props.dispatchEvent;
+                dispatcher = dispatchEvent('change', resolveEventData(this.props, { value: nextValue }, 'value'));
                 if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
                     return [2 /*return*/];
                 }

package/esm/renderers/Form/InputDateRange.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __rest, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { filterDate, createObject, isMobile, parseDuration, autobind, FormItem } from 'amis-core';
+import { filterDate, resolveEventData, isMobile, parseDuration, autobind, FormItem } from 'amis-core';
 import cx from 'classnames';
 import 'moment/locale/zh-cn';
 import { DateRangePicker } from 'amis-ui';
@@ -48,10 +48,8 @@ var DateRangeControl = /** @class */ (function (_super) {
     };
     // 派发有event的事件
     DateRangeControl.prototype.dispatchEvent = function (eventName) {
-        var _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, value = _a.value;
-        dispatchEvent(eventName, createObject(data, {
-            value: value
-        }));
+        var _a = this.props, dispatchEvent = _a.dispatchEvent; _a.data; var value = _a.value;
+        dispatchEvent(eventName, resolveEventData(this.props, { value: value }, 'value'));
     };
     // 动作
     DateRangeControl.prototype.doAction = function (action, data, throwErrors) {
@@ -68,10 +66,10 @@ var DateRangeControl = /** @class */ (function (_super) {
     // 值的变化
     DateRangeControl.prototype.handleChange = function (nextValue) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, dispatcher;
+            var _a, dispatchEvent, dispatcher;
             return __generator(this, function (_b) {
-                _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                dispatcher = dispatchEvent('change', createObject(data, { value: nextValue }));
+                _a = this.props, dispatchEvent = _a.dispatchEvent, _a.data;
+                dispatcher = dispatchEvent('change', resolveEventData(this.props, { value: nextValue }, 'value'));
                 if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
                     return [2 /*return*/];
                 }

package/esm/renderers/Form/InputExcel.js

@@ -1,12 +1,12 @@
 /**
- * amis v2.3.1
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __awaiter, __generator, __assign, __decorate, __metadata } from 'tslib';
 import React from 'react';
 import DropZone from 'react-dropzone';
-import { createObject, isObject, autobind, FormItem } from 'amis-core';
+import { resolveEventData, isObject, autobind, FormItem } from 'amis-core';
 
 var ExcelControl = /** @class */ (function (_super) {
     __extends(ExcelControl, _super);
@@ -24,7 +24,7 @@ var ExcelControl = /** @class */ (function (_super) {
     };
     ExcelControl.prototype.handleDrop = function (files) {
         var _this = this;
-        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange; _a.dispatchEvent; _a.data;
+        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange; _a.dispatchEvent;
         var excel = files[0];
         var reader = new FileReader();
         reader.readAsArrayBuffer(excel);
@@ -75,14 +75,12 @@ var ExcelControl = /** @class */ (function (_super) {
     };
     ExcelControl.prototype.dispatchEvent = function (eventName, eventData) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data;
+            var _a, dispatchEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, createObject(data, {
-                                value: eventData
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, _a.data;
+                        return [4 /*yield*/, dispatchEvent(eventName, resolveEventData(this.props, { value: eventData }, 'value'))];
                     case 1: return [2 /*return*/, _b.sent()];
                 }
             });