Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

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": "背景色",

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",

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,

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),

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,

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,

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 () {

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,

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

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

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;

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 () {