Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin into demo

zsping1989 · zsping1989 · commit 12da7eb47025 · 2022-08-16T11:03:47.000+08:00
diff --git a/app/Http/Controllers/Traits/ResourceController.php b/app/Http/Controllers/Traits/ResourceController.php
@@ -252,6 +252,7 @@ public function whereValidate(&$validate_rules, $value, $key)
     public function list()
     {
         $this->selectValidate();
+        $this->bindModel = $this->bindModel();
         //指定查询字段
         $fields = $this->selectFields($this->showIndexFields);
         //判断是否包含主键字段,没有包含自动添加
@@ -262,7 +263,7 @@ public function list()
             $has_primary_key = in_array($primary_key,$fields) || in_array($primary_key1,$fields);
             $fields = $has_primary_key ? $fields : array_merge([$primary_key1], $fields);
         }
-        $fields and $this->bindModel = $this->bindModel()->select($fields);
+        $fields and $this->bindModel->select($fields);
         //获取带有筛选条件的对象
         $obj = $this->getWithOptionModel();
         $obj = $this->handleList($obj);
diff --git a/resources/js/components/datatable.vue b/resources/js/components/datatable.vue
@@ -620,6 +620,10 @@
                 axios.get(this.use_url+url,{params:options}).then( (response)=> {
                     this.data.options.order = copyObj(options.order || {});
                     if(url==this.data.configUrl['listUrl']){
+                        //判断是否是每页条数变更
+                        if(response.data.per_page!=this.data.list.per_page){
+                            response.data.last_page = Math.ceil(this.data.list.total/response.data.per_page);
+                        }
                         for (let i in response.data ) {
                             if(i == 'data' && this.options.dataPush && response.data.current_page>1){ //数据追加
                                 let data = response.data[i];
