Browse Source

fix filter inputmask

jqh 4 years ago
parent
commit
277b6936ee
2 changed files with 13 additions and 1 deletions
  1. 8 0
      src/Grid/Filter/AbstractFilter.php
  2. 5 1
      src/Grid/Filter/Presenter/Text.php

+ 8 - 0
src/Grid/Filter/AbstractFilter.php

@@ -200,6 +200,14 @@ abstract class AbstractFilter
         $this->id = $this->formatId($this->column);
     }
 
+    /**
+     * @return Filter
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
     /**
      * Get siblings of current filter.
      *

+ 5 - 1
src/Grid/Filter/Presenter/Text.php

@@ -160,9 +160,13 @@ class Text extends Presenter
      */
     public function inputmask($options = [], $icon = 'pencil')
     {
+        Admin::js('@jquery.inputmask');
+
+        $options['rightAlign'] = false;
+
         $options = json_encode($options);
 
-        Admin::script("$('#filter-modal input.{$this->filter->getId()}').inputmask($options);");
+        Admin::script("$('#{$this->filter->getParent()->filterID()} input.{$this->filter->getId()}').inputmask($options);");
 
         $this->icon = $icon;