无JIRA任务 button的line-height

dist/base.js

@@ -16743,6 +16743,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             var o = this.options, self = this;
             if (BI.isNumber(o.height) && !o.clear && !o.block) {
                 this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
+            } else if (o.clear || o.block) {
+                this.element.css({lineHeight: o.height + "px"});
             } else {
                 this.element.css({lineHeight: (o.height - 2) + "px"});
             }

dist/bundle.css

@@ -4312,12 +4312,12 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li ul.line {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }

dist/bundle.js

@@ -52514,6 +52514,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             var o = this.options, self = this;
             if (BI.isNumber(o.height) && !o.clear && !o.block) {
                 this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
+            } else if (o.clear || o.block) {
+                this.element.css({lineHeight: o.height + "px"});
             } else {
                 this.element.css({lineHeight: (o.height - 2) + "px"});
             }
@@ -83174,11 +83176,6 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 editor: o.editor
             });
         }));
-        this.element.mousedown(function (e) {
-            BI.each(buttons, function (i, btn) {
-                btn.hideIf(e);
-            });
-        });
         BI.createWidget({
             type: "bi.left",
             element: this,
@@ -83300,6 +83297,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.instance.getContent();
         },
 
+        getContentHeight: function () {
+            return this.instance.getContentHeight();
+        },
+
         getInstance: function () {
             return this.instance;
         },
@@ -83509,6 +83510,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.content;
         },
 
+        getContentHeight: function () {
+            return this.elm.element.height();
+        },
+
         setContent: function (e) {
             this.content = e;
             this.ne.fireEvent("set");
@@ -84274,6 +84279,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
 
     getValue: function () {
         return this.editor.getValue();
+    },
+
+    getContentHeight: function () {
+        return this.editor.getContentHeight();
     }
 });
 BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";

dist/case.js

@@ -10673,11 +10673,6 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 editor: o.editor
             });
         }));
-        this.element.mousedown(function (e) {
-            BI.each(buttons, function (i, btn) {
-                btn.hideIf(e);
-            });
-        });
         BI.createWidget({
             type: "bi.left",
             element: this,
@@ -10799,6 +10794,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.instance.getContent();
         },
 
+        getContentHeight: function () {
+            return this.instance.getContentHeight();
+        },
+
         getInstance: function () {
             return this.instance;
         },
@@ -11008,6 +11007,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.content;
         },
 
+        getContentHeight: function () {
+            return this.elm.element.height();
+        },
+
         setContent: function (e) {
             this.content = e;
             this.ne.fireEvent("set");
@@ -11773,6 +11776,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
 
     getValue: function () {
         return this.editor.getValue();
+    },
+
+    getContentHeight: function () {
+        return this.editor.getContentHeight();
     }
 });
 BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";

dist/fineui.css

@@ -4312,12 +4312,12 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li ul.line {
-  background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }

dist/fineui.js

@@ -52763,6 +52763,8 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             var o = this.options, self = this;
             if (BI.isNumber(o.height) && !o.clear && !o.block) {
                 this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
+            } else if (o.clear || o.block) {
+                this.element.css({lineHeight: o.height + "px"});
             } else {
                 this.element.css({lineHeight: (o.height - 2) + "px"});
             }
@@ -83423,11 +83425,6 @@ BI.RichEditorTextToolbar = BI.inherit(BI.Widget, {
                 editor: o.editor
             });
         }));
-        this.element.mousedown(function (e) {
-            BI.each(buttons, function (i, btn) {
-                btn.hideIf(e);
-            });
-        });
         BI.createWidget({
             type: "bi.left",
             element: this,
@@ -83549,6 +83546,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.instance.getContent();
         },
 
+        getContentHeight: function () {
+            return this.instance.getContentHeight();
+        },
+
         getInstance: function () {
             return this.instance;
         },
@@ -83758,6 +83759,10 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             return this.content;
         },
 
+        getContentHeight: function () {
+            return this.elm.element.height();
+        },
+
         setContent: function (e) {
             this.content = e;
             this.ne.fireEvent("set");
@@ -84523,6 +84528,10 @@ BI.RichEditor = BI.inherit(BI.Widget, {
 
     getValue: function () {
         return this.editor.getValue();
+    },
+
+    getContentHeight: function () {
+        return this.editor.getContentHeight();
     }
 });
 BI.RichEditor.EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";

dist/resource.css

@@ -100,12 +100,12 @@ textarea::-webkit-scrollbar-thumb:hover {
   _background: none;
 }
 .ztree li ul.line {
-  background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }

public/css/background.css

@@ -29,12 +29,12 @@
   _background: none;
 }
 .ztree li ul.line {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }

src/base/single/button/buttons/button.js

@@ -43,6 +43,8 @@
             var o = this.options, self = this;
             if (BI.isNumber(o.height) && !o.clear && !o.block) {
                 this.element.css({height: o.height + "px", lineHeight: (o.height - 2) + "px"});
+            } else if (o.clear || o.block) {
+                this.element.css({lineHeight: o.height + "px"});
             } else {
                 this.element.css({lineHeight: (o.height - 2) + "px"});
             }

src/css/resource/background.css

@@ -29,12 +29,12 @@
   _background: none;
 }
 .ztree li ul.line {
-  background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }

src/less/resource/background.less

@@ -29,12 +29,12 @@
 }
 
 .ztree li ul.line {
-  .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y);
+  .imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y);
 }
 
 .bi-theme-dark {
   .ztree li ul.line {
-    .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y);
+    .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);
   }
 }
 

ui/css/background.css

@@ -29,12 +29,12 @@
   _background: none;
 }
 .ztree li ul.line {
-  background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png');
   _background: none;
 }
 .bi-theme-dark .ztree li ul.line {
-  background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
+  background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png');
   _background: none;
 }