This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new f99f234fe Automated deployment:
95e4e571c6acacdde623aa09683ba5179e96ff5e
f99f234fe is described below
commit f99f234fea45c2e8a4ef83ae54eb1d3bc762156e
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 10 05:07:21 2022 +0000
Automated deployment: 95e4e571c6acacdde623aa09683ba5179e96ff5e
---
.../guide/installation/pseudo-cluster.html | 3 +-
.../guide/installation/pseudo-cluster.json | 2 +-
.../guide/project/workflow-definition.html | 61 ++++++++++++++-------
.../guide/project/workflow-definition.json | 2 +-
en-us/docs/dev/user_doc/guide/start/docker.html | 2 +-
en-us/docs/dev/user_doc/guide/start/docker.json | 2 +-
.../dev/project/workflow-concurrency-from.png | Bin 0 -> 52048 bytes
img/new_ui/dev/project/workflow-concurrency.png | Bin 0 -> 69050 bytes
.../dev/project/workflow-configuredTiming.png | Bin 0 -> 51860 bytes
.../project/workflow-configuredTimingResult.png | Bin 0 -> 52048 bytes
img/new_ui/dev/project/workflow-dependency.png | Bin 0 -> 47150 bytes
img/new_ui/dev/project/workflow-input.png | Bin 0 -> 54766 bytes
img/new_ui/dev/project/workflow-pageSelection.png | Bin 0 -> 67199 bytes
img/new_ui/dev/project/workflow-parallel.png | Bin 0 -> 53845 bytes
img/new_ui/dev/project/workflow-serial.png | Bin 0 -> 54577 bytes
.../project/workflow-unconfiguredTimingResult.png | Bin 0 -> 64994 bytes
.../guide/installation/pseudo-cluster.html | 3 +-
.../guide/installation/pseudo-cluster.json | 2 +-
.../guide/project/workflow-definition.html | 54 ++++++++++++------
.../guide/project/workflow-definition.json | 2 +-
zh-cn/docs/dev/user_doc/guide/start/docker.html | 2 +-
zh-cn/docs/dev/user_doc/guide/start/docker.json | 2 +-
22 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index d9da811f8..5a3dc35f6 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -71,7 +71,7 @@ chmod 600 ~/.ssh/authorized_keys
</code></pre>
<h2>Modify Configuration</h2>
<p>After completing the preparation of the basic environment, you need to
modify the configuration file according to the
-environment you used. The configuration files are both in directory
<code>bin/env</code> and named <code>install_env.sh</code> and
<code>dolphinscheduler_env.sh</code>.</p>
+environment you used. Change the environment configurations via <code>export
<ENV_NAME>=<VALUE></code>. The configuration files are located in
directory <code>bin/env</code> as <code>install_env.sh</code> and
<code>dolphinscheduler_env.sh</code>.</p>
<h3>Modify <code>install_env.sh</code></h3>
<p>File <code>install_env.sh</code> describes which machines will be installed
DolphinScheduler and what server will be installed on
each machine. You could find this file in the path
<code>bin/env/install_env.sh</code> and the detail of the configuration as
below.</p>
@@ -80,6 +80,7 @@ each machine. You could find this file in the path
<code>bin/env/install_env.sh<
<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> Due to the master, worker,
and API server being deployed on a single node, the IP of the server is the
machine IP or localhost</span>
ips="localhost"
+sshPort="22"
masters="localhost"
workers="localhost:default"
alertServer="localhost"
diff --git a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index 1753ea8a9..84e6bcdb5 100644
--- a/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
+ "__html": "<h1>Pseudo-Cluster Deployment</h1>\n<p>The purpose of the
pseudo-cluster deployment is to deploy the DolphinScheduler service on a single
machine. In this mode, DolphinScheduler's master, worker, API server, are all
on the same machine.</p>\n<p>If you are a new hand and want to experience
DolphinScheduler functions, we recommend you install follow <a
href=\"standalone.md\">Standalone deployment</a>. If you want to experience
more complete functions and schedule massive tasks [...]
"link":
"/dist/en-us/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/project/workflow-definition.html
b/en-us/docs/dev/user_doc/guide/project/workflow-definition.html
index 8317bf300..b61c47f3a 100644
--- a/en-us/docs/dev/user_doc/guide/project/workflow-definition.html
+++ b/en-us/docs/dev/user_doc/guide/project/workflow-definition.html
@@ -106,28 +106,49 @@
<p>Startup parameter: Set or overwrite global parameter values when starting a
new process instance.</p>
</li>
<li>
-<p>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: manually i [...]
+<p>Complement: refers to running the workflow definition within the specified
date range and generating the corresponding workflow instance according to the
complement policy. The complement policy includes two modes: <strong>serial
complement</strong> and <strong>parallel complement</strong>. The date can be
selected on the page or entered manually.</p>
<ul>
-<li>Dependent Mode: Trigger the complement of workflow instances that the
downstream dependent node depends on the current workflow(It is required that
the scheduled status of the workflow instance of the current replenishment is
online, and only the downstream supplement directly dependent on the current
workflow will be triggered).</li>
-<li>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:</li>
-</ul>
-<p><img src="/img/new_ui/dev/project/workflow-date.png"
alt="workflow-date"></p>
-<blockquote>
-<p>Serial mode: the complement execute sequentially from 9th May to 10th May,
and the process instance page generates 2 process instances;</p>
-</blockquote>
-<blockquote>
-<p>Parallel mode: The tasks from 9th May to 10th May execute simultaneously,
and the process instance page generates 2 process instances;</p>
-</blockquote>
-<ul>
-<li>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:</li>
+<li>
+<p>Serial complement: within the specified time range, complement is executed
from the start date to the end date, and multiple process instances are
generated in turn; Click Run workflow and select the serial complement mode:
for example, from July 9 to July 10, execute in sequence, and generate two
process instances in sequence on the process instance page.</p>
+<p><img src="/img/new_ui/dev/project/workflow-serial.png"
alt="workflow-serial"></p>
+</li>
+<li>
+<p>Parallel Replenishment: within the specified time range, replenishment is
performed simultaneously for multiple days, and multiple process instances are
generated at the same time. Enter date manually: manually enter a date in the
comma separated date format of 'yyyy MM DD hh:mm:ss'.Click Run workflow and
select the parallel complement mode: for example, execute the workflow
definition from July 9 to July 10 at the same time, and generate two process
instances on the process instance [...]
+<p><img src="/img/new_ui/dev/project/workflow-parallel.png"
alt="workflow-parallel"></p>
+</li>
+<li>
+<p>Concurrency: refers to the maximum number of instances executed in parallel
in the parallel complement mode.For example, if tasks from July 6 to July 10
are executed at the same time, and the concurrency is 2, then the process
instance is:</p>
+<p><img src="/img/new_ui/dev/project/workflow-concurrency-from.png"
alt="workflow-concurrency-from"></p>
+<p><img src="/img/new_ui/dev/project/workflow-concurrency.png"
alt="workflow-concurrency"></p>
+</li>
+<li>
+<p>Dependency mode: whether to trigger the replenishment of workflow instances
that downstream dependent nodes depend on the current workflow (the timing
status of workflow instances that require the current replenishment is online,
which will only trigger the replenishment of downstream directly dependent on
the current workflow).</p>
+<p><img src="/img/new_ui/dev/project/workflow-dependency.png"
alt="workflow-dependency"></p>
+</li>
+<li>
+<p>Date selection:</p>
+<ol>
+<li>Select the date through the page:</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-pageSelection.png"
alt="workflow-pageSelection"></p>
+<ol start="2">
+<li>Manual input:</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-input.png"
alt="workflow-input"></p>
+</li>
+<li>
+<p>Relationship between complement and timing configuration:</p>
+<ol>
+<li>Unconfigured timing: When there is no timing configuration, the daily
replenishment will be performed by default according to the selected time
range. For example, the workflow scheduling date is July 7 to July 10. If
timing is not configured, the process instance is:</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-unconfiguredTimingResult.png"
alt="workflow-unconfiguredTimingResult"></p>
+<ol start="2">
+<li>Configured timing: If there is a timing configuration, it will be
supplemented according to the selected time range in combination with the
timing configuration. For example, the workflow scheduling date is July 7 to
July 10, and the timing is configured (running every 5 a.m.). The process
example is:</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-configuredTiming.png"
alt="workflow-configuredTiming"></p>
+<p><img src="/img/new_ui/dev/project/workflow-configuredTimingResult.png"
alt="workflow-configuredTimingResult"></p>
+</li>
</ul>
-<p><img src="/img/new_ui/dev/project/workflow_date_manual.png"
alt="workflow-date"></p>
-<blockquote>
-<p>Serial mode: the complement execute sequentially from 9th May to 10th May,
and the process instance page generates 2 process instances;</p>
-</blockquote>
-<blockquote>
-<p>Parallel mode: The tasks from 9th May to 10th May execute simultaneously,
and the process instance page generates 2 process instances;</p>
-</blockquote>
</li>
</ul>
<h2>Run the task alone</h2>
diff --git a/en-us/docs/dev/user_doc/guide/project/workflow-definition.json
b/en-us/docs/dev/user_doc/guide/project/workflow-definition.json
index 62476ae2b..d3dc0f9e4 100644
--- a/en-us/docs/dev/user_doc/guide/project/workflow-definition.json
+++ b/en-us/docs/dev/user_doc/guide/project/workflow-definition.json
@@ -1,6 +1,6 @@
{
"filename": "workflow-definition.md",
- "__html": "<h1>Workflow Definition</h1>\n<h2>Overview</h2>\n<p>Work
Definition screen shows list of existing workflows and utility to create or
import workflows.</p>\n<p><img
src=\"/img/new_ui/dev/project/workflow-overview.png\"
alt=\"workflow-dag\"></p>\n<h2>Create workflow definition</h2>\n<p>Click
<code>Project Management -> Workflow -> Workflow Definition</code>, enter
the <code>Workflow Definition</code> page, and click the <code>Create
Workflow</code> button to enter the <s [...]
+ "__html": "<h1>Workflow Definition</h1>\n<h2>Overview</h2>\n<p>Work
Definition screen shows list of existing workflows and utility to create or
import workflows.</p>\n<p><img
src=\"/img/new_ui/dev/project/workflow-overview.png\"
alt=\"workflow-dag\"></p>\n<h2>Create workflow definition</h2>\n<p>Click
<code>Project Management -> Workflow -> Workflow Definition</code>, enter
the <code>Workflow Definition</code> page, and click the <code>Create
Workflow</code> button to enter the <s [...]
"link":
"/dist/en-us/docs/dev/user_doc/guide/project/workflow-definition.html",
"meta": {}
}
\ No newline at end of file
diff --git a/en-us/docs/dev/user_doc/guide/start/docker.html
b/en-us/docs/dev/user_doc/guide/start/docker.html
index 1f36f7b15..7af50a898 100644
--- a/en-us/docs/dev/user_doc/guide/start/docker.html
+++ b/en-us/docs/dev/user_doc/guide/start/docker.html
@@ -42,7 +42,7 @@ be stored on disks after you change docker-compose
configuration, and it is robu
DolphinScheduler in a long term. You have to install <a
href="https://docs.docker.com/compose/install/";>docker-compose</a> before you
start servers.</p>
<p>After installed docker-compose, it is recommended to modify some
configurations for better experience. We highly recommended
-modify docker-compose's memory up to 4 GB.</p>
+modify docker-compose's free memory up to 4 GB.</p>
<ul>
<li>Mac：Click <code>Docker Desktop -> Preferences -> Resources ->
Memory</code> modified it</li>
<li>Windows Docker Desktop：
diff --git a/en-us/docs/dev/user_doc/guide/start/docker.json
b/en-us/docs/dev/user_doc/guide/start/docker.json
index e0573661a..128a2a838 100644
--- a/en-us/docs/dev/user_doc/guide/start/docker.json
+++ b/en-us/docs/dev/user_doc/guide/start/docker.json
@@ -1,6 +1,6 @@
{
"filename": "docker.md",
- "__html": "<h1>Docker Quick Start</h1>\n<p>There are three ways to start
DolphinScheduler with Docker, <a
href=\"#using-standalone-server-docker-image\">Standalone-server</a> is the way
you\nfind if you just want to start and try DolphinScheduler as a beginner. <a
href=\"#using-docker-compose-to-start-server\">docker-compose</a> is for\nsome
who want to deploy DolphinScheduler in small or event middle scale workflows in
their daily work.\n<a href=\"#using-exists-postgresql-zookeeper\"> [...]
+ "__html": "<h1>Docker Quick Start</h1>\n<p>There are three ways to start
DolphinScheduler with Docker, <a
href=\"#using-standalone-server-docker-image\">Standalone-server</a> is the way
you\nfind if you just want to start and try DolphinScheduler as a beginner. <a
href=\"#using-docker-compose-to-start-server\">docker-compose</a> is for\nsome
who want to deploy DolphinScheduler in small or event middle scale workflows in
their daily work.\n<a href=\"#using-exists-postgresql-zookeeper\"> [...]
"link": "/dist/en-us/docs/dev/user_doc/guide/start/docker.html",
"meta": {}
}
\ No newline at end of file
diff --git a/img/new_ui/dev/project/workflow-concurrency-from.png
b/img/new_ui/dev/project/workflow-concurrency-from.png
new file mode 100644
index 000000000..e16f9710c
Binary files /dev/null and
b/img/new_ui/dev/project/workflow-concurrency-from.png differ
diff --git a/img/new_ui/dev/project/workflow-concurrency.png
b/img/new_ui/dev/project/workflow-concurrency.png
new file mode 100644
index 000000000..af90317c9
Binary files /dev/null and b/img/new_ui/dev/project/workflow-concurrency.png
differ
diff --git a/img/new_ui/dev/project/workflow-configuredTiming.png
b/img/new_ui/dev/project/workflow-configuredTiming.png
new file mode 100644
index 000000000..c7c4be64f
Binary files /dev/null and
b/img/new_ui/dev/project/workflow-configuredTiming.png differ
diff --git a/img/new_ui/dev/project/workflow-configuredTimingResult.png
b/img/new_ui/dev/project/workflow-configuredTimingResult.png
new file mode 100644
index 000000000..658d32af1
Binary files /dev/null and
b/img/new_ui/dev/project/workflow-configuredTimingResult.png differ
diff --git a/img/new_ui/dev/project/workflow-dependency.png
b/img/new_ui/dev/project/workflow-dependency.png
new file mode 100644
index 000000000..d2cd8a0a7
Binary files /dev/null and b/img/new_ui/dev/project/workflow-dependency.png
differ
diff --git a/img/new_ui/dev/project/workflow-input.png
b/img/new_ui/dev/project/workflow-input.png
new file mode 100644
index 000000000..f1d04882e
Binary files /dev/null and b/img/new_ui/dev/project/workflow-input.png differ
diff --git a/img/new_ui/dev/project/workflow-pageSelection.png
b/img/new_ui/dev/project/workflow-pageSelection.png
new file mode 100644
index 000000000..30975df65
Binary files /dev/null and b/img/new_ui/dev/project/workflow-pageSelection.png
differ
diff --git a/img/new_ui/dev/project/workflow-parallel.png
b/img/new_ui/dev/project/workflow-parallel.png
new file mode 100644
index 000000000..e11634b0e
Binary files /dev/null and b/img/new_ui/dev/project/workflow-parallel.png differ
diff --git a/img/new_ui/dev/project/workflow-serial.png
b/img/new_ui/dev/project/workflow-serial.png
new file mode 100644
index 000000000..f9731965d
Binary files /dev/null and b/img/new_ui/dev/project/workflow-serial.png differ
diff --git a/img/new_ui/dev/project/workflow-unconfiguredTimingResult.png
b/img/new_ui/dev/project/workflow-unconfiguredTimingResult.png
new file mode 100644
index 000000000..f7c16af46
Binary files /dev/null and
b/img/new_ui/dev/project/workflow-unconfiguredTimingResult.png differ
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
index 32cc293cb..009f946fb 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html
@@ -72,12 +72,13 @@ chmod 600 ~/.ssh/authorized_keys
<h2>修改相关配置</h2>
<p>完成基础环境的准备后，需要根据你的机器环境修改配置文件。配置文件可以在目录 <code>bin/env</code> 中找到，他们分别是 并命名为
<code>install_env.sh</code> 和 <code>dolphinscheduler_env.sh</code>。</p>
<h3>修改 <code>install_env.sh</code> 文件</h3>
-<p>文件 <code>install_env.sh</code> 描述了哪些机器将被安装 DolphinScheduler
以及每台机器对应安装哪些服务。您可以在路径 <code>bin/env/install_env.sh</code> 中找到此文件，配置详情如下。</p>
+<p>文件 <code>install_env.sh</code> 描述了哪些机器将被安装 DolphinScheduler
以及每台机器对应安装哪些服务。您可以在路径 <code>bin/env/install_env.sh</code>
中找到此文件，可通过以下方式更改env变量,export <ENV_NAME>=<VALUE>，配置详情如下。</p>
<pre><code class="language-shell"><span class="hljs-meta">#</span><span
class="bash"> ---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> INSTALL MACHINE</span>
<span class="hljs-meta">#</span><span class="bash">
---------------------------------------------------------</span>
<span class="hljs-meta">#</span><span class="bash"> Due to the master, worker,
and API server being deployed on a single node, the IP of the server is the
machine IP or localhost</span>
ips="localhost"
+sshPort="22"
masters="localhost"
workers="localhost:default"
alertServer="localhost"
diff --git a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
index 6e3cfb638..e0f813e87 100644
--- a/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
+++ b/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.json
@@ -1,6 +1,6 @@
{
"filename": "pseudo-cluster.md",
- "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
+ "__html": "<h1>伪集群部署</h1>\n<p>伪集群部署目的是在单台机器部署 DolphinScheduler
服务，该模式下master、worker、api server 都在同一台机器上</p>\n<p>如果你是新手，想要体验 DolphinScheduler
的功能，推荐使用<a
href=\"standalone.md\">Standalone</a>方式体检。如果你想体验更完整的功能，或者更大的任务量，推荐使用<a
href=\"pseudo-cluster.md\">伪集群部署</a>。如果你是在生产中使用，推荐使用<a
href=\"cluster.md\">集群部署</a>或者<a
href=\"kubernetes.md\">kubernetes</a></p>\n<h2>前置准备工作</h2>\n<p>伪分布式部署
DolphinScheduler 需要有外部软件的支持</p>\n<ul>\n<li>JDK：下载<a
href=\"https://www.oracle.com/technetwork/java/javase/dow [...]
"link":
"/dist/zh-cn/docs/dev/user_doc/guide/installation/pseudo-cluster.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html
b/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html
index a1dc5cb7a..23c91639e 100644
--- a/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html
+++ b/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html
@@ -101,28 +101,48 @@
<p>启动参数: 在启动新的流程实例时，设置或覆盖全局参数的值。</p>
</li>
<li>
-<p>补数：包括串行补数、并行补数 2
种模式，日期可以通过选择或者手动进行输入。串行补数：指定时间范围内，从开始日期至结束日期依次执行补数，依次生成N条流程实例；并行补数：指定时间范围内，多天同时进行补数，同时生成
N 条流程实例。手动输入日期：手动输入以逗号分割日期格式为 <code>yyyy-MM-dd HH:mm:ss</code>
的日期。日期选择：通过前端选择日期。</p>
+<p>补数：指运行指定日期范围内的工作流定义，根据补数策略生成对应的工作流实例，补数策略包括串行补数、并行补数 2
种模式，日期可以通过页面选择或者手动输入。</p>
+<ul>
+<li>串行补数：指定时间范围内，从开始日期至结束日期依次执行补数，依次生成多条流程实例；点击运行工作流，选择串行补数模式：例如从7月
9号到7月10号依次执行，依次在流程实例页面生成两条流程实例。</li>
+</ul>
+<p><img src="/img/new_ui/dev/project/workflow-serial.png"
alt="workflow-serial"></p>
+<ul>
+<li>并行补数： 指定时间范围内，同时进行多天的补数，同时生成多条流程实例。手动输入日期：手动输入以逗号分割日期格式为 <code>yyyy-MM-dd
HH:mm:ss</code>
的日期。点击运行工作流，选择并行补数模式：例如同时执行7月9号到7月10号的工作流定义，同时在流程实例页面生成两条流程实例(执行策略为串行时流程实例按照策略执行)。</li>
+</ul>
+<p><img src="/img/new_ui/dev/project/workflow-parallel.png"
alt="workflow-parallel"></p>
+<pre><code>* 并行度：是指在并行补数的模式下，最多并行执行的实例数。例如同时执行7月6号到7月10号的工作流定义，并行度为2，那么流程实例为：
+</code></pre>
+<p><img src="/img/new_ui/dev/project/workflow-concurrency-from.png"
alt="workflow-concurrency-from"></p>
+<p><img src="/img/new_ui/dev/project/workflow-concurrency.png"
alt="workflow-concurrency"></p>
<ul>
<li>依赖模式：是否触发下游依赖节点依赖到当前工作流的工作流实例的补数（要求当前补数的工作流实例的定时状态为已上线，只会触发下游直接依赖到当前工作流的补数）。</li>
-<li>补数：
执行指定日期的工作流定义，可以选择补数时间范围（当定时配置未上线时默认会根据所选时间范围进行每天一次的补数，如果定时配置已上线则会根据所选的时间范围结合定时配置进行补数)，比如需要补
5 月 9 号到 5 月 10 号的数据，如下图所示：</li>
</ul>
-<p><img src="/img/new_ui/dev/project/workflow-date.png"
alt="workflow-date"></p>
-<blockquote>
-<p>串行模式：补数从 5 月 9 号到 5 月 10 号依次执行，依次在流程实例页面生成两条流程实例；</p>
-</blockquote>
-<blockquote>
-<p>并行模式：同时执行 5 月 9 号到 5 月 10 号的任务，同时在流程实例页面生成两条流程实例。</p>
-</blockquote>
+<p><img src="/img/new_ui/dev/project/workflow-dependency.png"
alt="workflow-dependency"></p>
<ul>
-<li>补数： 通过手动输入补数时间（不依赖定时配置)完成工作流定义的补数。比如需要补 5 月 9 号到 5 月 10 号的数据，如下图所示：</li>
+<li>
+<p>日期选择：</p>
+<ol>
+<li>通过页面选择日期：</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-pageSelection.png"
alt="workflow-pageSelection"></p>
+<ol start="2">
+<li>手动输入：</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-input.png"
alt="workflow-input"></p>
+</li>
+<li>
+<p>补数与定时配置的关系：</p>
+<ol>
+<li>未配置定时：当没有定时配置时默认会根据所选时间范围进行每天一次的补数，比如该工作流调度日期为7月 7号到7月10号，未配置定时，流程实例为：</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-unconfiguredTimingResult.png"
alt="workflow-unconfiguredTimingResult"></p>
+<ol start="2">
+<li>已配置定时：如果有定时配置则会根据所选的时间范围结合定时配置进行补数，比如该工作流调度日期为7月
7号到7月10号，配置了定时（每日凌晨5点运行），流程实例为：</li>
+</ol>
+<p><img src="/img/new_ui/dev/project/workflow-configuredTiming.png"
alt="workflow-configuredTiming"></p>
+<p><img src="/img/new_ui/dev/project/workflow-configuredTimingResult.png"
alt="workflow-configuredTimingResult"></p>
+</li>
</ul>
-<p><img src="/img/new_ui/dev/project/workflow_date_manual.png"
alt="workflow-date"></p>
-<blockquote>
-<p>串行模式：补数从 5 月 9 号到 5 月 10 号依次执行，依次在流程实例页面生成两条流程实例；</p>
-</blockquote>
-<blockquote>
-<p>并行模式：同时执行 5 月 9 号到 5 月 10 号的任务，同时在流程实例页面生成两条流程实例。</p>
-</blockquote>
</li>
</ul>
<h2>单独运行任务</h2>
diff --git a/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.json
b/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.json
index e86d66634..08f0d3c6d 100644
--- a/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.json
+++ b/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.json
@@ -1,6 +1,6 @@
{
"filename": "workflow-definition.md",
- "__html":
"<h1>工作流定义</h1>\n<h2>创建工作流定义</h2>\n<ul>\n<li>\n<p>点击项目管理->工作流->工作流定义，进入工作流定义页面，点击“创建工作流”按钮，进入<strong>工作流DAG编辑</strong>页面，如下图所示：</p>\n<p><img
src=\"/img/new_ui/dev/project/workflow-dag.png\"
alt=\"workflow-dag\"></p>\n</li>\n<li>\n<p>工具栏中拖拽 <img
src=\"/img/tasks/icons/shell.png\" width=\"15\"/>
到画板中，新增一个Shell任务,如下图所示：</p>\n<p><img src=\"/img/tasks/demo/shell.jpg\"
alt=\"demo-shell-simple\"></p>\n</li>\n<li>\n<p><strong>添加 Shell
任务的参数设置：</strong></p>\n<ol>\n<li>填写“节点名称”，“ [...]
+ "__html":
"<h1>工作流定义</h1>\n<h2>创建工作流定义</h2>\n<ul>\n<li>\n<p>点击项目管理->工作流->工作流定义，进入工作流定义页面，点击“创建工作流”按钮，进入<strong>工作流DAG编辑</strong>页面，如下图所示：</p>\n<p><img
src=\"/img/new_ui/dev/project/workflow-dag.png\"
alt=\"workflow-dag\"></p>\n</li>\n<li>\n<p>工具栏中拖拽 <img
src=\"/img/tasks/icons/shell.png\" width=\"15\"/>
到画板中，新增一个Shell任务,如下图所示：</p>\n<p><img src=\"/img/tasks/demo/shell.jpg\"
alt=\"demo-shell-simple\"></p>\n</li>\n<li>\n<p><strong>添加 Shell
任务的参数设置：</strong></p>\n<ol>\n<li>填写“节点名称”，“ [...]
"link":
"/dist/zh-cn/docs/dev/user_doc/guide/project/workflow-definition.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/docs/dev/user_doc/guide/start/docker.html
b/zh-cn/docs/dev/user_doc/guide/start/docker.html
index c283b50a3..b4a3866af 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/docker.html
+++ b/zh-cn/docs/dev/user_doc/guide/start/docker.html
@@ -36,7 +36,7 @@ apache/dolphinscheduler-standalone-server 仅包含
DolphinScheduler 核心服
<p>使用 docker-compose 启动服务相比 standalone-server 的优点是 DolphinScheduler
的各个是独立的容器和进程，相互影响降到最小，且能够在
服务重启的时候保留元数据（如需要挂载到本地路径需要做指定）。他更健壮，能保证用户体验更加完整的 DolphinScheduler 服务。这种方式需要先安装
<a href="https://docs.docker.com/compose/install/";>docker-compose</a>，链接适用于
Mac，Linux，Windows。</p>
-<p>安装完成 docker-compose 后我们需要修改部分配置以便能更好体验 DolphinScheduler 服务，我们需要配置不少于 4GB
的内存：</p>
+<p>安装完成 docker-compose 后我们需要修改部分配置以便能更好体验 DolphinScheduler 服务，我们需要配置不少于 4GB
的空闲内存：</p>
<ul>
<li>Mac：点击 <code>Docker Desktop -> Preferences -> Resources ->
Memory</code> 调整内存大小</li>
<li>Windows Docker Desktop：
diff --git a/zh-cn/docs/dev/user_doc/guide/start/docker.json
b/zh-cn/docs/dev/user_doc/guide/start/docker.json
index 71aa39371..365269043 100644
--- a/zh-cn/docs/dev/user_doc/guide/start/docker.json
+++ b/zh-cn/docs/dev/user_doc/guide/start/docker.json
@@ -1,6 +1,6 @@
{
"filename": "docker.md",
- "__html": "<h1>Docker 快速使用教程</h1>\n<p>本教程使用三种不同的方式通过 Docker 完成
DolphinScheduler 的部署，如果你想要快速体验，推荐使用 standalone-server 镜像，\n如果你想要体验比较完成的服务，推荐使用
docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务\n你想要沿用这些基础服务，你可以参考沿用已有的
PostgreSQL 和 ZooKeeper 服务完成部署。</p>\n<h2>前置条件</h2>\n<ul>\n<li><a
href=\"https://docs.docker.com/engine/install/\";>Docker</a>
1.13.1+</li>\n<li><a href=\"https://docs.docker.com/compose/\";>Docker
Compose</a> 1.28.0+</li>\n</ul>\n<h2>启动服务</h2>\n<h3>使用 standalone-server
镜像</h3>\n [...]
+ "__html": "<h1>Docker 快速使用教程</h1>\n<p>本教程使用三种不同的方式通过 Docker 完成
DolphinScheduler 的部署，如果你想要快速体验，推荐使用 standalone-server 镜像，\n如果你想要体验比较完成的服务，推荐使用
docker-compose 启动服务。如果你已经有自己的数据库或者 Zookeeper 服务\n你想要沿用这些基础服务，你可以参考沿用已有的
PostgreSQL 和 ZooKeeper 服务完成部署。</p>\n<h2>前置条件</h2>\n<ul>\n<li><a
href=\"https://docs.docker.com/engine/install/\";>Docker</a>
1.13.1+</li>\n<li><a href=\"https://docs.docker.com/compose/\";>Docker
Compose</a> 1.28.0+</li>\n</ul>\n<h2>启动服务</h2>\n<h3>使用 standalone-server
镜像</h3>\n [...]
"link": "/dist/zh-cn/docs/dev/user_doc/guide/start/docker.html",
"meta": {}
}
\ No newline at end of file
