Merge remote-tracking branch 'upstream/dev' into json-split

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

@@ -687,6 +687,12 @@ public class ProcessService {
                 processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
             } else {
                 processInstance = this.findProcessInstanceDetailById(processInstanceId);
+                // Recalculate global parameters after rerun.
+                processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
+                    processDefinition.getGlobalParamMap(),
+                    processDefinition.getGlobalParamList(),
+                    getCommandTypeIfComplement(processInstance, command),
+                    processInstance.getScheduleTime()));
             }
             processDefinition = processDefineMapper.selectById(processInstance.getProcessDefinitionId());
             processInstance.setProcessDefinition(processDefinition);

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue

@@ -74,6 +74,11 @@
     </div>
     <div class="bottom">
       <div class="submit">
+        <template v-if="router.history.current.name === 'projects-definition-details'">
+          <div class="lint-pt">
+            <el-checkbox v-model="releaseState" size="small" :false-label="0" :true-label="1">{{$t('Whether to go online the process definition')}}</el-checkbox>
+          </div>
+        </template>
         <template v-if="router.history.current.name === 'projects-instance-details'">
           <div class="lint-pt">
             <el-checkbox v-model="syncDefine" size="small">{{$t('Whether to update the process definition')}}</el-checkbox>
@@ -106,6 +111,8 @@
         udpList: [],
         // Global custom parameters
         udpListCache: [],
+        // Whether to go online the process definition
+        releaseState: 1,
         // Whether to update the process definition
         syncDefine: true,
         // Timeout alarm
@@ -141,6 +148,7 @@
         this.store.commit('dag/setTenantId', _.cloneDeep(this.tenantId))
         this.store.commit('dag/setDesc', _.cloneDeep(this.description))
         this.store.commit('dag/setSyncDefine', this.syncDefine)
+        this.store.commit('dag/setReleaseState', this.releaseState)
       },
       /**
        * submit
@@ -201,6 +209,7 @@
       this.originalName = dag.name
       this.description = dag.description
       this.syncDefine = dag.syncDefine
+      this.releaseState = dag.releaseState
       this.timeout = dag.timeout || 0
       this.checkedTimeout = this.timeout !== 0
       this.$nextTick(() => {

dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@@ -318,7 +318,8 @@ export default {
         connects: JSON.stringify(state.connects),
         name: _.trim(state.name),
         description: _.trim(state.description),
-        id: payload
+        id: payload,
+        releaseState: state.releaseState
       }, res => {
         resolve(res)
         state.isEditDag = false

dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js

@@ -75,6 +75,9 @@ export default {
   setDesc (state, payload) {
     state.description = payload
   },
+  setReleaseState (state, payload) {
+    state.releaseState = payload
+  },
   /**
    * Whether to update the process definition
    */

dolphinscheduler-ui/src/js/conf/home/store/dag/state.js

@@ -45,6 +45,8 @@ export default {
   isEditDag: false,
   // Current project
   projectName: projectName || '',
+  // Whether to go online the process definition
+  releaseState: 1,
   // Whether to update the process definition
   syncDefine: true,
   // tasks processList

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -64,6 +64,7 @@ export default {
   'Set the DAG diagram name': 'Set the DAG diagram name',
   'Please enter description(optional)': 'Please enter description(optional)',
   'Set global': 'Set global',
+  'Whether to go online the process definition': 'Whether to go online the process definition',
   'Whether to update the process definition': 'Whether to update the process definition',
   Add: 'Add',
   'DAG graph name cannot be empty': 'DAG graph name cannot be empty',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -64,6 +64,7 @@ export default {
   'Set the DAG diagram name': '设置DAG图名称',
   'Please enter description(optional)': '请输入描述(选填)',
   'Set global': '设置全局',
+  'Whether to go online the process definition': '是否上线流程定义',
   'Whether to update the process definition': '是否更新流程定义',
   Add: '添加',
   'DAG graph name cannot be empty': 'DAG图名称不能为空',