From d7e19bfaa26c480f6153f519121ee3ecb8e834b6 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 23 Apr 2018 11:28:49 +0800
Subject: [PATCH] =?UTF-8?q?BI-18690=20insert=5Fcombo=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/js/widget/multiselect/demo.multi_select_combo.js | 2 +-
 dist/bundle.js                                        | 4 ++--
 dist/demo.js                                          | 2 +-
 dist/widget.js                                        | 4 ++--
 src/widget/multiselect/multiselect..insert.combo.js   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/demo/js/widget/multiselect/demo.multi_select_combo.js b/demo/js/widget/multiselect/demo.multi_select_combo.js
index 80a7d147a..b941ded0d 100644
--- a/demo/js/widget/multiselect/demo.multi_select_combo.js
+++ b/demo/js/widget/multiselect/demo.multi_select_combo.js
@@ -9,7 +9,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
     _createMultiSelectCombo: function () {
         var self = this;
         var widget = BI.createWidget({
-            type: "bi.multi_select_combo",
+            type: "bi.multi_select_insert_combo",
             itemsCreator: BI.bind(this._itemsCreator, this),
             width: 200,
             value: {
diff --git a/dist/bundle.js b/dist/bundle.js
index 92058c087..b52631f5f 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -97192,7 +97192,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self.trigger.getSearcher().setState(self.storeValue);
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
-        this.storeValue = {};
+        this.storeValue = o.value || {};
         // 标记正在请求数据
         this.requesting = false;
 
@@ -109416,7 +109416,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
     },
 
     getKey: function () {
-        return this.yearEditor.getState() + "-" + this.monthEditor.getState();
+        return this.yearEditor.getValue() + "-" + this.monthEditor.getValue();
     }
 });
 BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS";
diff --git a/dist/demo.js b/dist/demo.js
index 4cddd86d0..6f5cd251b 100644
--- a/dist/demo.js
+++ b/dist/demo.js
@@ -12712,7 +12712,7 @@ Demo.MultiSelectCombo = BI.inherit(BI.Widget, {
     _createMultiSelectCombo: function () {
         var self = this;
         var widget = BI.createWidget({
-            type: "bi.multi_select_combo",
+            type: "bi.multi_select_insert_combo",
             itemsCreator: BI.bind(this._itemsCreator, this),
             width: 200,
             value: {
diff --git a/dist/widget.js b/dist/widget.js
index 2b25ef072..74561c52b 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -10045,7 +10045,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self.trigger.getSearcher().setState(self.storeValue);
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
-        this.storeValue = {};
+        this.storeValue = o.value || {};
         // 标记正在请求数据
         this.requesting = false;
 
@@ -22269,7 +22269,7 @@ BI.shortcut("bi.dynamic_year_month_popup", BI.DynamicYearMonthPopup);BI.DynamicY
     },
 
     getKey: function () {
-        return this.yearEditor.getState() + "-" + this.monthEditor.getState();
+        return this.yearEditor.getValue() + "-" + this.monthEditor.getValue();
     }
 });
 BI.DynamicYearMonthTrigger.EVENT_VALID = "EVENT_FOCUS";
diff --git a/src/widget/multiselect/multiselect..insert.combo.js b/src/widget/multiselect/multiselect..insert.combo.js
index 0708ed9d7..6554b8e82 100644
--- a/src/widget/multiselect/multiselect..insert.combo.js
+++ b/src/widget/multiselect/multiselect..insert.combo.js
@@ -23,7 +23,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self.trigger.getSearcher().setState(self.storeValue);
             self.trigger.getCounter().setButtonChecked(self.storeValue);
         };
-        this.storeValue = {};
+        this.storeValue = o.value || {};
         // 标记正在请求数据
         this.requesting = false;