From f68b447bd94eebc3c141168684b546f7b7b71861 Mon Sep 17 00:00:00 2001
From: imp <imp@fanruan.com>
Date: Fri, 5 Jan 2018 09:16:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?dist=E2=80=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/bundle.js | 2 ++
 dist/widget.js | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dist/bundle.js b/dist/bundle.js
index 31642f7d9..ff93356d1 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -79518,6 +79518,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             direction: "bottom",
             trigger: "click",
             container: null,
+            stopPropagation: false,
             el: {}
         });
     },
@@ -79550,6 +79551,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             container: o.container,
             adjustLength: o.adjustLength,
             direction: o.direction,
+            stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
                 extraCls: o.iconCls ? o.iconCls : "pull-down-font",
diff --git a/dist/widget.js b/dist/widget.js
index e6b95ef63..9ee5c37f8 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -3464,6 +3464,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             direction: "bottom",
             trigger: "click",
             container: null,
+            stopPropagation: false,
             el: {}
         });
     },
@@ -3496,6 +3497,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             container: o.container,
             adjustLength: o.adjustLength,
             direction: o.direction,
+            stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
                 extraCls: o.iconCls ? o.iconCls : "pull-down-font",

From 780c83516681f857a62bd14af950ed718b2fda6c Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 5 Jan 2018 10:11:24 +0800
Subject: [PATCH 2/2] update

---
 dist/fix/fix.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dist/fix/fix.js b/dist/fix/fix.js
index 0568197e5..17b56748b 100644
--- a/dist/fix/fix.js
+++ b/dist/fix/fix.js
@@ -1122,10 +1122,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
         }
     }
 
-    function createWatcher(vm, keyOrFn, handler) {
-        return watch(vm.model, keyOrFn, _.bind(handler, vm.$$model ? vm.model : vm), {
+    function createWatcher(vm, keyOrFn, cb, options) {
+        if (isPlainObject(cb)) {
+            options = cb;
+            cb = cb.handler;
+        }
+        if (typeof cb === 'string') {
+            cb = vm[cb];
+        }
+        return watch(vm.model, keyOrFn, _.bind(cb, vm.$$model ? vm.model : vm), _.extend({
             sync: true
-        });
+        }, options));
     }
 
     function initMethods(vm, methods) {