Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

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

@@ -34,30 +34,30 @@
     <div class="dag-contect">
       <div class="dag-toolbar">
         <div class="assist-btn">
-          <el-button
+          <el-tooltip :content="$t('View variables')" placement="top" :enterable="false">
-            style="vertical-align: middle;"
+           <span>
-            data-toggle="tooltip"
-            :title="$t('View variables')"
-            data-container="body"
-            type="primary"
-            size="mini"
-            :disabled="$route.name !== 'projects-instance-details'"
-            @click="_toggleView"
-            icon="el-icon-c-scale-to-original">
-          </el-button>
-          <span>
             <el-button
               style="vertical-align: middle;"
-              data-toggle="tooltip"
-              :title="$t('Startup parameter')"
-              data-container="body"
               type="primary"
               size="mini"
               :disabled="$route.name !== 'projects-instance-details'"
-              @click="_toggleParam"
+              @click="_toggleView"
-              icon="el-icon-arrow-right">
+              icon="el-icon-c-scale-to-original">
             </el-button>
-          </span>
+           </span>
+          </el-tooltip>
+          <el-tooltip :content="$t('Startup parameter')" placement="top" :enterable="false">
+            <span>
+              <el-button
+                style="vertical-align: middle;"
+                type="primary"
+                size="mini"
+                :disabled="$route.name !== 'projects-instance-details'"
+                @click="_toggleParam"
+                icon="el-icon-arrow-right">
+              </el-button>
+            </span>
+          </el-tooltip>
           <span class="name">{{name}}</span>
           &nbsp;
           <span v-if="name"  class="copy-name" @click="_copyName" :data-clipboard-text="name"><em class="el-icon-copy-document" data-container="body"  data-toggle="tooltip" :title="$t('Copy name')" ></em></span>
@@ -70,32 +70,36 @@
                :id="item.code"
                :key="$index"
                @click="_ckOperation(item,$event)">
-              <el-button type="text" class="operBtn" data-container="body" :icon="item.icon" v-tooltip.light="item.desc"></el-button>
+              <el-tooltip :content="item.desc" placement="top" :enterable="false">
+                <span><el-button type="text" class="operBtn" :icon="item.icon"></el-button></span>
+              </el-tooltip>
             </a>
           </div>
-          <el-button
+          <el-tooltip :content="$t('Format DAG')" placement="top" :enterable="false">
-            type="primary"
+            <span>
-            v-tooltip.light="$t('Format DAG')"
+              <el-button
-            icon="el-icon-caret-right"
+                type="primary"
-            size="mini"
+                icon="el-icon-caret-right"
-            data-container="body"
+                size="mini"
-            v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"
+                v-if="(type === 'instance' || 'definition') && urlParam.id !=undefined"
-            style="vertical-align: middle;"
+                style="vertical-align: middle;"
-            @click="dagAutomaticLayout">
+                @click="dagAutomaticLayout">
-          </el-button>
+              </el-button>
-          <span>
+            </span>
-            <el-button
+          </el-tooltip>
-              v-tooltip.light="$t('Refresh DAG status')"
+          <el-tooltip :content="$t('Refresh DAG status')" placement="top" :enterable="false">
-              data-container="body"
+            <span>
-              style="vertical-align: middle;"
+              <el-button
-              icon="el-icon-refresh"
+                style="vertical-align: middle;"
-              type="primary"
+                icon="el-icon-refresh"
-              :loading="isRefresh"
+                type="primary"
-              v-if="type === 'instance'"
+                :loading="isRefresh"
-              @click="!isRefresh && _refresh()"
+                v-if="type === 'instance'"
-              size="mini" >
+                @click="!isRefresh && _refresh()"
-            </el-button>
+                size="mini" >
-          </span>
+              </el-button>
+            </span>
+          </el-tooltip>
           <el-button
                   v-if="isRtTasks"
                   style="vertical-align: middle;"
@@ -108,10 +112,8 @@
           <span>
             <el-button
               type="primary"
-              v-tooltip.light="$t('Close')"
               icon="el-icon-switch-button"
               size="mini"
-              data-container="body"
               v-if="(type === 'instance' || 'definition') "
               style="vertical-align: middle;"
               @click="_closeDAG">