浏览代码

优化筛选按钮选中效果逻辑

jqh 5 年之前
父节点
当前提交
d41e573fc4
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 1 1
      resources/views/filter/button.blade.php
  2. 3 0
      src/Grid/Tools/FilterButton.php

+ 1 - 1
resources/views/filter/button.blade.php

@@ -1,5 +1,5 @@
 <div class="btn-group filter-button-group" style="margin-right:3px">
-    <label class="btn btn-primary {{ $btn_class }} btn-sm" @if($show_filter_text)data-toggle="dropdown"@endif>
+    <label class="btn btn-primary dropdown-toggle {{ $btn_class }} btn-sm" @if($only_scopes)data-toggle="dropdown"@endif>
         <i class=" ti-filter"></i>@if($show_filter_text)<span class="hidden-xs">&nbsp;&nbsp;{{ trans('admin.filter') }}</span>@endif
     </label>
     @if($scopes->isNotEmpty())

+ 3 - 0
src/Grid/Tools/FilterButton.php

@@ -92,6 +92,8 @@ JS
 
         $this->setupScripts();
 
+        $onlyScopes = ((!$filters || $this->grid->option('show_filter') === false) && !$scopres->isEmpty()) ? true : false;
+
         $variables = [
             'scopes'           => $scopres,
             'current_label'    => $this->getCurrentScopeLabel(),
@@ -99,6 +101,7 @@ JS
             'btn_class'        => $this->getElementClassName(),
             'expand'           => $filter->expand,
             'show_filter_text' => true,
+            'only_scopes'      => $onlyScopes,
         ];
 
         return view($this->view, $variables)->render();