Pull request #1406: 无JIRA任务 更新提交

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '4778b9ebd6c2b83f694fa494be8ef2bd67347c6c':
  update
  无JIRA任务 更新提交

src/widget/date/calendar/picker.date.js

@@ -147,7 +147,7 @@ BI.DatePicker = BI.inherit(BI.Widget, {
         maxDate.setDate(1);
         var calcMin = BI.print(minDate, "%Y-%X-%d");
         var calcMax = BI.print(maxDate, "%Y-%X-%d");
-        
+
         return BI.filter(BI.range(1, 13), function (idx, v) {
             return !BI.checkDateVoid(self.year.getValue(), v, 1, calcMin, calcMax)[0];
         });
@@ -172,10 +172,12 @@ BI.DatePicker = BI.inherit(BI.Widget, {
     },
 
     setMinDate: function (minDate) {
+        this.options.min = minDate;
         this.year.setMinDate(minDate);
     },
 
     setMaxDate: function (maxDate) {
+        this.options.max = maxDate;
         this.year.setMaxDate(maxDate);
     },
 

src/widget/multiselect/search/multiselect.search.insert.pane.js

@@ -78,7 +78,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
     setKeyword: function (keyword) {
         var o = this.options;
         var hasSameValue = BI.some(this.loader.getAllButtons(), function (idx, btn) {
-            return keyword === (o.valueFormatter(btn.getValue()) || btn.getValue());
+            return keyword === btn.getValue();
         });
         var isMatchTipVisible = this.loader.getAllButtons().length > 0 && hasSameValue;
         this.tooltipClick.setVisible(isMatchTipVisible);

src/widget/multiselect/search/multiselect.search.pane.js

@@ -65,7 +65,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
 
     setKeyword: function (keyword) {
         var btn, o = this.options;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === (o.valueFormatter(btn.getValue()) || btn.getValue()));
+        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && keyword === btn.getValue();
         if (isVisible !== this.tooltipClick.isVisible()) {
             this.tooltipClick.setVisible(isVisible);
             this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);

src/widget/singleselect/search/singleselect.search.pane.insert.js

@@ -80,7 +80,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
     setKeyword: function (keyword) {
         var o = this.options;
         var hasSameValue = BI.some(this.loader.getAllButtons(), function (idx, btn) {
-            return keyword === (o.valueFormatter(btn.getValue()) || btn.getValue());
+            return keyword === btn.getValue();
         });
         var isMatchTipVisible = this.loader.getAllButtons().length > 0 && hasSameValue;
         this.tooltipClick.setVisible(isMatchTipVisible);

src/widget/singleselect/search/singleselect.search.pane.js

@@ -67,7 +67,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
 
     setKeyword: function (keyword) {
         var btn, o = this.options;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === (o.valueFormatter(btn.getValue()) || btn.getValue()));
+        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && keyword === btn.getValue();
         if (isVisible !== this.tooltipClick.isVisible()) {
             this.tooltipClick.setVisible(isVisible);
             this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);