去掉列表输出tojson方法

加入json中文不转换中间件
修改菜单关闭按钮样式

app/Gdoo/Approach/Controllers/ApproachController.php

@@ -67,12 +67,11 @@ class ApproachController extends WorkflowController
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
 
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 $item['master_cash_amount'] = '<a href="javascript:;" data-toggle="event" data-action="fee_detail" data-master_id="'.$item['master_id'].'" class="option">'.$item['master_cash_amount'].'</a>';
                 $item['master_product'] = '<a href="javascript:;" data-toggle="event" data-action="product" data-master_id="'.$item['master_id'].'" class="option">明细</a>';
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Approach/Controllers/MarketController.php

@@ -57,8 +57,7 @@ class MarketController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Approach/Controllers/ReviewController.php

@@ -58,8 +58,7 @@ class ReviewController extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Article/Controllers/ArticleController.php

@@ -80,10 +80,16 @@ class ArticleController extends DefaultController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
+
+            $header['cols'] = $cols;
+            $header['tabs'] = Article::$tabs;
+            $header['bys'] = Article::$bys;
+            $header['js'] = Grid::js($header);
+
             $items = Grid::dataFilters($rows, $header, function($item) {
                 return $item;
             });
-            return $items->toJson();
+            return $items;
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/ComplaintController.php

@@ -62,9 +62,7 @@ class ComplaintController extends WorkflowController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit'])->appends($query);
-
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/ContactController.php

@@ -59,8 +59,7 @@ class ContactController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/CustomerApplyController.php

@@ -72,11 +72,9 @@ class CustomerApplyController extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/CustomerController.php

@@ -73,11 +73,9 @@ class CustomerController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/DeliveryAddressController.php

@@ -58,8 +58,7 @@ class DeliveryAddressController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/PriceController.php

@@ -63,8 +63,7 @@ class PriceController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/TaxController.php

@@ -60,8 +60,7 @@ class TaxController extends AuditController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Customer/Controllers/TypeController.php

@@ -51,8 +51,7 @@ class TypeController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/CustomerCost/Controllers/AdjustController.php

@@ -61,8 +61,7 @@ class AdjustController extends AuditController
             $header['select'][] = 'customer_cost_data.cost_id';
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/CustomerCost/Controllers/CategoryController.php

@@ -49,8 +49,7 @@ class CategoryController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/CustomerCost/Controllers/CompenController.php

@@ -61,8 +61,7 @@ class CompenController extends AuditController
             $header['select'][] = 'customer_cost_data.cost_id';
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/CustomerCost/Controllers/CostController.php

@@ -68,8 +68,7 @@ class CostController extends AuditController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/CustomerCost/Controllers/RebateController.php

@@ -61,8 +61,7 @@ class RebateController extends AuditController
             $header['select'][] = 'customer_cost_data.cost_id';
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/File/Controllers/CertificateController.php

@@ -47,11 +47,10 @@ class CertificateController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 $item['size'] = human_filesize($item['size']);
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/File/Controllers/InspectReportController.php

@@ -47,11 +47,10 @@ class InspectReportController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 $item['size'] = human_filesize($item['size']);
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Index/views/index/index.blade.php

@@ -38,6 +38,7 @@
             </a>
 
             <a href="{{url('/')}}" class="navbar-brand">
+                
                 <img src="{{$asset_url}}/images/logo.svg" width="18" />
                 <!--
                 <i class="fa text-lg fa-buysellads"></i>

app/Gdoo/Model/Grid.php

@@ -105,13 +105,14 @@ class Grid
             $rows[] = static::dataFilter($item, $header, $callback);
         }
 
-        $rows = collect($rows);
+        $ret = [];
         if ($items instanceof AbstractPaginator) {
-            $items->setCollection($rows);
+            $ret = $items->setCollection(collect($rows))->toArray();
         } else {
-            $items = $rows;
+            $ret = collect(['data' => $rows]);
         }
-        return $items;
+        $ret['header'] = $header;
+        return $ret;
     }
 
     public static function dataFilter($item, $header, $callback = null)

app/Gdoo/Order/Controllers/LogisticsController.php

@@ -52,8 +52,7 @@ class LogisticsController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Order/Controllers/OrderController.php

