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

* commit 'e3cb050eeecedb3f6298bfc6473d48592b72b565': 更新箭头替换，bi-background背景替换
6 years ago · cc82567293
29 changed files with 178 additions and 47 deletions
--- a/demo/css/main.css
+++ b/demo/css/main.css
@ -40,7 +40,7 @@
  background-color: #178cdf;
 }
 body {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 #wrapper {
  position: absolute;
--- a/demo/js/core/layout/demo.htape.js
+++ b/demo/js/core/layout/demo.htape.js
@ -14,7 +14,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
                    el: {
                        type: "bi.label",
                        text: "1",
-                        cls: "layout-bg1"
+                        cls: "bi-background"
                    }
                }, {
                    width: 200,
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/dist/base.js
@ -18393,7 +18393,6 @@ BI.Editor = BI.inherit(BI.Single, {
            element: this,
            items: items
        });
-        this.element[0].tabIndex = -1;
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
        });
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -325,7 +325,7 @@ textarea {
  clear: both;
 }
 .bi-background {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #3d4d66;
 }
 .bi-background .bi-input {
@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL {
  max-width: 200px;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #999999;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL {
 }
 .bi-preview-table > div > table > thead > tr.odd,
 .bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -54163,7 +54163,6 @@ BI.Editor = BI.inherit(BI.Single, {
            element: this,
            items: items
        });
-        this.element[0].tabIndex = -1;
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
        });
@ -74519,9 +74518,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
    setSelected: function (v) {
        BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
        if(v) {
-            this.element.removeClass("pull-right-font").addClass("pull-down-font");
+            this.element.removeClass("expander-right-font").addClass("expander-down-font");
        } else {
-            this.element.removeClass("pull-down-font").addClass("pull-right-font");
+            this.element.removeClass("expander-down-font").addClass("expander-right-font");
        }
    }
 });
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -2049,9 +2049,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
    setSelected: function (v) {
        BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
        if(v) {
-            this.element.removeClass("pull-right-font").addClass("pull-down-font");
+            this.element.removeClass("expander-right-font").addClass("expander-down-font");
        } else {
-            this.element.removeClass("pull-down-font").addClass("pull-right-font");
+            this.element.removeClass("expander-down-font").addClass("expander-right-font");
        }
    }
 });
--- a/dist/core.css
+++ b/dist/core.css
@ -325,7 +325,7 @@ textarea {
  clear: both;
 }
 .bi-background {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #3d4d66;
 }
 .bi-background .bi-input {
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -47,7 +47,7 @@ textarea {
  clear: both;
 }
 .bi-background {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #3d4d66;
 }
 .bi-background .bi-input {
--- a/dist/demo.css
+++ b/dist/demo.css
@ -43,7 +43,7 @@
  background-color: #178cdf;
 }
 body {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 #wrapper {
  position: absolute;
--- a/dist/demo.js
+++ b/dist/demo.js
@ -8200,7 +8200,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
                    el: {
                        type: "bi.label",
                        text: "1",
-                        cls: "layout-bg1"
+                        cls: "bi-background"
                    }
                }, {
                    width: 200,
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -325,7 +325,7 @@ textarea {
  clear: both;
 }
 .bi-background {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #3d4d66;
 }
 .bi-background .bi-input {
@ -3673,7 +3673,7 @@ ul.ztree.zTreeDragUL {
  max-width: 200px;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #999999;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -3928,7 +3928,7 @@ ul.ztree.zTreeDragUL {
 }
 .bi-preview-table > div > table > thead > tr.odd,
 .bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
@ -4957,6 +4957,28 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -54406,7 +54406,6 @@ BI.Editor = BI.inherit(BI.Single, {
            element: this,
            items: items
        });
-        this.element[0].tabIndex = -1;
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
        });
@ -74762,9 +74761,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
    setSelected: function (v) {
        BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
        if(v) {
-            this.element.removeClass("pull-right-font").addClass("pull-down-font");
+            this.element.removeClass("expander-right-font").addClass("expander-down-font");
        } else {
-            this.element.removeClass("pull-down-font").addClass("pull-right-font");
+            this.element.removeClass("expander-down-font").addClass("expander-right-font");
        }
    }
 });
