Merge branch 'fixbug-dataGovernance' into 'develop'

修改数据治理bug

See merge request luban/dataspherestudio!258

Author: 汪鸣峰

web/src/apps/dataGovernance/i18n/en.json

@@ -7,7 +7,7 @@
       "dataAssetsIndex": "Data Assets Index",
       "overallMeasurement": "Overall measurement",
       "menu": "Menu",
-      "pleaseEnterATableName": "Please enter a table name / description to search the database table",
+      "pleaseEnterATableName": "Please enter [database name / table name / field name / table description] to search the data table vaguely",
       "search": "Search"
     }
   }

web/src/apps/dataGovernance/i18n/zh.json

@@ -7,7 +7,7 @@
       "dataAssetsIndex": "数据资产目录",
       "overallMeasurement": "总体计量",
       "menu": "目录",
-      "pleaseEnterATableName": "请输入表名/描述搜索数据库表",
+      "pleaseEnterATableName": "请输入 [数据库名/表名/字段名/表描述] 来模糊搜索数据表",
       "search": "搜索"
     }
   }

web/src/apps/dataGovernance/module/common/tabCard/index.vue

@@ -86,7 +86,7 @@ export default {
 <style lang="scss" scoped>
 @import "@/common/style/variables.scss";
 .tab-card-wrap {
-  min-height: 99px;
+  min-height: 10.5vh;
   padding-left: 24px;
   padding-right: 24px;
   border: 1px solid #dee4ec;

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

@@ -123,7 +123,7 @@
             <Icon
               type="md-checkmark"
               v-else
-              @click="changeClassifications"
+              @click.once="changeClassifications"
               style="position: absolute; right:0; top: -15px;cursor: pointer;"
             ></Icon>
             <label>分层</label>
@@ -149,8 +149,7 @@
 
       <div class="assets-info-b-r">
         <Tabs type="card" class="assets-tabs" v-model="curTab">
-          <TabPane label="字段信息"
-                   name="info"
+          <TabPane label="字段信息" name="info"
             ><field-info
               :fieldInfo="fieldInfo"
               :rangeFieldInfo="rangeFieldInfo"
@@ -194,8 +193,8 @@ import {
   getLayersAll,
   updateClassifications
 } from "../../service/api";
-import util from '@/common/util'
-import { EventBus } from "../../module/common/eventBus/event-bus"
+import util from "@/common/util";
+import { EventBus } from "../../module/common/eventBus/event-bus";
 
 export default {
   name: "assetsInfo",
@@ -227,7 +226,7 @@ export default {
       layerList: [],
       isChangingClassifications: false,
       editable: false,
-      curTab: 'info'
+      curTab: "info"
     };
   },
   watch: {
@@ -248,21 +247,21 @@ export default {
       this.layerList = result;
     });
 
-    util.Hub.$on('register_click_hive_table', data => {
-      this.$nextTick(()=> {
-        $(`#${data.guid}`).on('click', () => {
-          this.curTab = 'info'
+    util.Hub.$on("register_click_hive_table", data => {
+      this.$nextTick(() => {
+        $(`#${data.guid}`).on("click", () => {
+          this.curTab = "info";
           EventBus.$emit("on-choose-card", data);
           const workspaceId = this.$route.query.workspaceId,
-            guid = data.guid
+            guid = data.guid;
           this.$router.push({
             name: "dataGovernance/assets/info",
             params: { guid },
             query: { workspaceId }
           });
-        })
-      })
-    })
+        });
+      });
+    });
   },
   methods: {
     init() {
@@ -305,22 +304,22 @@ export default {
               classifications
             } = data.result;
             if (parseInt(basic.store)) {
-              let tempLen = Math.floor(basic.store.length / 4)
-              let len = tempLen > 2 ? 3 : tempLen
-              basic.store = (basic.store /  Math.pow(1024, len + 1)).toFixed(2)
-              switch(len){
+              let tempLen = Math.floor(basic.store.length / 4);
+              let len = tempLen > 2 ? 3 : tempLen;
+              basic.store = (basic.store / Math.pow(1024, len + 1)).toFixed(2);
+              switch (len) {
                 case 0:
-                  basic.store = basic.store + 'KB'
-                  break
+                  basic.store = basic.store + "KB";
+                  break;
                 case 1:
-                  basic.store = basic.store + 'MB'
-                  break
+                  basic.store = basic.store + "MB";
+                  break;
                 case 2:
-                  basic.store = basic.store + 'GB'
-                  break
+                  basic.store = basic.store + "GB";
+                  break;
                 default:
-                  basic.store = basic.store + 'TB'
-                  break
+                  basic.store = basic.store + "TB";
+                  break;
               }
             }
             this.basicData = basic;
@@ -364,6 +363,28 @@ export default {
         .then(data => {
           if (data.result) {
             this.rangeInfo = data.result;
+            this.rangeInfo.forEach(item => {
+              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);
+              switch (len) {
+                case 0:
+                  item.store = item.store + "KB";
+                  break;
+                case 1:
+                  item.store = item.store + "MB";
+                  break;
+                case 2:
+                  item.store = item.store + "GB";
+                  break;
+                default:
+                  item.store = item.store + "TB";
+                  break;
+              }
+            });
           }
         })
         .catch(err => {

web/src/apps/dataGovernance/view/assetsSearch/index.vue

@@ -95,13 +95,14 @@
 
       <!-- right -->
       <div class="assets-index-b-r" v-if="cardTabs.length">
-        <template v-for="model in cardTabs">
+        <Scroll :on-reach-bottom="handleReachBottom" height="100vh">
           <tab-card
+            v-for="model in cardTabs"
             :model="model"
             :key="model.guid"
             @on-choose="onChooseCard"
           ></tab-card>
-        </template>
+        </Scroll>
       </div>
       <div class="assets-index-b-r" v-else>
         <div style="text-align: center; margin-top:50px; font-weight: bolder;">暂无数据</div>
@@ -175,9 +176,10 @@ export default {
   mounted() {
     let _this = this;
     this.throttleLoad = throttle(() => {
+      console.log('scroll')
       _this.scrollHander();
     }, 300);
-    window.addEventListener("scroll", this.throttleLoad);
+    window.addEventListener("scroll", this.throttleLoad, false);
     getThemedomains().then(res => {
       let { result } = res;
       this.subjectList = result;
@@ -315,7 +317,8 @@ export default {
         } else {
           clientHeight = Math.max(
             document.body.clientHeight,
-            document.documentElement.clientHeight
+            document.documentElement.clientHeight,
+            document.querySelector('.layout').clientHeight
           );
         }
         return clientHeight;
@@ -326,7 +329,11 @@ export default {
           document.documentElement.scrollHeight
         );
       };
-      if (getScrollTop() + getClientHeight() === getScrollHeight()) {
+      let st = getScrollTop();
+      let ch = getClientHeight();
+      let sh = getScrollHeight();
+      console.log(st,ch,sh)
+      if (st + ch + 54 >= sh) {
         // 拉数据
         this.handleReachBottom();
       }

web/vue.config.js

@@ -250,7 +250,7 @@ module.exports = {
         target: "http://***REMOVED***:8088",
         //target: 'http://***REMOVED***:9202', //yichao
         // target: "http://***REMOVED***:9202", //jiawei
-        //target: "http://luban.ctyun.cn:8088",
+        // target: "http://luban.ctyun.cn:8088",
         //target: "http://devluban.ctyun.cn:8088",
         changeOrigin: true,
         pathRewrite: {