amis 2.3.0 → 2.3.2-beta.1

package/lib/renderers/DropDownButton.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -50,7 +50,9 @@ var DropDownButton = /** @class */ (function (_super) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.props.dispatchEvent('mouseenter', { data: this.props.buttons })];
+                    case 0: return [4 /*yield*/, this.props.dispatchEvent('mouseenter', {
+                            items: this.props.buttons // 为了保持名字统一
+                        })];
                     case 1:
                         _a.sent();
                         this.setState({
@@ -64,7 +66,7 @@ var DropDownButton = /** @class */ (function (_super) {
     DropDownButton.prototype.close = function () {
         var _this = this;
         this.timer = setTimeout(function () {
-            _this.props.dispatchEvent('mouseleave', { data: _this.props.buttons });
+            _this.props.dispatchEvent('mouseleave', { items: _this.props.buttons });
             _this.setState({
                 isOpened: false
             });
@@ -138,13 +140,9 @@ var DropDownButton = /** @class */ (function (_super) {
                         'Button--primary': primary,
                         'Button--iconOnly': iconOnly
                     }, size ? "Button--".concat(size) : '') },
-                    amisUi.hasIcon(icon)
-                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
-                        : amisCore.generateIcon(cx, icon, 'm-r-xs'),
+                    amisUi.hasIcon(icon) ? (React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })) : (amisCore.generateIcon(cx, icon, 'm-r-xs')),
                     typeof label === 'string' ? amisCore.filter(label, data) : label,
-                    rightIcon && amisUi.hasIcon(rightIcon)
-                        ? React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })
-                        : amisCore.generateIcon(cx, rightIcon, 'm-l-xs'),
+                    rightIcon && amisUi.hasIcon(rightIcon) ? (React__default["default"].createElement(amisUi.Icon, { icon: icon, className: "icon" })) : (amisCore.generateIcon(cx, rightIcon, 'm-l-xs')),
                     !hideCaret ? (React__default["default"].createElement("span", { className: cx('DropDown-caret') },
                         React__default["default"].createElement(amisUi.Icon, { icon: "caret", className: "icon" }))) : null)),
             this.state.isOpened ? this.renderOuter() : null));

package/lib/renderers/Each.js

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

package/lib/renderers/Flex.js

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

package/lib/renderers/Form/ButtonGroupSelect.js

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

package/lib/renderers/Form/ButtonToolbar.js

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

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -121,9 +121,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                             arr.splice(idx + 1, value.length - idx - 1);
                             arr.push(remoteValue);
                             valueRes = this.array2value(arr, true);
