BI-30217 统一处理combo的灰化

dist/base.css

@@ -517,6 +517,20 @@
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled {
+  background-color: #F2F4F7;
+}
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-combo.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
+  border-color: #3a3c53;
+}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -559,6 +573,12 @@
 .bi-search-editor .search-font {
   font-size: 16px;
 }
+.bi-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-search-editor.disabled {
+  background-color: #2F3149;
+}
 
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
@@ -576,6 +596,12 @@
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
+.bi-small-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-small-search-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-message-title {
   font-size: 14px;
   cursor: pointer;

dist/base.js

@@ -3303,6 +3303,11 @@ BI.Combo = BI.inherit(BI.Widget, {
 
     _setEnable: function (arg) {
         BI.Combo.superclass._setEnable.apply(this, arguments);
+        if (arg === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (arg === false) {
+            this.element.addClass("base-disabled disabled");
+        }
         !arg && this.element.removeClass(this.options.hoverClass);
         !arg && this.isViewVisible() && this._hideView();
     },

dist/bundle.css

@@ -317,6 +317,12 @@ textarea {
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
+.bi-focus-shadow.disabled:hover {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-focus-shadow.disabled:hover {
+  border-color: #3a3c53;
+}
 .base-invalid {
   cursor: default !important;
 }
@@ -2447,6 +2453,20 @@ textarea {
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled {
+  background-color: #F2F4F7;
+}
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-combo.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
+  border-color: #3a3c53;
+}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -2489,6 +2509,12 @@ textarea {
 .bi-search-editor .search-font {
   font-size: 16px;
 }
+.bi-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-search-editor.disabled {
+  background-color: #2F3149;
+}
 
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
@@ -2506,6 +2532,12 @@ textarea {
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
+.bi-small-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-small-search-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-message-title {
   font-size: 14px;
   cursor: pointer;
@@ -3597,6 +3629,12 @@ ul.ztree.zTreeDragUL {
 .bi-number-editor .pull-up-font {
   font-size: 12px;
 }
+.bi-number-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-number-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-number-interval .number-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;

dist/bundle.js

@@ -38575,6 +38575,11 @@ BI.Combo = BI.inherit(BI.Widget, {
 
     _setEnable: function (arg) {
         BI.Combo.superclass._setEnable.apply(this, arguments);
+        if (arg === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (arg === false) {
+            this.element.addClass("base-disabled disabled");
+        }
         !arg && this.element.removeClass(this.options.hoverClass);
         !arg && this.isViewVisible() && this._hideView();
     },

dist/core.css

@@ -317,6 +317,12 @@ textarea {
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
+.bi-focus-shadow.disabled:hover {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-focus-shadow.disabled:hover {
+  border-color: #3a3c53;
+}
 .base-invalid {
   cursor: default !important;
 }

dist/core_without_normalize.css

@@ -36,6 +36,12 @@ textarea {
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
+.bi-focus-shadow.disabled:hover {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-focus-shadow.disabled:hover {
+  border-color: #3a3c53;
+}
 .base-invalid {
   cursor: default !important;
 }

dist/fineui.css

@@ -317,6 +317,12 @@ textarea {
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
+.bi-focus-shadow.disabled:hover {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-focus-shadow.disabled:hover {
+  border-color: #3a3c53;
+}
 .base-invalid {
   cursor: default !important;
 }
@@ -2447,6 +2453,20 @@ textarea {
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled {
+  background-color: #F2F4F7;
+}
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-combo.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
+  border-color: #3a3c53;
+}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;
@@ -2489,6 +2509,12 @@ textarea {
 .bi-search-editor .search-font {
   font-size: 16px;
 }
+.bi-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-search-editor.disabled {
+  background-color: #2F3149;
+}
 
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
@@ -2506,6 +2532,12 @@ textarea {
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
+.bi-small-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-small-search-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-message-title {
   font-size: 14px;
   cursor: pointer;
@@ -3597,6 +3629,12 @@ ul.ztree.zTreeDragUL {
 .bi-number-editor .pull-up-font {
   font-size: 12px;
 }
+.bi-number-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-number-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-number-interval .number-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;

dist/fineui.js

@@ -38796,6 +38796,11 @@ BI.Combo = BI.inherit(BI.Widget, {
 
     _setEnable: function (arg) {
         BI.Combo.superclass._setEnable.apply(this, arguments);
+        if (arg === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (arg === false) {
+            this.element.addClass("base-disabled disabled");
+        }
         !arg && this.element.removeClass(this.options.hoverClass);
         !arg && this.isViewVisible() && this._hideView();
     },

dist/widget.css

@@ -121,6 +121,12 @@
 .bi-number-editor .pull-up-font {
   font-size: 12px;
 }
+.bi-number-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-number-editor.disabled {
+  background-color: #2F3149;
+}
 .bi-number-interval .number-interval-small-editor {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;

src/base/combination/combo.js

@@ -413,6 +413,11 @@ BI.Combo = BI.inherit(BI.Widget, {
 
     _setEnable: function (arg) {
         BI.Combo.superclass._setEnable.apply(this, arguments);
+        if (arg === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (arg === false) {
+            this.element.addClass("base-disabled disabled");
+        }
         !arg && this.element.removeClass(this.options.hoverClass);
         !arg && this.isViewVisible() && this._hideView();
     },

src/css/base/combo/combo.css

@@ -93,6 +93,20 @@
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled {
+  background-color: #F2F4F7;
+}
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-combo.disabled {
+  background-color: #2F3149;
+}
+.bi-theme-dark .bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-theme-dark .bi-combo.disabled:hover > .bi-border {
+  border-color: #3a3c53;
+}
 
 .bi-search-text-value-combo .trigger-icon-button {
   font-size: 16px;

src/css/base/editor/editor.css

@@ -10,6 +10,12 @@
 .bi-search-editor .search-font {
   font-size: 16px;
 }
+.bi-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-search-editor.disabled {
+  background-color: #2F3149;
+}
 
 /*************BI.SearchEditor******************/
 .bi-small-search-editor .bi-editor {
@@ -27,3 +33,9 @@
 .bi-small-search-editor .search-font {
   font-size: 18px;
 }
+.bi-small-search-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-small-search-editor.disabled {
+  background-color: #2F3149;
+}

src/css/core/utils/common.css

@@ -36,6 +36,12 @@ textarea {
 .bi-focus-shadow:hover {
   border-color: #3685f2;
 }
+.bi-focus-shadow.disabled:hover {
+  border-color: #e8eaed;
+}
+.bi-theme-dark .bi-focus-shadow.disabled:hover {
+  border-color: #3a3c53;
+}
 .base-invalid {
   cursor: default !important;
 }

src/css/widget/numbereditor/number.css

@@ -9,3 +9,9 @@
 .bi-number-editor .pull-up-font {
   font-size: 12px;
 }
+.bi-number-editor.disabled {
+  background-color: #F2F4F7;
+}
+.bi-theme-dark .bi-number-editor.disabled {
+  background-color: #2F3149;
+}

src/less/base/combo/combo.less

@@ -16,4 +16,25 @@
       border-color: @color-bi-border-highlight;
     }
   }
+  &.disabled {
+    background-color: @color-bi-background-disabled;
+    &.bi-combo-hover, &:hover {
+      & > .bi-border {
+        border-color: @border-color-line;
+      }
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-combo {
+    &.disabled {
+      background-color: @color-bi-background-disabled-theme-dark;
+      &.bi-combo-hover, &:hover {
+        & > .bi-border {
+          border-color: @border-color-line-theme-dark;
+        }
+      }
+    }
+  }
 }

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

@@ -8,4 +8,15 @@
   & .search-font{
     font-size: @font-size-16;
   }
+  &.disabled {
+    background-color: @color-bi-background-disabled;
+  }
+}
+
+.bi-theme-dark {
+  .bi-search-editor {
+    &.disabled {
+      background-color: @color-bi-background-disabled-theme-dark;
+    }
+  }
 }

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

@@ -16,4 +16,15 @@
   & .search-font{
     font-size: 18px;
   }
+  &.disabled {
+    background-color: @color-bi-background-disabled;
+  }
+}
+
+.bi-theme-dark {
+  .bi-small-search-editor {
+    &.disabled {
+      background-color: @color-bi-background-disabled-theme-dark;
+    }
+  }
 }

src/less/core/utils/common.less

@@ -45,6 +45,21 @@ textarea {
   &:focus-within, &:focus, &:hover {
     border-color: @color-bi-border-highlight;
   }
+  &.disabled {
+    &:hover {
+      border-color: @border-color-line;
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-focus-shadow {
+    &.disabled {
+      &:hover {
+        border-color: @border-color-line-theme-dark;
+      }
+    }
+  }
 }
 
 .base-invalid {

src/less/lib/colors.less

@@ -52,6 +52,8 @@
 @color-bi-background-light-gray-theme-dark: @background-color-light-gray-theme-dark;
 //灰化背景
 @color-bi-background-disabled: @background-color-disabled;
+//深色主题灰化背景
+@color-bi-background-disabled-theme-dark: @background-color-disabled-theme-dark;
 //成功背景色
 @color-bi-background-success: @background-color-dark-success;
 //成功背景色(浅)
@@ -77,7 +79,7 @@
 @color-bi-border-line: @border-color-line;
 //深色系边框线色
 @color-bi-border-line-theme-dark: @border-color-line-theme-dark;
-//灰化分割线
+//灰化边框
 @color-bi-border-disabled: @border-color-disabled;
 //成功边框色
 @color-bi-border-success: @border-color-success;

src/less/lib/constant.less

@@ -61,6 +61,7 @@
 @background-color-light-gray-theme-dark: #2F3149;
 @background-color-dark-gray: #d0d4da;
 @background-color-disabled: #F2F4F7;
+@background-color-disabled-theme-dark: #2F3149;
 @background-color-yellow: #ffc101;//
 
 @background-color-negative: #ff4949;

src/less/widget/numbereditor/number.editor.less

@@ -8,4 +8,15 @@
   & .pull-up-font {
     font-size: 12px;
   }
+  &.disabled {
+    background-color: @color-bi-background-disabled;
+  }
+}
+
+.bi-theme-dark {
+  .bi-number-editor {
+    &.disabled {
+      background-color: @color-bi-background-disabled-theme-dark;
+    }
+  }
 }