From 9b446078cb656f62c09046b3106afc447e28eb4d Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Tue, 25 Apr 2017 16:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=8C=89button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bi/base.js                                    | 168 +++++++++---------
 bi/widget.js                                  |   4 +-
 docs/base.js                                  | 168 +++++++++---------
 docs/widget.js                                |   4 +-
 src/base/single/button/button.basic.js        | 168 +++++++++---------
 .../finetuning.number.editor.js               |   4 +-
 6 files changed, 267 insertions(+), 249 deletions(-)

diff --git a/bi/base.js b/bi/base.js
index 82e71967e..ed5c38f49 100644
--- a/bi/base.js
+++ b/bi/base.js
@@ -685,95 +685,99 @@ BI.BasicButton = BI.inherit(BI.Single, {
             return;
         }
         hand = hand.element;
-        switch (o.trigger) {
-            case "mouseup":
-                var mouseDown = false;
-                hand.mousedown(function () {
-                    mouseDown = true;
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    if (mouseDown === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    ev(e);
-                });
-                break;
-            case "mousedown":
-                var mouseDown = false;
-                var selected = false;
-                hand.mousedown(function (e) {
-                    // if (e.button === 0) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        // if (e.button === 0) {
-                        if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
-                            self.setSelected(!self.isSelected());
-                            self._trigger();
+        var triggerArr = (o.trigger || "").split(",");
+        BI.each(triggerArr, function (idx, trigger) {
+            switch (trigger) {
+                case "mouseup":
+                    var mouseDown = false;
+                    hand.mousedown(function () {
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        if (mouseDown === true) {
+                            clk(e);
                         }
                         mouseDown = false;
-                        $(document).unbind("mouseup." + self.getName());
+                        ev(e);
+                    });
+                    break;
+                case "mousedown":
+                    var mouseDown = false;
+                    var selected = false;
+                    hand.mousedown(function (e) {
+                        // if (e.button === 0) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            // if (e.button === 0) {
+                            if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
+                                self.setSelected(!self.isSelected());
+                                self._trigger();
+                            }
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                            // }
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (self.isSelected()) {
+                            selected = true;
+                        } else {
+                            clk(e);
+                        }
+                        mouseDown = true;
+                        ev(e);
                         // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (self.isSelected()) {
-                        selected = true;
-                    } else {
-                        clk(e);
-                    }
-                    mouseDown = true;
-                    ev(e);
-                    // }
-                });
-                hand.mouseup(function (e) {
-                    // if (e.button === 0) {
-                    if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    selected = false;
-                    $(document).unbind("mouseup." + self.getName());
-                    // }
-                });
-                break;
-            case "dblclick":
-                hand.dblclick(clk);
-                break;
-            case "lclick":
-                var mouseDown = false;
-                var interval;
-                hand.mousedown(function (e) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        interval && clearInterval(interval);
-                        interval = null;
+                    hand.mouseup(function (e) {
+                        // if (e.button === 0) {
+                        if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
+                            clk(e);
+                        }
                         mouseDown = false;
+                        selected = false;
                         $(document).unbind("mouseup." + self.getName());
+                        // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
-                        return;
-                    }
-                    interval = setInterval(function () {
-                        self.doClick();
-                    }, 100);
-                    mouseDown = true;
-                    ev(e);
-                });
-                break;
-            default:
-                hand.mousedown(function (e) {
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    ev(e);
-                });
-                hand.click(clk);
-                break;
-        }
+                    break;
+                case "dblclick":
+                    hand.dblclick(clk);
+                    break;
+                case "lclick":
+                    var mouseDown = false;
+                    var interval;
+                    hand.mousedown(function (e) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            interval && clearInterval(interval);
+                            interval = null;
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
+                            return;
+                        }
+                        interval = setInterval(function () {
+                            self.doClick();
+                        }, 100);
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    break;
+                default:
+                    hand.mousedown(function (e) {
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        ev(e);
+                    });
+                    hand.click(clk);
+                    break;
+            }
+        });
+
         //之后的300ms点击无效
         var onClick = BI.debounce(this.doClick, BI.EVENT_RESPONSE_TIME, true);
 
diff --git a/bi/widget.js b/bi/widget.js
index 1a44714db..64a98ef1a 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -7055,6 +7055,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.topBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -7063,6 +7064,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.bottomBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -7105,7 +7107,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
     _finetuning: function(add){
         var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue()));
         this.editor.setValue(this._alertInEditorValue(v + add));
