Merge pull request #590 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'c0bdc0e12d3fae2a0719dbfd04d926213436db34':
  无JIRA任务 color_chooser的trigger不要阴影了
  update
  更新
  BI-30217 统一处理combo的灰化

demo/js/case/combo/demo.search_text_value_combo.js

@@ -11,6 +11,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.horizontal_auto",
             items: [{
                 type: "bi.search_text_value_combo",
+                disabled: true,
                 ref: function () {
                     combo = this;
                 },

dist/base.css

@@ -12,9 +12,6 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #232e40;
@@ -517,6 +514,14 @@
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.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;

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

@@ -288,7 +288,7 @@ textarea {
   border: 1px solid #3a3c53;
 }
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: #9ea6b2 !important;
 }
 .base-disabled .bi-input {
@@ -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;
 }
@@ -1942,9 +1948,6 @@ textarea {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #232e40;
@@ -2447,6 +2450,14 @@ textarea {
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.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;

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();
     },
@@ -51268,7 +51273,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -51277,7 +51282,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
         BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
         this.colorContainer = BI.createWidget({
             type: "bi.layout",
-            cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
+            cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
         });
 
         var down = BI.createWidget({
@@ -51332,7 +51337,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -51342,7 +51347,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options;
         this.colorContainer = BI.createWidget({
             type: "bi.htape",
-            cls: "bi-card color-chooser-trigger-content",
+            cls: "color-chooser-trigger-content",
             items: [{
                 type: "bi.icon_change_button",
                 ref: function (_ref) {

dist/case.js

@@ -2644,7 +2644,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -2653,7 +2653,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
         BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
         this.colorContainer = BI.createWidget({
             type: "bi.layout",
-            cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
+            cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
         });
 
         var down = BI.createWidget({
@@ -2708,7 +2708,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -2718,7 +2718,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options;
         this.colorContainer = BI.createWidget({
             type: "bi.htape",
-            cls: "bi-card color-chooser-trigger-content",
+            cls: "color-chooser-trigger-content",
             items: [{
                 type: "bi.icon_change_button",
                 ref: function (_ref) {

dist/core.css

@@ -288,7 +288,7 @@ textarea {
   border: 1px solid #3a3c53;
 }
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: #9ea6b2 !important;
 }
 .base-disabled .bi-input {
@@ -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

@@ -7,7 +7,7 @@ textarea {
   border: 1px solid #3a3c53;
 }
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: #9ea6b2 !important;
 }
 .base-disabled .bi-input {
@@ -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/demo.js

@@ -1318,6 +1318,7 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.horizontal_auto",
             items: [{
                 type: "bi.search_text_value_combo",
+                disabled: true,
                 ref: function () {
                     combo = this;
                 },

dist/fineui.css

@@ -288,7 +288,7 @@ textarea {
   border: 1px solid #3a3c53;
 }
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: #9ea6b2 !important;
 }
 .base-disabled .bi-input {
@@ -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;
 }
@@ -1942,9 +1948,6 @@ textarea {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
 }
 .bi-color-picker-button .color-picker-button-mask {
   border: 1px solid #232e40;
@@ -2447,6 +2450,14 @@ textarea {
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.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;

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();
     },
@@ -51489,7 +51494,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -51498,7 +51503,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
         BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
         this.colorContainer = BI.createWidget({
             type: "bi.layout",
-            cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
+            cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
         });
 
         var down = BI.createWidget({
@@ -51553,7 +51558,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -51563,7 +51568,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options;
         this.colorContainer = BI.createWidget({
             type: "bi.htape",
-            cls: "bi-card color-chooser-trigger-content",
+            cls: "color-chooser-trigger-content",
             items: [{
                 type: "bi.icon_change_button",
                 ref: function (_ref) {

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/case/colorchooser/colorchooser.trigger.js

@@ -10,7 +10,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -19,7 +19,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
         BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
         this.colorContainer = BI.createWidget({
             type: "bi.layout",
-            cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
+            cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
         });
 
         var down = BI.createWidget({

src/case/colorchooser/colorchooser.trigger.long.js

@@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
     _defaultConfig: function () {
         var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
             height: 24
         });
     },
@@ -20,7 +20,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options;
         this.colorContainer = BI.createWidget({
             type: "bi.htape",
-            cls: "bi-card color-chooser-trigger-content",
+            cls: "color-chooser-trigger-content",
             items: [{
                 type: "bi.icon_change_button",
                 ref: function (_ref) {

src/css/base/colorchooser/colorchooser.css

@@ -8,7 +8,4 @@
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   border-radius: 2px;
-  box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-  -moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
 }

src/css/base/combo/combo.css

@@ -93,6 +93,14 @@
 .bi-combo:hover > .bi-border {
   border-color: #3685f2;
 }
+.bi-combo.disabled.bi-combo-hover > .bi-border,
+.bi-combo.disabled:hover > .bi-border {
+  border-color: #e8eaed;
+}
+.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/core/utils/common.css

@@ -7,7 +7,7 @@ textarea {
   border: 1px solid #3a3c53;
 }
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: #9ea6b2 !important;
 }
 .base-disabled .bi-input {
@@ -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/less/base/colorchooser/colorchooser.trigger.less

@@ -2,5 +2,4 @@
 
 .bi-color-chooser-trigger {
   .border-radius(2px);
-  .box-shadow(0px, 0px, 2px, 1px, @color-bi-background-dark-gray, inset);
 }

src/less/base/combo/combo.less

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

src/less/core/utils/common.less

@@ -13,7 +13,7 @@ textarea {
 }
 
 .base-disabled {
-  cursor: default !important;
+  cursor: not-allowed !important;
   color: @color-bi-text-disabled !important;
   & .bi-input {
     color: @color-bi-text-disabled !important;
@@ -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;