amis-editor 4.1.0-beta.25 → 4.1.0-beta.28

package/dist/manager.d.ts

@@ -48,6 +48,7 @@ export declare class EditorManager {
     readonly hackIn: any;
     constructor(config: EditorManagerConfig, store: EditorStoreType, parent?: EditorManager | undefined);
     dynamicAddPlugin(pluginName: string): void;
+    buildRenderersAndPanels(): void;
     buildEventContext(idOrNode: string | EditorNodeType): {
         node: {
             parentId: string;
@@ -223,8 +224,8 @@ export declare class EditorManager {
     buildJSONSchemaUri(): void;
     buildToolbars(): void;
     collectPanels(node: EditorNodeType, triggerEvent?: boolean, secondFactor?: boolean): BasicPanelItem[];
-    buildPanels(): void;
-    collectRenderers(region?: string, id?: string): Promise<SubRendererInfo[]>;
+    buildPanels(curRendererId?: string): void;
+    collectRenderers(region?: string, activeContainerId?: string): Promise<SubRendererInfo[]>;
     buildRenderers(region?: string): Promise<void>;
     rebuild(): Promise<void>;
     /**

package/dist/plugin.d.ts

@@ -281,10 +281,10 @@ export interface ToolbarItem {
     level?: 'primary' | 'secondary' | 'special';
     className?: string;
     draggable?: boolean;
-    onDragStart?: (e: React.DragEvent) => void;
+    onDragStart?: (e: any) => void;
     icon?: string;
     iconSvg?: string;
-    onClick?: (e: React.MouseEvent) => void;
+    onClick?: (e: any) => void;
     tooltip?: string;
     placement?: 'top' | 'bottom' | 'right' | 'left';
 }

package/dist/store/editor.d.ts

@@ -363,9 +363,9 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         setWidthMutable(value: any): void;
         setHeightMutable(value: any): void;
     }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>)[];
-    getNodeById(id: string, region?: string | undefined): EditorNodeType | undefined;
+    getNodeById(id: string, region?: string): EditorNodeType | undefined;
     readonly activeNodeInfo: RendererInfo | null | undefined;
-    getSchema(id?: string | undefined): any;
+    getSchema(id?: string): any;
     getSchemaParentById(id: string): any;
     getSchemaPath(id: string): string;
     getSimpleSchema(curSchema: any): any;
@@ -878,13 +878,13 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
      */
     readonly customRenderersByOrder: SubRendererInfo[];
     /** 根据关键字过滤组件 */
-    groupedRenderersByKeyword(_subRenderers: Array<SubRendererInfo>, keywords?: string | undefined): {
+    groupedRenderersByKeyword(_subRenderers: Array<SubRendererInfo>, keywords?: string): {
         [propName: string]: SubRendererInfo[];
     };
     /** 根据关键字过滤预置组件
      * 备注：组件搜索中需要
      */
-    groupedSubRenderersByKeyword(_subRenderers?: SubRendererInfo[] | undefined, keywords?: string | undefined): {
+    groupedSubRenderersByKeyword(_subRenderers?: Array<SubRendererInfo>, keywords?: string): {
         [propName: string]: SubRendererInfo[];
     };
     /**
@@ -895,7 +895,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
         [propName: string]: SubRendererInfo[];
     };
     /** 根据关键字过滤自定义组件 */
-    groupedCustomRenderersByKeyword(_subRenderers?: SubRendererInfo[] | undefined, keywords?: string | undefined): {
+    groupedCustomRenderersByKeyword(_subRenderers?: Array<SubRendererInfo>, keywords?: string): {
         [propName: string]: SubRendererInfo[];
     };
     /**
@@ -920,7 +920,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
     getDoc(): Document;
     setIframe(value: any): void;
     getIframe(): HTMLIFrameElement | undefined;
-    setIsMobile(value?: boolean | undefined): void;
+    setIsMobile(value?: boolean): void;
     setCtx(value: any): void;
     setTheme(value: string): void;
     setIsSubEditor(isSubEditor: boolean): void;
@@ -931,7 +931,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 | undefined): void;
+    setHoverId(id: string, region?: string): void;
     setMouseMoveRegion(region: string): void;
     setInsertId(id: string): void;
     setContextId(id: string): void;
@@ -952,9 +952,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 | undefined, msg?: string | undefined): void;
+    showRendererPanel(tag?: string, msg?: string): void;
     changeValue(value: Schema, diff?: any): void;
-    changeValueById(id: string, value: Schema, diff?: any, replace?: boolean | undefined, noTrace?: boolean | undefined): void;
+    changeValueById(id: string, value: Schema, diff?: any, replace?: boolean, noTrace?: boolean): void;
     moveUp(id: string): void;
     moveDown(id: string): void;
     del(id: string): void;
@@ -962,7 +962,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 | undefined): void;
+    setInsertRegion(region: string, id?: string, tag?: string, mode?: 'insert' | 'replace', originId?: string, beforeId?: string): void;
     closeInsertPanel(): void;
     showInsertRendererPanel(): void;
     closeInsertRendererPanel(): void;
@@ -991,7 +991,7 @@ export declare const EditorStore: import("mobx-state-tree").IModelType<{
      * 更新可供 target 及 reload 使用的名称列表
      */
     updateTargetName(): void;
-    traceableSetSchema(schema: any, noTrace?: boolean | undefined): void;
+    traceableSetSchema(schema: any, noTrace?: boolean): void;
     undo(): void;
     redo(): void;
     resetHistory(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "4.1.0-beta.25",
+  "version": "4.1.0-beta.28",
   "description": "amis 可视化编辑器",
   "main": "dist/index.min.js",
   "types": "dist/index.d.ts",
@@ -60,7 +60,7 @@
     "@types/react-router": "^4.0.16",
     "@types/sortablejs": "^1.10.7",
     "ajv": "^8.8.2",
-    "amis": "^1.9.0",
+    "amis": "^1.9.1-beta.21",
     "axios": "0.21.1",
     "concurrently": "^6.2.0",
     "css-loader": "^6.2.0",

package/src/plugin/Panel/AvailableRenderers.tsx

@@ -21,7 +21,7 @@ export class AvailableRenderersPlugin extends BasePlugin {
       return;
     }
 
-    if (store.activeContainerId && store.subRenderers.length) {
+    if (store.subRenderers.length) {
       panels.push({
         key: 'renderers',
         icon: 'png-icon renderers-png', // 'fa fa-cube',

package/src/plugin.ts

@@ -374,10 +374,10 @@ export interface ToolbarItem {
   level?: 'primary' | 'secondary' | 'special';
   className?: string;
   draggable?: boolean;
-  onDragStart?: (e: React.DragEvent) => void;
+  onDragStart?: (e: any) => void;
   icon?: string;
   iconSvg?: string; // 自定义icon（svg格式）
-  onClick?: (e: React.MouseEvent) => void;
+  onClick?: (e: any) => void;
   tooltip?: string;
   placement?: 'top' | 'bottom' | 'right' | 'left';
 }
@@ -412,7 +412,7 @@ export interface PanelItem {
   component?: React.ComponentType<PanelProps | any>;
   order: number;
   position?: 'left' | 'right';
-  render?: (props: PanelProps) => JSX.Element;
+  render?:(props: PanelProps) => JSX.Element;
   menus?: Array<any>;
 }
 
@@ -841,9 +841,10 @@ export abstract class BasePlugin implements PluginInterface {
     panels: Array<BasicPanelItem>
   ) {
     const plugin: PluginInterface = this;
+    const store = this.manager.store;
 
-    // 多选时不处理
-    if (context.selections.length) {
+    // 没有选中元素 或者 多选时不处理
+    if (!store.activeId || context.selections.length) {
       return;
     }