amis-editor 4.1.0-beta.27 → 4.2.0-beta.0

package/dist/manager.d.ts

@@ -4,13 +4,14 @@
  * @file 把一些功能性的东西放在了这个里面，辅助 compoennt/Editor.tsx 组件的。
  * 编辑器非 UI 相关的东西应该放在这。
  */
-import { RendererConfig, RenderOptions } from 'amis/lib/factory';
+import { RenderOptions } from 'amis-core';
 import { PluginInterface, BasicPanelItem, RendererInfo, SubRendererInfo, PluginEvent, RegionConfig, ContextMenuItem, ContextMenuEventContext, EventContext, PluginEventFn, ScaffoldForm } from './plugin';
 import { EditorStoreType, SubEditorContext } from './store/editor';
-import { SchemaObject } from 'amis';
 import { EditorNodeType } from './store/node';
 import { EditorProps } from './component/Editor';
 import { EditorDNDManager } from './dnd';
+import { SchemaObject } from 'amis/lib/Schema';
+import type { RendererConfig } from 'amis-core/lib/factory';
 export interface EditorManagerConfig extends Omit<EditorProps, 'value' | 'onChange'> {
 }
 export interface PluginClass {
@@ -44,12 +45,11 @@ export declare class EditorManager {
     readonly dnd: EditorDNDManager;
     readonly id: string;
     disableHover: boolean;
-    private renderersId;
-    private panelsId;
     private clipboardData;
     readonly hackIn: any;
     constructor(config: EditorManagerConfig, store: EditorStoreType, parent?: EditorManager | undefined);
     dynamicAddPlugin(pluginName: string): void;
+    buildRenderersAndPanels(): void;
     buildEventContext(idOrNode: string | EditorNodeType): {
         node: {
             parentId: string;
@@ -121,11 +121,7 @@ export declare class EditorManager {
                 memberIndex?: number | undefined;
             }): any;
             removeChild(child: any): void;
-            toggleFold(e: import("react").MouseEvent<HTMLAnchorElement, MouseEvent>): void; /**
-             * 显示插入面板
-             * @param region
-             * @param preferTag
-             */
+            toggleFold(e: import("react").MouseEvent<HTMLAnchorElement, MouseEvent>): void;
             patch(store: any, force?: boolean): void;
             updateSchema(value: any): void;
             setComponent(value: any): void;
@@ -133,11 +129,6 @@ export declare class EditorManager {
             calculateHighlightBox(root?: any): void;
             resetHighlightBox(root: any): void;
             updateState(state: any, replace?: boolean): void;
-            /**
-             * 在当前选中元素插入或追加新的元素
-             * @param rendererIdOrSchema
-             * 备注：可以根据渲染器ID添加新元素，也可以根据现有schema片段添加新元素
-             */
             setWidthMutable(value: any): void;
             setHeightMutable(value: any): void;
         } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
@@ -210,11 +201,7 @@ export declare class EditorManager {
                 memberIndex?: number | undefined;
             }): any;
             removeChild(child: any): void;
-            toggleFold(e: import("react").MouseEvent<HTMLAnchorElement, MouseEvent>): void; /**
-             * 显示插入面板
-             * @param region
-             * @param preferTag
-             */
+            toggleFold(e: import("react").MouseEvent<HTMLAnchorElement, MouseEvent>): void;
             patch(store: any, force?: boolean): void;
             updateSchema(value: any): void;
             setComponent(value: any): void;
@@ -222,11 +209,6 @@ export declare class EditorManager {
             calculateHighlightBox(root?: any): void;
             resetHighlightBox(root: any): void;
             updateState(state: any, replace?: boolean): void;
-            /**
-             * 在当前选中元素插入或追加新的元素
-             * @param rendererIdOrSchema
-             * 备注：可以根据渲染器ID添加新元素，也可以根据现有schema片段添加新元素
-             */
             setWidthMutable(value: any): void;
             setHeightMutable(value: any): void;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>;

package/dist/plugin/Alert.d.ts

@@ -1,5 +1,5 @@
-import { SchemaObject } from 'amis';
 import { BasePlugin } from '../plugin';
+import { SchemaObject } from 'amis/lib/Schema';
 export declare class AlertPlugin extends BasePlugin {
     rendererName: string;
     $schema: string;

package/dist/plugin/Button.d.ts

@@ -1,5 +1,5 @@
-import { SchemaObject } from 'amis';
 import { BaseEventContext, BasePlugin, BasicRendererInfo, RendererInfoResolveEventContext } from '../plugin';
+import { SchemaObject } from 'amis/lib/Schema';
 export declare class ButtonPlugin extends BasePlugin {
     rendererName: string;
     $schema: string;

package/dist/plugin/Dialog.d.ts

@@ -7,7 +7,7 @@ export declare class DialogPlugin extends BasePlugin {
     isBaseComponent: boolean;
     wrapperProps: {
         wrapperComponent: typeof InlineModal;
-        onClose: typeof import("amis/lib/utils/helper").noop;
+        onClose: typeof import("amis-core").noop;
         show: boolean;
     };
     regions: Array<RegionConfig>;

package/dist/plugin/Drawer.d.ts

@@ -7,7 +7,7 @@ export declare class DrawerPlugin extends BasePlugin {
     isBaseComponent: boolean;
     wrapperProps: {
         wrapperComponent: typeof InlineModal;
-        onClose: typeof import("amis/lib/utils/helper").noop;
+        onClose: typeof import("amis-core").noop;
         resizable: boolean;
         show: boolean;
     };

package/dist/plugin/Form/Formula.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { BasePlugin } from '../../plugin';
 export declare class FormulaControlPlugin extends BasePlugin {
     rendererName: string;
@@ -40,10 +40,10 @@ export declare class FormulaControlPlugin extends BasePlugin {
         mode: string;
         className: string;
     })[];
-    renderRenderer(props: any): React.DetailedReactHTMLElement<{
+    renderRenderer(props: any): import("react").DetailedReactHTMLElement<{
         key: any;
         className: string;
-        children: React.DetailedReactHTMLElement<{
+        children: import("react").DetailedReactHTMLElement<{
             className: string;
             children: string;
         }, HTMLElement>;

package/dist/plugin/IFrame.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { BasePlugin } from '../plugin';
 export declare class IFramePlugin extends BasePlugin {
     rendererName: string;
@@ -18,10 +18,10 @@ export declare class IFramePlugin extends BasePlugin {
     };
     panelTitle: string;
     panelBody: any[];
-    renderRenderer(props: any): React.DetailedReactHTMLElement<{
+    renderRenderer(props: any): import("react").DetailedReactHTMLElement<{
         key: any;
         className: string;
-        children: React.DetailedReactHTMLElement<{
+        children: import("react").DetailedReactHTMLElement<{
             className: string;
             children: string;
         }, HTMLElement>;

package/dist/plugin/Page.d.ts

@@ -1,6 +1,6 @@
-import { SchemaObject } from 'amis';
 import { ContainerWrapper } from '../component/ContainerWrapper';
 import { BasePlugin } from '../plugin';
+import type { SchemaObject } from 'amis/lib/Schema';
 export declare class PagePlugin extends BasePlugin {
     rendererName: string;
     $schema: string;

package/dist/plugin/Table.d.ts

@@ -1,5 +1,5 @@
-import { SchemaObject } from 'amis';
 import { BasePlugin, BaseEventContext, PluginEvent, RegionConfig, RendererInfoResolveEventContext, BasicRendererInfo, InsertEventContext, ScaffoldForm } from '../plugin';
+import { SchemaObject } from 'amis/lib/Schema';
 export declare class TablePlugin extends BasePlugin {
     rendererName: string;
     $schema: string;

package/dist/plugin.d.ts

@@ -1,9 +1,6 @@
 /**
  * @file 定义插件的 interface，以及提供一个 BasePlugin 基类，把一些通用的方法放在这。
  */
-import { BaseSchema } from 'amis';
-import { MenuDivider, MenuItem } from 'amis/lib/components/ContextMenu';
-import { RendererConfig } from 'amis/lib/factory';
 import { RegionWrapperProps } from './component/RegionWrapper';
 import { EditorManager } from './manager';
 import { EditorStoreType } from './store/editor';
@@ -12,6 +9,9 @@ import { DNDModeInterface } from './dnd/interface';
 import { EditorDNDManager } from './dnd';
 import React from 'react';
 import { DiffChange } from './util';
+import type { RendererConfig } from 'amis-core/lib/factory';
+import type { MenuDivider, MenuItem } from 'amis-ui/lib/components/ContextMenu';
+import type { BaseSchema } from 'amis/lib/Schema';
 /**
  * 区域的定义，容器渲染器都需要定义区域信息。
  */

package/dist/store/editor.d.ts

@@ -136,7 +136,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>, [undefined]>;
     theme: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -280,7 +282,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -360,12 +364,14 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
-    getNodeById(id: string, region?: string): EditorNodeType | undefined;
+    getNodeById(id: string, region?: string | undefined): EditorNodeType | undefined;
     readonly activeNodeInfo: RendererInfo | null | undefined;
-    getSchema(id?: string): any;
+    getSchema(id?: string | undefined): any;
     getSchemaParentById(id: string): any;
     getSchemaPath(id: string): string;
     getSimpleSchema(curSchema: any): any;
@@ -461,7 +467,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -541,7 +549,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     readonly activePath: ({
@@ -622,7 +632,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -702,7 +714,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     getNodePathById(id: string): ({
@@ -783,7 +797,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     } & import("mobx-state-tree").IStateTreeNode<import("mobx-state-tree").IModelType<{
         parentId: import("mobx-state-tree").IType<string | undefined, string, string>;
@@ -863,7 +879,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         calculateHighlightBox(root?: any): void;
         resetHighlightBox(root: any): void;
         updateState(state: any, replace?: boolean): void;
-        setWidthMutable(value: any): void;
+        setWidthMutable(value: any): void; /** 获取自定义组件
+         * 备注：disabledRendererPlugin 为 true 则不在面板中展示
+         */
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
     readonly dragging: boolean;
@@ -878,13 +896,13 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
      */
     readonly customRenderersByOrder: SubRendererInfo[];
     /** 根据关键字过滤组件 */
-    groupedRenderersByKeyword(_subRenderers: Array<SubRendererInfo>, keywords?: string): {
+    groupedRenderersByKeyword(_subRenderers: Array<SubRendererInfo>, keywords?: string | undefined): {
         [propName: string]: SubRendererInfo[];
     };
     /** 根据关键字过滤预置组件
      * 备注：组件搜索中需要
      */
-    groupedSubRenderersByKeyword(_subRenderers?: Array<SubRendererInfo>, keywords?: string): {
+    groupedSubRenderersByKeyword(_subRenderers?: SubRendererInfo[] | undefined, keywords?: string | undefined): {
         [propName: string]: SubRendererInfo[];
     };
     /**
@@ -895,7 +913,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         [propName: string]: SubRendererInfo[];
     };
     /** 根据关键字过滤自定义组件 */
-    groupedCustomRenderersByKeyword(_subRenderers?: Array<SubRendererInfo>, keywords?: string): {
+    groupedCustomRenderersByKeyword(_subRenderers?: SubRendererInfo[] | undefined, keywords?: string | undefined): {
         [propName: string]: SubRendererInfo[];
     };
     /**
@@ -920,7 +938,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
     getDoc(): Document;
     setIframe(value: any): void;
     getIframe(): HTMLIFrameElement | undefined;
-    setIsMobile(value?: boolean): void;
+    setIsMobile(value?: boolean | undefined): void;
     setCtx(value: any): void;
     setTheme(value: string): void;
     setIsSubEditor(isSubEditor: boolean): void;
@@ -931,7 +949,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
     setActiveId(id: string, region?: string, selections?: Array<string>): void;
     setSelections(ids: Array<string>): void;
     clearSelection(): void;
-    setHoverId(id: string, region?: string): void;
+    setHoverId(id: string, region?: string | undefined): void;
     setMouseMoveRegion(region: string): void;
     setInsertId(id: string): void;
     setContextId(id: string): void;
@@ -952,9 +970,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
     changeLeftPanelKey(key: string): void;
     changeRenderersTabsKey(key: string): void;
     changeLeftPanelOpenStatus(isOpenStatus: boolean): void;
-    showRendererPanel(tag?: string, msg?: string): void;
+    showRendererPanel(tag?: string | undefined, msg?: string | undefined): void;
     changeValue(value: Schema, diff?: any): void;
-    changeValueById(id: string, value: Schema, diff?: any, replace?: boolean, noTrace?: boolean): void;
+    changeValueById(id: string, value: Schema, diff?: any, replace?: boolean | undefined, noTrace?: boolean | undefined): void;
     moveUp(id: string): void;
     moveDown(id: string): void;
     del(id: string): void;
@@ -962,7 +980,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
     duplicate(id: string | Array<string>): void;
     emptyRegion(id: string, region: string): void;
     replaceChild(id: string, json: any): void;
-    setInsertRegion(region: string, id?: string, tag?: string, mode?: 'insert' | 'replace', originId?: string, beforeId?: string): void;
+    setInsertRegion(region: string, id?: string, tag?: string, mode?: 'insert' | 'replace', originId?: string, beforeId?: string | undefined): void;
     closeInsertPanel(): void;
     showInsertRendererPanel(): void;
     closeInsertRendererPanel(): void;
@@ -991,7 +1009,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
      * 更新可供 target 及 reload 使用的名称列表
      */
     updateTargetName(): void;
-    traceableSetSchema(schema: any, noTrace?: boolean): void;
+    traceableSetSchema(schema: any, noTrace?: boolean | undefined): void;
     undo(): void;
     redo(): void;
     resetHistory(): void;

package/dist/util.d.ts

@@ -50,7 +50,7 @@ export declare function sortByList(list: Array<string>, attr: string | Function)
 export declare function persistGet(key: string, defaultValue?: any): any;
 export declare function persistSet(key: string, value: any): void;
 export declare function normalizeId(id: string): string;
-export declare const autobind: typeof import("amis/lib/utils/autobind").autobindMethod;
+export declare const autobind: typeof import("amis").autobindMethod;
 export declare function addDragingClass(el: HTMLElement): void;
 export declare function removeDragingClass(el: HTMLElement): void;
 export declare function camelize(str: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "4.1.0-beta.27",
+  "version": "4.2.0-beta.0",
   "description": "amis 可视化编辑器",
   "main": "dist/index.min.js",
   "types": "dist/index.d.ts",
@@ -60,7 +60,10 @@
     "@types/react-router": "^4.0.16",
     "@types/sortablejs": "^1.10.7",
     "ajv": "^8.8.2",
-    "amis": "^1.9.0",
+    "amis": "^2.0.0-rc.9",
+    "amis-core": "^2.0.0-rc.9",
+    "amis-formula": "^2.0.0-rc.9",
+    "amis-ui": "^2.0.0-rc.9",
     "axios": "0.21.1",
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",

package/src/plugin/Alert.tsx

@@ -1,8 +1,8 @@
-import {SchemaObject} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {BasePlugin} from '../plugin';
 import {getSchemaTpl} from '../component/schemaTpl';
+import {SchemaObject} from 'amis/lib/Schema';
 
 export class AlertPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/AnchorNav.tsx

@@ -6,7 +6,7 @@ import {VRenderer} from '../component/VRenderer';
 import {mapReactElement} from '../component/factory';
 import findIndex from 'lodash/findIndex';
 import {RegionWrapper as Region} from '../component/RegionWrapper';
-import {AnchorNavSection} from 'amis/lib/components/AnchorNav';
+import {AnchorNavSection} from 'amis-ui';
 
 export class AnchorNavPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Audio.tsx

@@ -1,12 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {
-  BaseEventContext,
-  BasePlugin,
-  RegionConfig,
-  RendererInfo
-} from '../plugin';
+import {BaseEventContext, BasePlugin} from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 
 export class AudioPlugin extends BasePlugin {

package/src/plugin/Button.tsx

@@ -1,6 +1,3 @@
-import {Button, SchemaObject} from 'amis';
-import flatten from 'lodash/flatten';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   BaseEventContext,
@@ -9,7 +6,8 @@ import {
   PluginInterface,
   RendererInfoResolveEventContext
 } from '../plugin';
-import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
+import {getSchemaTpl} from '../component/schemaTpl';
+import {SchemaObject} from 'amis/lib/Schema';
 
 export class ButtonPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/ButtonGroup.tsx

@@ -1,9 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {BasePlugin, RegionConfig, RendererInfo} from '../plugin';
-import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
-import {RegionWrapper as Region} from '../component/RegionWrapper';
+import {BasePlugin, RegionConfig} from '../plugin';
 
 export class ButtonGroupPlugin extends BasePlugin {
   // 关联渲染器名字
@@ -63,7 +59,8 @@ export class ButtonGroupPlugin extends BasePlugin {
           type: 'tpl',
           inline: false,
           className: 'p-t-xs',
-          tpl: '<span class="label label-default"><% if (data.type === "button-group") { %> 按钮组 <% } else { %><%= data.label %><% if (data.icon) { %><i class="<%= data.icon %>"/><% }%><% } %></span>'
+          tpl:
+            '<span class="label label-default"><% if (data.type === "button-group") { %> 按钮组 <% } else { %><%= data.label %><% if (data.icon) { %><i class="<%= data.icon %>"/><% }%><% } %></span>'
         }
       ],
       addButtonText: '新增按钮',

package/src/plugin/ButtonToolbar.tsx

@@ -1,8 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
-import {registerEditorPlugin} from '../manager';
-import {BasePlugin, RegionConfig, RendererInfo} from '../plugin';
-import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
+import {BasePlugin} from '../plugin';
+import {getSchemaTpl} from '../component/schemaTpl';
 
 export class ButtonToolbarPlugin extends BasePlugin {
   // 关联渲染器名字
@@ -63,7 +60,8 @@ export class ButtonToolbarPlugin extends BasePlugin {
                 type: 'tpl',
                 inline: false,
                 className: 'p-t-xs',
-                tpl: '<span class="label label-default"><% if (data.type === "button-group") { %> 按钮组 <% } else { %><%= data.label %><% if (data.icon) { %><i class="<%= data.icon %>"/><% }%><% } %></span>'
+                tpl:
+                  '<span class="label label-default"><% if (data.type === "button-group") { %> 按钮组 <% } else { %><%= data.label %><% if (data.icon) { %><i class="<%= data.icon %>"/><% }%><% } %></span>'
               }
             ],
             addButtonText: '新增按钮',

package/src/plugin/CRUD.tsx

@@ -1,5 +1,5 @@
-import {buildApi, Button, SchemaObject, Html, toast} from 'amis';
-import {RendererConfig} from 'amis/lib/factory';
+import {toast} from 'amis';
+
 import get from 'lodash/get';
 import cloneDeep from 'lodash/cloneDeep';
 import React from 'react';
@@ -20,10 +20,10 @@ import {
 } from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 import {isObject, JSONPipeIn} from '../util';
-import {setVariable} from 'amis/lib/utils/helper';
+import {setVariable} from 'amis-core';
 import {ActionSchema} from 'amis/lib/renderers/Action';
 import {getEnv} from 'mobx-state-tree';
-import {normalizeApi} from 'amis/lib/utils/api';
+import {normalizeApi} from 'amis-core';
 
 interface ColumnItem {
   label: string;

package/src/plugin/Card.tsx

@@ -1,4 +1,4 @@
-import {Button, SchemaObject} from 'amis';
+import {Button} from 'amis-ui';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {

package/src/plugin/Cards.tsx

@@ -1,4 +1,4 @@
-import {Button, resolveVariable, SchemaObject} from 'amis';
+import {Button, resolveVariable} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {

package/src/plugin/Carousel.tsx

@@ -1,15 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {
-  BaseEventContext,
-  BasePlugin,
-  BasicToolbarItem,
-  PluginEvent,
-  PreventClickEventContext,
-  RegionConfig,
-  RendererInfo
-} from '../plugin';
+import {BaseEventContext, BasePlugin, BasicToolbarItem} from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 import {mockValue} from '../mocker';
 
@@ -33,7 +23,8 @@ export class CarouselPlugin extends BasePlugin {
         image: mockValue({type: 'image'})
       },
       {
-        html: '<div style="width: 100%; height: 300px; background: #e3e3e3; text-align: center; line-height: 300px;">carousel data</div>'
+        html:
+          '<div style="width: 100%; height: 300px; background: #e3e3e3; text-align: center; line-height: 300px;">carousel data</div>'
       },
       {
         image: mockValue({type: 'image'})

package/src/plugin/Chart.tsx

@@ -1,4 +1,4 @@
-import {Button, SchemaObject} from 'amis';
+import {Button} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {

package/src/plugin/Collapse.tsx

@@ -1,12 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {
-  BasePlugin,
-  RegionConfig,
-  RendererInfo,
-  BaseEventContext
-} from '../plugin';
+import {BasePlugin, RegionConfig, BaseEventContext} from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 
 export class CollapsePlugin extends BasePlugin {

package/src/plugin/Container.tsx

@@ -1,13 +1,9 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   BaseEventContext,
   BasePlugin,
-  RegionConfig,
-  RendererInfo
-} from '../plugin';
-import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
+  RegionConfig} from '../plugin';
+import {getSchemaTpl} from '../component/schemaTpl';
 
 export class ContainerPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Date.tsx

@@ -1,12 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {
-  BaseEventContext,
-  BasePlugin,
-  RegionConfig,
-  RendererInfo
-} from '../plugin';
+import {BaseEventContext, BasePlugin} from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 
 export class DatePlugin extends BasePlugin {

package/src/plugin/Datetime.tsx

@@ -1,12 +1,5 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
-import {
-  BaseEventContext,
-  BasePlugin,
-  RegionConfig,
-  RendererInfo
-} from '../plugin';
+import {BaseEventContext} from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
 import {DatePlugin} from './Date';