From 8fb7f8785220852ab360edfbed9bc76a3a0362ab Mon Sep 17 00:00:00 2001 From: Kobi Date: Mon, 8 Jan 2024 15:47:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-141781=20feat:=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E6=8E=A5=E6=94=B6tipText?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/widget/multiselect/multiselect.loader.js | 5 ++++- .../src/widget/multiselect/multiselect.loader.nobar.js | 5 ++++- .../multitextvalue.loader.search.js | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/fineui/src/widget/multiselect/multiselect.loader.js b/packages/fineui/src/widget/multiselect/multiselect.loader.js index ab234b3f9..b7b397627 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.loader.js +++ b/packages/fineui/src/widget/multiselect/multiselect.loader.js @@ -107,7 +107,10 @@ export class MultiSelectLoader extends Widget { } firstItems = self._createItems(json); } - callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); + const context = { + tipText: ob.tipText, + }; + callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || "", context); if (op.times === 1 && self.storeValue) { isKey(startValue) && (self.storeValue.type === Selection.All diff --git a/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js b/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js index 825a7f6ac..802c3b3ba 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js +++ b/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js @@ -115,7 +115,10 @@ export class MultiSelectNoBarLoader extends Widget { } firstItems = self._createItems(json); } - callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); + const context = { + tipText: ob.tipText, + }; + callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || "", context); if (op.times === 1 && self.storeValue) { isKey(startValue) && (self.storeValue.type === Selection.All diff --git a/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js b/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js index 965208bac..abdcc7398 100644 --- a/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js +++ b/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js @@ -120,8 +120,10 @@ export class SearchMultiSelectLoader extends Widget { } firstItems = this._createItems(json); } - - callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || ""); + const context = { + tipText: ob.tipText, + }; + callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || "", context); if (op.times === 1 && this.storeValue) { isKey(startValue) && (this.storeValue.type === Selection.All From 9ccd890ed5423557f5531e12a9fae8752cc9e4bb Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 10 Jan 2024 17:41:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/base/foundation/message.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/fineui/src/base/foundation/message.js b/packages/fineui/src/base/foundation/message.js index e96848c35..042779c08 100644 --- a/packages/fineui/src/base/foundation/message.js +++ b/packages/fineui/src/base/foundation/message.js @@ -239,13 +239,15 @@ function _show(hasCancel, title, message, callback, config = {}) { height: 24, }, { - type: Label.xtype, - css: { "font-size": 16 }, - cls: 'bi-font-bold', // 16px - textAlign: 'left', + el: { + type: Label.xtype, + css: {"font-size": 16}, + cls: 'bi-font-bold', // 16px + textAlign: 'left', + text: title || i18nText('BI-Basic_Prompt'), + lgap: 16, + }, width: 'fill', - text: title || i18nText('BI-Basic_Prompt'), - lgap: 16, }, ], },