diff --git a/i18n/i18n.cn.js b/i18n/i18n.cn.js index fa58fd897..77db2c53d 100644 --- a/i18n/i18n.cn.js +++ b/i18n/i18n.cn.js @@ -166,7 +166,8 @@ BI.i18n = { "BI-More_Than": "大于", "BI-More_And_Equal": "大于等于", "BI-Please_Enter_SQL": "请输入SQL", - "BI-Basic_Click_To_Add_Text": "点按回车键添加\"{R1}\"", + "BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"", + "BI-Basic_Press_Enter_To_Add_Text": "点按回车键添加\"{R1}\"", "BI-Basic_Please_Select": "请选择", "BI-Basic_Font_Color": "文字颜色", "BI-Basic_Background_Color": "背景色", diff --git a/package.json b/package.json index c43199d39..a2fe593e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211013101239", + "version": "2.0.20211013185141", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index 88cc16689..c02b8e731 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -52,7 +52,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, }, }, valueFormatter: o.valueFormatter, @@ -219,7 +219,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, }, }, valueFormatter: o.valueFormatter, diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js index 0c978ce89..49b6f6d41 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -49,8 +49,8 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 - } + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, valueFormatter: o.valueFormatter, itemsCreator: BI.bind(this._itemsCreator4Trigger, this), @@ -222,8 +222,8 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 - } + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, valueFormatter: o.valueFormatter, itemsCreator: BI.bind(this._itemsCreator4Trigger, this), diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index d94fe7a61..35d005cd6 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -49,7 +49,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1 } }, valueFormatter: o.valueFormatter, @@ -221,7 +221,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1 } }, valueFormatter: o.valueFormatter, diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index 226af3a3c..226cc5260 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -49,7 +49,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1 } }, valueFormatter: o.valueFormatter, @@ -215,7 +215,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1 } }, valueFormatter: o.valueFormatter, diff --git a/src/widget/multiselect/search/multiselect.search.insert.pane.js b/src/widget/multiselect/search/multiselect.search.insert.pane.js index 53c439562..5af3ec36e 100644 --- a/src/widget/multiselect/search/multiselect.search.insert.pane.js +++ b/src/widget/multiselect/search/multiselect.search.insert.pane.js @@ -29,7 +29,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, { this.addNotMatchTip = BI.createWidget({ type: "bi.label", - text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), + text: BI.i18nText("BI-Basic_Press_Enter_To_Add_Text", ""), height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, cls: "bi-keyword-red-mark", hgap: 5, @@ -65,7 +65,7 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, { }, setKeyword: function (keyword) { - this.addNotMatchTip.setText(BI.i18nText("BI-Basic_Click_To_Add_Text", keyword)); + this.addNotMatchTip.setText(BI.i18nText("BI-Basic_Press_Enter_To_Add_Text", keyword)); }, isAllSelected: function () { diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 1b2e1e19e..a6763d87e 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -5,16 +5,6 @@ */ BI.MultiTreeCombo = BI.inherit(BI.Single, { - - constants: { - offset: { - top: 0, - left: 0, - right: 0, - bottom: 25 - } - }, - _defaultConfig: function () { return BI.extend(BI.MultiTreeCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-tree-combo", @@ -43,7 +33,12 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { watermark: o.watermark, // adapter: this.popup, masker: { - offset: this.constants.offset + offset: { + left: 0, + top: 0, + right: 0, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, searcher: { type: "bi.multi_tree_searcher", @@ -241,7 +236,12 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { type: "bi.multi_tree_check_pane" }, masker: { - offset: this.constants.offset + offset: { + left: 0, + top: 0, + right: 0, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 7f8cc8eee..4e4a62e8d 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -6,15 +6,6 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { - constants: { - offset: { - top: 0, - left: 0, - right: 0, - bottom: 25 - } - }, - _defaultConfig: function () { return BI.extend(BI.MultiTreeInsertCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-tree-insert-combo", @@ -41,7 +32,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { valueFormatter: o.valueFormatter, // adapter: this.popup, masker: { - offset: this.constants.offset + offset: { + left: 0, + top: 0, + right: 0, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, searcher: { type: "bi.multi_tree_searcher", @@ -252,7 +248,12 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { }, itemsCreator: o.itemsCreator, masker: { - offset: this.constants.offset + offset: { + left: 0, + top: 0, + right: 0, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, valueFormatter: o.valueFormatter, value: o.value diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index e279c49cf..c4be0a760 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -5,16 +5,6 @@ */ BI.MultiTreeListCombo = BI.inherit(BI.Single, { - - constants: { - offset: { - top: 0, - left: 0, - right: 0, - bottom: 25 - } - }, - _defaultConfig: function () { return BI.extend(BI.MultiTreeListCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-multi-tree-list-combo", @@ -44,7 +34,12 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { valueFormatter: o.valueFormatter, // adapter: this.popup, masker: { - offset: this.constants.offset + offset: { + left: 0, + top: 0, + right: 0, + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, searcher: { type: "bi.multi_list_tree_searcher", @@ -275,8 +270,8 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 - } + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, valueFormatter: o.valueFormatter, value: o.value diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index 87b252fa0..def624c1b 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -42,8 +42,8 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { left: 0, top: 0, right: 0, - bottom: 25 - } + bottom: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, allValueGetter: function () { return self.allValue; diff --git a/src/widget/singleselect/search/singleselect.search.pane.insert.js b/src/widget/singleselect/search/singleselect.search.pane.insert.js index 13ad63678..95fd13cc3 100644 --- a/src/widget/singleselect/search/singleselect.search.pane.insert.js +++ b/src/widget/singleselect/search/singleselect.search.pane.insert.js @@ -29,7 +29,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, { this.addNotMatchTip = BI.createWidget({ type: "bi.label", - text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""), + text: BI.i18nText("BI-Basic_Press_Enter_To_Add_Text", ""), height: this.constants.height, cls: "bi-keyword-red-mark", hgap: 5, @@ -66,7 +66,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, { }, setKeyword: function (keyword) { - this.addNotMatchTip.setText(BI.i18nText("BI-Basic_Click_To_Add_Text", keyword)); + this.addNotMatchTip.setText(BI.i18nText("BI-Basic_Press_Enter_To_Add_Text", keyword)); }, hasMatched: function () {