Browse Source

Merge remote-tracking branch 'origin/master'

research/test
jian 11 months ago
parent
commit
d4b3fc811e
  1. 4
      packages/fineui/src/base/foundation/message.js
  2. 5
      packages/fineui/src/widget/multiselect/multiselect.loader.js
  3. 5
      packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js
  4. 6
      packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

4
packages/fineui/src/base/foundation/message.js

@ -239,14 +239,16 @@ function _show(hasCancel, title, message, callback, config = {}) {
height: 24, height: 24,
}, },
{ {
el: {
type: Label.xtype, type: Label.xtype,
css: {"font-size": 16}, css: {"font-size": 16},
cls: 'bi-font-bold', // 16px cls: 'bi-font-bold', // 16px
textAlign: 'left', textAlign: 'left',
width: 'fill',
text: title || i18nText('BI-Basic_Prompt'), text: title || i18nText('BI-Basic_Prompt'),
lgap: 16, lgap: 16,
}, },
width: 'fill',
},
], ],
}, },
tgap: 32, tgap: 32,

5
packages/fineui/src/widget/multiselect/multiselect.loader.js

@ -107,7 +107,10 @@ export class MultiSelectLoader extends Widget {
} }
firstItems = self._createItems(json); 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) { if (op.times === 1 && self.storeValue) {
isKey(startValue) && isKey(startValue) &&
(self.storeValue.type === Selection.All (self.storeValue.type === Selection.All

5
packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js

@ -115,7 +115,10 @@ export class MultiSelectNoBarLoader extends Widget {
} }
firstItems = self._createItems(json); 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) { if (op.times === 1 && self.storeValue) {
isKey(startValue) && isKey(startValue) &&
(self.storeValue.type === Selection.All (self.storeValue.type === Selection.All

6
packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

@ -120,8 +120,10 @@ export class SearchMultiSelectLoader extends Widget {
} }
firstItems = this._createItems(json); firstItems = this._createItems(json);
} }
const context = {
callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || ""); tipText: ob.tipText,
};
callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || "", context);
if (op.times === 1 && this.storeValue) { if (op.times === 1 && this.storeValue) {
isKey(startValue) && isKey(startValue) &&
(this.storeValue.type === Selection.All (this.storeValue.type === Selection.All

Loading…
Cancel
Save