This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f5a8b56 Online editing is prohibited (#2444)
f5a8b56 is described below
commit f5a8b5667444b18a7de5ae8304a654e4d4d9a39b
Author: break60 <[email protected]>
AuthorDate: Fri Apr 17 10:53:11 2020 +0800
Online editing is prohibited (#2444)
* Fix the problem of data echo in script edit box
* Optimize resource tree
* Change the name of the shell node and modify the parameter transmission
method of spark, mr, python, and flink nodes
* Repair naming
* Modify list style
* Online editing is prohibited
Co-authored-by: dailidong <[email protected]>
Co-authored-by: qiaozhanwei <[email protected]>
---
.../src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index 195e3c6..9d41894 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -141,7 +141,7 @@
<m-list-box>
<div slot="text">{{$t('Resources')}}</div>
<div slot="content">
- <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer"
:value-consists-of="valueConsistsOf" :placeholder="$t('Please select
resources')">
+ <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer" :disabled="isDetails"
:value-consists-of="valueConsistsOf" :placeholder="$t('Please select
resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
</div>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index 112e47d..a5c23d4 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -78,7 +78,7 @@
<m-list-box>
<div slot="text">{{$t('Resources')}}</div>
<div slot="content">
- <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer" :placeholder="$t('Please select
resources')">
+ <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer" :disabled="isDetails"
:placeholder="$t('Please select resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
</div>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
index dd7ea94..b9ed72c 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
@@ -28,7 +28,7 @@
<m-list-box>
<div slot="text">{{$t('Resources')}}</div>
<div slot="content">
- <treeselect v-model="resourceList" :multiple="true"
:options="resourceOptions" :normalizer="normalizer"
:value-consists-of="valueConsistsOf" :placeholder="$t('Please select
resources')">
+ <treeselect v-model="resourceList" :multiple="true"
:options="resourceOptions" :normalizer="normalizer"
:value-consists-of="valueConsistsOf" :disabled="isDetails"
:placeholder="$t('Please select resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
<!-- <m-resources
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
index b627602..d4fa70e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
@@ -34,7 +34,7 @@
<m-list-box>
<div slot="text">{{$t('Resources')}}</div>
<div slot="content">
- <treeselect v-model="resourceList" :multiple="true" :options="options"
:normalizer="normalizer" :value-consists-of="valueConsistsOf"
:placeholder="$t('Please select resources')">
+ <treeselect v-model="resourceList" :multiple="true"
:options="options" :normalizer="normalizer" :disabled="isDetails"
:value-consists-of="valueConsistsOf" :placeholder="$t('Please select
resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
</div>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index 628d58a..6e94374 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -169,7 +169,7 @@
<m-list-box>
<div slot="text">{{$t('Resources')}}</div>
<div slot="content">
- <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer"
:value-consists-of="valueConsistsOf" :placeholder="$t('Please select
resources')">
+ <treeselect v-model="resourceList" :multiple="true"
:options="mainJarList" :normalizer="normalizer"
:value-consists-of="valueConsistsOf" :disabled="isDetails"
:placeholder="$t('Please select resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
</div>
