Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

develop/@gms/gms-plugin-mainpage-commonfunctions/package-lock.json

@@ -27,6 +27,7 @@
         "less": "^4.1.1",
         "less-loader": "^7.3.0",
         "node-sass": "^4.12.0",
+        "resize-observer-polyfill": "^1.5.1",
         "sass-loader": "^8.0.2",
         "svg-sprite-loader": "^6.0.11",
         "vue-template-compiler": "^2.6.11"
@@ -14099,8 +14100,8 @@
     },
     "node_modules/resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "http://nvwa.jiuqi.com.cn/nexus/repository/npm-gov-public/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=",
+      "resolved": "http://nvwa.jiuqi.com.cn/nexus/repository/npm-gov-group/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
       "license": "MIT"
     },
     "node_modules/resolve": {
@@ -29167,8 +29168,8 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "http://nvwa.jiuqi.com.cn/nexus/repository/npm-gov-public/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+      "resolved": "http://nvwa.jiuqi.com.cn/nexus/repository/npm-gov-group/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
       "version": "1.20.0",

develop/@gms/gms-plugin-mainpage-commonfunctions/package.json

@@ -33,6 +33,7 @@
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
     "node-sass": "^4.12.0",
+    "resize-observer-polyfill": "^1.5.1",
     "sass-loader": "^8.0.2",
     "svg-sprite-loader": "^6.0.11",
     "vue-template-compiler": "^2.6.11"

develop/@gms/gms-plugin-mainpage-commonfunctions/src/views/gms-app.vue

@@ -121,6 +121,7 @@
 </template>
 <script>
 import CardItem from '../components/CardItem.vue'
+import ResizeObserver from 'resize-observer-polyfill';
 
 export default {
   props: {
@@ -138,6 +139,7 @@ export default {
   },
   data() {
     return {
+      resizeObserver: null,
       postTemplate: {},
       reimburseList: [],
       rowIconNum: 4,
@@ -206,12 +208,21 @@ export default {
       this.addApp(routes.data.children)
       this.getData()
     })
-    this.cardWrapperHeight = this.$refs.cardWrapper.clientHeight || this.$refs.cardWrapper.offsetHeight
-    this.rowNum = Math.floor(this.cardWrapperHeight / 118)
-    if (this.rowNum == 0) this.rowNum = 1
-    
+    this.resizeObserver = new ResizeObserver(entries => {
+      for (const entry of entries) {
+        switch(entry.target){
+          case this.$refs.cardWrapper:
+            this.cardWrapperHeight = this.$refs.cardWrapper.clientHeight || this.$refs.cardWrapper.offsetHeight
+            this.rowNum = Math.floor(this.cardWrapperHeight / 118)
+            if (this.rowNum == 0) this.rowNum = 1
+            break;
+        }
+      }
+    });
+    this.resizeObserver.observe(this.$refs.cardWrapper)
   },
   unmounted() {
+    this.resizeObserver.disconnect()
   },
 	methods: {
     getData() {

develop/@rbc/bill-runner-query/src/views/query-runner.vue

@@ -3,6 +3,7 @@
     :templateName="config.name"
     v-if="config.name"
     :extrCondition="extrCondition"
+    :tableHeight="tableHeight"
   ></gms-query>
   <p v-else>没有查询模板定义！</p>
 </template>
@@ -18,8 +19,16 @@ export default {
     },
   },
   data() {
+    let height = window.innerHeight - 245
+    if (window.osConfig.appOpenMode == 'apploader') {
+      height -= 32
+    }
+    if (window.osConfig.showAcctbookBar) {
+      height -= 32
+    }
     return {
       extrCondition: [],
+      tableHeight: height,
     };
   },
   mounted() {