amis-editor 5.2.5-beta.7 → 5.3.0

package/lib/renderer/APIControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -353,7 +353,8 @@ var APIControl = /** @class */function (_super) {
     var _a = this.props;
       _a.messageDesc;
       var _b = _a.debug,
-      debug = _b === void 0 ? false : _b;
+      debug = _b === void 0 ? false : _b,
+      name = _a.name;
     return {
       type: 'form',
       className: 'ae-ApiControl-form',
@@ -625,18 +626,7 @@ var APIControl = /** @class */function (_super) {
               placeholder: 'Value',
               name: 'value'
             })]
-          }, {
-            label: i18nRuntime.i18n("417125a06b1d2bfff025e83a4e067bf0"),
-            name: 'requestAdaptor',
-            type: 'js-editor',
-            mode: 'horizontal',
-            horizontal: {
-              justify: true
-            },
-            clasName: 'm-t-sm',
-            allowFullscreen: true,
-            description: i18nRuntime.i18n("62efcb25e5b21da47c09780119da3458")
-          }, {
+          }, amisEditorCore.getSchemaTpl('apiRequestAdaptor'), {
             type: 'switch',
             label: amisEditorCore.tipedLabel(i18nRuntime.i18n("6d33298a54888a30753373ca5bfe3bc2"), i18nRuntime.i18n("542e06175ff4f7407c467bbde90de56a")),
             name: 'responseData',
@@ -697,18 +687,7 @@ var APIControl = /** @class */function (_super) {
               type: 'input-text',
               name: 'value'
             }]
