Merge branch 'hotfix/20211202' of https://10.30.90.89:39999/luban/dataspherestudio into fixbug-dataGovernance

Author: 张晨曦

web/src/apps/dataGovernance/view/assetsInfo/components/lineage/index.vue

@@ -22,6 +22,11 @@ export default {
       required: true
     }
   },
+  watch: {
+    lineageData() {
+      this.createOrUpdateCanvas(this.convertData())
+    }
+  },
   methods: {
     convertData() {
       let data = {
@@ -93,7 +98,7 @@ export default {
         })
         this.canvas.draw(data);
       } else {
-        this.canvas.drageReDraw(data);
+        this.canvas.redraw(data);
       }
     }
   },

web/src/apps/workflows/module/dispatch/index.vue

@@ -923,7 +923,8 @@ export default {
       startData: {},
       timingData: {
         item: {},
-        type: ''
+        type: '',
+        id: ''
       },
       pagination: {
         size: 10,
@@ -1142,6 +1143,7 @@ export default {
         tempData.type = 'timing'
         id = this.list[index].id
       }
+      this.timingData.id = id
       this.getReceiver(id, (res) => {
         this.timingData.item = {
           ...tempData.item,
@@ -1278,7 +1280,8 @@ export default {
     closeRun() {
       this.showRunTaskModal = false
     },
-    setTiming() {
+    setTiming(id) {
+      this.schedulerId = id
       this.showTimingTaskModal = false
       this.activeList(3)
     },

web/src/apps/workflows/module/dispatch/timing.vue

@@ -320,7 +320,7 @@ export default {
 
         this.api.fetch(api, searchParams, {useFormQuery: true}).then(res => {
           this.$Message.success(msg)
-          this.$emit('onUpdateTiming')
+          this.$emit('onUpdateTiming', this.timingData.id)
         })
       }
     },

web/vue.config.js

@@ -258,8 +258,8 @@ module.exports = {
         }
       },
       "/dolphinscheduler": {
-        target: "http://***REMOVED***:12345",
-        //target: "https://dolphin.ctyun.cn:10002",
+        //target: "http://***REMOVED***:12345",
+        target: "https://dolphin.ctyun.cn:10002",
         changeOrigin: true,
         pathRewrite: {
           "^/dolphinscheduler": "/dolphinscheduler"