修BUG

app/Distributor/Controllers/SitePagesController.php

@@ -88,7 +88,7 @@ class SitePagesController extends AdminDistController
                 $filter->panel();
                 $filter->expand();
                 $filter->like('title')->width(2);
-                $filter->equal('pagesTag.id',admin_trans_label('tags'))->select(SitePagesTag::all()->pluck('name', 'id'))->width(2);
+                $filter->equal('pagesTag.id',admin_trans_label('tags'))->select('api/tag')->width(2);
             });
             //权限与条件
             $grid->model()->where('dist_id', getDistributorId())->where('page_type', $location)->orderBy('id', 'desc');

app/repair/dcat-plus/laravel-admin/src/Http/Middleware/Bootstrap.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace Dcat\Admin\Http\Middleware;
+
+use Dcat\Admin\Admin;
+use Dcat\Admin\Support\Helper;
+use Dcat\Admin\Widgets\DarkModeSwitcher;
+use Illuminate\Http\Request;
+
+class Bootstrap
+{
+    public function handle(Request $request, \Closure $next)
+    {
+        $this->includeBootstrapFile();
+        $this->addScript();
+        $this->fireEvents();
+        $this->setUpDarkMode();
+
+        $response = $next($request);
+
+        $this->storeCurrentUrl($request);
+
+        return $response;
+    }
+
+    protected function setUpDarkMode()
+    {
+        if (
+            config('admin.layout.dark_mode_switch')
+            && ! Helper::isAjaxRequest()
+            && ! request()->routeIs(admin_api_route_name('*'))
+        ) {
+            Admin::navbar()->right((new DarkModeSwitcher())->render());
+        }
+    }
+
+    protected function includeBootstrapFile()
+    {
+        if (is_file($bootstrap = admin_path('bootstrap.php'))) {
+            require $bootstrap;
+        }
+    }
+
+    protected function addScript()
+    {
+        $token = csrf_token();
+        Admin::script("Dcat.token = \"$token\";");
+    }
+
+    protected function fireEvents()
+    {
+        Admin::callBooting();
+
+        Admin::callBooted();
+    }
+
+    /**
+     * @param  \Illuminate\Http\Request
+     * @return void
+     */
+    protected function storeCurrentUrl(Request $request)
+    {
+        if (
+            $request->method() === 'GET'
+            && $request->route()
+            && ! Helper::isAjaxRequest()
+            && ! $this->prefetch($request)
+        ) {
+            Admin::addIgnoreQueryName(['_token', '_pjax']);
+
+            $url = Helper::fullUrlWithoutQuery(Admin::getIgnoreQueryNames());
+            session()->put('admin.prev.url', Helper::urlWithoutQuery((string) $url, '_pjax'));
+
+//            Helper::setPreviousUrl(
+//                Helper::fullUrlWithoutQuery(Admin::getIgnoreQueryNames())
+//            );
+        }
+    }
+
+    /**
+     * @param  \Illuminate\Http\Request  $request
+     * @return bool
+     */
+    public function prefetch($request)
+    {
+        if (method_exists($request, 'prefetch')) {
+            return $request->prefetch();
+        }
+
+        return strcasecmp($request->server->get('HTTP_X_MOZ'), 'prefetch') === 0 ||
+            strcasecmp($request->headers->get('Purpose'), 'prefetch') === 0;
+    }
+}

composer.json

@@ -26,7 +26,8 @@
         "psr-4": {
             "App\\": "app/",
             "Database\\Factories\\": "database/factories/",
-            "Database\\Seeders\\": "database/seeders/"
+            "Database\\Seeders\\": "database/seeders/",
+            "Dcat\\Admin\\Http\\Middleware\\": "app/repair/dcat-plus/laravel-admin/src/Http/Middleware/"
         }
     },
     "autoload-dev": {