-          }, {
-            label: i18nRuntime.i18n("6eb8944029108ad3b6bb3572a648fafa"),
-            name: 'adaptor',
-            type: 'js-editor',
-            mode: 'horizontal',
-            horizontal: {
-              justify: true
-            },
-            clasName: 'm-t-sm',
-            allowFullscreen: true,
-            description: i18nRuntime.i18n("e83cbec70e17988749c4a02a3b73f55c")
-          }]
+          }, amisEditorCore.getSchemaTpl(name === 'validateApi' ? 'validateApiAdaptor' : 'apiAdaptor')]
         }, {
           title: i18nRuntime.i18n("99c74120cc62f4bf31d661e3212b7121"),
           tab: [{

package/lib/renderer/ActionApiControl.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import type { SchemaObject, SchemaCollection, SchemaApi } from 'amis/lib/Schema';
+import type { SchemaObject, SchemaCollection, SchemaApi } from 'amis';
 import type { FormControlProps } from 'amis-core';
-import type { ActionSchema } from 'amis/lib/renderers/Action';
+import type { ActionSchema } from 'amis';
 export interface APIControlProps extends FormControlProps {
     name?: string;
     label?: string;
@@ -127,9 +127,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             description?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -150,9 +147,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             description?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -173,9 +167,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -199,9 +190,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             placeholder?: undefined;
                             required?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -245,9 +233,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             placeholder?: undefined;
                             required?: undefined;
                             disabled?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             direction?: undefined;
                             body?: undefined;
@@ -285,9 +270,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -343,9 +325,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             description?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -385,9 +364,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             direction?: undefined;
@@ -407,9 +383,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             required?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -433,9 +406,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                             description?: undefined;
                             disabled?: undefined;
                             pipeIn?: undefined;
-                            /**
-                             * Picker绑定的Name
-                             */
                             pipeOut?: undefined;
                             min?: undefined;
                             step?: undefined;
@@ -444,161 +414,12 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                         })[];
                     } | {
                         title: string;
-                        tab: ({
-                            type: string;
-                            title: string;
-                            headingClassName: string;
-                            body: ({
-                                type: string;
-                                label: any;
-                                name: string;
-                                mode: string;
-                                pipeIn: (value: any) => boolean;
-                                pipeOut: (value: any) => {
-                                    '&': string;
-                                } | null;
-                                syncDefaultValue?: undefined;
-                                renderLabel?: undefined;
-                                visibleOn?: undefined;
-                                descriptionClassName?: undefined;
-                                description?: undefined;
-                                multiple?: undefined;
-                                items?: undefined;
-                                horizontal?: undefined;
-                                clasName?: undefined;
-                                allowFullscreen?: undefined;
-                            } | {
-                                type: string;
-                                syncDefaultValue: boolean;
-                                name: string;
-                                mode: string;
-                                renderLabel: boolean;
-                                visibleOn: string;
-                                descriptionClassName: string;
-                                description: string;
-                                multiple: boolean;
-                                pipeIn: (value: any) => any;
-                                pipeOut: (value: any) => any;
-                                items: ({
-                                    placeholder: string;
-                                    type: string;
-                                    unique: boolean;
-                                    name: string;
-                                    required: boolean;
-                                } | {
-                                    placeholder: string;
-                                    type: string;
-                                    name: string;
-                                    unique?: undefined;
-                                    required?: undefined;
-                                })[];
-                                label?: undefined;
-                                horizontal?: undefined;
-                                clasName?: undefined;
-                                allowFullscreen?: undefined;
-                            } | {
-                                type: string;
-                                syncDefaultValue: boolean;
-                                name: string;
-                                mode: string;
-                                renderLabel: boolean;
-                                visibleOn: string;
-                                descriptionClassName: string;
-                                multiple: boolean;
-                                pipeIn: (value: any) => any;
-                                pipeOut: (value: any) => any;
-                                items: ({
-                                    placeholder: string;
-                                    type: string;
-                                    unique: boolean;
-                                    name: string;
-                                    required: boolean;
-                                } | {
-                                    placeholder: string;
-                                    type: string;
-                                    name: string;
-                                    unique?: undefined;
-                                    required?: undefined;
-                                })[];
-                                label?: undefined;
-                                description?: undefined;
-                                horizontal?: undefined;
-                                clasName?: undefined;
-                                allowFullscreen?: undefined;
-                            } | {
-                                label: string;
-                                name: string;
-                                type: string;
-                                mode: string;
-                                horizontal: {
-                                    justify: boolean;
-                                };
-                                clasName: string;
-                                allowFullscreen: boolean;
-                                description: string;
-                                pipeIn?: undefined;
-                                /**
-                                 * Picker绑定的Name
-                                 */
-                                pipeOut?: undefined;
-                                syncDefaultValue?: undefined;
-                                renderLabel?: undefined;
-                                visibleOn?: undefined;
-                                descriptionClassName?: undefined;
-                                multiple?: undefined;
-                                items?: undefined;
-                            })[];
-                        } | {
+                        tab: {
                             type: string;
                             title: string;
                             headingClassName: string;
-                            body: ({
-                                type: string;
-                                label: any;
-                                name: string;
-                                mode: string;
-                                className: string;
-                                pipeIn: (value: any) => boolean;
-                                pipeOut: (value: any) => {
-                                    '': string;
-                                } | null;
-                                syncDefaultValue?: undefined;
-                                multiple?: undefined;
-                                visibleOn?: undefined;
-                                items?: undefined;
-                            } | {
-                                type: string;
-                                name: string;
-                                mode: string;
-                                syncDefaultValue: boolean;
-                                multiple: boolean;
-                                visibleOn: string;
-                                items: ({
-                                    type: string;
-                                    name: string;
-                                    placeholder: string;
-                                    unique: boolean;
-                                    required: boolean;
-                                    options: {
-                                        label: string;
-                                        value: string;
-                                    }[];
-                                    disabled?: undefined;
-                                } | {
-                                    type: string;
-                                    name: string;
-                                    placeholder: string;
-                                    disabled: boolean;
-                                    unique?: undefined;
-                                    required?: undefined;
-                                    options?: undefined;
-                                })[];
-                                pipeIn: (value: any) => any;
-                                pipeOut: (value: any) => any;
-                                label?: undefined;
-                                className?: undefined;
-                            })[];
-                        })[];
+                            body: any[];
+                        }[];
                     } | {
                         title: string;
                         tab: {
@@ -648,9 +469,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     description?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -671,9 +489,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     description?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -694,9 +509,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -720,9 +532,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     placeholder?: undefined;
                     required?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -766,9 +575,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     placeholder?: undefined;
                     required?: undefined;
                     disabled?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     direction?: undefined;
                     body?: undefined;
@@ -806,9 +612,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -864,9 +667,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     description?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -906,9 +706,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     direction?: undefined;
@@ -928,9 +725,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     required?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -954,9 +748,6 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                     description?: undefined;
                     disabled?: undefined;
                     pipeIn?: undefined;
-                    /**
-                     * Picker绑定的Name
-                     */
                     pipeOut?: undefined;
                     min?: undefined;
                     step?: undefined;
@@ -965,161 +756,12 @@ export default class APIControl extends React.Component<APIControlProps, APICont
                 })[];
             } | {
                 title: string;
-                tab: ({
-                    type: string;
-                    title: string;
-                    headingClassName: string;
-                    body: ({
-                        type: string;
-                        label: any;
-                        name: string;
-                        mode: string;
-                        pipeIn: (value: any) => boolean;
-                        pipeOut: (value: any) => {
-                            '&': string;
-                        } | null;
-                        syncDefaultValue?: undefined;
-                        renderLabel?: undefined;
-                        visibleOn?: undefined;
-                        descriptionClassName?: undefined;
-                        description?: undefined;
-                        multiple?: undefined;
-                        items?: undefined;
-                        horizontal?: undefined;
-                        clasName?: undefined;
-                        allowFullscreen?: undefined;
-                    } | {
-                        type: string;
-                        syncDefaultValue: boolean;
-                        name: string;
-                        mode: string;
-                        renderLabel: boolean;
-                        visibleOn: string;
-                        descriptionClassName: string;
-                        description: string;
-                        multiple: boolean;
-                        pipeIn: (value: any) => any;
-                        pipeOut: (value: any) => any;
-                        items: ({
-                            placeholder: string;
-                            type: string;
-                            unique: boolean;
-                            name: string;
-                            required: boolean;
-                        } | {
-                            placeholder: string;
-                            type: string;
-                            name: string;
-                            unique?: undefined;
-                            required?: undefined;
-                        })[];
-                        label?: undefined;
-                        horizontal?: undefined;
-                        clasName?: undefined;
-                        allowFullscreen?: undefined;
-                    } | {
-                        type: string;
-                        syncDefaultValue: boolean;
-                        name: string;
-                        mode: string;
-                        renderLabel: boolean;
-                        visibleOn: string;
-                        descriptionClassName: string;
-                        multiple: boolean;
-                        pipeIn: (value: any) => any;
-                        pipeOut: (value: any) => any;
-                        items: ({
-                            placeholder: string;
-                            type: string;
-                            unique: boolean;
-                            name: string;
-                            required: boolean;
-                        } | {
-                            placeholder: string;
-                            type: string;
-                            name: string;
-                            unique?: undefined;
-                            required?: undefined;
-                        })[];
-                        label?: undefined;
-                        description?: undefined;
-                        horizontal?: undefined;
-                        clasName?: undefined;
-                        allowFullscreen?: undefined;
-                    } | {
-                        label: string;
-                        name: string;
-                        type: string;
-                        mode: string;
-                        horizontal: {
-                            justify: boolean;
-                        };
-                        clasName: string;
-                        allowFullscreen: boolean;
-                        description: string;
-                        pipeIn?: undefined;
-                        /**
-                         * Picker绑定的Name
-                         */
-                        pipeOut?: undefined;
-                        syncDefaultValue?: undefined;
-                        renderLabel?: undefined;
-                        visibleOn?: undefined;
-                        descriptionClassName?: undefined;
-                        multiple?: undefined;
-                        items?: undefined;
-                    })[];
-                } | {
+                tab: {
                     type: string;
                     title: string;
                     headingClassName: string;
-                    body: ({
-                        type: string;
-                        label: any;
-                        name: string;
-                        mode: string;
-                        className: string;
-                        pipeIn: (value: any) => boolean;
-                        pipeOut: (value: any) => {
-                            '': string;
-                        } | null;
-                        syncDefaultValue?: undefined;
-                        multiple?: undefined;
-                        visibleOn?: undefined;
-                        items?: undefined;
-                    } | {
-                        type: string;
-                        name: string;
-                        mode: string;
-                        syncDefaultValue: boolean;
-                        multiple: boolean;
-                        visibleOn: string;
-                        items: ({
-                            type: string;
-                            name: string;
-                            placeholder: string;
-                            unique: boolean;
-                            required: boolean;
-                            options: {
-                                label: string;
-                                value: string;
-                            }[];
-                            disabled?: undefined;
-                        } | {
-                            type: string;
-                            name: string;
-                            placeholder: string;
-                            disabled: boolean;
-                            unique?: undefined;
-                            required?: undefined;
-                            options?: undefined;
-                        })[];
-                        pipeIn: (value: any) => any;
-                        pipeOut: (value: any) => any;
-                        label?: undefined;
-                        className?: undefined;
-                    })[];
-                })[];
+                    body: any[];
+                }[];
             } | {
                 title: string;
                 tab: {

package/lib/renderer/BadgeControl.d.ts

@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import type { FormControlProps } from 'amis-core';
-import type { SchemaExpression } from 'amis/lib/Schema';
+import type { SchemaExpression } from 'amis';
 export interface BadgeControlProps extends FormControlProps {
     /**
      * 角标类型
@@ -71,12 +71,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
         style?: {
             [propName: string]: any;
         } | undefined;
-        visibleOn?: any;
         text?: string | number | undefined;
-        mode?: "text" | "dot" | "ribbon" | undefined;
         level?: any;
-        animation?: boolean | undefined;
+        visibleOn?: any;
+        mode?: "text" | "dot" | "ribbon" | undefined;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
+        animation?: boolean | undefined;
         overflowCount?: number | undefined;
     } | {
         offset: [number, number];
@@ -84,12 +84,12 @@ export default class BadgeControl extends React.Component<BadgeControlProps, Bad
         style?: {
             [propName: string]: any;
         } | undefined;
-        visibleOn?: any;
         text?: string | number | undefined;
-        mode?: "text" | "dot" | "ribbon" | undefined;
         level?: any;
-        animation?: boolean | undefined;
+        visibleOn?: any;
+        mode?: "text" | "dot" | "ribbon" | undefined;
         position?: "top-right" | "top-left" | "bottom-left" | "bottom-right" | undefined;
+        animation?: boolean | undefined;
         overflowCount?: number | undefined;
     };
     handleSwitchChange(checked: boolean): void;

package/lib/renderer/BadgeControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -41,11 +41,17 @@ var BadgeControl = /** @class */function (_super) {
     }
   };
   BadgeControl.prototype.transformBadgeValue = function () {
-    var _a, _b;
-    var ctx = this.props.data;
+    var _a, _b, _c, _d;
+    var _e = this.props,
+      ctx = _e.data,
+      node = _e.node;
     var badge = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.badge) !== null && _a !== void 0 ? _a : {};
     // 避免获取到上层的size
     var size = (_b = ctx === null || ctx === void 0 ? void 0 : ctx.badge) === null || _b === void 0 ? void 0 : _b.size;
+    if (node.type === 'button-group-select') {
+      badge = (_d = (_c = ctx === null || ctx === void 0 ? void 0 : ctx.option) === null || _c === void 0 ? void 0 : _c.badge) !== null && _d !== void 0 ? _d : {};
+      size = badge === null || badge === void 0 ? void 0 : badge.size;
+    }
     var offset = [0, 0];
     // 转换成combo可以识别的格式
     if (Array.isArray(badge === null || badge === void 0 ? void 0 : badge.offset) && (badge === null || badge === void 0 ? void 0 : badge.offset.length) >= 2) {

package/lib/renderer/ButtonGroupControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-editor v5.2.5-alpha.12
+ * amis-editor v5.3.0
  * Copyright 2018-2023 @fex
  */
 
@@ -37,7 +37,7 @@ var ButtonGroupControl = /** @class */ (function (_super) {
     }
     ButtonGroupControlRenderer = tslib.__decorate([
         amis.FormItem({
-            type: 'button-icon-group'
+            type: 'icon-button-group'
         })
     ], ButtonGroupControlRenderer);
     return ButtonGroupControlRenderer;

package/lib/renderer/DataBindingControl.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="lodash" />
 import { FormControlProps, RendererProps } from 'amis-core';
 import React from 'react';
-import { EditorManager, EditorNodeType, DSField, DSFieldGroup } from 'amis-editor-core';
-import { SchemaCollection } from 'amis/lib/Schema';
+import { EditorManager, EditorNodeType } from 'amis-editor-core';
+import type { DSField, DSFieldGroup } from 'amis-editor-core';
+import type { SchemaCollection } from 'amis';
 export interface DataBindingProps extends FormControlProps {
     node: EditorNodeType;
     manager: EditorManager;