github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'upstream/dev' into spilit

pull/3/MERGE
lenboo 4 years ago
parent
ce6338b353 71bd231c95
commit
bb7106d100
17 changed files with 312 additions and 358 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
  2. 23
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/KerberosHttpClient.java
  3. 84
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  4. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
  6. 18
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  7. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
  8. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
  9. 19
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
  10. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
  11. 17
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
  12. 3
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
  13. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
  14. 50
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
  15. 16
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
  16. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
  17. 8
      dolphinscheduler-ui/src/sass/common/index.scss

12
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java
Unescape View File

@ -428,12 +428,7 @@ public class HadoopUtils implements Closeable {
String applicationUrl = getApplicationUrl(applicationId); String applicationUrl = getApplicationUrl(applicationId);
logger.info("applicationUrl={}", applicationUrl); logger.info("applicationUrl={}", applicationUrl);
String responseContent; String responseContent = PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false) ? KerberosHttpClient.get(applicationUrl) : HttpUtils.get(applicationUrl);
if (PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false)) {
responseContent = KerberosHttpClient.get(applicationUrl);
} else {
responseContent = HttpUtils.get(applicationUrl);
}
if (responseContent != null) { if (responseContent != null) {
ObjectNode jsonObject = JSONUtils.parseObject(responseContent); ObjectNode jsonObject = JSONUtils.parseObject(responseContent);
if (!jsonObject.has("app")) { if (!jsonObject.has("app")) {
@ -445,7 +440,8 @@ public class HadoopUtils implements Closeable {
//may be in job history //may be in job history
String jobHistoryUrl = getJobHistoryUrl(applicationId); String jobHistoryUrl = getJobHistoryUrl(applicationId);
logger.info("jobHistoryUrl={}", jobHistoryUrl); logger.info("jobHistoryUrl={}", jobHistoryUrl);
responseContent = HttpUtils.get(jobHistoryUrl); responseContent = PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false) ? KerberosHttpClient.get(jobHistoryUrl) : HttpUtils.get(jobHistoryUrl);
if (null != responseContent) { if (null != responseContent) {
ObjectNode jsonObject = JSONUtils.parseObject(responseContent); ObjectNode jsonObject = JSONUtils.parseObject(responseContent);
if (!jsonObject.has("job")) { if (!jsonObject.has("job")) {
@ -682,7 +678,7 @@ public class HadoopUtils implements Closeable {
*/ */
public static String getRMState(String url) { public static String getRMState(String url) {
String retStr = HttpUtils.get(url); String retStr = PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE, false) ? KerberosHttpClient.get(url) : HttpUtils.get(url);
if (StringUtils.isEmpty(retStr)) { if (StringUtils.isEmpty(retStr)) {
return null; return null;

23
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/KerberosHttpClient.java
Unescape View File

@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.Constants;
import org.apache.http.auth.AuthSchemeProvider; import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.auth.AuthScope; import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials; import org.apache.http.auth.Credentials;
@ -28,15 +30,7 @@ import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClientBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.security.auth.Subject;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import java.security.Principal; import java.security.Principal;
import java.security.PrivilegedAction; import java.security.PrivilegedAction;
import java.util.HashMap; import java.util.HashMap;
@ -44,16 +38,24 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.kerberos.KerberosPrincipal;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* kerberos http client * kerberos http client
*/ */
public class KerberosHttpClient { public class KerberosHttpClient {
public static final Logger logger = LoggerFactory.getLogger(KerberosHttpClient.class); public static final Logger logger = LoggerFactory.getLogger(KerberosHttpClient.class);
private String principal; private String principal;
private String keyTabLocation; private String keyTabLocation;
public KerberosHttpClient(String principal, String keyTabLocation) { public KerberosHttpClient(String principal, String keyTabLocation) {
super(); super();
this.principal = principal; this.principal = principal;
@ -152,5 +154,4 @@ public class KerberosHttpClient {
return responseContent; return responseContent;
} }
} }

84
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
Unescape View File

@ -30,10 +30,9 @@
<div class="content-box" v-if="isContentBox"> <div class="content-box" v-if="isContentBox">
<div class="form-model"> <div class="form-model">
<!-- Node name --> <!-- Node name -->
<div class="clearfix list"> <m-list-box>
<div class="text-box"><span>{{$t('Node name')}}</span></div> <div slot="text">{{$t('Node name')}}</div>
<div class="cont-box"> <div slot="content">
<label class="label-box">
<el-input <el-input
type="text" type="text"
v-model="name" v-model="name"
@ -43,30 +42,24 @@
maxlength="100" maxlength="100"
@blur="_verifName()"> @blur="_verifName()">
</el-input> </el-input>
</label>
</div>
</div> </div>
</m-list-box>
<!-- Running sign --> <!-- Running sign -->
<div class="clearfix list"> <m-list-box>
<div class="text-box"><span>{{$t('Run flag')}}</span></div> <div slot="text">{{$t('Run flag')}}</div>
<div class="cont-box"> <div slot="content">
<label class="label-box">
<el-radio-group v-model="runFlag" size="small"> <el-radio-group v-model="runFlag" size="small">
<el-radio :label="'NORMAL'" :disabled="isDetails">{{$t('Normal')}}</el-radio> <el-radio :label="'NORMAL'" :disabled="isDetails">{{$t('Normal')}}</el-radio>
<el-radio :label="'FORBIDDEN'" :disabled="isDetails">{{$t('Prohibition execution')}}</el-radio> <el-radio :label="'FORBIDDEN'" :disabled="isDetails">{{$t('Prohibition execution')}}</el-radio>
</el-radio-group> </el-radio-group>
</label>
</div>
</div> </div>
</m-list-box>
<!-- description --> <!-- description -->
<div class="clearfix list"> <m-list-box>
<div class="text-box"> <div slot="text">{{$t('Description')}}</div>
<span>{{$t('Description')}}</span> <div slot="content">
</div>
<div class="cont-box">
<label class="label-box">
<el-input <el-input
:rows="2" :rows="2"
type="textarea" type="textarea"
@ -74,55 +67,46 @@
v-model="description" v-model="description"
:placeholder="$t('Please enter description')"> :placeholder="$t('Please enter description')">
</el-input> </el-input>
</label>
</div>
</div> </div>
</m-list-box>
<!-- Task priority --> <!-- Task priority -->
<div class="clearfix list"> <m-list-box>
<div class="text-box"> <div slot="text">{{$t('Task priority')}}</div>
<span>{{$t('Task priority')}}</span> <div slot="content">
</div>
<div class="cont-box">
<span class="label-box" style="width: 193px;display: inline-block;"> <span class="label-box" style="width: 193px;display: inline-block;">
<m-priority v-model="taskInstancePriority"></m-priority> <m-priority v-model="taskInstancePriority"></m-priority>
</span> </span>
<span class="text-b">{{$t('Worker group')}}</span> <span class="text-b">{{$t('Worker group')}}</span>
<m-worker-groups v-model="workerGroup"></m-worker-groups> <m-worker-groups v-model="workerGroup"></m-worker-groups>
</div> </div>
</div> </m-list-box>
<!-- Number of failed retries --> <!-- Number of failed retries -->
<div class="clearfix list" v-if="nodeData.taskType !== 'SUB_PROCESS'"> <m-list-box v-if="nodeData.taskType !== 'SUB_PROCESS'">
<div class="text-box"> <div slot="text">{{$t('Number of failed retries')}}</div>
<span>{{$t('Number of failed retries')}}</span> <div slot="content">
</div>
<div class="cont-box">
<m-select-input v-model="maxRetryTimes" :list="[0,1,2,3,4]"></m-select-input> <m-select-input v-model="maxRetryTimes" :list="[0,1,2,3,4]"></m-select-input>
<span>({{$t('Times')}})</span> <span>({{$t('Times')}})</span>
<span class="text-b">{{$t('Failed retry interval')}}</span> <span class="text-b">{{$t('Failed retry interval')}}</span>
<m-select-input v-model="retryInterval" :list="[1,10,30,60,120]"></m-select-input> <m-select-input v-model="retryInterval" :list="[1,10,30,60,120]"></m-select-input>
<span>({{$t('Minute')}})</span> <span>({{$t('Minute')}})</span>
</div> </div>
</div> </m-list-box>
<!-- Delay execution time --> <!-- Delay execution time -->
<div class="clearfix list" v-if="nodeData.taskType !== 'SUB_PROCESS' && nodeData.taskType !== 'CONDITIONS' && nodeData.taskType !== 'DEPENDENT'"> <m-list-box v-if="nodeData.taskType !== 'SUB_PROCESS' && nodeData.taskType !== 'CONDITIONS' && nodeData.taskType !== 'DEPENDENT'">
<div class="text-box"> <div slot="text">{{$t('Delay execution time')}}</div>
<span>{{$t('Delay execution time')}}</span> <div slot="content">
</div>
<div class="cont-box">
<m-select-input v-model="delayTime" :list="[0,1,5,10]"></m-select-input> <m-select-input v-model="delayTime" :list="[0,1,5,10]"></m-select-input>
<span>({{$t('Minute')}})</span> <span>({{$t('Minute')}})</span>
</div> </div>
</div> </m-list-box>
<!-- Branch flow --> <!-- Branch flow -->
<div class="clearfix list" v-if="nodeData.taskType === 'CONDITIONS'"> <m-list-box v-if="nodeData.taskType === 'CONDITIONS'">
<div class="text-box"> <div slot="text">{{$t('State')}}</div>
<span>{{$t('State')}}</span> <div slot="content">
</div>
<div class="cont-box">
<span class="label-box" style="width: 193px;display: inline-block;"> <span class="label-box" style="width: 193px;display: inline-block;">
<el-select style="width: 157px;" size="small" v-model="successNode" :disabled="true"> <el-select style="width: 157px;" size="small" v-model="successNode" :disabled="true">
<el-option v-for="item in stateList" :key="item.value" :value="item.value" :label="item.label"></el-option> <el-option v-for="item in stateList" :key="item.value" :value="item.value" :label="item.label"></el-option>
@ -133,12 +117,10 @@
<el-option v-for="item in nodeData.rearList" :key="item.value" :value="item.value" :label="item.label"></el-option> <el-option v-for="item in nodeData.rearList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select> </el-select>
</div> </div>
</div> </m-list-box>
<div class="clearfix list" v-if="nodeData.taskType === 'CONDITIONS'"> <m-list-box v-if="nodeData.taskType === 'CONDITIONS'">
<div class="text-box"> <div slot="text">{{$t('State')}}</div>
<span>{{$t('State')}}</span> <div slot="content">
</div>
<div class="cont-box">
<span class="label-box" style="width: 193px;display: inline-block;"> <span class="label-box" style="width: 193px;display: inline-block;">
<el-select style="width: 157px;" size="small" v-model="failedNode" :disabled="true"> <el-select style="width: 157px;" size="small" v-model="failedNode" :disabled="true">
<el-option v-for="item in stateList" :key="item.value" :value="item.value" :label="item.label"></el-option> <el-option v-for="item in stateList" :key="item.value" :value="item.value" :label="item.label"></el-option>
@ -149,7 +131,7 @@
<el-option v-for="item in nodeData.rearList" :key="item.value" :value="item.value" :label="item.label"></el-option> <el-option v-for="item in nodeData.rearList" :key="item.value" :value="item.value" :label="item.label"></el-option>
</el-select> </el-select>
</div> </div>
</div> </m-list-box>
<!-- Task timeout alarm --> <!-- Task timeout alarm -->
<m-timeout-alarm <m-timeout-alarm
@ -299,6 +281,7 @@
import mMr from './tasks/mr' import mMr from './tasks/mr'
import mSql from './tasks/sql' import mSql from './tasks/sql'
import i18n from '@/module/i18n' import i18n from '@/module/i18n'
import mListBox from './tasks/_source/listBox'
import mShell from './tasks/shell' import mShell from './tasks/shell'
import mWaterdrop from './tasks/waterdrop' import mWaterdrop from './tasks/waterdrop'
import mSpark from './tasks/spark' import mSpark from './tasks/spark'
@ -800,6 +783,7 @@
} }
}, },
components: { components: {
mListBox,
mMr, mMr,
mShell, mShell,
mWaterdrop, mWaterdrop,

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
Unescape View File

@ -257,6 +257,7 @@
// get processlist // get processlist
this._getProjectList().then(() => { this._getProjectList().then(() => {
if (!this.dependItemList.length) { if (!this.dependItemList.length) {
if (!this.projectList.length) return
let projectId = this.projectList[0].value let projectId = this.projectList[0].value
this._getProcessByProjectId(projectId).then(definitionList => { this._getProcessByProjectId(projectId).then(definitionList => {
let value = definitionList[0].value let value = definitionList[0].value

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
Unescape View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="dependence-model"> <div class="conditions-model">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Custom Parameters')}}</div> <div slot="text">{{$t('Custom Parameters')}}</div>
<div slot="content"> <div slot="content">
@ -178,7 +178,7 @@
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">
.dependence-model { .conditions-model {
margin-top: -10px; margin-top: -10px;
.dep-opt { .dep-opt {
margin-bottom: 10px; margin-bottom: 10px;

18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
Unescape View File

@ -26,7 +26,7 @@
</label> </label>
</div> </div>
</m-list-box> </m-list-box>
<div v-if="!enable"> <template v-if="!enable">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Datasource')}}</div> <div slot="text">{{$t('Datasource')}}</div>
<div slot="content"> <div slot="content">
@ -115,8 +115,8 @@
<span>({{$t('0 means unlimited by count')}})</span> <span>({{$t('0 means unlimited by count')}})</span>
</div> </div>
</m-list-box> </m-list-box>
</div> </template>
<div v-else> <template v-else>
<m-list-box> <m-list-box>
<div slot="text">json</div> <div slot="text">json</div>
<div slot="content"> <div slot="content">
@ -140,12 +140,10 @@
</m-local-params> </m-local-params>
</div> </div>
</m-list-box> </m-list-box>
</div> </template>
<div class="clearfix list"> <m-list-box>
<div class="text-box"> <div slot="text">{{$t('Running Memory')}}</div>
<span>{{$t('Running Memory')}}</span> <div slot="content">
</div>
<div class="cont-box">
<span >{{$t('Min Memory')}}</span> <span >{{$t('Min Memory')}}</span>
<m-select-input v-model="xms" :list="[1,2,3,4]"> <m-select-input v-model="xms" :list="[1,2,3,4]">
</m-select-input> </m-select-input>
@ -155,7 +153,7 @@
</m-select-input> </m-select-input>
<span>&nbsp;&nbsp;&nbsp;G</span> <span>&nbsp;&nbsp;&nbsp;G</span>
</div> </div>
</div> </m-list-box>
<el-dialog <el-dialog
:visible.sync="scriptBoxDialog" :visible.sync="scriptBoxDialog"
append-to-body="true" append-to-body="true"

10
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
Unescape View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="dependence-model"> <div class="dependent-model">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Add dependency')}}</div> <div slot="text">{{$t('Add dependency')}}</div>
<div slot="content"> <div slot="content">
@ -67,7 +67,7 @@
import disabledState from '@/module/mixin/disabledState' import disabledState from '@/module/mixin/disabledState'
export default { export default {
name: 'dependence', name: 'dependent',
data () { data () {
return { return {
relation: 'AND', relation: 'AND',
@ -132,7 +132,7 @@
this.isLoading = false this.isLoading = false
}, 600) }, 600)
}, },
cacheDependence (val) { cacheDependent (val) {
this.$emit('on-cache-dependent', val) this.$emit('on-cache-dependent', val)
} }
}, },
@ -157,7 +157,7 @@
destroyed () { destroyed () {
}, },
computed: { computed: {
cacheDependence () { cacheDependent () {
return { return {
relation: this.relation, relation: this.relation,
dependTaskList: _.map(this.dependTaskList, v => { dependTaskList: _.map(this.dependTaskList, v => {
@ -174,7 +174,7 @@
</script> </script>
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">
.dependence-model { .dependent-model {
margin-top: -10px; margin-top: -10px;
.dep-opt { .dep-opt {
margin-bottom: 10px; margin-bottom: 10px;

1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
Unescape View File

@ -33,7 +33,6 @@
</el-select> </el-select>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box v-if="programType !== 'PYTHON'"> <m-list-box v-if="programType !== 'PYTHON'">
<div slot="text">{{$t('Main Class')}}</div> <div slot="text">{{$t('Main Class')}}</div>
<div slot="content"> <div slot="content">

19
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
Unescape View File

@ -88,8 +88,7 @@
</el-input> </el-input>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box>
<m-list-box >
<div slot="text">{{$t('Timeout Settings')}}</div> <div slot="text">{{$t('Timeout Settings')}}</div>
<div slot="content"> <div slot="content">
<label class="label-box"> <label class="label-box">
@ -99,24 +98,20 @@
</label> </label>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box v-if="timeoutSettings">
<div class="clearfix list" v-if = "timeoutSettings" > <div slot="text">{{$t('Connect Timeout')}}</div>
<div class="text-box"> <div slot="content">
<span>{{$t('Connect Timeout')}}</span> <span class="label-box" style="width: 193px;display: inline-block;">
</div>
<div class="cont-box">
<span class="label-box" style="width: 193px;display: inline-block;" >
<el-input size="small" v-model='connectTimeout' maxlength="7"></el-input> <el-input size="small" v-model='connectTimeout' maxlength="7"></el-input>
</span> </span>
<span>{{$t('ms')}}</span> <span>{{$t('ms')}}</span>
<span class="text-b">{{$t('Socket Timeout')}}</span> <span class="text-b">{{$t('Socket Timeout')}}</span>
<span class="label-box" style="width: 193px;display: inline-block;" > <span class="label-box" style="width: 193px;display: inline-block;">
<el-input size="small" v-model='socketTimeout' maxlength="7"></el-input> <el-input size="small" v-model='socketTimeout' maxlength="7"></el-input>
</span> </span>
<span>{{$t('ms')}}</span> <span>{{$t('ms')}}</span>
</div> </div>
</div> </m-list-box>
<m-list-box> <m-list-box>
<div slot="text">{{$t('Custom Parameters')}}</div> <div slot="text">{{$t('Custom Parameters')}}</div>
<div slot="content"> <div slot="content">

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
Unescape View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="spark-model"> <div class="mr-model">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Program Type')}}</div> <div slot="text">{{$t('Program Type')}}</div>
<div slot="content"> <div slot="content">

17
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
Unescape View File

@ -16,12 +16,9 @@
*/ */
<template> <template>
<div class="pre_tasks-model"> <div class="pre_tasks-model">
<div class="clearfix list"> <m-list-box>
<div class="text-box"> <div slot="text">{{$t('Pre tasks')}}</div>
<span>{{$t('Pre tasks')}}</span> <div slot="content">
</div>
<div class="cont-box">
<div class="label-box">
<el-select <el-select
ref="preTasksSelector" ref="preTasksSelector"
style="width: 100%;" style="width: 100%;"
@ -39,12 +36,13 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</div> </m-list-box>
</div>
</div> </div>
</template> </template>
<script> <script>
import disabledState from '@/module/mixin/disabledState' import disabledState from '@/module/mixin/disabledState'
import mListBox from './_source/listBox'
export default { export default {
name: 'pre_tasks', name: 'pre_tasks',
mixins: [disabledState], mixins: [disabledState],
@ -104,6 +102,7 @@
}) })
return true return true
} }
} },
components: { mListBox }
} }
</script> </script>

3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
Unescape View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="shell-model"> <div class="python-model">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Script')}}</div> <div slot="text">{{$t('Script')}}</div>
<div slot="content"> <div slot="content">
@ -36,7 +36,6 @@
</treeselect> </treeselect>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box> <m-list-box>
<div slot="text">{{$t('Custom Parameters')}}</div> <div slot="text">{{$t('Custom Parameters')}}</div>
<div slot="content"> <div slot="content">

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
Unescape View File

@ -34,7 +34,7 @@
</div> </div>
</div> </div>
</m-list-box> </m-list-box>
<template v-if="sqlType==0"> <template v-if="sqlType === 0">
<m-list-box> <m-list-box>
<div slot="text"><strong class='requiredIcon'>*</strong>{{$t('Title')}}</div> <div slot="text"><strong class='requiredIcon'>*</strong>{{$t('Title')}}</div>
<div slot="content"> <div slot="content">
@ -54,7 +54,7 @@
</div> </div>
</m-list-box> </m-list-box>
</template> </template>
<m-list-box v-show="type === 'HIVE'"> <m-list-box v-if="type === 'HIVE'">
<div slot="text">{{$t('SQL Parameter')}}</div> <div slot="text">{{$t('SQL Parameter')}}</div>
<div slot="content"> <div slot="content">
<el-input <el-input

50
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
Unescape View File

@ -15,8 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="sql-model"> <div class="sqoop-model">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Custom Job')}}</div> <div slot="text">{{$t('Custom Job')}}</div>
<div slot="content"> <div slot="content">
@ -78,8 +77,6 @@
</m-local-params> </m-local-params>
</div> </div>
</m-list-box> </m-list-box>
<template>
<m-list-box> <m-list-box>
<div slot="text" style="font-weight:bold">{{$t('Data Source')}}</div> <div slot="text" style="font-weight:bold">{{$t('Data Source')}}</div>
</m-list-box> </m-list-box>
@ -102,9 +99,7 @@
</el-select> </el-select>
</div> </div>
</m-list-box> </m-list-box>
<template v-if="sourceType === 'MYSQL'">
<template v-if="sourceType ==='MYSQL'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Datasource')}}</div> <div slot="text">{{$t('Datasource')}}</div>
<div slot="content"> <div slot="content">
@ -118,7 +113,6 @@
</m-datasource> </m-datasource>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box> <m-list-box>
<div slot="text">{{$t('ModelType')}}</div> <div slot="text">{{$t('ModelType')}}</div>
<div slot="content"> <div slot="content">
@ -128,9 +122,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
</m-list-box> </m-list-box>
<template v-if="sourceMysqlParams.srcQueryType === '0'">
<template v-if="sourceMysqlParams.srcQueryType=='0'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Table')}}</div> <div slot="text">{{$t('Table')}}</div>
<div slot="content"> <div slot="content">
@ -143,7 +135,6 @@
</el-input> </el-input>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box> <m-list-box>
<div slot="text">{{$t('ColumnType')}}</div> <div slot="text">{{$t('ColumnType')}}</div>
<div slot="content"> <div slot="content">
@ -153,8 +144,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box v-if="sourceMysqlParams.srcColumnType === '1'">
<m-list-box v-if="sourceMysqlParams.srcColumnType=='1'">
<div slot="text">{{$t('Column')}}</div> <div slot="text">{{$t('Column')}}</div>
<div slot="content"> <div slot="content">
<el-input <el-input
@ -168,9 +158,7 @@
</m-list-box> </m-list-box>
</template> </template>
</template> </template>
</template> <template v-if="sourceType === 'HIVE'">
<template v-if="sourceType=='HIVE'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Database')}}</div> <div slot="text">{{$t('Database')}}</div>
<div slot="content"> <div slot="content">
@ -220,8 +208,7 @@
</div> </div>
</m-list-box> </m-list-box>
</template> </template>
<template v-if="sourceType === 'HDFS'">
<template v-if="sourceType=='HDFS'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Export Dir')}}</div> <div slot="text">{{$t('Export Dir')}}</div>
<div slot="content"> <div slot="content">
@ -235,8 +222,8 @@
</div> </div>
</m-list-box> </m-list-box>
</template> </template>
<template v-if="sourceType === 'MYSQL'">
<m-list-box v-show="srcQueryType === '1' && sourceType ==='MYSQL'"> <m-list-box v-if="srcQueryType === '1'">
<div slot="text">{{$t('SQL Statement')}}</div> <div slot="text">{{$t('SQL Statement')}}</div>
<div slot="content"> <div slot="content">
<div class="from-mirror"> <div class="from-mirror">
@ -251,9 +238,7 @@
</div> </div>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box>
<template>
<m-list-box v-show="sourceType === 'MYSQL'">
<div slot="text">{{$t('Map Column Hive')}}</div> <div slot="text">{{$t('Map Column Hive')}}</div>
<div slot="content"> <div slot="content">
<m-local-params <m-local-params
@ -264,7 +249,7 @@
</m-local-params> </m-local-params>
</div> </div>
</m-list-box> </m-list-box>
<m-list-box v-show="sourceType === 'MYSQL'"> <m-list-box>
<div slot="text">{{$t('Map Column Java')}}</div> <div slot="text">{{$t('Map Column Java')}}</div>
<div slot="content"> <div slot="content">
<m-local-params <m-local-params
@ -276,12 +261,10 @@
</div> </div>
</m-list-box> </m-list-box>
</template> </template>
<m-list-box> <m-list-box>
<div slot="text" style="font-weight:bold">{{$t('Data Target')}}</div> <div slot="text" style="font-weight:bold">{{$t('Data Target')}}</div>
</m-list-box> </m-list-box>
<hr style="margin-left: 60px;"> <hr style="margin-left: 60px;">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Type')}}</div> <div slot="text">{{$t('Type')}}</div>
<div slot="content"> <div slot="content">
@ -299,7 +282,7 @@
</el-select> </el-select>
</div> </div>
</m-list-box> </m-list-box>
<div v-show="targetType==='HIVE'"> <template v-if="targetType === 'HIVE'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Database')}}</div> <div slot="text">{{$t('Database')}}</div>
<div slot="content"> <div slot="content">
@ -378,8 +361,8 @@
</el-input> </el-input>
</div> </div>
</m-list-box> </m-list-box>
</div> </template>
<div v-show="targetType==='HDFS'"> <template v-if="targetType === 'HDFS'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Target Dir')}}</div> <div slot="text">{{$t('Target Dir')}}</div>
<div slot="content"> <div slot="content">
@ -444,8 +427,8 @@
</el-input> </el-input>
</div> </div>
</m-list-box> </m-list-box>
</div> </template>
<div v-show="targetType==='MYSQL'"> <template v-if="targetType === 'MYSQL'">
<m-list-box> <m-list-box>
<div slot="text">{{$t('Datasource')}}</div> <div slot="text">{{$t('Datasource')}}</div>
<div slot="content"> <div slot="content">
@ -534,8 +517,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
</m-list-box> </m-list-box>
</template>
</div>
<m-list-box> <m-list-box>
<div slot="text">{{$t('Concurrency')}}</div> <div slot="text">{{$t('Concurrency')}}</div>
<div slot="content"> <div slot="content">

16
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
Unescape View File

@ -16,12 +16,9 @@
*/ */
<template> <template>
<div class="sub_process-model"> <div class="sub_process-model">
<div class="clearfix list"> <m-list-box>
<div class="text-box"> <div slot="text">{{$t('Child Node')}}</div>
<span>{{$t('Child Node')}}</span> <div slot="content">
</div>
<div class="cont-box">
<div class="label-box">
<el-select <el-select
style="width: 100%;" style="width: 100%;"
size="small" size="small"
@ -37,14 +34,14 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</div> </m-list-box>
</div>
</div> </div>
</template> </template>
<script> <script>
import _ from 'lodash' import _ from 'lodash'
import i18n from '@/module/i18n' import i18n from '@/module/i18n'
import disabledState from '@/module/mixin/disabledState' import disabledState from '@/module/mixin/disabledState'
import mListBox from './_source/listBox'
export default { export default {
name: 'sub_process', name: 'sub_process',
@ -125,6 +122,7 @@
} }
}, },
mounted () { mounted () {
} },
components: { mListBox }
} }
</script> </script>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
Unescape View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
<template> <template>
<div class="shell-model"> <div class="waterdrop-model">
<!--deploy mode--> <!--deploy mode-->
<m-list-box> <m-list-box>
<div slot="text">{{$t('Deploy Mode')}}</div> <div slot="text">{{$t('Deploy Mode')}}</div>

8
dolphinscheduler-ui/src/sass/common/index.scss
Unescape View File

@ -365,6 +365,8 @@ body::-webkit-scrollbar-thumb {
.el-dialog__body { .el-dialog__body {
padding: 10px; padding: 10px;
} }
.el-dialog__header {
.el-dialog__headerbtn {
right: 10px;
}
}

Write Preview
Loading…
Cancel
Save