-                            return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                    value: valueRes
-                                }))];
+                            return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: valueRes }, 'value'))];
                         case 1:
                             rendererEvent = _d.sent();
                             if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -152,11 +150,11 @@ var ChainedSelectControl = /** @class */ (function (_super) {
     };
     ChainedSelectControl.prototype.handleChange = function (index, currentValue) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, value, delimiter, onChange, joinValues, dispatchEvent, data, arr, valueRes, rendererEvent;
+            var _a, value, delimiter, onChange, joinValues, dispatchEvent, arr, valueRes, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, _a.data;
                         arr = Array.isArray(value)
                             ? value.concat()
                             : value && typeof value === 'string'
@@ -165,9 +163,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                         arr.splice(index, arr.length - index);
                         arr.push(joinValues ? currentValue.value : currentValue);
                         valueRes = this.array2value(arr);
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.createObject(data, {
-                                value: valueRes
-                            }))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: valueRes }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/ChartRadios.js

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

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -36,14 +36,12 @@ var CheckboxControl = /** @class */ (function (_super) {
     CheckboxControl.prototype.dispatchChangeEvent = function (eventData) {
         if (eventData === void 0) { eventData = {}; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onChange, rendererEvent;
+            var _a, dispatchEvent, onChange, rendererEvent;
             return tslib.__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', amisCore.createObject(data, {
-                                value: eventData
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: eventData }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Form/Checkboxes.js

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

package/lib/renderers/Form/Combo.d.ts

@@ -249,7 +249,7 @@ export default class ComboControl extends React.Component<ComboProps> {
     render(): JSX.Element | null;
 }
 export declare class ComboControlRenderer extends ComboControl {
-    setData(value: any, index?: number): void;
+    setData(value: any, replace?: boolean, index?: number): void;
 }
 export declare class KVControlRenderer extends ComboControl {
 }

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -153,18 +153,18 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.addItem = function () {
         return tslib.__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 tslib.__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', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('add', amisCore.resolveEventData(this.props, {
                                 value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep__default["default"](value)
-                            }))];
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -198,10 +198,13 @@ var ComboControl = /** @class */ (function (_super) {
                         }
                         value = this.getValueAsArray();
                         ctx = amisCore.createObject(data, value[key]);
-                        return [4 /*yield*/, dispatchEvent('delete', amisCore.createObject(data, {
+                        return [4 /*yield*/, dispatchEvent('delete', amisCore.resolveEventData(this.props, {
                                 key: key,
-                                value: flat && joinValues ? value.join(delimiter || ',') : cloneDeep__default["default"](value)
-                            }))];
+                                value: flat && joinValues
+                                    ? value.join(delimiter || ',')
+                                    : cloneDeep__default["default"](value),
+                                item: value[key]
+                            }, 'value'))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -469,16 +472,20 @@ var ComboControl = /** @class */ (function (_super) {
     };
     ComboControl.prototype.handleTabSelect = function (key) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, store, data, dispatchEvent, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
+            var _a, store, data, name, value, dispatchEvent, eventData, rendererEvent;
+            var _b;
+            return tslib.__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', amisCore.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', amisCore.createObject(data, name
+                                ? tslib.__assign(tslib.__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*/];
                         }
@@ -817,7 +824,7 @@ var ComboControl = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     // 支持更新指定索引的值
-    ComboControlRenderer.prototype.setData = function (value, index) {
+    ComboControlRenderer.prototype.setData = function (value, replace, index) {
         var _a = this.props, multiple = _a.multiple, onChange = _a.onChange, submitOnChange = _a.submitOnChange;
         if (multiple) {
             if (index !== undefined && ~index) {

package/lib/renderers/Form/ConditionBuilder.js

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

package/lib/renderers/Form/Control.js

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

package/lib/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>;
@@ -3831,12 +3828,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3872,26 +3869,27 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
-        remark?: import("../Remark").SchemaRemark | undefined;
-        hidden?: boolean | undefined;
-        label?: string | false | undefined;
+        placeholder?: string | undefined;
         $ref?: string | undefined;
         disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
         hiddenOn?: string | undefined;
         visible?: boolean | undefined;
         visibleOn?: string | undefined;
         id?: string | undefined;
+        label?: string | false | undefined;
+        remark?: import("../Remark").SchemaRemark | undefined;
         desc?: string | undefined;
-        placeholder?: string | undefined;
-        labelRemark?: import("../Remark").SchemaRemark | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
         labelClassName?: string | undefined;
-        submitOnChange?: boolean | undefined;
+        inline?: boolean | undefined;
         readOnly?: boolean | undefined;
+        labelRemark?: import("../Remark").SchemaRemark | undefined;
+        options?: any;
+        submitOnChange?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3964,8 +3962,7 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        options?: any;
-        language?: string | undefined;
         diffValue?: string | undefined;
+        language?: string | undefined;
     };
 }

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -72,14 +72,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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
+            return tslib.__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', amisCore.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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return tslib.__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', amisCore.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) {
@@ -121,8 +155,24 @@ var DiffEditor = /** @class */ (function (_super) {
         });
     };
     DiffEditor.prototype.handleModifiedEditorChange = function () {
-        var onChange = this.props.onChange;
-        onChange && onChange(this.modifiedEditor.getModel().getValue());
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, onChange, dispatchEvent, value, rendererEvent;
+            return tslib.__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', amisCore.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;
@@ -159,18 +209,6 @@ var DiffEditor = /** @class */ (function (_super) {
         },
         diffValue: ''
     };
-    tslib.__decorate([
-        amisCore.bindRendererEvent('focus'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], DiffEditor.prototype, "handleFocus", null);
-    tslib.__decorate([
-        amisCore.bindRendererEvent('blur'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], DiffEditor.prototype, "handleBlur", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/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>;
@@ -3833,12 +3827,12 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.0
+ * amis v2.3.2-beta.1
  * Copyright 2018-2022 baidu
  */
 
@@ -28,6 +28,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;
     }
@@ -55,14 +56,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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onFocus, rendererEvent;
+            return tslib.__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', amisCore.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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, value, onBlur, rendererEvent;
+            return tslib.__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', amisCore.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 tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, dispatchEvent, onChange, rendererEvent;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.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) {
@@ -99,7 +153,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') {
@@ -113,7 +167,7 @@ var EditorControl = /** @class */ (function (_super) {
                 },
                 _a["EditorControl--".concat(size)] = size,
                 _a), className) },
-            React__default["default"].createElement(amisCore.LazyComponent, { classPrefix: ns, component: amisUi.Editor, allowFullscreen: allowFullscreen, value: finnalValue, onChange: onChange, disabled: disabled, onFocus: this.handleFocus, onBlur: this.handleBlur, language: language, editorTheme: editorTheme, editorDidMount: this.handleEditorMounted, childProps: {
+            React__default["default"].createElement(amisCore.LazyComponent, { classPrefix: ns, component: amisUi.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: tslib.__assign(tslib.__assign({}, options), { readOnly: disabled }) })));
     };
@@ -131,18 +185,6 @@ var EditorControl = /** @class */ (function (_super) {
             }
         }
     };
-    tslib.__decorate([
-        amisCore.bindRendererEvent('focus'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], EditorControl.prototype, "handleFocus", null);
-    tslib.__decorate([
-        amisCore.bindRendererEvent('blur'),
-        tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
-        tslib.__metadata("design:returntype", void 0)
-    ], EditorControl.prototype, "handleBlur", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),