amis-editor 4.1.0-beta.28 → 4.2.0-beta.2

package/src/plugin/Form/InputRepeat.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class RepeatControlPlugin extends BasePlugin {
   // 关联渲染器名字
@@ -56,10 +45,9 @@ export class RepeatControlPlugin extends BasePlugin {
       name: 'options',
       type: 'select',
       label: '启用单位',
-      options:
-        'secondly,minutely,hourly,daily,weekdays,weekly,monthly,yearly'.split(
-          ','
-        ),
+      options: 'secondly,minutely,hourly,daily,weekdays,weekly,monthly,yearly'.split(
+        ','
+      ),
       value: 'hourly,daily,weekly,monthly',
       multiple: true
     }

package/src/plugin/Form/InputRichText.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class RichTextControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/InputSubForm.tsx

@@ -1,21 +1,12 @@
-import {Button, relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
+import {Button} from 'amis';
 import React from 'react';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
 import {
   BaseEventContext,
   BasePlugin,
-  BasicSubRenderInfo,
   BasicToolbarItem,
   ContextMenuEventContext,
-  ContextMenuItem,
-  RendererEventContext,
-  SubRendererInfo
+  ContextMenuItem
 } from '../../plugin';
 import {diff, JSONPipeOut} from '../../util';
 

package/src/plugin/Form/InputTable.tsx

@@ -14,7 +14,7 @@ import {
   SubRendererInfo,
   RegionConfig
 } from '../../plugin';
-import {setVariable} from 'amis/lib/utils/helper';
+import {setVariable} from 'amis-core';
 import {repeatArray} from '../../util';
 import {mockValue} from '../../mocker';
 

package/src/plugin/Form/InputTag.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TagControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/InputTime.tsx

@@ -1,17 +1,7 @@
 import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TimeControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/InputTree.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TreeControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/ListSelect.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class ListControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/LocationPicker.tsx

@@ -1,18 +1,5 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import React from 'react';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class LocationControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/MatrixCheckboxes.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class MatrixControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/NestedSelect.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class NestedSelectControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/Picker.tsx

@@ -1,22 +1,14 @@
 import React from 'react';
 import {Button} from 'amis';
 import omit = require('lodash/omit');
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
 import {
   BaseEventContext,
   BasePlugin,
-  BasicSubRenderInfo,
   BasicToolbarItem,
   ContextMenuEventContext,
-  ContextMenuItem,
-  RendererEventContext,
-  SubRendererInfo
+  ContextMenuItem
 } from '../../plugin';
 import {diff} from '../../../src/util';
 

package/src/plugin/Form/Radios.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 import flatten = require('lodash/flatten');
 
 export class RadiosControlPlugin extends BasePlugin {

package/src/plugin/Form/Static.tsx

@@ -1,21 +1,8 @@
 import React from 'react';
 import {Button} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BaseEventContext,
-  BasePlugin,
-  BasicSubRenderInfo,
-  PluginEvent,
-  RendererEventContext,
-  ReplaceEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BaseEventContext, BasePlugin} from '../../plugin';
 import {EditorNodeType} from '../../store/node';
 import {mockValue} from '../../mocker';
 

package/src/plugin/Form/Switch.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl, valuePipeOut} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class SwitchControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/TabsTransfer.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TabsTransferPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/Textarea.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TextareaControlPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Form/Transfer.tsx

@@ -1,17 +1,6 @@
-import {relativeValueRe} from 'amis';
-import {availableLanguages} from 'amis/lib/renderers/Form/Editor';
-import {
-  defaultValue,
-  getSchemaTpl,
-  valuePipeOut
-} from '../../component/schemaTpl';
+import {getSchemaTpl} from '../../component/schemaTpl';
 import {registerEditorPlugin} from '../../manager';
-import {
-  BasePlugin,
-  BasicSubRenderInfo,
-  RendererEventContext,
-  SubRendererInfo
-} from '../../plugin';
+import {BasePlugin} from '../../plugin';
 
 export class TransferPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Grid.tsx

@@ -1,4 +1,4 @@
-import {Button, SchemaObject} from 'amis';
+import {Button} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
@@ -7,7 +7,6 @@ import {
   ContextMenuEventContext,
   ContextMenuItem,
   PluginEvent,
-  RegionConfig,
   ResizeMoveEventContext,
   RendererJSONSchemaResolveEventContext,
   VRendererConfig

package/src/plugin/IFrame.tsx

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

package/src/plugin/Image.tsx

@@ -1,13 +1,9 @@
-import {Button, SchemaObject} from 'amis';
-import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   ActiveEventContext,
   BaseEventContext,
   BasePlugin,
   PluginEvent,
-  RegionConfig,
-  RendererInfo,
   ResizeMoveEventContext
 } from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';

package/src/plugin/Images.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';
 import {mockValue} from '../mocker';
 

package/src/plugin/Json.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';
 import flatten = require('lodash/flatten');
 export class JsonPlugin extends BasePlugin {

package/src/plugin/Link.tsx

@@ -1,8 +1,6 @@
-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 LinkPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/List.tsx

@@ -1,17 +1,14 @@
-import {Button, resolveVariable, SchemaObject} from 'amis';
+import {Button, resolveVariable} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   BaseEventContext,
   BasePlugin,
-  BasicPanelItem,
   BasicRendererInfo,
   BasicToolbarItem,
   ContextMenuEventContext,
   ContextMenuItem,
   PluginInterface,
-  RegionConfig,
-  RendererInfo,
   RendererInfoResolveEventContext
 } from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';

package/src/plugin/ListItem.tsx

@@ -1,21 +1,17 @@
-import {Button, SchemaObject} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   BaseEventContext,
   BasePlugin,
-  BasicPanelItem,
   BasicRendererInfo,
   InsertEventContext,
   PluginEvent,
-  PluginInterface,
   RegionConfig,
   RendererInfo,
   RendererInfoResolveEventContext,
   VRendererConfig
 } from '../plugin';
 import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
