BI-24098

6 years ago · 9fee4e5149
20 changed files with 116 additions and 24 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.css
+++ b/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 {
--- a/dist/bundle.css
+++ b/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 {
@ -4474,6 +4479,17 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -92655,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
@ -92662,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("");
@ -92683,14 +92684,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                            }
                        }]
                    },
-                    width: 25
+                    width: 24
                },
                {
                    el: self.editor
                },
                {
                    el: this.clear,
-                    width: 25
+                    width: 24
                }
            ]
        });
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.css
+++ b/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 {
@ -4474,6 +4479,17 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -92898,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
@ -92905,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("");
@ -92926,14 +92927,14 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
                            }
                        }]
                    },
-                    width: 25
+                    width: 24
                },
                {
                    el: self.editor
                },
                {
                    el: this.clear,
-                    width: 25
+                    width: 24
                }
            ]
        });
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/resource.css
+++ b/dist/resource.css
@ -385,6 +385,17 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }
--- a/dist/widget.js
+++ b/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
                }
            ]
        });
--- a/public/css/font.css
+++ b/public/css/font.css
@ -59,6 +59,17 @@
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }
--- a/src/css/base/editor/editor.css
+++ b/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 {
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@ -59,6 +59,17 @@
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }
--- a/src/less/base/editor/editor.search.less
+++ b/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{
--- a/src/less/lib/font.less
+++ b/src/less/lib/font.less
@ -38,5 +38,4 @@
@font-tip-warning: "e755";
@font-tip-message: "e74b";
@font-add: "e6dd";
-
-
+@font-circle-close: "e6d5";
--- a/src/less/resource/font.less
+++ b/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);

--- a/src/widget/editor/editor.search.js
+++ b/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
                }
            ]
        });
--- a/ui/css/font.css
+++ b/ui/css/font.css
@ -59,6 +59,17 @@
  content: "\e6d0";
  color: inherit;
 }
+.circle-close-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d5;');
+}
+.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 {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d0;');
 }