From ec771c01161d69e315c55fe41af7a61e3881fd2e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Mon, 2 Dec 2019 18:19:58 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-24691=20fix:=20=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E6=98=AF=E5=90=A6=E5=8F=AF=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../treevaluechooser/combo.treevaluechooser.insert.js | 1 + src/component/treevaluechooser/combo.treevaluechooser.js | 1 + src/component/valuechooser/combo.valuechooser.insert.js | 1 + src/component/valuechooser/combo.valuechooser.js | 1 + src/widget/multiselect/multiselect.combo.js | 2 +- src/widget/multiselect/multiselect.insert.combo.js | 2 +- src/widget/multitree/multi.tree.combo.js | 6 ++++-- src/widget/multitree/multi.tree.insert.combo.js | 2 +- src/widget/multitree/multi.tree.list.combo.js | 2 +- 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/component/treevaluechooser/combo.treevaluechooser.insert.js b/src/component/treevaluechooser/combo.treevaluechooser.insert.js index 2a8b0ca546..8a95f2e360 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.insert.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.insert.js @@ -25,6 +25,7 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, { } this.combo = BI.createWidget({ type: "bi.multi_tree_insert_combo", + allowEdit: o.allowEdit, text: o.text, value: o.value, watermark: o.watermark, diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 662f22385a..fbf8132477 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -26,6 +26,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_tree_combo", text: o.text, + allowEdit: o.allowEdit, value: o.value, watermark: o.watermark, element: this, diff --git a/src/component/valuechooser/combo.valuechooser.insert.js b/src/component/valuechooser/combo.valuechooser.insert.js index c1f290c3a9..4494466054 100644 --- a/src/component/valuechooser/combo.valuechooser.insert.js +++ b/src/component/valuechooser/combo.valuechooser.insert.js @@ -24,6 +24,7 @@ BI.ValueChooserInsertCombo = BI.inherit(BI.AbstractValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_select_insert_combo", element: this, + allowEdit: o.allowEdit, text: o.text, value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), diff --git a/src/component/valuechooser/combo.valuechooser.js b/src/component/valuechooser/combo.valuechooser.js index 312f4c0e49..00fafcb860 100644 --- a/src/component/valuechooser/combo.valuechooser.js +++ b/src/component/valuechooser/combo.valuechooser.js @@ -28,6 +28,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { this.combo = BI.createWidget({ type: "bi.multi_select_combo", element: this, + allowEdit: o.allowEdit, text: o.text, value: o.value, itemsCreator: BI.bind(this._itemsCreator, this), diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index 15b7d90627..4745ece5a3 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -127,7 +127,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - toggle: false, + toggle: !o.allowEdit, container: o.container, el: this.trigger, adjustLength: 1, diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 5b1064dc58..b00eee3db3 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -121,7 +121,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - toggle: false, + toggle: !o.allowEdit, el: this.trigger, adjustLength: 1, container: o.container, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 0aae1f0a2c..89ce0949d5 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -20,7 +20,8 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { baseCls: "bi-multi-tree-combo", itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, - height: 24 + height: 24, + allowEdit: true }); }, @@ -36,6 +37,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.trigger = BI.createWidget({ type: "bi.multi_select_trigger", + allowEdit: o.allowEdit, height: o.height, valueFormatter: o.valueFormatter, text: o.text, @@ -53,7 +55,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - toggle: false, + toggle: !o.allowEdit, container: o.container, el: this.trigger, adjustLength: 1, diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 690100305d..77f4c9636d 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -70,7 +70,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - toggle: false, + toggle: !o.allowEdit, container: o.container, el: this.trigger, adjustLength: 1, diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index 4169827a8e..6750b81927 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -86,7 +86,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - toggle: false, + toggle: !o.allowEdit, container: o.container, el: this.trigger, adjustLength: 1,