Domů Procházet Nápověda
Registrovat se Přihlásit se
dcatadmin2
/
dcat-admin2
2
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Merge remote-tracking branch 'origin/2.0' into 2.0

Jiang qinghua před 4 roky
rodič
8697dcf03a d7358a089f
revize
a10d8102d9
4 změnil soubory, kde provedl 17 přidání a 9 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 4 4
      resources/views/partials/menu.blade.php
  2. 1 1
      src/Admin.php
  3. 10 4
      src/Grid/Model.php
  4. 2 0
      src/Http/Controllers/ScaffoldController.php

+ 4 - 4
resources/views/partials/menu.blade.php
Zobrazit soubor 

@@ -9,24 +9,24 @@
 
 @if($builder->visible($item))
 
     @if(empty($item['children']))
 
         <li class="nav-item">
 
-            <a @if(mb_strpos($item['uri'], '://') !== false) target="_blank" @endif
 
+            <a data-id="{{ $item['id'] ?? '' }}" @if(mb_strpos($item['uri'], '://') !== false) target="_blank" @endif
 
                href="{{ $builder->getUrl($item['uri']) }}"
 
                class="nav-link {!! $builder->isActive($item) ? 'active' : '' !!}">
 
                 {!! str_repeat('&nbsp;', $depth) !!}<i class="fa fa-fw {{ $item['icon'] ?: $defaultIcon }}"></i>
 
                 <p>
 
-                    {{ $builder->translate($item['title']) }}
 
+                    {!! $builder->translate($item['title']) !!}
 
                 </p>
 
             </a>
 
         </li>
 
     @else
 
 
         <li class="{{ $horizontal ? 'dropdown' : 'has-treeview' }} {{ $depth > 0 ? 'dropdown-submenu' : '' }} nav-item {{ $builder->isActive($item) ? 'menu-open' : '' }}">
 
-            <a href="#"
 
+            <a href="#"  data-id="{{ $item['id'] ?? '' }}"
 
                class="nav-link {{ $builder->isActive($item) ? ($horizontal ? 'active' : '') : '' }}
 
                     {{ $horizontal ? 'dropdown-toggle' : '' }}">
 
                 {!! str_repeat('&nbsp;', $depth) !!}<i class="fa fa-fw {{ $item['icon'] ?: $defaultIcon }}"></i>
 
                 <p>
 
-                    {{ $builder->translate($item['title']) }}
 
+                    {!! $builder->translate($item['title']) !!}
 
 
                     @if(! $horizontal)
 
                         <i class="right fa fa-angle-left"></i>

+ 1 - 1
src/Admin.php
Zobrazit soubor 

@@ -31,7 +31,7 @@ class Admin
 
     use HasAssets;
 
     use HasHtml;
 
 
-    const VERSION = '2.1.1-beta';
 
+    const VERSION = '2.1.2-beta';
 
 
     const SECTION = [
 
         // 往 <head> 标签内输入内容

+ 10 - 4
src/Grid/Model.php
Zobrazit soubor 

@@ -484,7 +484,13 @@ class Model
 
     {
 
         $this->paginator = $paginator;
 
 
-        $paginator->withQueryString();
 
+        if ($this->simple) {
 
+            if (method_exists($paginator, 'withQueryString')) {
 
+                $paginator->withQueryString();
 
+            } else {
 
+                $paginator->appends(request()->all());
 
+            }
 
+        }
 
 
         $paginator->setPageName($this->getPageName());
 
     }
 
@@ -665,13 +671,13 @@ class Model
 
     }
 
 
     /**
 
-     * @param \Illuminate\Database\Query\Builder $query
 
+     * @param Builder $query
 
      * @param bool $fetch
 
      * @param string[] $columns
 
      *
 
-     * @return mixed
 
+     * @return Builder|Paginator|Collection
 
      */
 
-    public function apply($query, bool $fetch = true, $columns = null)
 
+    public function apply($query, bool $fetch = false, $columns = null)
 
     {
 
         $this->getQueries()->unique()->each(function ($value) use (&$query, $fetch, $columns) {
 
             if (! $fetch && in_array($value['method'], ['paginate', 'simplePaginate', 'get'], true)) {

+ 2 - 0
src/Http/Controllers/ScaffoldController.php
Zobrazit soubor 

@@ -229,6 +229,8 @@ class ScaffoldController extends Controller
 
                     $sql .= " AND TABLE_NAME = '{$p}{$tb}'";
 
                 }
 
 
+                $sql .= ' ORDER BY `ORDINAL_POSITION` ASC';
 
+
 
                 $tmp = DB::connection($connectName)->select($sql);
 
 
                 $collection = collect($tmp)->map(function ($v) use ($value) {