ソースを参照

Merge pull request #931 from djhvscf/master

Fix #727 filtercontrol选择器问题
文翼 10 年 前
コミット
f202449ccb

+ 5 - 1
src/extensions/filter-control/bootstrap-table-filter-control.js

@@ -99,6 +99,10 @@
             isVisible = 'hidden';
             isVisible = 'hidden';
             html = [];
             html = [];
 
 
+            if (!column.visible) {
+                return;
+            }
+
             if (!column.filterControl) {
             if (!column.filterControl) {
                 html.push('<div style="height: 34px;"></div>');
                 html.push('<div style="height: 34px;"></div>');
             } else {
             } else {
@@ -119,7 +123,7 @@
                 }
                 }
             }
             }
 
 
-            that.$header.find(sprintf('.th-inner:contains("%s")', column.title)).next().append(html.join(''));
+            that.$header.find(sprintf('.th-inner:eq("%s")', i)).next().append(html.join(''));
             if (column.filterData !== undefined && column.filterData.toLowerCase() !== 'column') {
             if (column.filterData !== undefined && column.filterData.toLowerCase() !== 'column') {
                 var filterDataType = column.filterData.substring(0, 3);
                 var filterDataType = column.filterData.substring(0, 3);
                 var filterDataSource = column.filterData.substring(4, column.filterData.length);
                 var filterDataSource = column.filterData.substring(4, column.filterData.length);