From d5565fef01515062b0c656ad3c595399293f6f08 Mon Sep 17 00:00:00 2001 From: zsmj Date: Fri, 12 Aug 2022 17:34:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-77978=20fix:=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A0=91=E6=B0=B4=E5=8D=B0=E8=A1=A8=E7=8E=B0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/editor/editor.defaulttext.js | 7 +++++-- .../multilayersingletree.combo.js | 1 + .../multilayersingletree.trigger.js | 17 ++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/case/editor/editor.defaulttext.js b/src/case/editor/editor.defaulttext.js index 5c01c7a01..4cfaf59a5 100644 --- a/src/case/editor/editor.defaulttext.js +++ b/src/case/editor/editor.defaulttext.js @@ -46,12 +46,15 @@ BI.DefaultTextEditor = BI.inherit(BI.Widget, { errorText: o.errorText, invisible: true, }); + + var showText = BI.isFunction(o.text) ? o.text() : o.text; + this.text = BI.createWidget({ type: "bi.text_button", - cls: BI.isKey(o.text) ? "tip-text-style" : "bi-water-mark tip-text-style", + cls: BI.isKey(showText) ? "tip-text-style" : "bi-water-mark tip-text-style", textAlign: "left", height: o.height, - text: BI.isKey(o.text) ? o.text : o.defaultText, + text: showText || o.defaultText, hgap: o.hgap + 2, handler: function () { self._showInput(); diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index c33e3d216..ba67f0c3a 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -105,6 +105,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { valueFormatter: o.valueFormatter, height: o.height, text: o.text, + defaultText: o.defaultText, value: o.value, tipType: o.tipType, warningTitle: o.warningTitle, diff --git a/src/widget/multilayersingletree/multilayersingletree.trigger.js b/src/widget/multilayersingletree/multilayersingletree.trigger.js index e00394a38..1ede397e2 100644 --- a/src/widget/multilayersingletree/multilayersingletree.trigger.js +++ b/src/widget/multilayersingletree/multilayersingletree.trigger.js @@ -37,11 +37,11 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { }, isAutoSearch: false, el: { - type: "bi.state_editor", + type: "bi.default_text_editor", ref: function () { self.editor = this; }, - defaultText: o.text, + defaultText: o.defaultText, text: this._digest(o.value), value: o.value, height: o.height, @@ -192,16 +192,11 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, { return o.valueFormatter(v); } - if (o.itemsCreator === BI.emptyFn) { - var result = BI.find(o.items, function (i, item) { - return item.value === v; - }); - - return BI.isNotNull(result) ? result.text : o.text; - } - - return v; + var result = BI.find(o.items, function (i, item) { + return item.value === v; + }); + return BI.isNotNull(result) ? result.text : (o.text ?? v); }, _getShowText: function () { From 5ffe80cdaad61abc59453387509b0698f767ef54 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 15 Aug 2022 10:06:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-11286=20feat:=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86value,text,defaultText=E5=B1=9E=E6=80=A7=E8=A7=84?= =?UTF-8?q?=E5=88=99=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/component/demo.treevaluechoosercombo.js | 3 ++- src/component/treevaluechooser/combo.treevaluechooser.js | 3 ++- src/component/valuechooser/combo.valuechooser.js | 3 ++- src/component/valuechooser/combo.valuechooser.nobar.js | 7 ++++--- .../multilayerselecttree/multilayerselecttree.trigger.js | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/demo/js/component/demo.treevaluechoosercombo.js b/demo/js/component/demo.treevaluechoosercombo.js index 8fa557ee1..9a38fe428 100644 --- a/demo/js/component/demo.treevaluechoosercombo.js +++ b/demo/js/component/demo.treevaluechoosercombo.js @@ -10,7 +10,8 @@ Demo.TreeValueChooser = BI.inherit(BI.Widget, { // items: BI.deepClone(Demo.CONSTANTS.TREEITEMS), itemsCreator: function (op, callback) { callback(BI.deepClone(Demo.CONSTANTS.TREEITEMS)); - } + }, + defaultText: "请选择", }); return { type: "bi.vertical", diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js index 4eec5d7c4..33cb4e520 100644 --- a/src/component/treevaluechooser/combo.treevaluechooser.js +++ b/src/component/treevaluechooser/combo.treevaluechooser.js @@ -28,6 +28,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { type: "bi.multi_tree_combo", simple: o.simple, text: o.text, + defaultText: o.defaultText, allowEdit: o.allowEdit, value: o.value, watermark: o.watermark, @@ -96,7 +97,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, { return this.combo.getValue(); }, - getAllValue: function() { + getAllValue: function () { return this.buildCompleteTree(this.combo.getValue()); }, diff --git a/src/component/valuechooser/combo.valuechooser.js b/src/component/valuechooser/combo.valuechooser.js index 3da94a312..786dc1abd 100644 --- a/src/component/valuechooser/combo.valuechooser.js +++ b/src/component/valuechooser/combo.valuechooser.js @@ -31,6 +31,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { element: this, allowEdit: o.allowEdit, text: o.text, + defaultText: o.defaultText, value: this._assertValue(o.value), itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), @@ -82,7 +83,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, { }; }, - getAllValue: function() { + getAllValue: function () { var val = this.combo.getValue() || {}; if (val.type === BI.Selection.Multi) { return val.value || []; diff --git a/src/component/valuechooser/combo.valuechooser.nobar.js b/src/component/valuechooser/combo.valuechooser.nobar.js index 927f70f81..2910ea4fa 100644 --- a/src/component/valuechooser/combo.valuechooser.nobar.js +++ b/src/component/valuechooser/combo.valuechooser.nobar.js @@ -25,12 +25,13 @@ BI.ValueChooserNoBarCombo = BI.inherit(BI.AbstractValueChooser, { simple: o.simple, allowEdit: o.allowEdit, text: o.text, + defaultText: o.defaultText, value: this._assertValue(o.value), itemsCreator: BI.bind(this._itemsCreator, this), valueFormatter: BI.bind(this._valueFormatter, this), width: o.width, height: o.height, - ref: function(_ref) { + ref: function (_ref) { self.combo = _ref; }, listeners: [{ @@ -64,7 +65,7 @@ BI.ValueChooserNoBarCombo = BI.inherit(BI.AbstractValueChooser, { self.fireEvent(BI.ValueChooserNoBarCombo.EVENT_CONFIRM); } }] - } + }; }, setValue: function (v) { @@ -75,7 +76,7 @@ BI.ValueChooserNoBarCombo = BI.inherit(BI.AbstractValueChooser, { return this.combo.getValue(); }, - getAllValue: function() { + getAllValue: function () { return this.getValue(); }, diff --git a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js index 179aeeec2..c094bac9e 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.trigger.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.trigger.js @@ -37,11 +37,11 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, { }, isAutoSearch: false, el: { - type: "bi.state_editor", + type: "bi.default_text_editor", ref: function () { self.editor = this; }, - defaultText: o.text, + defaultText: o.defaultText, text: this._digest(o.value), value: o.value, height: o.height,