Merge pull request #5099 from a443939412/master

Grid filter 列过滤的reset按钮功能无效
z-song · Nov 14, 2020 · 2169e07 · 2169e07
2 parents 3816c0d + f0f0a8e
commit 2169e07
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/Grid/Column/CheckFilter.php b/src/Grid/Column/CheckFilter.php
@@ -115,7 +115,7 @@ public function render()
         <li class="divider"></li>
         <li class="text-right">
             <button class="btn btn-sm btn-flat btn-primary pull-left" data-loading-text="{$this->trans('search')}..."><i class="fa fa-search"></i>&nbsp;&nbsp;{$this->trans('search')}</button>
-            <button class="btn btn-sm btn-flat btn-default" type="reset" data-loading-text="..."><i class="fa fa-undo"></i></button>
+            <span><a href="{$this->getFormAction()}" class="btn btn-sm btn-flat btn-default"><i class="fa fa-undo"></i></a></span>
         </li>
     </ul>
 </form>

diff --git a/src/Grid/Column/InputFilter.php b/src/Grid/Column/InputFilter.php
@@ -112,6 +112,7 @@ public function render()
         <li class="text-right">
             <button class="btn btn-sm btn-flat btn-primary column-filter-submit pull-left" data-loading-text="{$this->trans('search')}..."><i class="fa fa-search"></i>&nbsp;&nbsp;{$this->trans('search')}</button>
             <button class="btn btn-sm btn-flat btn-default column-filter-all" data-loading-text="..."><i class="fa fa-undo"></i></button>
+            <span><a href="{$this->getFormAction()}" class="btn btn-sm btn-default btn-flat column-filter-all"><i class="fa fa-undo"></i></a></span>
         </li>
     </ul>
     </form>

diff --git a/src/Grid/Column/RangeFilter.php b/src/Grid/Column/RangeFilter.php
@@ -109,6 +109,7 @@ public function render()
         <li class="text-right">
             <button class="btn btn-sm btn-primary btn-flat column-filter-submit pull-left" data-loading-text="{$this->trans('search')}..."><i class="fa fa-search"></i>&nbsp;&nbsp;{$this->trans('search')}</button>
             <button class="btn btn-sm btn-default btn-flat column-filter-all" data-loading-text="..."><i class="fa fa-undo"></i></button>
+            <span><a href="{$this->getFormAction()}" class="btn btn-sm btn-default btn-flat column-filter-all"><i class="fa fa-undo"></i></a></span>
         </li>
     </ul>
     </form>