bugfix

doshu · Sep 3, 2019 · 4ba628e · 4ba628e
1 parent 80432c6
commit 4ba628e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Template/Element/templates.ctp b/src/Template/Element/templates.ctp
@@ -209,10 +209,10 @@
 <template id="range-filter-template">
     <div class="range-filter">
         <div>
-            <input :type="getFieldType()" class="form-control" :placeholder="'filtra da ' + getColumnName()" ref="from" />
+            Da <input :type="getFieldType()" class="form-control" :placeholder="'filtra da ' + getColumnName()" ref="from" />
         </div>
         <div>
-            <input :type="getFieldType()" class="form-control" :placeholder="'filtra a ' + getColumnName()" ref="to" />
+            A<input :type="getFieldType()" class="form-control" :placeholder="'filtra a ' + getColumnName()" ref="to" />
         </div>
     </div>
 </template>

diff --git a/webroot/css/datatable.css b/webroot/css/datatable.css
@@ -44,6 +44,7 @@
 
 .datatable thead th .select2-container {
     width:100%!important;
+    position:relative!important;
 }
 
 

diff --git a/webroot/js/components.js b/webroot/js/components.js
@@ -123,6 +123,7 @@ Vue.component('datatable', {
         },
         filter: function() {
             this.current_filters = {};
+            this.current_page = 1;
             if(this.$refs.filter) {
                 for(filter of this.$refs.filter) {
                     this.current_filters[filter.column] = filter.getFilterValue();
@@ -334,14 +335,15 @@ Vue.component('selectFilter', {
             return $(this.$refs.value).val();
         },
         reset: function() {
-            $(this.$refs.value).val('');
+            $(this.$refs.value).val('').change();
         }
     },
     mounted: function() {
         var that = this;
         setTimeout(function() {
             $(that.$refs.value).select2();
         }, 0);
+
     },
     updated: function() {
         var that = this;
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ @@
     .datatable thead th .select2-container {
         width:100%!important;
+        position:relative!important;
     }
@@ Expand Down @@