[incubator-dolphinscheduler] branch dev-1.2.1 updated: fix udfs assignment and task instance page jump #1789 (#1791)

[lgcareer]

This is an automated email from the ASF dual-hosted git repository.

lgcareer pushed a commit to branch dev-1.2.1
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.2.1 by this push:
     new 9a13d97  fix udfs assignment and task instance page jump #1789 (#1791)
9a13d97 is described below

commit 9a13d97d3d20d74d69107bb629a1f131973b89d3
Author: break60 <790061...@qq.com>
AuthorDate: Fri Jan 10 10:24:02 2020 +0800

    fix udfs assignment and task instance page jump #1789 (#1791)
    
    * merge dev branch front-end code
    
    * fix udfs assignment
    
    * Fix task instance page jump
    
    * fix udfs assignment and task instance page jump #1789
---
 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss        | 3 +++
 .../js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue    | 2 +-
 .../src/js/conf/home/pages/projects/pages/taskInstance/index.vue       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index 237e6f5..a63157d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -157,6 +157,9 @@
       background: #F2F3F7;
       position: relative;
       border-radius: 0 3px 0 0;
+      .ans-btn-text {
+        color: #337ab7;
+      }
       .assist-btn {
         position: absolute;
         left: 10px;
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
index 87ede38..44736f8 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
@@ -74,7 +74,7 @@
             _.map(udfs, v => {
               _.map(this.udfsList, v1 => {
                 if (parseInt(v) === v1.id) {
-                  arr.push(v1)
+                  arr.push(parseInt(v))
                 }
               })
             })
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
index f966d86..7395442 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
@@ -81,6 +81,7 @@
        */
       _onQuery (o) {
         this.searchParams = _.assign(this.searchParams, o)
+        this.searchParams.processInstanceId = ''
         if (this.searchParams.taskName) {
           this.searchParams.taskName = ''
         }