Merge branch 'hotfix/20211202' into 'develop'

Hotfix/20211202

See merge request luban/dataspherestudio!259

Author: 汪鸣峰

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

@@ -13,7 +13,7 @@ export default {
   name: 'lineage',
   data() {
     return {
-      canvas: null
+      canvas: null,
     }
   },
   props: {
@@ -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/dataGovernance/view/assetsInfo/index.vue

@@ -41,7 +41,7 @@
           <div class="assets-info-b-l-content-item">
             <label for="comment">描述</label>
             <span v-show="!isCommentEdit">{{ basicData.comment }}</span>
-            <Input
+            <!-- <Input
               v-show="isCommentEdit"
               v-model="basicData.comment"
               size="small"
@@ -59,7 +59,7 @@
               v-else
               @click="editSingleComment"
               style="float:right;cursor: pointer;"
-            ></Icon>
+            ></Icon> -->
           </div>
           <div class="assets-info-b-l-content-item" style="overflow: hidden">
             <label for="labels">标签</label>
@@ -77,10 +77,17 @@
               <Input
                 v-show="isLabelEdit"
                 v-model="singleLabel"
+                style="width: 135px;"
                 size="small"
                 placeholder=""
                 @on-enter="editSingleLabel"
               />
+              <Icon
+                type="md-checkmark"
+                v-show="isLabelEdit"
+                @click="editSingleLabel"
+                style="margin-left: 8px; cursor: pointer;"
+              ></Icon>
               <span
                 v-for="label in labelOptions"
                 :key="label"
@@ -163,7 +170,7 @@
             <div class="dagreLayout-page" v-if="lineageData">
               <lineage
                 class="flow-canvas"
-                id="dag-canvas"
+                id='dag-canvas'
                 :lineageData="lineageData"
               ></lineage>
             </div>
@@ -367,9 +374,7 @@ export default {
               item.store = item.store + "";
               let tempLen = Math.floor(item.store.length / 4);
               let len = tempLen > 2 ? 3 : tempLen;
-              item.store = (
-                item.store / Math.pow(1024, len + 1)
-              ).toFixed(2);
+              item.store = (item.store / Math.pow(1024, len + 1)).toFixed(2);
               switch (len) {
                 case 0:
                   item.store = item.store + "KB";

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"