-import {EditorNodeType} from '../store/node';
 import {VRenderer} from '../component/VRenderer';
 
 export class ListItemPlugin extends BasePlugin {

package/src/plugin/Mapping.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';
 import {isObject} from '../util';
 

package/src/plugin/Nav.tsx

@@ -1,8 +1,6 @@
-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 NavPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Operation.tsx

@@ -1,17 +1,15 @@
-import {Button, SchemaObject} from 'amis';
+import {Button} from 'amis';
 import React from 'react';
 import {registerEditorPlugin} from '../manager';
 import {
   BaseEventContext,
   BasePlugin,
   BasicSubRenderInfo,
-  PluginInterface,
   RegionConfig,
   RendererEventContext,
-  RendererInfo,
   SubRendererInfo
 } from '../plugin';
-import {defaultValue, getSchemaTpl} from '../component/schemaTpl';
+import {getSchemaTpl} from '../component/schemaTpl';
 
 export class OperationPlugin extends BasePlugin {
   // 关联渲染器名字

package/src/plugin/Others/Action.tsx

@@ -1,5 +1,4 @@
-import {Button, SchemaObject} from 'amis';
-import flatten from 'lodash/flatten';
+import {Button} from 'amis-ui';
 import React from 'react';
 import {registerEditorPlugin} from '../../manager';
 import {
@@ -7,8 +6,7 @@ import {
   BasePlugin,
   BasicPanelItem,
   BasicToolbarItem,
-  BuildPanelEventContext,
-  PluginInterface
+  BuildPanelEventContext
 } from '../../plugin';
 import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
 import {diff} from '../../util';

package/src/plugin/Others/BasicToolbar.tsx

@@ -7,15 +7,11 @@ import {
   BasicPanelItem,
   BuildPanelEventContext,
   PluginEvent,
-  ActiveEventContext,
   InsertEventContext
 } from '../../plugin';
 import {registerEditorPlugin} from '../../manager';
-import find from 'lodash/find';
-import {EditorStoreType} from '../../store/editor';
 import {EditorNodeType} from '../../store/node';
-import {AddBTNSvg} from '../../component/RegionHLBox';
-import {MenuItem} from 'amis/lib/components/ContextMenu';
+import type {MenuItem} from 'amis-ui/lib/components/ContextMenu';
 
 /**
  * 用来给当前选中的元素添加一些基本的工具栏按钮。
@@ -209,9 +205,7 @@ export class BasicToolbarPlugin extends BasePlugin {
       order: 1000,
       onClick: e => {
         if (!e.defaultPrevented) {
-          const info = (
-            e.target as HTMLElement
-          ).parentElement!.getBoundingClientRect();
+          const info = (e.target as HTMLElement).parentElement!.getBoundingClientRect();
           this.manager.openContextMenu(id, '', {
             x: window.scrollX + info.left + info.width - 155,
             y: window.scrollY + info.top + info.height + 8

package/src/plugin/Others/TableCell.tsx

@@ -10,7 +10,7 @@ import {
   PluginEvent
 } from '../../plugin';
 import {defaultValue, getSchemaTpl} from '../../component/schemaTpl';
-import {getVariable} from 'amis/lib/utils/helper';
+import {getVariable} from 'amis-core';
 
 export class TableCellPlugin extends BasePlugin {
   panelTitle = '列配置';

package/src/plugin/Page.tsx

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

package/src/plugin/Panel.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/Plain.tsx

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