Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2

escheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="assist-dag-model">
-    <template v-if="isView">
+    <template v-if="isView && isActive">
       <m-variables-view></m-variables-view>
     </template>
   </div>
@@ -11,7 +11,8 @@
     name: 'assist-dag-index',
     data () {
       return {
-        isView: false
+        isView: false,
+        isActive: true
       }
     },
     methods: {
@@ -19,6 +20,15 @@
         this.isView = !this.isView
       }
     },
+    watch: {
+      '$route': {
+        deep: true,
+        handler () {
+          this.isActive = false
+          this.$nextTick(() => (this.isActive = true))
+        }
+      }
+    },
     components: { mVariablesView }
   }
-</script>
+</script>