jqh 5 년 전
부모
커밋
5385deb74b
3개의 변경된 파일17개의 추가작업 그리고 4개의 파일을 삭제
  1. 7 3
      resources/views/tree.blade.php
  2. 9 0
      src/Repositories/Repository.php
  3. 1 1
      src/Tree.php

+ 7 - 3
resources/views/tree.blade.php

@@ -34,9 +34,13 @@
 <div class="card-body table-responsive">
     <div class="dd" id="{{ $id }}" style="margin:18px">
         <ol class="dd-list">
-            @foreach($items as $branch)
-                @include($branchView)
-            @endforeach
+            @if($items)
+                @foreach($items as $branch)
+                    @include($branchView)
+                @endforeach
+            @else
+                <span class="help-block" style="margin-bottom:0"><i class="fa fa-info-circle"></i>&nbsp;{{ trans('admin.no_data') }}</span>
+            @endif
         </ol>
     </div>
 </div>

+ 9 - 0
src/Repositories/Repository.php

@@ -6,9 +6,14 @@ use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Traits\Macroable;
 
 abstract class Repository implements \Dcat\Admin\Contracts\Repository
 {
+    use Macroable {
+        __call as __macroCall;
+    }
+
     /**
      * @var array
      */
@@ -264,6 +269,10 @@ abstract class Repository implements \Dcat\Admin\Contracts\Repository
      */
     public function __call($method, $arguments)
     {
+        if (static::hasMacro($method)) {
+            return static::__macroCall($method, $arguments);
+        }
+
         $this->attributes[$method] = $arguments;
 
         return $this;

+ 1 - 1
src/Tree.php

@@ -193,7 +193,7 @@ class Tree implements Renderable
     /**
      * Set query callback this tree.
      *
-     * @return Model
+     * @return $this
      */
     public function query(\Closure $callback)
     {