修复去除with的bug

SmallRuralDog · Apr 2, 2020 · ba3f057 · ba3f057
1 parent 38c1d2c
commit ba3f057
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=4ed697702cd557bc2437",
+    "/app.js": "/app.js?id=b947f979d10b28c67ed3",
     "/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
     "/vendor.js": "/vendor.js?id=159feaa1cb9cfd111212"
 }
diff --git a/resources/js/components/widgets/Grid/Boole.vue b/resources/js/components/widgets/Grid/Boole.vue
@@ -5,7 +5,7 @@
   </span>
 </template>
 <script>
-import { GridColumnComponent } from "../../../mixins";
+import { GridColumnComponent } from "@/mixins";
 export default {
   mixins: [GridColumnComponent]
 };

diff --git a/src/Controllers/LogController.php b/src/Controllers/LogController.php
@@ -17,8 +17,7 @@ class LogController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new OperationLog());
-        $grid->with(['user'])
-            ->perPage(15)
+        $grid->perPage(15)
             ->quickSearch()
             ->selection()
             ->defaultSort('id', 'desc')

diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php
@@ -27,7 +27,6 @@ protected function grid()
             ->quickSearchPlaceholder("用户名 / 名称")
             ->pageBackground()
             ->defaultSort('id', 'asc')
-            ->with(['roles:id,name', 'roles.permissions', 'roles.menus'])
             ->selection()
             ->stripe(true)->emptyText("暂无用户")
             ->perPage(10);