Merge pull request #64 from lphkxd/master

修复隐藏toolbar自动计算高度报错；隐藏表单时自定义data数据返回数据结构错误bug

Author: SmallRuralDog

resources/js/components/grid/Table.vue

@@ -302,7 +302,7 @@ export default {
         this.$nextTick(() => {
             this.topViewHeight = this.$refs.topView.offsetHeight;
 
-            this.toolbarsViewHeight = this.$refs.toolbarsView.offsetHeight;
+            this.toolbarsViewHeight = this.$refs.toolbarsView? this.$refs.toolbarsView.offsetHeight:0;
 
             this.pageViewHeight = this.$refs.pageView ? this.$refs.pageView.offsetHeight : 0;
 

src/Grid.php

@@ -394,7 +394,7 @@ protected function data()
             $this->customData['data'] = $this->model()->displayData($this->customData['data']);
             return [
                 'code' => 200,
-                'data' => $this->customData
+                'data' => $this->isHidePage() ? $this->customData['data'] : $this->customData
             ];
         }