--- 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
@ -835,6 +835,28 @@ textarea::-webkit-scrollbar-thumb:hover {
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }
--- a/dist/widget.css
+++ b/dist/widget.css
@ -28,7 +28,7 @@
  max-width: 200px;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #999999;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-triangle {
@ -283,7 +283,7 @@
 }
 .bi-preview-table > div > table > thead > tr.odd,
 .bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
--- a/public/css/font.css
+++ b/public/css/font.css
@ -509,6 +509,28 @@
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@ -98,7 +98,6 @@ BI.Editor = BI.inherit(BI.Single, {
            element: this,
            items: items
        });
-        this.element[0].tabIndex = -1;
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
        });
--- a/src/case/checkbox/check.arrownode.js
+++ b/src/case/checkbox/check.arrownode.js
@ -14,9 +14,9 @@ BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
    setSelected: function (v) {
        BI.ArrowTreeGroupNodeCheckbox.superclass.setSelected.apply(this, arguments);
        if(v) {
-            this.element.removeClass("pull-right-font").addClass("pull-down-font");
+            this.element.removeClass("expander-right-font").addClass("expander-down-font");
        } else {
-            this.element.removeClass("pull-down-font").addClass("pull-right-font");
+            this.element.removeClass("expander-down-font").addClass("expander-right-font");
        }
    }
 });
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -47,7 +47,7 @@ textarea {
  clear: both;
 }
 .bi-background {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #3d4d66;
 }
 .bi-background .bi-input {
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@ -509,6 +509,28 @@
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }
--- a/src/css/widget/filemanager/nav/button/button.css
+++ b/src/css/widget/filemanager/nav/button/button.css
@ -2,7 +2,7 @@
  max-width: 200px;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-text.active {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
  color: #999999;
 }
 .bi-file-manager-nav-button .file-manager-nav-button-triangle {
--- a/src/css/widget/previewtable/previewtable.css
+++ b/src/css/widget/previewtable/previewtable.css
@ -19,7 +19,7 @@
 }
 .bi-preview-table > div > table > thead > tr.odd,
 .bi-preview-table > div > div > div > table > thead > tr.odd {
-  background-color: #fafbfc;
+  background-color: #f7f8fa;
 }
 .bi-theme-dark .bi-preview-table > div > table > thead > tr.odd,
 .bi-theme-dark .bi-preview-table > div > div > div > table > thead > tr.odd {
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@ -33,7 +33,7 @@
@background-color-black: #1a1a1a;//
@background-color-default: #ffffff;//
@background-color-default-theme-dark: #242640;//
-@background-color-normal: #fafbfc;//
+@background-color-normal: #f7f8fa;//
@background-color-normal-theme-dark: #191B2B;//
@background-color-light-highlight: #eaf2fd;
@background-color-highlight: #3685f2;
--- a/src/less/resource/font.less
+++ b/src/less/resource/font.less
@ -67,6 +67,9 @@
 .font-hover(column-pre-page-h-font, @font-solid-top);
 .font-hover(column-next-page-h-font, @font-solid-bottom);

+.font(expander-right-font, @font-solid-right);
+.font(expander-down-font, @font-solid-bottom);
+
 // 实心下拉三角
 .font-hover(solid-triangle-top-font, @font-solid-top);
 .font-hover(solid-triangle-bottom-font, @font-solid-bottom);
--- a/ui/css/font.css
+++ b/ui/css/font.css
@ -509,6 +509,28 @@
  content: "\e6d7";
  color: inherit;
 }
+.expander-right-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d8;');
+}
+.expander-right-font .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-right-font.disabled .b-font:before {
+  content: "\e6d8";
+  color: inherit;
+}
+.expander-down-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d7;');
+}
+.expander-down-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.expander-down-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .solid-triangle-top-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6d6;');
 }