Merge pull request #447 in FUI/fineui from ~WINDY/fui:master to master

* commit 'fc00502641bc1fc6f289ee05aa19e770cda90b77':
  update
  BI-24098
  BI-24215

dist/base.css

@@ -192,7 +192,12 @@
   color: #ff4949;
 }
 /*************BI.SearchEditor******************/
-.bi-search-editor .search-close-h-font {
+.bi-search-editor {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-search-editor .circle-close-font {
   font-size: 16px;
 }
 .bi-search-editor .search-font {

dist/bundle.css

@@ -1863,7 +1863,12 @@ textarea {
   color: #ff4949;
 }
 /*************BI.SearchEditor******************/
-.bi-search-editor .search-close-h-font {
+.bi-search-editor {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-search-editor .circle-close-font {
   font-size: 16px;
 }
 .bi-search-editor .search-font {
@@ -4477,6 +4482,18 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/bundle.js

@@ -72781,6 +72781,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             text: o.text,
             keyword: o.keyword,
             value: o.value,
+            title: o.text,
             py: o.py
         });
     },
@@ -92654,6 +92655,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: o.watermark,
             allowBlank: true,
+            hgap: 1,
             errorText: o.errorText,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker
@@ -92661,7 +92663,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         this.clear = BI.createWidget({
             type: "bi.icon_button",
             stopEvent: true,
-            cls: "search-close-h-font"
+            cls: "circle-close-font"
         });
         this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
             self.setValue("");
@@ -92682,14 +92684,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                             }
                         }]
                     },
-                    width: 25
+                    width: 24
                 },
                 {
                     el: self.editor
                 },
                 {
                     el: this.clear,
-                    width: 25
+                    width: 24
                 }
             ]
         });

dist/case.js

@@ -311,6 +311,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             text: o.text,
             keyword: o.keyword,
             value: o.value,
+            title: o.text,
             py: o.py
         });
     },

dist/fineui.css

@@ -1863,7 +1863,12 @@ textarea {
   color: #ff4949;
 }
 /*************BI.SearchEditor******************/
-.bi-search-editor .search-close-h-font {
+.bi-search-editor {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-search-editor .circle-close-font {
   font-size: 16px;
 }
 .bi-search-editor .search-font {
@@ -4477,6 +4482,18 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/fineui.js

@@ -73024,6 +73024,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             text: o.text,
             keyword: o.keyword,
             value: o.value,
+            title: o.text,
             py: o.py
         });
     },
@@ -92897,6 +92898,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: o.watermark,
             allowBlank: true,
+            hgap: 1,
             errorText: o.errorText,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker
@@ -92904,7 +92906,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         this.clear = BI.createWidget({
             type: "bi.icon_button",
             stopEvent: true,
-            cls: "search-close-h-font"
+            cls: "circle-close-font"
         });
         this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
             self.setValue("");
@@ -92925,14 +92927,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                             }
                         }]
                     },
-                    width: 25
+                    width: 24
                 },
                 {
                     el: self.editor
                 },
                 {
                     el: this.clear,
-                    width: 25
+                    width: 24
                 }
             ]
         });

dist/resource.css

@@ -388,6 +388,18 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/widget.js

@@ -5033,6 +5033,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: o.watermark,
             allowBlank: true,
+            hgap: 1,
             errorText: o.errorText,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker
@@ -5040,7 +5041,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         this.clear = BI.createWidget({
             type: "bi.icon_button",
             stopEvent: true,
-            cls: "search-close-h-font"
+            cls: "circle-close-font"
         });
         this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
             self.setValue("");
@@ -5061,14 +5062,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                             }
                         }]
                     },
-                    width: 25
+                    width: 24
                 },
                 {
                     el: self.editor
                 },
                 {
                     el: this.clear,
-                    width: 25
+                    width: 24
                 }
             ]
         });

public/css/font.css

@@ -62,6 +62,18 @@
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

src/case/button/item.singleselect.js

@@ -26,6 +26,7 @@ BI.SingleSelectItem = BI.inherit(BI.BasicButton, {
             text: o.text,
             keyword: o.keyword,
             value: o.value,
+            title: o.text,
             py: o.py
         });
     },

src/css/base/editor/editor.css

@@ -1,5 +1,10 @@
 /*************BI.SearchEditor******************/
-.bi-search-editor .search-close-h-font {
+.bi-search-editor {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
+.bi-search-editor .circle-close-font {
   font-size: 16px;
 }
 .bi-search-editor .search-font {

src/css/resource/font.css

@@ -62,6 +62,18 @@
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

src/less/base/editor/editor.search.less

@@ -1,7 +1,8 @@
 @import "../../index";
 /*************BI.SearchEditor******************/
 .bi-search-editor {
-  & .search-close-h-font{
+  .border-radius(2px);
+  & .circle-close-font{
     font-size: @font-size-16;
   }
   & .search-font{

src/less/lib/font.less

@@ -38,5 +38,4 @@
 @font-tip-warning: "e755";
 @font-tip-message: "e74b";
 @font-add: "e6dd";
-
+@font-circle-close: "e6d5";
-

src/less/resource/font.less

@@ -20,6 +20,8 @@
 .font-hover(close-h-font, @font-cross);
 .font-hover-active(close-ha-font, @font-cross);
 
+.font(circle-close-font, @font-circle-close);
+
 //搜索框中的带有hover后颜色变红的图标
 .font-hover(search-close-h-font, @font-cross, inherit, @color-bi-text-failure);
 

src/widget/editor/editor.search.js

@@ -22,6 +22,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
             height: o.height,
             watermark: o.watermark,
             allowBlank: true,
+            hgap: 1,
             errorText: o.errorText,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker
@@ -29,7 +30,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         this.clear = BI.createWidget({
             type: "bi.icon_button",
             stopEvent: true,
-            cls: "search-close-h-font"
+            cls: "circle-close-font"
         });
         this.clear.on(BI.IconButton.EVENT_CHANGE, function () {
             self.setValue("");
@@ -50,14 +51,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                             }
                         }]
                     },
-                    width: 25
+                    width: 24
                 },
                 {
                     el: self.editor
                 },
                 {
                     el: this.clear,
-                    width: 25
+                    width: 24
                 }
             ]
         });

ui/css/font.css

@@ -62,6 +62,18 @@
   content: "\e6d0";
   color: inherit;
 }
+.circle-close-font .b-font {
+  line-height: 1;
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.circle-close-font .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
+.circle-close-font.disabled .b-font:before {
+  content: "\e6d5";
+  color: inherit;
+}
 .search-close-h-font .b-font {
   line-height: 1;
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');