diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx index 8bc70c543..6e24f4d2f 100644 --- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx +++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx @@ -1,8 +1,5 @@ -import React from 'react'; import { css } from '@tachybase/client'; -import { Trans } from 'react-i18next'; - import { defaultFieldNames, WorkflowVariableRawTextArea } from '../..'; import { NAMESPACE } from '../../locale'; import { Instruction } from '../../nodes'; @@ -32,7 +29,6 @@ export default class extends Instruction { type: 'string', required: true, title: 'SQL', - description: '{{sqlDescription()}}', 'x-decorator': 'FormItem', 'x-component': 'WorkflowVariableRawTextArea', 'x-component-props': { @@ -44,19 +40,6 @@ export default class extends Instruction { }, }, }; - scope = { - sqlDescription() { - return ( - - {'SQL query result could be used through '} - - {'JSON query node'} - - {' (Commercial plugin).'} - - ); - }, - }; components = { WorkflowVariableRawTextArea, }; diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/trigger-instruction/TriggerInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/trigger-instruction/TriggerInstruction.tsx index d83338bfa..c23a24769 100644 --- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/trigger-instruction/TriggerInstruction.tsx +++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/trigger-instruction/TriggerInstruction.tsx @@ -5,18 +5,19 @@ import { Instruction } from '../../nodes'; import { VariableOption } from '../../variable'; export class TriggerInstruction extends Instruction { - title = tval('Trigger'); + title = tval('Workflow'); type = 'trigger-instruction'; group = 'extended'; fieldset = { workflowKey: { type: 'string', - title: tval('workflow'), + title: tval('Workflow'), name: 'workflowKey', 'x-decorator': 'FormItem', 'x-component': 'WorkflowSelect', 'x-component-props': { buttonAction: 'customize:triggerWorkflows', + noCollection: true, label: 'title', value: 'key', }, diff --git a/packages/plugins/@tachybase/plugin-workflow/src/locale/en-US.json b/packages/plugins/@tachybase/plugin-workflow/src/locale/en-US.json index 04493e93d..0bb011093 100644 --- a/packages/plugins/@tachybase/plugin-workflow/src/locale/en-US.json +++ b/packages/plugins/@tachybase/plugin-workflow/src/locale/en-US.json @@ -38,6 +38,8 @@ "Approved": "Approved", "Are you sure you want to withdraw it?": "Are you sure you want to withdraw it?", "Arithmetic calculation": "Arithmetic calculation", + "Assign value to a variable, for later use.": "Assign value to a variable, for later use.", + "Assign value to an existing variable": "Assign value to an existing variable", "Assigned": "Assigned", "Assignee": "Assignee", "Assignees": "Assignees", @@ -92,6 +94,7 @@ "Data record": "Data record", "Data will be updated": "Data will be updated", "Days": "Days", + "Declare a new variable": "Declare a new variable", "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.", "Delay": "Delay", "Disabled": "Disabled", @@ -256,9 +259,11 @@ "User submitted form": "User submitted form", "Values preset in this form will override user submitted ones when continue or reject.": "Values preset in this form will override user submitted ones when continue or reject.", "Variable datasource": "Variable datasource", + "Variable": "Variable", "Version": "Version", "View user interface": "View user interface", "Voting": "Voting", + "Webhook manager": "Webhook manager", "Weeks": "Weeks", "When rejected or returned, the workflow will be terminated immediately.": "When rejected or returned, the workflow will be terminated immediately.", "Withdraw": "Withdraw", @@ -266,7 +271,6 @@ "Withdrawn": "Withdrawn", "Workflow todos": "Workflow todos", "Workflow": "Workflow", - "Webhook manager": "Webhook manager", "\"Content-Type\" only support \"application/json\", and no need to specify": "\"Content-Type\" only support \"application/json\", and no need to specify", "concat": "concat", "ms": "ms" diff --git a/packages/plugins/@tachybase/plugin-workflow/src/locale/zh-CN.json b/packages/plugins/@tachybase/plugin-workflow/src/locale/zh-CN.json index 94f359a0b..0ed2db878 100644 --- a/packages/plugins/@tachybase/plugin-workflow/src/locale/zh-CN.json +++ b/packages/plugins/@tachybase/plugin-workflow/src/locale/zh-CN.json @@ -46,6 +46,8 @@ "Approver's interface": "审批人的操作界面", "Are you sure you want to cancel the execution?": "确定要取消该执行吗?", "Are you sure you want to withdraw it?": "确定要撤回吗?", + "Assign value to a variable, for later use.": "给一个变量赋值以便于后续的使用。", + "Assign value to an existing variable": "给已有的变量赋值", "Assigned": "已分配", "Assignee": "审批人", "Assignees": "审批人", @@ -111,6 +113,7 @@ "Data will be updated": "更新的数据", "Date variables": "日期变量", "Days": "天", + "Declare a new variable": "声明一个新的变量", "Delay a period of time and then continue or exit the process. Can be used to set wait or timeout times in parallel branches.": "延时一段时间,然后继续或退出流程。可以用于并行分支中等待其他分支或设置超时时间。", "Delay": "延时", "Delete a main version will cause all other revisions to be deleted too.": "删除主版本将导致其他版本一并被删除。", @@ -247,7 +250,6 @@ "Run multiple branch processes in parallel.": "并行运行多个分支流程。", "Running of some node was aborted by program flow.": "某个节点被程序流程终止。", "SQL action": "SQL 操作", - "SQL query result could be used through <1>JSON query node (Commercial plugin).": "SQL 执行的结果可在 <1>JSON 解析节点 中使用(商业插件)。", "Save draft": "保存草稿", "Save temporarily": "暂存", "Schedule event": "定时任务", @@ -329,9 +331,11 @@ "Values preset in this form will override user submitted ones when continue or reject.": "表单中预设的字段值会在用户提交继续或拒绝时覆盖相应字段的值。", "Variable datasource": "变量数据源", "Variable key of node": "节点变量标识", + "Variable": "变量", "Version": "版本", "View user interface": "查看界面", "Voting": "投票", + "Webhook manager": "Webhook 管理", "Weeks": "周", "When checked, the workflow will terminate when the rejection branch ends.": "勾选后,否决分支结束后工作流将终止。", "When rejected or returned, the workflow will be terminated immediately.": "当否决或退回时,工作流将立即终止。", @@ -345,7 +349,6 @@ "Workflow will be triggered before or after submitting succeeded based on workflow type.": "工作流会基于其类型在提交成功之前或之后触发。", "Workflow will be triggered directly once the button clicked, without data saving.": "按钮点击后直接触发工作流,但不会保存数据。", "Workflow": "工作流", - "Webhook manager": "Webhook 管理", "\"Content-Type\" only support \"application/json\", and no need to specify": "\"Content-Type\" 请求头仅支持 \"application/json\",无需填写", "concat": "连接", "ms": "毫秒"