Pull request #2044: 无JIRA任务 调整CLICK_ITEM事件位置

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

* commit '6450adb917d5dc0c01d4f246141497f1e90a44e3':
  格式化
  无JIRA任务 调整CLICK_ITEM事件位置

src/widget/multiselect/multiselect.combo.js

@@ -100,14 +100,15 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             if (obj instanceof BI.MultiSelectBar) {
                 self._joinAll(this.getValue(), function () {
                     assertShowValue();
+                    self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
                 });
             } else {
                 self._join(this.getValue(), function () {
                     assertShowValue();
+                    self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
                 });
             }
             self._dataChange = true;
-            self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
             // counter的值随点击项的改变而改变, 点击counter的时候不需要setValue(counter会请求刷新计数)
@@ -412,8 +413,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             });
             change && (this.storeValue.value = BI.values(map));
             self._adjust(callback);
-            
+
-return;
+            return;
         }
         this._joinAll(res, callback);
     },

src/widget/multiselect/multiselect.insert.combo.js

@@ -101,14 +101,15 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             if (obj instanceof BI.MultiSelectBar) {
                 self._joinAll(this.getValue(), function () {
                     assertShowValue();
+                    self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM);
                 });
             } else {
                 self._join(this.getValue(), function () {
                     assertShowValue();
+                    self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM);
                 });
             }
             self._dataChange = true;
-            self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM);
         });
         this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
             // counter的值随点击项的改变而改变, 点击counter的时候不需要setValue(counter会请求刷新计数)