Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

See merge request GFP/RBC/rbc-frontend!56

develop/@rbc/rbc-login/src/views/login/index.vue

 <template>
   <div class="login-wrapper">
+    <div v-if="imgLoading" class="white-loading"></div>
     <img v-if="loginImageBg" :src="loginImageBg" class="login-img-bg" />
     <div class="bg-color-class" />
     
@@ -154,14 +155,6 @@ export default {
     },
   },
   watch: {
-    imgLoading(val) {
-      if (val) {
-        this.$Spin.show()
-      }
-      else {
-        this.$Spin.hide()
-      }
-    }
   },
   methods: {
     getImgUrl(imgCode) {
@@ -301,6 +294,13 @@ export default {
   background-size: cover;
   overflow: hidden;
   position: absolute;
+  .white-loading {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-color: white;
+    z-index: 2000;
+  }
   
   .login-img-bg {
     width: 100%;

develop/@rbc/workflow-job-view/src/components/custom-query/senior-query/senior-query-mixins.js

@@ -103,7 +103,17 @@ let seniorQueryMixins = {
     },
     computed: {
         flatSeniorQueryData() {
-            return this.copySeniorQueryData.flat()
+            const flatten = (array) => {
+                var flattend = [];
+                (function flat(array) {
+                    array.forEach(function(el) {
+                        if (Array.isArray(el)) flat(el);
+                        else flattend.push(el);
+                    });
+                })(array);
+                return flattend;
+            }
+            return flatten(this.copySeniorQueryData)
         }
     },
     methods: {

develop/@rbc/workflow-job-view/src/components/custom-query/table-view/table-view.vue

 <template>
-    <div class="tableContentBody">
+    <div class="tableContentBody workflow-job-view-table">
         <custom-table-view
             v-if="showTableView"
             ref='table'
@@ -1731,6 +1731,9 @@ export default {
         
     }
 }
+.workflow-job-view-table {
+    border: 1px #e8e8e8 solid !important;
+}
 
 /*
 		样式展示为三种：