From 83c60c1afde66cf47be29508b538014814124663 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 25 Jan 2018 09:25:24 +0800 Subject: [PATCH] static_combo --- dist/bundle.js | 7 +++++-- dist/case.js | 7 +++++-- dist/fineui.js | 7 +++++-- src/case/combo/staticcombo/combo.static.js | 3 ++- src/case/trigger/trigger.text.select.js | 4 +++- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dist/bundle.js b/dist/bundle.js index e676b52ee0..15fbdca389 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -68130,7 +68130,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, { type: "bi.select_text_trigger", items: o.items, height: o.height, - text: o.text + text: o.text, + readonly: true }); this.popup = BI.createWidget({ type: "bi.text_value_combo_popup", @@ -76482,7 +76483,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - this.trigger.setText(this._digest(vals, this.options.items)); + if (!this.isReadOnly()) { + this.trigger.setText(this._digest(vals, this.options.items)); + } }, populate: function (items) { diff --git a/dist/case.js b/dist/case.js index 95efa4c762..45d64d8efe 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5615,7 +5615,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, { type: "bi.select_text_trigger", items: o.items, height: o.height, - text: o.text + text: o.text, + readonly: true }); this.popup = BI.createWidget({ type: "bi.text_value_combo_popup", @@ -13967,7 +13968,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - this.trigger.setText(this._digest(vals, this.options.items)); + if (!this.isReadOnly()) { + this.trigger.setText(this._digest(vals, this.options.items)); + } }, populate: function (items) { diff --git a/dist/fineui.js b/dist/fineui.js index 5090032e4d..bda48b2c1d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -69884,7 +69884,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, { type: "bi.select_text_trigger", items: o.items, height: o.height, - text: o.text + text: o.text, + readonly: true }); this.popup = BI.createWidget({ type: "bi.text_value_combo_popup", @@ -78236,7 +78237,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - this.trigger.setText(this._digest(vals, this.options.items)); + if (!this.isReadOnly()) { + this.trigger.setText(this._digest(vals, this.options.items)); + } }, populate: function (items) { diff --git a/src/case/combo/staticcombo/combo.static.js b/src/case/combo/staticcombo/combo.static.js index 67ec697182..c2e66034eb 100644 --- a/src/case/combo/staticcombo/combo.static.js +++ b/src/case/combo/staticcombo/combo.static.js @@ -23,7 +23,8 @@ BI.StaticCombo = BI.inherit(BI.Widget, { type: "bi.select_text_trigger", items: o.items, height: o.height, - text: o.text + text: o.text, + readonly: true }); this.popup = BI.createWidget({ type: "bi.text_value_combo_popup", diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 206fbbb489..d1ffd07127 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -45,7 +45,9 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { }, setValue: function (vals) { - this.trigger.setText(this._digest(vals, this.options.items)); + if (!this.isReadOnly()) { + this.trigger.setText(this._digest(vals, this.options.items)); + } }, populate: function (items) {