BI-20686

demo/version.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -163,5 +163,7 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-Word_Align_Center": "文字居中",
     "BI-More_Than": "大于",
-    "BI-More_And_Equal": "大于等于"
+    "BI-More_And_Equal": "大于等于",
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/bundle.css

@@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/tree_collapse_1.png') no-repeat center center;

dist/bundle.js

@@ -97841,7 +97841,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self._setStartValue("");
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
-            // if (this.getSearcher().hasMatched()) {
+            if (this.getSearcher().hasMatched()) {
                 var keyword = this.getSearcher().getKeyword();
                 self._join({
                     type: BI.Selection.Multi,
@@ -97857,7 +97857,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     self.populate();
                     self._setStartValue("");
                 });
-            // }
+            }
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
             var last = BI.last(keywords);
@@ -99374,6 +99374,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             height: this.constants.height
         });
 
+        this.addNotMatchTip = BI.createWidget({
+            type: "bi.icon_text_item",
+            invisible: true,
+            text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
+            cls: "text-add-tip-font",
+            height: this.constants.height,
+            handler: function () {
+                self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
+            }
+        });
+
         this.loader = BI.createWidget({
             type: "bi.multi_select_search_loader",
             keywordGetter: o.keywordGetter,
@@ -99394,23 +99405,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             type: "bi.vtape",
             element: this,
             items: [{
-                el: this.tooltipClick,
+                type: "bi.center_adapt",
-                height: 0
+                items: [this.tooltipClick, this.addNotMatchTip],
+                height: this.constants.height
             }, {
                 el: this.loader
             }]
         });
-        this.tooltipClick.setVisible(false);
     },
 
     setKeyword: function (keyword) {
         var btn;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
+        var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
-        if (isVisible !== this.tooltipClick.isVisible()) {
+        this.tooltipClick.setVisible(isMatchTipVisible);
-            this.tooltipClick.setVisible(isVisible);
+        this.addNotMatchTip.setVisible(!isMatchTipVisible);
-            this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
-            this.resizer.resize();
-        }
     },
 
     isAllSelected: function () {
@@ -99439,6 +99447,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
 });
 
 BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
+BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
 
 BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
  * 查看已选按钮
@@ -112961,7 +112970,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -113066,5 +113075,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/config.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -163,5 +163,7 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-Word_Align_Center": "文字居中",
     "BI-More_Than": "大于",
-    "BI-More_And_Equal": "大于等于"
+    "BI-More_And_Equal": "大于等于",
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/fineui.css

@@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('resources?path=/com/fr/web/ui/images/2x/icon/tree_collapse_1.png') no-repeat center center;

dist/fineui.js

@@ -98084,7 +98084,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self._setStartValue("");
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
-            // if (this.getSearcher().hasMatched()) {
+            if (this.getSearcher().hasMatched()) {
                 var keyword = this.getSearcher().getKeyword();
                 self._join({
                     type: BI.Selection.Multi,
@@ -98100,7 +98100,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     self.populate();
                     self._setStartValue("");
                 });
-            // }
+            }
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
             var last = BI.last(keywords);
@@ -99617,6 +99617,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             height: this.constants.height
         });
 
+        this.addNotMatchTip = BI.createWidget({
+            type: "bi.icon_text_item",
+            invisible: true,
+            text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
+            cls: "text-add-tip-font",
+            height: this.constants.height,
+            handler: function () {
+                self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
+            }
+        });
+
         this.loader = BI.createWidget({
             type: "bi.multi_select_search_loader",
             keywordGetter: o.keywordGetter,
@@ -99637,23 +99648,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             type: "bi.vtape",
             element: this,
             items: [{
-                el: this.tooltipClick,
+                type: "bi.center_adapt",
-                height: 0
+                items: [this.tooltipClick, this.addNotMatchTip],
+                height: this.constants.height
             }, {
                 el: this.loader
             }]
         });
-        this.tooltipClick.setVisible(false);
     },
 
     setKeyword: function (keyword) {
         var btn;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
+        var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
-        if (isVisible !== this.tooltipClick.isVisible()) {
+        this.tooltipClick.setVisible(isMatchTipVisible);
-            this.tooltipClick.setVisible(isVisible);
+        this.addNotMatchTip.setVisible(!isMatchTipVisible);
-            this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
-            this.resizer.resize();
-        }
     },
 
     isAllSelected: function () {
@@ -99682,6 +99690,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
 });
 
 BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
+BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
 
 BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
  * 查看已选按钮
@@ -113204,7 +113213,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -113309,5 +113318,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/resource.css

@@ -1175,6 +1175,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('images/2x/icon/tree_collapse_1.png') no-repeat center center;

dist/widget.js

@@ -10274,7 +10274,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             self._setStartValue("");
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
-            // if (this.getSearcher().hasMatched()) {
+            if (this.getSearcher().hasMatched()) {
                 var keyword = this.getSearcher().getKeyword();
                 self._join({
                     type: BI.Selection.Multi,
@@ -10290,7 +10290,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     self.populate();
                     self._setStartValue("");
                 });
-            // }
+            }
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
             var last = BI.last(keywords);
@@ -11807,6 +11807,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             height: this.constants.height
         });
 
+        this.addNotMatchTip = BI.createWidget({
+            type: "bi.icon_text_item",
+            invisible: true,
+            text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
+            cls: "text-add-tip-font",
+            height: this.constants.height,
+            handler: function () {
+                self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
+            }
+        });
+
         this.loader = BI.createWidget({
             type: "bi.multi_select_search_loader",
             keywordGetter: o.keywordGetter,
@@ -11827,23 +11838,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
             type: "bi.vtape",
             element: this,
             items: [{
-                el: this.tooltipClick,
+                type: "bi.center_adapt",
-                height: 0
+                items: [this.tooltipClick, this.addNotMatchTip],
+                height: this.constants.height
             }, {
                 el: this.loader
             }]
         });
-        this.tooltipClick.setVisible(false);
     },
 
     setKeyword: function (keyword) {
         var btn;
-        var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
+        var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
-        if (isVisible !== this.tooltipClick.isVisible()) {
+        this.tooltipClick.setVisible(isMatchTipVisible);
-            this.tooltipClick.setVisible(isVisible);
+        this.addNotMatchTip.setVisible(!isMatchTipVisible);
-            this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
-            this.resizer.resize();
-        }
     },
 
     isAllSelected: function () {
@@ -11872,6 +11880,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
 });
 
 BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
+BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
 
 BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
  * 查看已选按钮

public/css/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

public/js/index.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -164,5 +164,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

src/css/resource/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

src/less/lib/font.less

@@ -37,4 +37,6 @@
 @font-tip-success: "e756";
 @font-tip-warning: "e755";
 @font-tip-message: "e74b";
+@font-add: "e6dd";
+
 

src/less/resource/font.less

@@ -107,3 +107,5 @@
 .font(toast-success-font, @font-tip-success);
 .font(toast-warning-font, @font-tip-warning);
 .font(toast-message-font, @font-tip-message);
+
+.font(text-add-tip-font, @font-add, @color-bi-text-success);

ui/css/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

ui/js/index.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -164,5 +164,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };