You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/04/15 09:00:39 UTC
[incubator-dolphinscheduler] branch dev updated: Repair naming
(#2426)
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 c4acbdc Repair naming (#2426)
c4acbdc is described below
commit c4acbdcfd0159df3c3336ff9b491b9fc7387116f
Author: break60 <79...@qq.com>
AuthorDate: Wed Apr 15 17:00:31 2020 +0800
Repair naming (#2426)
* 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
Co-authored-by: dailidong <da...@gmail.com>
Co-authored-by: qiaozhanwei <qi...@outlook.com>
---
.../src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue | 4 ++--
.../src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 4 ++--
.../src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue | 5 +++--
.../src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue | 4 ++--
.../home/pages/projects/pages/instance/pages/list/_source/list.vue | 4 ++--
.../js/conf/home/pages/projects/pages/taskInstance/_source/list.vue | 6 +++---
6 files changed, 14 insertions(+), 13 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 30b644d..195e3c6 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
@@ -391,8 +391,8 @@
}
let noResources = [{
id: -1,
- name: $t('No resources'),
- fullName: '/'+$t('No resources'),
+ name: $t('Unauthorized or deleted resources'),
+ fullName: '/'+$t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
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 1df1f93..112e47d 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
@@ -232,8 +232,8 @@
}
let noResources = [{
id: -1,
- name: $t('No resources'),
- fullName: '/'+$t('No resources'),
+ name: $t('Unauthorized or deleted resources'),
+ fullName: '/'+$t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
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 3e2abcb..dd7ea94 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
@@ -224,8 +224,8 @@
}
let noResources = [{
id: -1,
- name: $t('No resources'),
- fullName: '/'+$t('No resources'),
+ name: $t('Unauthorized or deleted resources'),
+ fullName: '/'+$t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
@@ -308,6 +308,7 @@
})
} else {
this.resourceList.push(v.id)
+ this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
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 2304ab1..628d58a 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
@@ -351,8 +351,8 @@
}
let noResources = [{
id: -1,
- name: $t('No resources'),
- fullName: '/'+$t('No resources'),
+ name: $t('Unauthorized or deleted resources'),
+ fullName: '/'+$t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 513b8ec..641c7aa 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -49,10 +49,10 @@
<th scope="col" width="60">
<span>{{$t('Run Times')}}</span>
</th>
- <th scope="col" width="100">
+ <th scope="col" width="125">
<span>{{$t('host')}}</span>
</th>
- <th scope="col" width="60">
+ <th scope="col" width="55">
<span>{{$t('fault-tolerant sign')}}</span>
</th>
<th scope="col" width="30">
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index f7be553..f014874 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -43,13 +43,13 @@
<th scope="col" width="140">
<span>{{$t('Start Time')}}</span>
</th>
- <th scope="col" width="140">
+ <th scope="col" width="125">
<span>{{$t('End Time')}}</span>
</th>
- <th scope="col" width="110">
+ <th scope="col" width="130">
<span>{{$t('host')}}</span>
</th>
- <th scope="col" width="74">
+ <th scope="col" width="70">
<span>{{$t('Duration')}}(s)</span>
</th>
<th scope="col" width="84">