amis-editor 4.2.0-beta.2 → 5.1.9-beta.0

package/src/plugin/HBox.tsx

@@ -448,6 +448,7 @@ export class HBoxPlugin extends BasePlugin {
         return (
           <VRenderer
             key={node.$$id}
+            type={info.type}
             plugin={info.plugin}
             renderer={info.renderer}
             $schema="" // /schemas/GridColumn.json

package/src/plugin/IFrame.tsx

@@ -1,6 +1,12 @@
 import {registerEditorPlugin} from '../manager';
-import {BasePlugin} from '../plugin';
+import {
+  BasePlugin,
+  RegionConfig,
+  RendererInfo,
+  BaseEventContext
+} from '../plugin';
 import {defaultValue, getSchemaTpl, valuePipeOut} from '../component/schemaTpl';
+import {formItemControl} from '../component/control/BaseControl';
 
 export class IFramePlugin extends BasePlugin {
   // 关联渲染器名字
@@ -23,10 +29,10 @@ export class IFramePlugin extends BasePlugin {
   };
 
   panelTitle = 'iFrame';
-  panelBody = [
-    getSchemaTpl('tabs', [
-      {
-        title: '常规',
+  panelBodyCreator = (context: BaseEventContext) => {
+    return formItemControl({
+      common: {
+        replace: true,
         body: [
           {
             name: 'src',
@@ -36,8 +42,12 @@ export class IFramePlugin extends BasePlugin {
           }
         ]
       },
-      {
-        title: '外观',
+      status: {
+        replace: true,
+        body: [getSchemaTpl('visible')]
+      },
+      style: {
+        replace: true,
         body: [
           {
             name: 'width',
@@ -55,12 +65,11 @@ export class IFramePlugin extends BasePlugin {
           getSchemaTpl('className')
         ]
       },
-      {
-        title: '显隐',
-        body: [getSchemaTpl('ref'), getSchemaTpl('visible')]
+      validation: {
+        hidden: true
       }
-    ])
-  ];
+    });
+  };
 
   renderRenderer(props: any) {
     return this.renderPlaceholder(`IFrame 页面（${props.src}）`);

package/src/plugin/Image.tsx

@@ -98,13 +98,10 @@ export class ImagePlugin extends BasePlugin {
         {
           title: '外观',
           body: [
-            {
-              type: 'switch',
+            getSchemaTpl('switch', {
               name: 'enlargeAble',
-              label: '开启图片放大功能',
-              mode: 'inline',
-              className: 'w-full'
-            },
+              label: '开启图片放大功能'
+            }),
 
             getSchemaTpl('imageUrl', {
               name: 'originalSrc',
@@ -113,13 +110,11 @@ export class ImagePlugin extends BasePlugin {
               description: '如果不配置将默认使用缩略图地址。'
             }),
 
-            {
-              type: 'switch',
+            getSchemaTpl('switch', {
               name: 'showDimensions',
-              label: '是否显示图片尺寸',
-              mode: 'inline',
-              className: 'w-full'
-            },
+              label: '是否显示图片尺寸'
+            }),
+
             {
               name: 'thumbMode',
               type: 'button-group-select',

package/src/plugin/Images.tsx

@@ -130,13 +130,10 @@ export class ImagesPlugin extends BasePlugin {
         {
           title: '外观',
           body: [
-            {
-              type: 'switch',
+            getSchemaTpl('switch', {
               name: 'enlargeAble',
-              label: '开启图片放大功能',
-              mode: 'inline',
-              className: 'w-full'
-            },
+              label: '开启图片放大功能'
+            }),
 
             {
               name: 'originalSrc',
@@ -146,13 +143,11 @@ export class ImagesPlugin extends BasePlugin {
               description: '如果不配置将默认使用缩略图地址。'
             },
 
-            {
-              type: 'switch',
+            getSchemaTpl('switch', {
               name: 'showDimensions',
-              label: '是否显示图片尺寸',
-              mode: 'inline',
-              className: 'w-full'
-            },
+              label: '是否显示图片尺寸'
+            }),
+
             {
               name: 'thumbMode',
               type: 'button-group-select',

package/src/plugin/Link.tsx

@@ -42,21 +42,15 @@ export class LinkPlugin extends BasePlugin {
             description: '不填写时，自动使用目标地址值'
           },
 
-          {
+          getSchemaTpl('switch', {
             name: 'blank',
-            type: 'switch',
-            label: '是否新窗口打开',
-            mode: 'inline',
-            className: 'w-full'
-          },
+            label: '是否新窗口打开'
+          }),
 
-          {
+          getSchemaTpl('switch', {
             name: 'disabled',
-            type: 'switch',
-            label: '是否禁用',
-            mode: 'inline',
-            className: 'w-full'
-          },
+            label: '是否禁用'
+          }),
 
           {
             name: 'htmlTarget',

package/src/plugin/List.tsx

@@ -101,22 +101,18 @@ export class ListPlugin extends BasePlugin {
       {
         title: '外观',
         body: [
-          {
+          getSchemaTpl('switch', {
             name: 'showHeader',
-            type: 'switch',
-            mode: 'inline',
-            className: 'block',
             label: '是否显示头部',
             pipeIn: defaultValue(true)
-          },
-          {
+          }),
+
+          getSchemaTpl('switch', {
             name: 'showFooter',
-            type: 'switch',
-            mode: 'inline',
-            className: 'block',
             label: '是否显示底部',
             pipeIn: defaultValue(true)
-          },
+          }),
+
           getSchemaTpl('className', {
             label: 'CSS 类名'
           }),

package/src/plugin/ListItem.tsx

@@ -157,6 +157,7 @@ export class ListItemPlugin extends BasePlugin {
       const id = field.$$id;
       return (
         <VRenderer
+          type={info.type}
           plugin={info.plugin}
           renderer={info.renderer}
           multifactor

package/src/plugin/Nav.tsx

@@ -68,7 +68,8 @@ export class NavPlugin extends BasePlugin {
         {
           type: 'icon-picker',
           name: 'icon',
-          label: '图标'
+          label: '图标',
+          className: 'fix-icon-picker-overflow'
         },
 
         {
@@ -118,8 +119,7 @@ export class NavPlugin extends BasePlugin {
           ]
         },
 
-        {
-          type: 'switch',
+        getSchemaTpl('switch', {
           label: '包含子菜单',
           name: 'children',
           mode: 'inline',
@@ -129,7 +129,7 @@ export class NavPlugin extends BasePlugin {
           messages: {
             validateFailed: '子菜单中存在配置错误，请仔细检查'
           }
-        },
+        }),
 
         {
           name: 'children',
@@ -163,13 +163,11 @@ export class NavPlugin extends BasePlugin {
       {
         title: '外观',
         body: [
-          {
+          getSchemaTpl('switch', {
             name: 'stacked',
-            type: 'switch',
-            mode: 'inline',
-            className: 'block',
             label: '是否竖着摆放'
-          },
+          }),
+
           getSchemaTpl('className')
         ]
       },

package/src/plugin/Others/Action.tsx

@@ -17,7 +17,7 @@ export class ActionPlugin extends BasePlugin {
     const isInDialog = /(?:\/|^)dialog\/.+$/.test(context.path);
     const isInDropdown = /(?:\/|^)dropdown-button\/.+$/.test(context.path);
 
-    return [
+    let schema = [
       {
         label: '按钮行为',
         type: 'select',
@@ -343,6 +343,12 @@ export class ActionPlugin extends BasePlugin {
         label: '键盘快捷键'
       }
     ];
+
+    return [{
+      type: 'container',
+      className: 'p-3',
+      body: schema
+    }];
   };
 
   buildEditorPanel(
@@ -373,15 +379,15 @@ export class ActionPlugin extends BasePlugin {
         };
       }
 
-      panels.push({
-        key: 'action',
-        icon: 'fa fa-gavel',
-        title: '动作',
-        render: this.manager.makeSchemaFormRender({
-          body: body
-        }),
-        order: 100
-      });
+      // panels.push({
+      //   key: 'action',
+      //   icon: 'fa fa-gavel',
+      //   title: '动作',
+      //   render: this.manager.makeSchemaFormRender({
+      //     body: body
+      //   }),
+      //   order: 100
+      // });
     } else {
       super.buildEditorPanel(context, panels);
     }

package/src/plugin/Others/BasicToolbar.tsx

@@ -530,6 +530,8 @@ export class BasicToolbarPlugin extends BasePlugin {
       return;
     }
 
+    const store = this.manager.store;
+
     let menus: Array<ContextMenuItem> = [];
     const contextMenuContext: ContextMenuEventContext = {
       ...context,
@@ -558,7 +560,8 @@ export class BasicToolbarPlugin extends BasePlugin {
                   onClick: (menu as MenuItem).onSelect
                 }))
             }
-          ]
+          ],
+          panelById: store.activeId
         })
       });
     }

package/src/plugin/Others/TableCell.tsx

@@ -61,14 +61,11 @@ export class TableCellPlugin extends BasePlugin {
               description: '当没有值时用这个来替代展示'
             },
 
-            {
+            getSchemaTpl('switch', {
               name: 'sortable',
-              type: 'switch',
               label: '是否可排序',
-              mode: 'inline',
-              className: 'w-full',
               description: '开启后可以根据当前列排序(后端排序)。'
-            }
+            })
           ]
         },
         {
@@ -81,14 +78,12 @@ export class TableCellPlugin extends BasePlugin {
               description:
                 '当多列的分组名称设置一致时，表格会在显示表头的上层显示超级表头，<a href="https://baidu.github.io/amis/crud/header-group" target="_blank">示例</a>'
             },
-            {
+
+            getSchemaTpl('switch', {
               name: 'quickEdit',
               label: '启用快速编辑',
-              type: 'switch',
-              pipeIn: (value: any) => !!value,
-              mode: 'inline',
-              className: 'w-full'
-            },
+              pipeIn: (value: any) => !!value
+            }),
 
             {
               visibleOn: 'data.quickEdit',
@@ -111,17 +106,14 @@ export class TableCellPlugin extends BasePlugin {
               ]
             },
 
-            {
-              visibleOn: 'data.quickEdit',
+            getSchemaTpl('switch', {
               name: 'quickEdit.saveImmediately',
               label: '是否立即保存',
-              type: 'switch',
-              mode: 'inline',
-              className: 'w-full',
+              visibleOn: 'data.quickEdit',
               description: '开启后修改即提交，而不是标记修改批量提交。',
               descriptionClassName: 'help-block m-b-none',
               pipeIn: (value: any) => !!value
-            },
+            }),
 
             getSchemaTpl('api', {
               label: '立即保存接口',
@@ -186,14 +178,11 @@ export class TableCellPlugin extends BasePlugin {
               }
             },
 
-            {
+            getSchemaTpl('switch', {
               name: 'popOver',
               label: '启用查看更多展示',
-              type: 'switch',
-              pipeIn: (value: any) => !!value,
-              mode: 'inline',
-              className: 'w-full'
-            },
+              pipeIn: (value: any) => !!value
+            }),
 
             {
               name: 'popOver.mode',
@@ -305,14 +294,11 @@ export class TableCellPlugin extends BasePlugin {
               }
             },
 
-            {
+            getSchemaTpl('switch', {
               name: 'copyable',
               label: '启用内容复制功能',
-              type: 'switch',
-              pipeIn: (value: any) => !!value,
-              mode: 'inline',
-              className: 'w-full'
-            },
+              pipeIn: (value: any) => !!value
+            }),
 
             {
               visibleOn: 'data.copyable',
@@ -352,14 +338,11 @@ export class TableCellPlugin extends BasePlugin {
               ]
             },
 
-            {
+            getSchemaTpl('switch', {
               name: 'toggled',
-              type: 'switch',
               label: '默认展示',
-              mode: 'inline',
-              className: 'w-full',
               pipeIn: defaultValue(true)
-            },
+            }),
 
             {
               name: 'breakpoint',
@@ -400,18 +383,15 @@ export class TableCellPlugin extends BasePlugin {
                   : value
             },
 
-            {
-              type: 'switch',
+            getSchemaTpl('switch', {
               name: 'className',
               label: '内容强制换行',
-              mode: 'inline',
-              className: 'w-full',
               pipeIn: (value: any) =>
                 typeof value === 'string' && /\word\-break\b/.test(value),
               pipeOut: (value: any, originValue: any) =>
                 (value ? 'word-break ' : '') +
                 (originValue || '').replace(/\bword\-break\b/g, '').trim()
-            },
+            }),
 
             getSchemaTpl('className'),
             getSchemaTpl('className', {