Merge remote-tracking branch 'baidu/master'

packages/amis-editor/src/plugin/Dialog.tsx

@@ -298,6 +298,8 @@ export class DialogPlugin extends BasePlugin {
                 name: 'title'
               },
 
+              getSchemaTpl('button-manager'),
+
               getSchemaTpl('switch', {
                 label: '展示关闭按钮',
                 name: 'showCloseButton',

packages/amis-editor/src/plugin/Drawer.tsx

@@ -171,6 +171,7 @@ export class DrawerPlugin extends BasePlugin {
                 label: '显示蒙层',
                 pipeIn: defaultValue(true)
               }),
+              getSchemaTpl('button-manager'),
               getSchemaTpl('switch', {
                 name: 'showCloseButton',
                 label: '展示关闭按钮',

packages/amis-editor/src/plugin/Form/Combo.tsx

@@ -19,9 +19,11 @@ import {ValidatorTag} from '../../validator';
 import {
   getArgsWrapper,
   getEventControlConfig,
-  getActionCommonProps
+  getActionCommonProps,
+  buildLinkActionDesc
 } from '../../renderer/event-control/helper';
 import {resolveInputTableEventDataSchame} from '../../util';
+import React from 'react';
 
 export class ComboControlPlugin extends BasePlugin {
   static id = 'ComboControlPlugin';
@@ -264,6 +266,14 @@ export class ComboControlPlugin extends BasePlugin {
       actionLabel: '添加项',
       description: '添加新的项',
       innerArgs: ['item'],
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            {buildLinkActionDesc(props.manager, info)}
+            添加项
+          </div>
+        );
+      },
       schema: getArgsWrapper({
         type: 'combo',
         label: '添加项',

packages/amis-editor/src/plugin/Form/InputTable.tsx

@@ -25,13 +25,15 @@ import {ValidatorTag} from '../../validator';
 import {
   getEventControlConfig,
   getArgsWrapper,
-  getActionCommonProps
+  getActionCommonProps,
+  buildLinkActionDesc
 } from '../../renderer/event-control/helper';
 import cloneDeep from 'lodash/cloneDeep';
 import {
   resolveArrayDatasource,
   resolveInputTableEventDataSchame
 } from '../../util';
+import React from 'react';
 
 export class TableControlPlugin extends BasePlugin {
   static id = 'TableControlPlugin';
@@ -960,6 +962,14 @@ export class TableControlPlugin extends BasePlugin {
       actionLabel: '添加行',
       description: '添加行数据',
       innerArgs: ['item', 'index'],
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            {buildLinkActionDesc(props.manager, info)}
+            添加行
+          </div>
+        );
+      },
       schema: getArgsWrapper({
         type: 'container',
         body: [
@@ -1028,6 +1038,14 @@ export class TableControlPlugin extends BasePlugin {
       actionLabel: '删除行',
       description: '删除某一行数据',
       innerArgs: ['condition', 'index'],
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            {buildLinkActionDesc(props.manager, info)}
+            删除行
+          </div>
+        );
+      },
       schema: getArgsWrapper({
         type: 'container',
         body: [
@@ -1109,12 +1127,30 @@ export class TableControlPlugin extends BasePlugin {
     {
       actionType: 'initDrag',
       actionLabel: '开启排序',
-      description: '开启表格拖拽排序功能'
+      description: '开启表格拖拽排序功能',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            开启
+            {buildLinkActionDesc(props.manager, info)}
+            排序
+          </div>
+        );
+      }
     },
     {
       actionType: 'cancelDrag',
       actionLabel: '取消排序',
-      description: '取消表格拖拽排序功能'
+      description: '取消表格拖拽排序功能',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            取消
+            {buildLinkActionDesc(props.manager, info)}
+            排序
+          </div>
+        );
+      }
     }
   ];
 

packages/amis-editor/src/plugin/Form/InputTree.tsx

@@ -34,6 +34,15 @@ export const TreeCommonAction: RendererPluginAction[] = [
     actionLabel: '新增',
     description: '新增数据项',
     innerArgs: ['item', 'parentValue'],
+    descDetail: (info: any, context: any, props: any) => {
+      return (
+        <div className="action-desc">
+          新增
+          {buildLinkActionDesc(props.manager, info)}
+          数据项
+        </div>
+      );
+    },
     schema: getArgsWrapper({
       type: 'container',
       body: [
@@ -71,6 +80,15 @@ export const TreeCommonAction: RendererPluginAction[] = [
     actionLabel: '编辑',
     description: '编辑数据项',
     innerArgs: ['item', 'originValue'],
+    descDetail: (info: any, context: any, props: any) => {
+      return (
+        <div className="action-desc">
+          编辑
+          {buildLinkActionDesc(props.manager, info)}
+          数据项
+        </div>
+      );
+    },
     schema: getArgsWrapper({
       type: 'container',
       body: [
@@ -109,6 +127,15 @@ export const TreeCommonAction: RendererPluginAction[] = [
     actionLabel: '删除',
     description: '删除数据项',
     innerArgs: ['value'],
+    descDetail: (info: any, context: any, props: any) => {
+      return (
+        <div className="action-desc">
+          删除
+          {buildLinkActionDesc(props.manager, info)}
+          数据项
+        </div>
+      );
+    },
     schema: getArgsWrapper([
       getSchemaTpl('formulaControl', {
         label: '数据删除项的值',

packages/amis-editor/src/plugin/Image.tsx

@@ -14,9 +14,11 @@ import {
 import {defaultValue, getSchemaTpl, tipedLabel} from 'amis-editor-core';
 import {mockValue} from 'amis-editor-core';
 import {
+  buildLinkActionDesc,
   getArgsWrapper,
   getEventControlConfig
 } from '../renderer/event-control/helper';
+import React from 'react';
 
 export class ImagePlugin extends BasePlugin {
   static id = 'ImagePlugin';
@@ -119,12 +121,29 @@ export class ImagePlugin extends BasePlugin {
     {
       actionType: 'preview',
       actionLabel: '预览',
-      description: '预览图片'
+      description: '预览图片',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            预览
+            {buildLinkActionDesc(props.manager, info)}
+          </div>
+        );
+      }
     },
     {
       actionType: 'zoom',
       actionLabel: '调整图片比例',
       description: '将图片等比例放大或缩小',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            调整
+            {buildLinkActionDesc(props.manager, info)}
+            图片比例
+          </div>
+        );
+      },
       schema: {
         type: 'container',
         body: [

packages/amis-editor/src/plugin/Nav.tsx

@@ -12,7 +12,8 @@ import {
 } from 'amis-editor-core';
 import {
   getEventControlConfig,
-  getActionCommonProps
+  getActionCommonProps,
+  buildLinkActionDesc
 } from '../renderer/event-control/helper';
 
 export class NavPlugin extends BasePlugin {
@@ -253,7 +254,16 @@ export class NavPlugin extends BasePlugin {
     {
       actionType: 'updateItems',
       actionLabel: '更新菜单项',
-      description: '触发组件更新菜单项'
+      description: '触发组件更新菜单项',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            更新
+            {buildLinkActionDesc(props.manager, info)}
+            菜单项
+          </div>
+        );
+      }
     },
     {
       actionType: 'collapse',

packages/amis-editor/src/plugin/OfficeViewer.tsx

@@ -1,6 +1,8 @@
 import {RendererPluginAction, registerEditorPlugin} from 'amis-editor-core';
 import {BaseEventContext, BasePlugin} from 'amis-editor-core';
 import {defaultValue, getSchemaTpl} from 'amis-editor-core';
+import React from 'react';
+import {buildLinkActionDesc} from '../renderer/event-control';
 
 export class OfficeViewerPlugin extends BasePlugin {
   static id = 'OfficeViewerPlugin';
@@ -32,12 +34,28 @@ export class OfficeViewerPlugin extends BasePlugin {
     {
       actionType: 'print',
       actionLabel: '打印',
-      description: '打印文档'
+      description: '打印文档',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            打印文档
+            {buildLinkActionDesc(props.manager, info)}
+          </div>
+        );
+      }
     },
     {
       actionType: 'saveAs',
       actionLabel: '下载',
-      description: '下载文档'
+      description: '下载文档',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            下载文档
+            {buildLinkActionDesc(props.manager, info)}
+          </div>
+        );
+      }
     }
   ];
 

packages/amis-editor/src/plugin/QRCode.tsx

@@ -1,6 +1,8 @@
 import {RendererPluginAction, registerEditorPlugin} from 'amis-editor-core';
 import {BasePlugin} from 'amis-editor-core';
 import {defaultValue, getSchemaTpl} from 'amis-editor-core';
+import React from 'react';
+import {buildLinkActionDesc} from '../renderer/event-control';
 
 export class QRCodePlugin extends BasePlugin {
   static id = 'QRCodePlugin';
@@ -29,7 +31,15 @@ export class QRCodePlugin extends BasePlugin {
     {
       actionType: 'saveAs',
       actionLabel: '下载',
-      description: '触发二维码下载'
+      description: '触发二维码下载',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            下载二维码
+            {buildLinkActionDesc(props.manager, info)}
+          </div>
+        );
+      }
     }
   ];
 

packages/amis-editor/src/plugin/Service.tsx

@@ -18,7 +18,8 @@ import {DSBuilderManager} from '../builder/DSBuilderManager';
 import {DSFeatureEnum, ModelDSBuilderKey, ApiDSBuilderKey} from '../builder';
 import {
   getEventControlConfig,
-  getActionCommonProps
+  getActionCommonProps,
+  buildLinkActionDesc
 } from '../renderer/event-control/helper';
 
 import type {Schema} from 'amis-core';
@@ -177,7 +178,16 @@ export class ServicePlugin extends BasePlugin {
     {
       actionType: 'rebuild',
       actionLabel: '重新构建',
-      description: '触发schemaApi刷新，重新构建Schema'
+      description: '触发schemaApi刷新，重新构建Schema',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            重新构建
+            {buildLinkActionDesc(props.manager, info)}
+            Schema
+          </div>
+        );
+      }
     },
     {
       actionType: 'setValue',

packages/amis-editor/src/plugin/Table.tsx

@@ -29,7 +29,8 @@ import {reaction} from 'mobx';
 import {DSBuilderManager} from '../builder/DSBuilderManager';
 import {
   getEventControlConfig,
-  getArgsWrapper
+  getArgsWrapper,
+  buildLinkActionDesc
 } from '../renderer/event-control/helper';
 import {
   schemaArrayFormat,
@@ -453,6 +454,15 @@ export class TablePlugin extends BasePlugin {
       actionLabel: '设置选中项',
       description: '设置表格的选中项',
       innerArgs: ['selected'],
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            设置
+            {buildLinkActionDesc(props.manager, info)}
+            选中项
+          </div>
+        );
+      },
       schema: getArgsWrapper([
         getSchemaTpl('formulaControl', {
           name: 'selected',
@@ -472,17 +482,44 @@ export class TablePlugin extends BasePlugin {
     {
       actionType: 'clearAll',
       actionLabel: '清空选中项',
-      description: '清空表格所有选中项'
+      description: '清空表格所有选中项',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            清空
+            {buildLinkActionDesc(props.manager, info)}
+            选中项
+          </div>
+        );
+      }
     },
     {
       actionType: 'initDrag',
       actionLabel: '开启排序',
-      description: '开启表格拖拽排序功能'
+      description: '开启表格拖拽排序功能',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            开启
+            {buildLinkActionDesc(props.manager, info)}
+            排序
+          </div>
+        );
+      }
     },
     {
       actionType: 'cancelDrag',
       actionLabel: '取消排序',
-      description: '取消表格拖拽排序功能'
+      description: '取消表格拖拽排序功能',
+      descDetail: (info: any, context: any, props: any) => {
+        return (
+          <div className="action-desc">
+            取消
+            {buildLinkActionDesc(props.manager, info)}
+            排序
+          </div>
+        );
+      }
     }
   ];
 

packages/amis-editor/src/tpl/common.tsx

@@ -6,7 +6,7 @@ import {
   tipedLabel,
   EditorManager
 } from 'amis-editor-core';
-import type {SchemaObject} from 'amis';
+import {render, type SchemaObject} from 'amis';
 import flatten from 'lodash/flatten';
 import {InputComponentName} from '../component/InputComponentName';
 import {FormulaDateType} from '../renderer/FormulaControl';
@@ -1851,3 +1851,39 @@ setSchemaTpl('inputForbid', {
   name: 'inputForbid',
   inputClassName: 'is-inline'
 });
+
+setSchemaTpl('button-manager', () => {
+  return getSchemaTpl('combo-container', {
+    type: 'combo',
+    label: '按钮管理',
+    name: 'actions',
+    mode: 'normal',
+    multiple: true,
+    addable: true,
+    draggable: true,
+    editable: false,
+    items: [
+      {
+        component: (props: any) => {
+          return render({
+            ...props.data,
+            onEvent: {},
+            actionType: '',
+            onClick: (e: any, props: any) => {
+              const editorStore = (window as any).editorStore;
+              const subEditorStore = editorStore.getSubEditorRef()?.store;
+              (subEditorStore || editorStore).setActiveIdByComponentId(
+                props.id
+              );
+            }
+          });
+        }
+      }
+    ],
+    addButtonText: '新增按钮',
+    scaffold: {
+      type: 'button',
+      label: '按钮'
+    }
+  });
+});

packages/amis/src/renderers/Action.tsx

@@ -707,9 +707,7 @@ export class Action extends React.Component<ActionProps, ActionState> {
   render() {
     const {
       type,
-      icon,
       iconClassName,
-      rightIcon,
       rightIconClassName,
       loadingClassName,
       primary,
@@ -791,6 +789,8 @@ export class Action extends React.Component<ActionProps, ActionState> {
       }) as string;
       disabled = true;
     }
+    const icon = filter(this.props.icon, data);
+    const rightIcon = filter(this.props.rightIcon, data);
 
     const iconElement = (
       <Icon