-        this.bottomBtn.setEnable((v + add) !== -1);
+        this.bottomBtn.setEnable((v + add) > -1);
     },
 
     getValue: function () {
diff --git a/docs/base.js b/docs/base.js
index 82e71967e..ed5c38f49 100644
--- a/docs/base.js
+++ b/docs/base.js
@@ -685,95 +685,99 @@ BI.BasicButton = BI.inherit(BI.Single, {
             return;
         }
         hand = hand.element;
-        switch (o.trigger) {
-            case "mouseup":
-                var mouseDown = false;
-                hand.mousedown(function () {
-                    mouseDown = true;
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    if (mouseDown === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    ev(e);
-                });
-                break;
-            case "mousedown":
-                var mouseDown = false;
-                var selected = false;
-                hand.mousedown(function (e) {
-                    // if (e.button === 0) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        // if (e.button === 0) {
-                        if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
-                            self.setSelected(!self.isSelected());
-                            self._trigger();
+        var triggerArr = (o.trigger || "").split(",");
+        BI.each(triggerArr, function (idx, trigger) {
+            switch (trigger) {
+                case "mouseup":
+                    var mouseDown = false;
+                    hand.mousedown(function () {
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        if (mouseDown === true) {
+                            clk(e);
                         }
                         mouseDown = false;
-                        $(document).unbind("mouseup." + self.getName());
+                        ev(e);
+                    });
+                    break;
+                case "mousedown":
+                    var mouseDown = false;
+                    var selected = false;
+                    hand.mousedown(function (e) {
+                        // if (e.button === 0) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            // if (e.button === 0) {
+                            if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
+                                self.setSelected(!self.isSelected());
+                                self._trigger();
+                            }
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                            // }
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (self.isSelected()) {
+                            selected = true;
+                        } else {
+                            clk(e);
+                        }
+                        mouseDown = true;
+                        ev(e);
                         // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (self.isSelected()) {
-                        selected = true;
-                    } else {
-                        clk(e);
-                    }
-                    mouseDown = true;
-                    ev(e);
-                    // }
-                });
-                hand.mouseup(function (e) {
-                    // if (e.button === 0) {
-                    if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    selected = false;
-                    $(document).unbind("mouseup." + self.getName());
-                    // }
-                });
-                break;
-            case "dblclick":
-                hand.dblclick(clk);
-                break;
-            case "lclick":
-                var mouseDown = false;
-                var interval;
-                hand.mousedown(function (e) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        interval && clearInterval(interval);
-                        interval = null;
+                    hand.mouseup(function (e) {
+                        // if (e.button === 0) {
+                        if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
+                            clk(e);
+                        }
                         mouseDown = false;
+                        selected = false;
                         $(document).unbind("mouseup." + self.getName());
+                        // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
-                        return;
-                    }
-                    interval = setInterval(function () {
-                        self.doClick();
-                    }, 100);
-                    mouseDown = true;
-                    ev(e);
-                });
-                break;
-            default:
-                hand.mousedown(function (e) {
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    ev(e);
-                });
-                hand.click(clk);
-                break;
-        }
+                    break;
+                case "dblclick":
+                    hand.dblclick(clk);
+                    break;
+                case "lclick":
+                    var mouseDown = false;
+                    var interval;
+                    hand.mousedown(function (e) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            interval && clearInterval(interval);
+                            interval = null;
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
+                            return;
+                        }
+                        interval = setInterval(function () {
+                            self.doClick();
+                        }, 100);
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    break;
+                default:
+                    hand.mousedown(function (e) {
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        ev(e);
+                    });
+                    hand.click(clk);
+                    break;
+            }
+        });
+
         //之后的300ms点击无效
         var onClick = BI.debounce(this.doClick, BI.EVENT_RESPONSE_TIME, true);
 
diff --git a/docs/widget.js b/docs/widget.js
index 1a44714db..64a98ef1a 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -7055,6 +7055,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.topBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -7063,6 +7064,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.bottomBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -7105,7 +7107,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
     _finetuning: function(add){
         var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue()));
         this.editor.setValue(this._alertInEditorValue(v + add));
-        this.bottomBtn.setEnable((v + add) !== -1);
+        this.bottomBtn.setEnable((v + add) > -1);
     },
 
     getValue: function () {
diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index 1882bd2de..0b0a2055e 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -102,95 +102,99 @@ BI.BasicButton = BI.inherit(BI.Single, {
             return;
         }
         hand = hand.element;
-        switch (o.trigger) {
-            case "mouseup":
-                var mouseDown = false;
-                hand.mousedown(function () {
-                    mouseDown = true;
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    if (mouseDown === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    ev(e);
-                });
-                break;
-            case "mousedown":
-                var mouseDown = false;
-                var selected = false;
-                hand.mousedown(function (e) {
-                    // if (e.button === 0) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        // if (e.button === 0) {
-                        if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
-                            self.setSelected(!self.isSelected());
-                            self._trigger();
+        var triggerArr = (o.trigger || "").split(",");
+        BI.each(triggerArr, function (idx, trigger) {
+            switch (trigger) {
+                case "mouseup":
+                    var mouseDown = false;
+                    hand.mousedown(function () {
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        if (mouseDown === true) {
+                            clk(e);
                         }
                         mouseDown = false;
-                        $(document).unbind("mouseup." + self.getName());
+                        ev(e);
+                    });
+                    break;
+                case "mousedown":
+                    var mouseDown = false;
+                    var selected = false;
+                    hand.mousedown(function (e) {
+                        // if (e.button === 0) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            // if (e.button === 0) {
+                            if (BI.DOM.isExist(self) && !hand.__isMouseInBounds__(e) && mouseDown === true && !selected) {
+                                self.setSelected(!self.isSelected());
+                                self._trigger();
+                            }
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                            // }
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (self.isSelected()) {
+                            selected = true;
+                        } else {
+                            clk(e);
+                        }
+                        mouseDown = true;
+                        ev(e);
                         // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (self.isSelected()) {
-                        selected = true;
-                    } else {
-                        clk(e);
-                    }
-                    mouseDown = true;
-                    ev(e);
-                    // }
-                });
-                hand.mouseup(function (e) {
-                    // if (e.button === 0) {
-                    if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
-                        clk(e);
-                    }
-                    mouseDown = false;
-                    selected = false;
-                    $(document).unbind("mouseup." + self.getName());
-                    // }
-                });
-                break;
-            case "dblclick":
-                hand.dblclick(clk);
-                break;
-            case "lclick":
-                var mouseDown = false;
-                var interval;
-                hand.mousedown(function (e) {
-                    $(document).bind("mouseup." + self.getName(), function (e) {
-                        interval && clearInterval(interval);
-                        interval = null;
+                    hand.mouseup(function (e) {
+                        // if (e.button === 0) {
+                        if (BI.DOM.isExist(self) && mouseDown === true && selected === true) {
+                            clk(e);
+                        }
                         mouseDown = false;
+                        selected = false;
                         $(document).unbind("mouseup." + self.getName());
+                        // }
                     });
-                    if (mouseDown === true) {
-                        return;
-                    }
-                    if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
-                        return;
-                    }
-                    interval = setInterval(function () {
-                        self.doClick();
-                    }, 100);
-                    mouseDown = true;
-                    ev(e);
-                });
-                break;
-            default:
-                hand.mousedown(function (e) {
-                    ev(e);
-                });
-                hand.mouseup(function (e) {
-                    ev(e);
-                });
-                hand.click(clk);
-                break;
-        }
+                    break;
+                case "dblclick":
+                    hand.dblclick(clk);
+                    break;
+                case "lclick":
+                    var mouseDown = false;
+                    var interval;
+                    hand.mousedown(function (e) {
+                        $(document).bind("mouseup." + self.getName(), function (e) {
+                            interval && clearInterval(interval);
+                            interval = null;
+                            mouseDown = false;
+                            $(document).unbind("mouseup." + self.getName());
+                        });
+                        if (mouseDown === true) {
+                            return;
+                        }
+                        if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
+                            return;
+                        }
+                        interval = setInterval(function () {
+                            self.doClick();
+                        }, 100);
+                        mouseDown = true;
+                        ev(e);
+                    });
+                    break;
+                default:
+                    hand.mousedown(function (e) {
+                        ev(e);
+                    });
+                    hand.mouseup(function (e) {
+                        ev(e);
+                    });
+                    hand.click(clk);
+                    break;
+            }
+        });
+
         //之后的300ms点击无效
         var onClick = BI.debounce(this.doClick, BI.EVENT_RESPONSE_TIME, true);
 
diff --git a/src/widget/finetuningnumbereditor/finetuning.number.editor.js b/src/widget/finetuningnumbereditor/finetuning.number.editor.js
index 4331684ad..f1832685d 100644
--- a/src/widget/finetuningnumbereditor/finetuning.number.editor.js
+++ b/src/widget/finetuningnumbereditor/finetuning.number.editor.js
@@ -27,6 +27,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.topBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-pre-page-h-font top-button bi-border-left bi-border-bottom"
         });
         this.topBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -35,6 +36,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
         });
         this.bottomBtn = BI.createWidget({
             type: "bi.icon_button",
+            trigger: "lclick,",
             cls: "column-next-page-h-font bottom-button bi-border-left bi-border-top"
         });
         this.bottomBtn.on(BI.IconButton.EVENT_CHANGE, function(){
@@ -77,7 +79,7 @@ BI.FineTuningNumberEditor = BI.inherit(BI.Widget, {
     _finetuning: function(add){
         var v = BI.parseInt(this._alertOutEditorValue(this.editor.getValue()));
         this.editor.setValue(this._alertInEditorValue(v + add));
-        this.bottomBtn.setEnable((v + add) !== -1);
+        this.bottomBtn.setEnable((v + add) > -1);
     },
 
     getValue: function () {