From 512aef23a580ec887c434fe1cf3d190f1213fd53 Mon Sep 17 00:00:00 2001 From: lvxiaojiao Date: Wed, 27 Nov 2024 16:44:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=A5=E5=85=85=E7=89=B9=E6=80=A7?= =?UTF-8?q?=E5=8A=A8=E4=BD=9C=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amis-editor/src/plugin/Form/Combo.tsx | 12 ++++- .../src/plugin/Form/InputTable.tsx | 42 +++++++++++++++-- .../amis-editor/src/plugin/Form/InputTree.tsx | 27 +++++++++++ packages/amis-editor/src/plugin/Image.tsx | 21 ++++++++- packages/amis-editor/src/plugin/Nav.tsx | 14 +++++- .../amis-editor/src/plugin/OfficeViewer.tsx | 22 ++++++++- packages/amis-editor/src/plugin/QRCode.tsx | 12 ++++- packages/amis-editor/src/plugin/Service.tsx | 14 +++++- packages/amis-editor/src/plugin/Table.tsx | 45 +++++++++++++++++-- 9 files changed, 193 insertions(+), 16 deletions(-) diff --git a/packages/amis-editor/src/plugin/Form/Combo.tsx b/packages/amis-editor/src/plugin/Form/Combo.tsx index a37a29a5e..cf4786b0d 100644 --- a/packages/amis-editor/src/plugin/Form/Combo.tsx +++ b/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 ( +
+ {buildLinkActionDesc(props.manager, info)} + 添加项 +
+ ); + }, schema: getArgsWrapper({ type: 'combo', label: '添加项', diff --git a/packages/amis-editor/src/plugin/Form/InputTable.tsx b/packages/amis-editor/src/plugin/Form/InputTable.tsx index 3d5c9e8fb..97d317140 100644 --- a/packages/amis-editor/src/plugin/Form/InputTable.tsx +++ b/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 ( +
+ {buildLinkActionDesc(props.manager, info)} + 添加行 +
+ ); + }, 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 ( +
+ {buildLinkActionDesc(props.manager, info)} + 删除行 +
+ ); + }, 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 ( +
+ 开启 + {buildLinkActionDesc(props.manager, info)} + 排序 +
+ ); + } }, { actionType: 'cancelDrag', actionLabel: '取消排序', - description: '取消表格拖拽排序功能' + description: '取消表格拖拽排序功能', + descDetail: (info: any, context: any, props: any) => { + return ( +
+ 取消 + {buildLinkActionDesc(props.manager, info)} + 排序 +
+ ); + } } ]; diff --git a/packages/amis-editor/src/plugin/Form/InputTree.tsx b/packages/amis-editor/src/plugin/Form/InputTree.tsx index 6087f428a..3db3f554d 100644 --- a/packages/amis-editor/src/plugin/Form/InputTree.tsx +++ b/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 ( +
+ 新增 + {buildLinkActionDesc(props.manager, info)} + 数据项 +
+ ); + }, 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 ( +
+ 编辑 + {buildLinkActionDesc(props.manager, info)} + 数据项 +
+ ); + }, 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 ( +
+ 删除 + {buildLinkActionDesc(props.manager, info)} + 数据项 +
+ ); + }, schema: getArgsWrapper([ getSchemaTpl('formulaControl', { label: '数据删除项的值', diff --git a/packages/amis-editor/src/plugin/Image.tsx b/packages/amis-editor/src/plugin/Image.tsx index fa055a0ac..61562bcd1 100644 --- a/packages/amis-editor/src/plugin/Image.tsx +++ b/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 ( +
+ 预览 + {buildLinkActionDesc(props.manager, info)} +
+ ); + } }, { actionType: 'zoom', actionLabel: '调整图片比例', description: '将图片等比例放大或缩小', + descDetail: (info: any, context: any, props: any) => { + return ( +
+ 调整 + {buildLinkActionDesc(props.manager, info)} + 图片比例 +
+ ); + }, schema: { type: 'container', body: [ diff --git a/packages/amis-editor/src/plugin/Nav.tsx b/packages/amis-editor/src/plugin/Nav.tsx index 52feda67b..53899520a 100644 --- a/packages/amis-editor/src/plugin/Nav.tsx +++ b/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 ( +
+ 更新 + {buildLinkActionDesc(props.manager, info)} + 菜单项 +
+ ); + } }, { actionType: 'collapse', diff --git a/packages/amis-editor/src/plugin/OfficeViewer.tsx b/packages/amis-editor/src/plugin/OfficeViewer.tsx index 5de3d067b..aefdbdfa5 100644 --- a/packages/amis-editor/src/plugin/OfficeViewer.tsx +++ b/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 ( +
+ 打印文档 + {buildLinkActionDesc(props.manager, info)} +
+ ); + } }, { actionType: 'saveAs', actionLabel: '下载', - description: '下载文档' + description: '下载文档', + descDetail: (info: any, context: any, props: any) => { + return ( +
+ 下载文档 + {buildLinkActionDesc(props.manager, info)} +
+ ); + } } ]; diff --git a/packages/amis-editor/src/plugin/QRCode.tsx b/packages/amis-editor/src/plugin/QRCode.tsx index c5e166abd..53386c5a0 100644 --- a/packages/amis-editor/src/plugin/QRCode.tsx +++ b/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 ( +
+ 下载二维码 + {buildLinkActionDesc(props.manager, info)} +
+ ); + } } ]; diff --git a/packages/amis-editor/src/plugin/Service.tsx b/packages/amis-editor/src/plugin/Service.tsx index 486984047..3d95f760c 100644 --- a/packages/amis-editor/src/plugin/Service.tsx +++ b/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 ( +
+ 重新构建 + {buildLinkActionDesc(props.manager, info)} + Schema +
+ ); + } }, { actionType: 'setValue', diff --git a/packages/amis-editor/src/plugin/Table.tsx b/packages/amis-editor/src/plugin/Table.tsx index 37cf6a44c..fff75f1a2 100644 --- a/packages/amis-editor/src/plugin/Table.tsx +++ b/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 ( +
+ 设置 + {buildLinkActionDesc(props.manager, info)} + 选中项 +
+ ); + }, 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 ( +
+ 清空 + {buildLinkActionDesc(props.manager, info)} + 选中项 +
+ ); + } }, { actionType: 'initDrag', actionLabel: '开启排序', - description: '开启表格拖拽排序功能' + description: '开启表格拖拽排序功能', + descDetail: (info: any, context: any, props: any) => { + return ( +
+ 开启 + {buildLinkActionDesc(props.manager, info)} + 排序 +
+ ); + } }, { actionType: 'cancelDrag', actionLabel: '取消排序', - description: '取消表格拖拽排序功能' + description: '取消表格拖拽排序功能', + descDetail: (info: any, context: any, props: any) => { + return ( +
+ 取消 + {buildLinkActionDesc(props.manager, info)} + 排序 +
+ ); + } } ];