This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 1b1a567fec [doc] Correct the complement add docs (#10521)
1b1a567fec is described below
commit 1b1a567fec8bc0c5027b2f8ea11bc57a85101ced
Author: houshitao <[email protected]>
AuthorDate: Thu Jun 23 12:02:28 2022 +0800
[doc] Correct the complement add docs (#10521)
---
docs/docs/en/guide/project/workflow-definition.md | 14 +++++++++++---
docs/docs/zh/guide/project/workflow-definition.md | 14 +++++++++++---
docs/img/new_ui/dev/project/workflow_date_manual.png | Bin 0 -> 25415 bytes
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/docs/docs/en/guide/project/workflow-definition.md
b/docs/docs/en/guide/project/workflow-definition.md
index 3a914373a3..7f16a6cbbd 100644
--- a/docs/docs/en/guide/project/workflow-definition.md
+++ b/docs/docs/en/guide/project/workflow-definition.md
@@ -74,14 +74,22 @@ The following are the operation functions of the workflow
definition list:
* Recipient: select notification policy||timeout alarm||when fault
tolerance occurs, process result information or alarm email will be sent to the
recipient list
* Cc: select notification policy||timeout alarm||when fault tolerance
occurs, the process result information or warning email will be copied to the
CC list
* Startup parameter: Set or overwrite global parameter values when
starting a new process instance
- * Complement: two modes including serial complement and parallel
complement. Serial complement: within the specified time range, the complements
are executed from the start date to the end date and N process instances are
generated in turn; parallel complement: within the specified time range,
multiple days are complemented at the same time to generate N process instances.
+ * Complement: includes serial complement and parallel complement and
supports manual date input and date selection. Serial complement defines,
within the specified time range, executes the complements from the start date
to the end date by sequential and N process instances are generated in
sequence. Parallel complement defines executing the complement concurrently in
the multiple days to generate N process instances within the specified time
range. Manual date input defines: manuall [...]
* You can select complement time range (When the scheduled configuration
is not online, the daily complement will be performed by default according to
the selected time range.If the timing configuration is online, it will be
complemented according to the selected time range in combination with the
timing configuration) when executing a timing workflow definition. For example,
need to fill in the data from 1st May to 10th May, as shown in the figure below:
- > Serial mode: the complement execute sequentially from 9th May to 10th May,
and the process instance page generates 10 process instances;
+ > Serial mode: the complement execute sequentially from 9th May to 10th May,
and the process instance page generates 2 process instances;
- > Parallel mode: The tasks from 9th May to 10th May execute simultaneously,
and the process instance page generates 10 process instances;
+ > Parallel mode: The tasks from 9th May to 10th May execute simultaneously,
and the process instance page generates 2 process instances;
+
+ * You can manually enter the complement dates (independent from the
timing configuration) to execute the complement data to workflow definitions.
The figure below is an example to make complement data from 9th May to 10th May:
+
+
+
+ > Serial mode: the complement execute sequentially from 9th May to 10th May,
and the process instance page generates 2 process instances;
+
+ > Parallel mode: The tasks from 9th May to 10th May execute simultaneously,
and the process instance page generates 2 process instances;
## Workflow Timing
diff --git a/docs/docs/zh/guide/project/workflow-definition.md
b/docs/docs/zh/guide/project/workflow-definition.md
index 930986b27d..5548d78291 100644
--- a/docs/docs/zh/guide/project/workflow-definition.md
+++ b/docs/docs/zh/guide/project/workflow-definition.md
@@ -75,14 +75,22 @@
* 收件人：选择通知策略||超时报警||发生容错时，会发送流程信息或告警邮件到收件人列表。
* 抄送人：选择通知策略||超时报警||发生容错时，会抄送流程信息或告警邮件到抄送人列表。
* 启动参数: 在启动新的流程实例时，设置或覆盖全局参数的值。
- * 补数：包括串行补数、并行补数 2
种模式。串行补数：指定时间范围内，从开始日期至结束日期依次执行补数，依次生成N条流程实例；并行补数：指定时间范围内，多天同时进行补数，同时生成 N
条流程实例。
+ * 补数：包括串行补数、并行补数 2
种模式，日期可以通过选择或者手动进行输入。串行补数：指定时间范围内，从开始日期至结束日期依次执行补数，依次生成N条流程实例；并行补数：指定时间范围内，多天同时进行补数，同时生成
N 条流程实例。手动输入日期：手动输入以逗号分割日期格式为 `yyyy-MM-dd HH:mm:ss` 的日期。日期选择：通过前端选择日期。
* 补数：
执行指定日期的工作流定义，可以选择补数时间范围（当定时配置未上线时默认会根据所选时间范围进行每天一次的补数，如果定时配置已上线则会根据所选的时间范围结合定时配置进行补数)，比如需要补
5 月 9 号到 5 月 10 号的数据，如下图所示：
- > 串行模式：补数从 5 月 9 号到 5 月 10 号依次执行，依次在流程实例页面生成十条流程实例；
+ > 串行模式：补数从 5 月 9 号到 5 月 10 号依次执行，依次在流程实例页面生成两条流程实例；
- > 并行模式：同时执行 5 月 9 号到 5 月 10 号的任务，同时在流程实例页面生成十条流程实例。
+ > 并行模式：同时执行 5 月 9 号到 5 月 10 号的任务，同时在流程实例页面生成两条流程实例。
+
+ * 补数： 通过手动输入补数时间（不依赖定时配置)完成工作流定义的补数。比如需要补 5 月 9 号到 5 月 10 号的数据，如下图所示：
+
+
+
+ > 串行模式：补数从 5 月 9 号到 5 月 10 号依次执行，依次在流程实例页面生成两条流程实例；
+
+ > 并行模式：同时执行 5 月 9 号到 5 月 10 号的任务，同时在流程实例页面生成两条流程实例。
## 工作流定时
diff --git a/docs/img/new_ui/dev/project/workflow_date_manual.png
b/docs/img/new_ui/dev/project/workflow_date_manual.png
new file mode 100644
index 0000000000..70d03372f9
Binary files /dev/null and
b/docs/img/new_ui/dev/project/workflow_date_manual.png differ