@@ -254,8 +254,7 @@ class OrderController extends WorkflowController
             }
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [
@@ -385,9 +384,7 @@ class OrderController extends WorkflowController
             $model->addSelect($header['select']);
 
             $rows = $model->paginate($query['limit'])->appends($query);
-
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [
@@ -582,8 +579,7 @@ class OrderController extends WorkflowController
             }
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Order/Controllers/SampleApplyController.php

@@ -94,8 +94,7 @@ class SampleApplyController extends WorkflowController
             $model->addSelect(DB::raw('sad.*'));
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [
@@ -157,8 +156,7 @@ class SampleApplyController extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Order/Controllers/TypeController.php

@@ -51,8 +51,7 @@ class TypeController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Produce/Controllers/MaterialController.php

@@ -54,8 +54,7 @@ class MaterialController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Produce/Controllers/PlanController.php

@@ -54,8 +54,7 @@ class PlanController extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Product/Controllers/ProductController.php

@@ -69,8 +69,7 @@ class ProductController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Product/Controllers/UnitController.php

@@ -48,8 +48,7 @@ class UnitController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Promotion/Controllers/MaterialController.php

@@ -78,10 +78,9 @@ class MaterialController extends DefaultController
 
             $rows = $model->paginate($query['limit'])->appends($query);
 
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Promotion/Controllers/PromotionController.php

@@ -86,13 +86,11 @@ class PromotionController extends WorkflowController
             $model->addSelect(DB::raw("case when promotion.type_id = 2 then promotion.undertake_money else 0 end as zp_money"));
 
             $rows = $model->paginate($query['limit'])->appends($query);
-
-            $items = Grid::dataFilters($rows, $header, function($item) {
+            return Grid::dataFilters($rows, $header, function($item) {
                 $item['master_cash_amount'] = '<a href="javascript:;" data-toggle="event" data-action="fee_detail" data-master_id="'.$item['master_id'].'" class="option">'.$item['master_cash_amount'].'</a>';
                 $item['master_product'] = '<a href="javascript:;" data-toggle="event" data-action="product" data-master_id="'.$item['master_id'].'" class="option">明细</a>';
                 return $item;
             });
-            return $items->toJson();
         }
 
         $header['buttons'] = [

app/Gdoo/Promotion/Controllers/ReviewController.php

@@ -59,8 +59,7 @@ class ReviewController extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Purchase/Controllers/OrderController.php

@@ -51,8 +51,7 @@ class OrderController extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Purchase/Controllers/SupplierController.php

@@ -51,8 +51,7 @@ class SupplierController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/AllocationController.php

@@ -52,8 +52,7 @@ class AllocationController extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/CancelController.php

@@ -50,8 +50,7 @@ class CancelController extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/CategoryController.php

@@ -50,8 +50,7 @@ class CategoryController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/DeliveryController.php

@@ -92,8 +92,7 @@ class DeliveryController extends WorkflowController
             $model->addSelect(DB::raw('sdd.total_quantity'));
             
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [
@@ -165,8 +164,7 @@ class DeliveryController extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/DirectController.php

@@ -50,8 +50,7 @@ class DirectController extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/LocationController.php

@@ -50,8 +50,7 @@ class LocationController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/Record01Controller.php

@@ -50,8 +50,7 @@ class Record01Controller extends AuditController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/Record08Controller.php

@@ -50,8 +50,7 @@ class Record08Controller extends AuditController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/Record09Controller.php

@@ -50,8 +50,7 @@ class Record09Controller extends WorkflowController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/Record10Controller.php

@@ -50,8 +50,7 @@ class Record10Controller extends WorkflowController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/Record11Controller.php

@@ -50,8 +50,7 @@ class Record11Controller extends AuditController
             
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/TypeController.php

@@ -50,8 +50,7 @@ class TypeController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/Stock/Controllers/WarehouseController.php

@@ -50,8 +50,7 @@ class WarehouseController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/System/Controllers/RegionController.php

@@ -53,8 +53,7 @@ class RegionController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/User/Controllers/GroupController.php

@@ -52,8 +52,7 @@ class GroupController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/User/Controllers/MessageController.php

@@ -62,8 +62,7 @@ class MessageController extends Controller
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/User/Controllers/PositionController.php

@@ -52,8 +52,7 @@ class PositionController extends DefaultController
 
             $model->select($header['select']);
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/User/Controllers/RoleController.php

@@ -80,8 +80,7 @@ class RoleController extends DefaultController
             ->addSelect(DB::raw('(select count(id) from [user] where role_id = role.id) as user_count'));
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Gdoo/User/Controllers/UserController.php

@@ -71,8 +71,7 @@ class UserController extends DefaultController
             $model->select($header['select']);
 
             $rows = $model->paginate($query['limit'])->appends($query);
-            $items = Grid::dataFilters($rows, $header);
-            return $items->toJson();
+            return Grid::dataFilters($rows, $header);
         }
 
         $header['buttons'] = [

app/Http/Kernel.php

@@ -54,6 +54,7 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
+        'json' => \App\Http\Middleware\JsonResponse::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
         'can' => \Illuminate\Auth\Middleware\Authorize::class,

app/Http/Middleware/Authenticate2.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Auth\Middleware\Authenticate as Middleware;
-
-class Authenticate2 extends Middleware
-{
-    /**
-     * Get the path the user should be redirected to when they are not authenticated.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return string|null
-     */
-    protected function redirectTo($request)
-    {
-        if (! $request->expectsJson()) {
-            return route('login');
-        }
-    }
-}

app/Http/Middleware/JsonResponse.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class JsonResponse
+{
+    public function handle(Request $request, Closure $next)
+    {
+        $data = $next($request);
+        if ($data instanceof \Illuminate\Http\JsonResponse) {
+            $data->setEncodingOptions(JSON_UNESCAPED_UNICODE);
+        }
+        return $data;
+    }
+}

composer.json

@@ -6,7 +6,7 @@
         "gdoo",
         "web"
     ],
-    "license": "MIT",
+    "license": "Apache",
     "require": {
         "php": "^8.0",
         "fideloper/proxy": "^4.4",

public/assets/css/menu.css

@@ -893,17 +893,27 @@ body.theme-purple {
     font-size: 10px;
     position: absolute;
     right: 3px;
-    top: 50%;
-    margin-top: -6px;
-    z-index: 100;
-    cursor: hand;
+    top: 3px;
+    z-index: 101;
     cursor: pointer;
-    color: #fff;
+    color: rgba(255, 255, 255, 0.6);
     display: none;
+    width: 16px;
+    height: 16px;
+    line-height: 16px;
+    text-align: center;
+    border-radius: 50%;
 }
 
 .tabs-list li:hover > .tab-close {
     display: block;
+    background: rgba(255, 255, 255, 0.2);
+}
+
+.tabs-list li:hover > .tab-close:hover {
+    display: block;
+    background: #fff;
+    color: #666;
 }
 
 .tab-drop {

public/mix-manifest.json

@@ -4,5 +4,5 @@
     "/assets/dist/app.min.css": "/assets/dist/app.min.css?id=b145e2781689d581fc3f",
     "/assets/vendor/ag-grid/ag-grid.min.css": "/assets/vendor/ag-grid/ag-grid.min.css?id=0e414057cb24126f35ae",
     "/assets/dist/index.min.js": "/assets/dist/index.min.js?id=ed7b4656fa575c6e2308",
-    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=657e1259b07737f84e4d"
+    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=5ef88862b299dea834f5"
 }

routes/web.php

@@ -35,15 +35,15 @@ $action = 'Gdoo\\'.ucfirst($uris['module']).'\\Controllers\\'.$controller.'Contr
 $method = Request::method();
 
 if ($method == 'GET') {
-    Route::get($path, $action);
+    Route::get($path, $action)->middleware('json');
 }
 
 if ($method == 'POST') {
-    Route::post($path, $action);
+    Route::post($path, $action)->middleware('json');
 }
 
 if ($method == 'OPTIONS') {
-    Route::options($path, $action);
+    Route::options($path, $action)->middleware('json');
 }
 
 View::addLocation(base_path('app/Gdoo/'.ucfirst(Request::module()).'/views'));

webpack.mix.js

@@ -93,6 +93,5 @@ mix.combine([
 ],'public/assets/dist/index.min.css');
 
 if (mix.inProduction()) {
-    console.log(121);
     mix.version();
 }