From 69b3cfabb054fdd13af7efb5402cb40eff37f21e Mon Sep 17 00:00:00 2001 From: Junyi Date: Sat, 18 May 2024 12:11:21 +0800 Subject: [PATCH] fix(plugin-workflow-action-trigger): fix hint (#4383) --- .../schema-component/antd/action/Action.Designer.tsx | 10 +++++++--- .../src/client/ActionTrigger.tsx | 6 +----- .../@nocobase/plugin-workflow/src/locale/zh-CN.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx index eb2d567cd6..e69aa16843 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx @@ -454,17 +454,21 @@ export function WorkflowConfig() { const description = { submit: t( - 'Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action and approval event).', + 'Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action event in local mode, and approval event).', { ns: 'workflow', }, ), 'customize:save': t( - 'Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action and approval event).', + 'Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action event in local mode, and approval event).', { ns: 'workflow', }, ), + 'customize:update': t( + 'Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action event in local mode, and approval event).', + { ns: 'workflow' }, + ), 'customize:triggerWorkflows': t( 'Workflow will be triggered directly once the button clicked, without data saving. Only supports to be bound with "Custom action event".', { ns: '@nocobase/plugin-workflow-custom-action-trigger' }, @@ -473,7 +477,7 @@ export function WorkflowConfig() { '"Submit to workflow" to "Post-action event" is deprecated, please use "Custom action event" instead.', { ns: 'workflow' }, ), - destroy: t('Workflow will be triggered before deleting succeeded (only supports pre-action event).', { + destroy: t('Workflow will be triggered before deleting succeeded (only supports pre-action event in local mode).', { ns: 'workflow', }), }[fieldSchema?.['x-action']]; diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx index 1205f484c4..01fd94f56f 100644 --- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx @@ -151,11 +151,7 @@ export default class extends Trigger { CheckboxGroupWithTooltip, }; isActionTriggerable = (config, context) => { - return ( - ['create', 'update'].includes(context.formAction) && - ['submit', 'customize:save'].includes(context.buttonAction) && - !config.global - ); + return !config.global && ['submit', 'customize:save', 'customize:update'].includes(context.buttonAction); }; useVariables(config, options) { // eslint-disable-next-line react-hooks/rules-of-hooks diff --git a/packages/plugins/@nocobase/plugin-workflow/src/locale/zh-CN.json b/packages/plugins/@nocobase/plugin-workflow/src/locale/zh-CN.json index 5731b4263d..a39e6722b3 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/locale/zh-CN.json +++ b/packages/plugins/@nocobase/plugin-workflow/src/locale/zh-CN.json @@ -37,10 +37,10 @@ "适用于需要即时反馈的用户操作。不能在此模式下使用异步节点，并且不建议在同步模式下执行耗时的操作。", "Go back": "返回", "Bind workflows": "绑定工作流", - "Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action and approval event).": "工作流会基于其类型在提交成功之前或之后触发（支持操作前、操作后和审批事件）。", + "Workflow will be triggered before or after submitting succeeded based on workflow type (supports pre/post action event in local mode, and approval event).": "工作流会基于其类型在提交成功之前或之后触发（支持局部模式的操作前、操作后事件，和审批事件）。", "Workflow will be triggered directly once the button clicked, without data saving. Only supports to be bound with \"Custom action event\".": "按钮点击后直接触发工作流，但不会保存数据。仅支持绑定“自定义操作事件”。", "\"Submit to workflow\" to \"Post-action event\" is deprecated, please use \"Custom action event\" instead.": "“提交至工作流”到“操作后事件”的方式已被弃用，请使用“自定义操作事件”代替。", - "Workflow will be triggered before deleting succeeded (only supports pre-action event).": "删除成功之前触发工作流（支持操作前事件）。", + "Workflow will be triggered before deleting succeeded (only supports pre-action event in local mode).": "删除成功之前触发工作流（支持操作前事件）。", "Submit to workflow": "提交至工作流", "Add workflow": "添加工作流", "Select workflow": "选择工作流",