amis 2.3.1 → 2.4.0

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * 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" | "default" | "inline" | "row" | "normal" | undefined;
+        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
-        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        size?: "full" | "xs" | "sm" | "md" | "lg" | 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.1
+ * amis v2.4.0
  * 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),

package/lib/renderers/Form/FieldSet.js

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

package/lib/renderers/Form/Formula.js

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

package/lib/renderers/Form/Group.js

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

package/lib/renderers/Form/Hidden.js

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

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.3.1
+ * amis v2.4.0
  * Copyright 2018-2022 baidu
  */
 
@@ -176,7 +176,7 @@ var IconPickerControl = /** @class */ (function (_super) {
                     placeholder && !value && !_this.state.inputValue ? (React__default["default"].createElement("div", { className: cx('IconPickerControl-placeholder') }, placeholder)) : null,
                     !value || (inputValue && isOpen) ? null : (React__default["default"].createElement("div", { className: cx('IconPickerControl-value') },
                         React__default["default"].createElement("i", { className: cx(value) }),
-                        value)),
+                        typeof value === 'string' ? value : '')),
                     React__default["default"].createElement("input", tslib.__assign({}, getInputProps({
                         name: name,
                         ref: _this.inputRef,

package/lib/renderers/Form/IconPickerIcons.js

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

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

@@ -0,0 +1,52 @@
+import React from 'react';
+import { FormControlProps } from 'amis-core';
+import { FormBaseControlSchema } from '../../Schema';
+import * as IconSelectStore from './IconSelectStore';
+export interface IconSelectControlSchema extends FormBaseControlSchema {
+    type: 'icon-select';
+    placeholder?: string;
+    disabled?: boolean;
+    noDataTip?: string;
+    clearable?: boolean;
+}
+export interface IconSelectProps extends FormControlProps {
+    placeholder?: string;
+    disabled?: boolean;
+    noDataTip?: string;
+}
+export interface IconChecked {
+    id: string;
+    name?: string;
+}
+export interface IconSelectState {
+    showModal: boolean;
+    tmpCheckIconId: IconChecked | null;
+    searchValue: string;
+    activeTypeIndex: number;
+    isRefreshLoading?: boolean;
+}
+/**
+ * 新图标选择器
+ */
+export default class IconSelectControl extends React.PureComponent<IconSelectProps, IconSelectState> {
+    input?: HTMLInputElement;
+    static defaultProps: Pick<IconSelectProps, 'noDataTip' | 'clearable'>;
+    state: IconSelectState;
+    constructor(props: IconSelectProps);
+    handleClick(): void;
+    handleClear(e: React.MouseEvent): void;
+    renderInputArea(): JSX.Element;
+    handleIconTypeClick(item: any, index: number): void;
+    renderIconTypes(): JSX.Element;
+    handleConfirm(): void;
+    handleClickIconInModal(icon: IconChecked): void;
+    renderIconList(icons: IconSelectStore.SvgIcon[]): JSX.Element;
+    handleSearchValueChange(e: string): void;
+    handleRefreshIconList(): Promise<void>;
+    renderModalContent(): JSX.Element;
+    getIconsByType(): IconSelectStore.SvgIcon[];
+    toggleModel(isShow?: boolean): void;
+    render(): JSX.Element;
+}
+export declare class IconSelectControlRenderer extends IconSelectControl {
+}