BI-25122 && BI-25134

6 years ago · 26feea671d
20 changed files with 72 additions and 73 deletions
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -472,14 +472,14 @@ textarea {
  border-color: #3685f2;
 }
 .bi-water-mark {
-  color: #cccccc;
+  color: #c4c9d1;
  cursor: text;
 }
 .bi-water-mark .bi-input {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-water-mark .bi-textarea {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-theme-dark .bi-water-mark {
  color: #666666;
@ -5049,18 +5049,18 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -5069,14 +5069,14 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -5090,7 +5090,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -72678,7 +72678,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.checkbox],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
@ -86035,7 +86035,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            type: "bi.htape",
            element: this,
            items: [{
-                width: 36,
+                width: 26,
                el: {
                    type: "bi.center_adapt",
                    items: [this.checkbox, this.half]
@ -107260,7 +107260,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            hgap: 10,
            height: 24
        });
    },
@ -107290,7 +107289,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.radio],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
--- a/dist/case.js
+++ b/dist/case.js
@ -199,7 +199,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.checkbox],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
@ -13556,7 +13556,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            type: "bi.htape",
            element: this,
            items: [{
-                width: 36,
+                width: 26,
                el: {
                    type: "bi.center_adapt",
                    items: [this.checkbox, this.half]
--- a/dist/core.css
+++ b/dist/core.css
@ -472,14 +472,14 @@ textarea {
  border-color: #3685f2;
 }
 .bi-water-mark {
-  color: #cccccc;
+  color: #c4c9d1;
  cursor: text;
 }
 .bi-water-mark .bi-input {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-water-mark .bi-textarea {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-theme-dark .bi-water-mark {
  color: #666666;
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -194,14 +194,14 @@ textarea {
  border-color: #3685f2;
 }
 .bi-water-mark {
-  color: #cccccc;
+  color: #c4c9d1;
  cursor: text;
 }
 .bi-water-mark .bi-input {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-water-mark .bi-textarea {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-theme-dark .bi-water-mark {
  color: #666666;
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -472,14 +472,14 @@ textarea {
  border-color: #3685f2;
 }
 .bi-water-mark {
-  color: #cccccc;
+  color: #c4c9d1;
  cursor: text;
 }
 .bi-water-mark .bi-input {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-water-mark .bi-textarea {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-theme-dark .bi-water-mark {
  color: #666666;
@ -5049,18 +5049,18 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -5069,14 +5069,14 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -5090,7 +5090,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -72921,7 +72921,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.checkbox],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
@ -86278,7 +86278,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            type: "bi.htape",
            element: this,
            items: [{
-                width: 36,
+                width: 26,
                el: {
                    type: "bi.center_adapt",
                    items: [this.checkbox, this.half]
@ -107503,7 +107503,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            hgap: 10,
            height: 24
        });
    },
@ -107533,7 +107532,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.radio],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
--- a/dist/resource.css
+++ b/dist/resource.css
@ -926,18 +926,18 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -946,14 +946,14 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -967,7 +967,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
--- a/dist/widget.js
+++ b/dist/widget.js
@ -19636,7 +19636,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            hgap: 10,
            height: 24
        });
    },
@ -19666,7 +19665,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.radio],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
--- a/public/css/font.css
+++ b/public/css/font.css
@ -600,18 +600,18 @@
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
--- a/src/case/button/item.multiselect.js
+++ b/src/case/button/item.multiselect.js
@ -45,7 +45,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.checkbox],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
--- a/src/case/toolbar/toolbar.multiselect.js
+++ b/src/case/toolbar/toolbar.multiselect.js
@ -70,7 +70,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
            type: "bi.htape",
            element: this,
            items: [{
-                width: 36,
+                width: 26,
                el: {
                    type: "bi.center_adapt",
                    items: [this.checkbox, this.half]
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -194,14 +194,14 @@ textarea {
  border-color: #3685f2;
 }
 .bi-water-mark {
-  color: #cccccc;
+  color: #c4c9d1;
  cursor: text;
 }
 .bi-water-mark .bi-input {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-water-mark .bi-textarea {
-  color: #cccccc;
+  color: #c4c9d1;
 }
 .bi-theme-dark .bi-water-mark {
  color: #666666;
--- a/src/css/resource/font.css
+++ b/src/css/resource/font.css
@ -600,18 +600,18 @@
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -244,13 +244,13 @@ textarea {

 //水印
 .bi-water-mark {
-  color: @water-mark-color;
+  color: @font-color-tips;
  cursor: text;
  & .bi-input {
-    color: @water-mark-color;
+    color: @font-color-tips;
  }
  & .bi-textarea {
-    color: @water-mark-color;
+    color: @font-color-tips;
  }
 }

--- a/src/less/lib/colors.less
+++ b/src/less/lib/colors.less
@ -12,6 +12,8 @@
@color-bi-text-dark: @font-color-dark;
 //灰色字体颜色
@color-bi-text-gray: @font-color-gray;
+//浅灰色字体
+@color-bi-text-light-gray: @font-color-light-gray;
 //白色字体颜色
@color-bi-text: @font-color-white;
 //灰化字体颜色
--- a/src/less/lib/constant.less
+++ b/src/less/lib/constant.less
@ -22,6 +22,7 @@
@font-color-disabled-theme-dark: #666666;//
@font-color-tips: #c4c9d1;//
@font-color-dark: #d4dadd;
+@font-color-light-gray: #647185;
@font-color-gray: #999999;
@font-color-white: #ffffff;//
@font-color-highlight: #3685f2;
--- a/src/less/resource/font.less
+++ b/src/less/resource/font.less
@ -80,9 +80,9 @@
 //单选下拉框
 //向下展开子菜单
 .font(pull-up-font, @font-up-triangle);
-.font(pull-down-font, @font-down-triangle);
-.font-hover(pull-down-h-font, @font-down-triangle);
-.font-hover-active(pull-down-ha-font, @font-down-triangle);
+.font(pull-down-font, @font-down-triangle, @color-bi-text-light-gray);
+.font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray);
+.font-hover-active(pull-down-ha-font, @font-down-triangle, @color-bi-text-light-gray);

 .font(check-font, @font-check-mark, @color-bi-text-highlight);

--- a/src/widget/singleselect/singleselect.item.js
+++ b/src/widget/singleselect/singleselect.item.js
@ -10,7 +10,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            logic: {
                dynamic: false
            },
-            hgap: 10,
            height: 24
        });
    },
@ -40,7 +39,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
            items: BI.LogicFactory.createLogicItemsByDirection("left", {
                type: "bi.center_adapt",
                items: [this.radio],
-                width: 36
+                width: 26
            }, this.text)
        }))));
    },
--- a/ui/css/font.css
+++ b/ui/css/font.css
@ -600,18 +600,18 @@
 }
 .pull-down-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-h-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-h-font:hover .b-font:before,
 .pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
 }
 .pull-down-h-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe70b;');
 }
 .pull-down-ha-font .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .pull-down-ha-font:hover .b-font:before,
 .pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
 }
 .pull-down-ha-font.disabled .b-font:before {
  content: "\e70b";
-  color: inherit;
+  color: #647185;
 }
 .check-font .b-font {
  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '&#xe6cf;');