From 63aba7eebb095c5d1fbac3cf37915c32e13cab00 Mon Sep 17 00:00:00 2001 From: zsmj Date: Tue, 16 Aug 2022 11:28:54 +0800 Subject: [PATCH] =?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 --- src/case/editor/editor.state.js | 4 ++-- src/case/editor/editor.state.simple.js | 3 ++- src/case/trigger/trigger.text.select.js | 2 +- src/widget/multiselect/multiselect.insert.combo.js | 3 ++- src/widget/multiselect/multiselect.insert.trigger.js | 5 +++-- .../multiselect/trigger/searcher.multiselect.insert.js | 2 +- src/widget/multitree/multi.tree.list.combo.js | 6 ++---- src/widget/multitree/trigger/searcher.list.multi.tree.js | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js index d1e11b20a..e9d3900bd 100644 --- a/src/case/editor/editor.state.js +++ b/src/case/editor/editor.state.js @@ -21,8 +21,8 @@ BI.StateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - defaultText: "", // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 - text: BI.i18nText("BI-Basic_Unrestricted"), // 显示值 + defaultText: BI.i18nText("BI-Basic_Unrestricted"), // 默认显示值，默认显示值与显示值的区别是默认显示值标记灰色 + text: "", // 显示值 el: {} }); }, diff --git a/src/case/editor/editor.state.simple.js b/src/case/editor/editor.state.simple.js index ec895996b..4d17ab30e 100644 --- a/src/case/editor/editor.state.simple.js +++ b/src/case/editor/editor.state.simple.js @@ -22,7 +22,8 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, { watermark: "", errorText: "", height: 24, - text: BI.i18nText("BI-Basic_Unrestricted") + text: "", + defaultText: BI.i18nText("BI-Basic_Unrestricted"), }); }, diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 1a74e7130..57cfadcb9 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -64,7 +64,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { if (result.length > 0) { return { textCls: "", - text: o.valueFormatter(val) || result.join(","), + text: o.valueFormatter(val) ?? result.join(","), }; } else { var text = BI.isFunction(o.text) ? o.text() : o.text; diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index b1b4a202e..329c0f3f9 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -43,6 +43,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { height: o.height - (o.simple ? 1 : 2), text: o.text, watermark: o.watermark, + defaultText: o.defaultText, // adapter: this.popup, masker: { offset: { @@ -55,7 +56,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { valueFormatter: o.valueFormatter, itemsCreator: BI.bind(this._itemsCreator4Trigger, this), itemHeight: o.itemHeight, - value: o.value + value: this.storeValue, }); this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_FOCUS, function () { diff --git a/src/widget/multiselect/multiselect.insert.trigger.js b/src/widget/multiselect/multiselect.insert.trigger.js index f0cf6054c..b04aebd07 100644 --- a/src/widget/multiselect/multiselect.insert.trigger.js +++ b/src/widget/multiselect/multiselect.insert.trigger.js @@ -37,6 +37,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { type: "bi.multi_select_insert_searcher", height: o.height, text: o.text, + defaultText: o.defaultText, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, itemHeight: o.itemHeight, @@ -109,7 +110,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, { /** * 重新调整numberCounter的空白占位符 */ - refreshPlaceHolderWidth: function(width) { + refreshPlaceHolderWidth: function (width) { this.wrapper.attr("items")[1].width = width; this.wrapper.resize(); }, @@ -150,4 +151,4 @@ BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW = "EVENT_BEFORE_COUNT BI.MultiSelectInsertTrigger.EVENT_FOCUS = "EVENT_FOCUS"; BI.MultiSelectInsertTrigger.EVENT_BLUR = "EVENT_BLUR"; -BI.shortcut("bi.multi_select_insert_trigger", BI.MultiSelectInsertTrigger); \ No newline at end of file +BI.shortcut("bi.multi_select_insert_trigger", BI.MultiSelectInsertTrigger); diff --git a/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/src/widget/multiselect/trigger/searcher.multiselect.insert.js index 36b3a115f..bf77db1e7 100644 --- a/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -16,7 +16,6 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { valueFormatter: BI.emptyFn, adapter: null, masker: {}, - text: BI.i18nText("BI-Basic_Please_Select"), watermark: BI.i18nText("BI-Basic_Search_And_Patch_Paste"), }); }, @@ -29,6 +28,7 @@ BI.MultiSelectInsertSearcher = BI.inherit(BI.Widget, { watermark: o.watermark, height: o.height, text: o.text, + defaultText: o.defaultText, listeners: [{ eventName: BI.MultiSelectEditor.EVENT_FOCUS, action: function () { diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index a4fd16c72..e22c5a7e0 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -15,7 +15,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { allowInsertValue: true, isNeedAdjustWidth: true, text: "", - defaultText: "", }); }, @@ -76,8 +75,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator } }, - value: { value: o.value || {} } - + value: this.storeValue }); this.combo = BI.createWidget({ @@ -141,7 +139,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { maxWidth: o.isNeedAdjustWidth ? "auto" : 500, }, isNeedAdjustWidth: o.isNeedAdjustWidth, - value: { value: o.value || {} }, + value: this.storeValue, hideChecker: function (e) { return triggerBtn.element.find(e.target).length === 0 && self.numberCounter.element.find(e.target).length === 0; diff --git a/src/widget/multitree/trigger/searcher.list.multi.tree.js b/src/widget/multitree/trigger/searcher.list.multi.tree.js index 1d213127a..8c54afe63 100644 --- a/src/widget/multitree/trigger/searcher.list.multi.tree.js +++ b/src/widget/multitree/trigger/searcher.list.multi.tree.js @@ -8,7 +8,7 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiListTreeSearcher.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multi-tree-searcher", + baseCls: "bi-multi-list-tree-searcher", itemsCreator: BI.emptyFn, valueFormatter: function (v) { return v;