Merge branch 'master' into bugfix/bugfix

demo/js/case/combo/demo.icon_text_value_combo.js

@@ -13,7 +13,6 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                 type: "bi.icon_text_value_combo",
                 text: "默认值",
                 // defaultIconCls: "next-page-h-font",
-                value: 1,
                 width: 300,
                 iconHeight: 16,
                 iconWidth: 16,

demo/js/case/demo.click.effect.js

@@ -0,0 +1,37 @@
+Demo.Func = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-func"
+    },
+
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: BI.createItems([{
+                text: "bi-list-item",
+                cls: "bi-list-item"
+            }, {
+                text: "bi-list-item-simple",
+                cls: "bi-list-item-simple"
+            }, {
+                text: "bi-list-item-effect",
+                cls: "bi-list-item-effect"
+            }, {
+                text: "bi-list-item-active",
+                cls: "bi-list-item-active"
+            }, {
+                text: "bi-list-item-active2",
+                cls: "bi-list-item-active2"
+            }, {
+                text: "bi-list-item-active3",
+                cls: "bi-list-item-active3"
+            }, {
+                text: "bi-list-item-select",
+                cls: "bi-list-item-select"
+            }], {
+                type: "bi.text_item"
+            }),
+            vgap: 10
+        };
+    }
+});
+BI.shortcut("demo.click_item_effect", Demo.Func);

demo/js/config/case.js

@@ -230,4 +230,8 @@ Demo.CASE_CONFIG = [{
     pId: 3,
     text: "bi.segment",
     value: "demo.segment"
+}, {
+    pId: 3,
+    text: "点击项样式查看",
+    value: "demo.click_item_effect"
 }];

dist/base.css

@@ -188,6 +188,10 @@
   display: none;
 }
 
+.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
+  color: #ff4949;
+}
+
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -806,14 +810,14 @@ li.CodeMirror-hint-active {
 }
 .bi-segment > .first-element {
   border-left: 1px solid #3685f2;
-  -webkit-border-radius: 6px 0px 0px 6px;
+  -webkit-border-radius: 2px 0px 0px 2px;
-  -moz-border-radius: 6px 0px 0px 6px;
+  -moz-border-radius: 2px 0px 0px 2px;
-  border-radius: 6px 0px 0px 6px;
+  border-radius: 2px 0px 0px 2px;
 }
 .bi-segment > .last-element {
-  -webkit-border-radius: 0px 6px 6px 0px;
+  -webkit-border-radius: 0px 2px 2px 0px;
-  -moz-border-radius: 0px 6px 6px 0px;
+  -moz-border-radius: 0px 2px 2px 0px;
-  border-radius: 0px 6px 6px 0px;
+  border-radius: 0px 2px 2px 0px;
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {

dist/base.js

@@ -342,7 +342,7 @@ BI.Single = BI.inherit(BI.Widget, {
             warningTitle: null,
             tipType: null, // success或warning
             value: null,
-            belowMouse: false   // title是否跟随鼠标
+            belowMouse: false   // title是否跟随鼠标,
         });
     },
 
@@ -353,6 +353,10 @@ BI.Single = BI.inherit(BI.Widget, {
         var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
         if (BI.isKey(title)) {
             BI.Tooltips.show(e, this.getName(), title, type, this, opt);
+            if (opt.action) {
+                BI.Actions.runAction(opt.action, "hover", opt, title);
+            }
+            BI.Actions.runGlobalAction("hover", opt, title);
         }
     },
 
@@ -905,9 +909,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
             this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
             this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
             if (o.action) {
-                BI.Actions.runAction(o.action, o);
+                BI.Actions.runAction(o.action, "click", o);
             }
-            BI.Actions.runGlobalAction(o);
+            BI.Actions.runGlobalAction("click", o);
         }
     },
 

dist/bundle.css

@@ -981,6 +981,55 @@ textarea {
 .bi-list-item-active3.disabled:active .bi-high-light {
   color: #9ea6b2 !important;
 }
+.bi-theme-dark .bi-list-item-active3:hover,
+.bi-theme-dark .bi-list-item-active3.hover {
+  color: #ffffff;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:active,
+.bi-theme-dark .bi-list-item-active3.active {
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-input,
+.bi-theme-dark .bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3.disabled,
+.bi-theme-dark .bi-list-item-active3.disabled:hover,
+.bi-theme-dark .bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -1979,6 +2028,10 @@ textarea {
   display: none;
 }
 
+.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
+  color: #ff4949;
+}
+
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -2597,14 +2650,14 @@ li.CodeMirror-hint-active {
 }
 .bi-segment > .first-element {
   border-left: 1px solid #3685f2;
-  -webkit-border-radius: 6px 0px 0px 6px;
+  -webkit-border-radius: 2px 0px 0px 2px;
-  -moz-border-radius: 6px 0px 0px 6px;
+  -moz-border-radius: 2px 0px 0px 2px;
-  border-radius: 6px 0px 0px 6px;
+  border-radius: 2px 0px 0px 2px;
 }
 .bi-segment > .last-element {
-  -webkit-border-radius: 0px 6px 6px 0px;
+  -webkit-border-radius: 0px 2px 2px 0px;
-  -moz-border-radius: 0px 6px 6px 0px;
+  -moz-border-radius: 0px 2px 2px 0px;
-  border-radius: 0px 6px 6px 0px;
+  border-radius: 0px 2px 2px 0px;
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
@@ -4537,9 +4590,14 @@ textarea::-webkit-scrollbar-thumb:hover {
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
   _background: none;
 }
+.auto-color-normal-disabled-background {
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
+  _background: none;
+}
 .trans-color-background {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png') no-repeat center center;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png');
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
   _background: none;
 }
 @font-face {
@@ -4767,7 +4825,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .dot-e-font:hover .b-font:before,
 .dot-e-font.hover .b-font:before {
@@ -4780,11 +4838,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font.active .b-font:before {
   content: "\e762";
-  color: #232e40;
+  color: #3685f2;
 }
 .dot-e-font.disabled .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .pull-right-font .b-font {
   font-size: 16px;

dist/bundle.js

@@ -28916,10 +28916,10 @@ BI.extend(BI.DOM, {
     };
 
     BI.Actions = {
-        runAction: function (type, config) {
+        runAction: function (type, event, config) {
             BI.each(actions[type], function (i, act) {
                 try {
-                    act(config);
+                    act(event, config);
                 } catch (e) {
                     console.error(e);
                 }
@@ -36147,7 +36147,7 @@ BI.Single = BI.inherit(BI.Widget, {
             warningTitle: null,
             tipType: null, // success或warning
             value: null,
-            belowMouse: false   // title是否跟随鼠标
+            belowMouse: false   // title是否跟随鼠标,
         });
     },
 
@@ -36158,6 +36158,10 @@ BI.Single = BI.inherit(BI.Widget, {
         var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
         if (BI.isKey(title)) {
             BI.Tooltips.show(e, this.getName(), title, type, this, opt);
+            if (opt.action) {
+                BI.Actions.runAction(opt.action, "hover", opt, title);
+            }
+            BI.Actions.runGlobalAction("hover", opt, title);
         }
     },
 
@@ -36710,9 +36714,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
             this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
             this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
             if (o.action) {
-                BI.Actions.runAction(o.action, o);
+                BI.Actions.runAction(o.action, "click", o);
             }
-            BI.Actions.runGlobalAction(o);
+            BI.Actions.runGlobalAction("click", o);
         }
     },
 
@@ -77177,15 +77181,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
     },
 
     _showPreColor: function (color) {
-        if (color === "") {
+        if(this.isEnabled()) {
-            this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
+            if (color === "") {
-        } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
-            this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            }
         } else {
-            this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            if (color === "") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
+            }
         }
     },
 
+    _setEnable: function (enable) {
+        BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
+        this.mask.setVisible(!enable);
+    },
+
     setValue: function (color) {
         if (color === "transparent") {
             this.transparent.setSelected(true);
@@ -78467,7 +78486,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-icon-text-value-combo",
+            baseCls: "bi-icon-text-value-combo",
             height: 24,
             iconHeight: null,
             iconWidth: null,
@@ -78518,9 +78537,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         }
     },
 
+    _checkError: function (v) {
+        if(BI.isNotNull(v)) {
+            v = BI.isArray(v) ? v : [v];
+            var result = BI.find(this.options.items, function (idx, item) {
+                return BI.contains(v, item.value);
+            });
+            if (BI.isNull(result)) {
+                this.element.removeClass("combo-error").addClass("combo-error");
+            } else {
+                this.element.removeClass("combo-error");
+            }
+        }
+    },
+
     setValue: function (v) {
         this.trigger.setValue(v);
         this.popup.setValue(v);
+        this._checkError(v);
     },
 
     getValue: function () {
@@ -83519,6 +83553,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             }
         },
 
+        restoreRngAndClearRange: function () {
+            if (this.savedRange) {
+                this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
+                this.selRng(this.savedRange, this.savedSel);
+            }
+        },
+
         keyDown: function (e, t) {
             this.ne.fireEvent("keydown", e);
         },
@@ -84096,8 +84137,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
         return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
             command: "FontName",
-            width: 50,
+            width: 100,
-            height: 20
+            height: 24
         });
     },
 
@@ -84169,7 +84210,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
             command: "FontSize",
             width: 50,
-            height: 20
+            height: 24
         });
     },
 
@@ -84437,6 +84478,15 @@ BI.Segment = BI.inherit(BI.Widget, {
         });
     },
 
+    _setEnable: function (enable) {
+        BI.Segment.superclass._setEnable.apply(this, arguments);
+        if (enable === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (enable === false) {
+            this.element.addClass("base-disabled disabled");
+        }
+    },
+
     setValue: function (v) {
         this.buttonGroup.setValue(v);
     },
@@ -87390,6 +87440,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.text = BI.createWidget({
             type: "bi.label",
+            cls: "select-text-label",
             textAlign: "left",
             height: o.height,
             text: o.text,
@@ -90423,6 +90474,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                     item.el.height = self.constants.height;
                     item.el.iconCls2 = self.constants.nextIcon;
                     item.popup = {
+                        lgap: 1,
                         el: {
                             type: "bi.button_tree",
                             chooseType: 0,

dist/case.js

@@ -4617,15 +4617,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
     },
 
     _showPreColor: function (color) {
-        if (color === "") {
+        if(this.isEnabled()) {
-            this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
+            if (color === "") {
-        } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
-            this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            }
         } else {
-            this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            if (color === "") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
+            }
         }
     },
 
+    _setEnable: function (enable) {
+        BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
+        this.mask.setVisible(!enable);
+    },
+
     setValue: function (color) {
         if (color === "transparent") {
             this.transparent.setSelected(true);
@@ -5907,7 +5922,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-icon-text-value-combo",
+            baseCls: "bi-icon-text-value-combo",
             height: 24,
             iconHeight: null,
             iconWidth: null,
@@ -5958,9 +5973,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         }
     },
 
+    _checkError: function (v) {
+        if(BI.isNotNull(v)) {
+            v = BI.isArray(v) ? v : [v];
+            var result = BI.find(this.options.items, function (idx, item) {
+                return BI.contains(v, item.value);
+            });
+            if (BI.isNull(result)) {
+                this.element.removeClass("combo-error").addClass("combo-error");
+            } else {
+                this.element.removeClass("combo-error");
+            }
+        }
+    },
+
     setValue: function (v) {
         this.trigger.setValue(v);
         this.popup.setValue(v);
+        this._checkError(v);
     },
 
     getValue: function () {
@@ -10959,6 +10989,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             }
         },
 
+        restoreRngAndClearRange: function () {
+            if (this.savedRange) {
+                this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
+                this.selRng(this.savedRange, this.savedSel);
+            }
+        },
+
         keyDown: function (e, t) {
             this.ne.fireEvent("keydown", e);
         },
@@ -11536,8 +11573,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
         return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
             command: "FontName",
-            width: 50,
+            width: 100,
-            height: 20
+            height: 24
         });
     },
 
@@ -11609,7 +11646,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
             command: "FontSize",
             width: 50,
-            height: 20
+            height: 24
         });
     },
 
@@ -11877,6 +11914,15 @@ BI.Segment = BI.inherit(BI.Widget, {
         });
     },
 
+    _setEnable: function (enable) {
+        BI.Segment.superclass._setEnable.apply(this, arguments);
+        if (enable === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (enable === false) {
+            this.element.addClass("base-disabled disabled");
+        }
+    },
+
     setValue: function (v) {
         this.buttonGroup.setValue(v);
     },
@@ -14830,6 +14876,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.text = BI.createWidget({
             type: "bi.label",
+            cls: "select-text-label",
             textAlign: "left",
             height: o.height,
             text: o.text,

dist/core.css

@@ -981,6 +981,55 @@ textarea {
 .bi-list-item-active3.disabled:active .bi-high-light {
   color: #9ea6b2 !important;
 }
+.bi-theme-dark .bi-list-item-active3:hover,
+.bi-theme-dark .bi-list-item-active3.hover {
+  color: #ffffff;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:active,
+.bi-theme-dark .bi-list-item-active3.active {
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-input,
+.bi-theme-dark .bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3.disabled,
+.bi-theme-dark .bi-list-item-active3.disabled:hover,
+.bi-theme-dark .bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/core.js

@@ -28916,10 +28916,10 @@ BI.extend(BI.DOM, {
     };
 
     BI.Actions = {
-        runAction: function (type, config) {
+        runAction: function (type, event, config) {
             BI.each(actions[type], function (i, act) {
                 try {
-                    act(config);
+                    act(event, config);
                 } catch (e) {
                     console.error(e);
                 }

dist/core_without_normalize.css

@@ -703,6 +703,55 @@ textarea {
 .bi-list-item-active3.disabled:active .bi-high-light {
   color: #9ea6b2 !important;
 }
+.bi-theme-dark .bi-list-item-active3:hover,
+.bi-theme-dark .bi-list-item-active3.hover {
+  color: #ffffff;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:active,
+.bi-theme-dark .bi-list-item-active3.active {
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-input,
+.bi-theme-dark .bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3.disabled,
+.bi-theme-dark .bi-list-item-active3.disabled:hover,
+.bi-theme-dark .bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/demo.js

@@ -2030,7 +2030,6 @@ Demo.IconTextValueCombo = BI.inherit(BI.Widget, {
                 type: "bi.icon_text_value_combo",
                 text: "默认值",
                 // defaultIconCls: "next-page-h-font",
-                value: 1,
                 width: 300,
                 iconHeight: 16,
                 iconWidth: 16,
@@ -2382,6 +2381,42 @@ BI.shortcut("demo.calendar", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
         baseCls: "demo-func"
     },
 
+    render: function () {
+        return {
+            type: "bi.vertical",
+            items: BI.createItems([{
+                text: "bi-list-item",
+                cls: "bi-list-item"
+            }, {
+                text: "bi-list-item-simple",
+                cls: "bi-list-item-simple"
+            }, {
+                text: "bi-list-item-effect",
+                cls: "bi-list-item-effect"
+            }, {
+                text: "bi-list-item-active",
+                cls: "bi-list-item-active"
+            }, {
+                text: "bi-list-item-active2",
+                cls: "bi-list-item-active2"
+            }, {
+                text: "bi-list-item-active3",
+                cls: "bi-list-item-active3"
+            }, {
+                text: "bi-list-item-select",
+                cls: "bi-list-item-select"
+            }], {
+                type: "bi.text_item"
+            }),
+            vgap: 10
+        };
+    }
+});
+BI.shortcut("demo.click_item_effect", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
+    props: {
+        baseCls: "demo-func"
+    },
+
     render: function () {
         var editor = BI.createWidget({
             type: "bi.text_editor",
@@ -5408,6 +5443,10 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
     pId: 3,
     text: "bi.segment",
     value: "demo.segment"
+}, {
+    pId: 3,
+    text: "点击项样式查看",
+    value: "demo.click_item_effect"
 }];Demo.CATEGORY_CONFIG = [{
     id: 100000,
     text: "专题"

dist/fineui.css

@@ -981,6 +981,55 @@ textarea {
 .bi-list-item-active3.disabled:active .bi-high-light {
   color: #9ea6b2 !important;
 }
+.bi-theme-dark .bi-list-item-active3:hover,
+.bi-theme-dark .bi-list-item-active3.hover {
+  color: #ffffff;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:active,
+.bi-theme-dark .bi-list-item-active3.active {
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-input,
+.bi-theme-dark .bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3.disabled,
+.bi-theme-dark .bi-list-item-active3.disabled:hover,
+.bi-theme-dark .bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);
@@ -1979,6 +2028,10 @@ textarea {
   display: none;
 }
 
+.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
+  color: #ff4949;
+}
+
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }
@@ -2597,14 +2650,14 @@ li.CodeMirror-hint-active {
 }
 .bi-segment > .first-element {
   border-left: 1px solid #3685f2;
-  -webkit-border-radius: 6px 0px 0px 6px;
+  -webkit-border-radius: 2px 0px 0px 2px;
-  -moz-border-radius: 6px 0px 0px 6px;
+  -moz-border-radius: 2px 0px 0px 2px;
-  border-radius: 6px 0px 0px 6px;
+  border-radius: 2px 0px 0px 2px;
 }
 .bi-segment > .last-element {
-  -webkit-border-radius: 0px 6px 6px 0px;
+  -webkit-border-radius: 0px 2px 2px 0px;
-  -moz-border-radius: 0px 6px 6px 0px;
+  -moz-border-radius: 0px 2px 2px 0px;
-  border-radius: 0px 6px 6px 0px;
+  border-radius: 0px 2px 2px 0px;
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {
@@ -4537,9 +4590,14 @@ textarea::-webkit-scrollbar-thumb:hover {
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
   _background: none;
 }
+.auto-color-normal-disabled-background {
+  background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
+  _background: none;
+}
 .trans-color-background {
-  background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_color.png') no-repeat center center;
+  background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_color.png');
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/trans_normal.png');
   _background: none;
 }
 @font-face {
@@ -4767,7 +4825,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .dot-e-font:hover .b-font:before,
 .dot-e-font.hover .b-font:before {
@@ -4780,11 +4838,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font.active .b-font:before {
   content: "\e762";
-  color: #232e40;
+  color: #3685f2;
 }
 .dot-e-font.disabled .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .pull-right-font .b-font {
   font-size: 16px;

dist/fineui.js

@@ -29165,10 +29165,10 @@ BI.extend(BI.DOM, {
     };
 
     BI.Actions = {
-        runAction: function (type, config) {
+        runAction: function (type, event, config) {
             BI.each(actions[type], function (i, act) {
                 try {
-                    act(config);
+                    act(event, config);
                 } catch (e) {
                     console.error(e);
                 }
@@ -36396,7 +36396,7 @@ BI.Single = BI.inherit(BI.Widget, {
             warningTitle: null,
             tipType: null, // success或warning
             value: null,
-            belowMouse: false   // title是否跟随鼠标
+            belowMouse: false   // title是否跟随鼠标,
         });
     },
 
@@ -36407,6 +36407,10 @@ BI.Single = BI.inherit(BI.Widget, {
         var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
         if (BI.isKey(title)) {
             BI.Tooltips.show(e, this.getName(), title, type, this, opt);
+            if (opt.action) {
+                BI.Actions.runAction(opt.action, "hover", opt, title);
+            }
+            BI.Actions.runGlobalAction("hover", opt, title);
         }
     },
 
@@ -36959,9 +36963,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
             this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
             this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
             if (o.action) {
-                BI.Actions.runAction(o.action, o);
+                BI.Actions.runAction(o.action, "click", o);
             }
-            BI.Actions.runGlobalAction(o);
+            BI.Actions.runGlobalAction("click", o);
         }
     },
 
@@ -77426,15 +77430,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
     },
 
     _showPreColor: function (color) {
-        if (color === "") {
+        if(this.isEnabled()) {
-            this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
+            if (color === "") {
-        } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
-            this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            }
         } else {
-            this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            if (color === "") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
+            }
         }
     },
 
+    _setEnable: function (enable) {
+        BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
+        this.mask.setVisible(!enable);
+    },
+
     setValue: function (color) {
         if (color === "transparent") {
             this.transparent.setSelected(true);
@@ -78716,7 +78735,7 @@ BI.shortcut("bi.icon_combo_trigger", BI.IconComboTrigger);/**
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-icon-text-value-combo",
+            baseCls: "bi-icon-text-value-combo",
             height: 24,
             iconHeight: null,
             iconWidth: null,
@@ -78767,9 +78786,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         }
     },
 
+    _checkError: function (v) {
+        if(BI.isNotNull(v)) {
+            v = BI.isArray(v) ? v : [v];
+            var result = BI.find(this.options.items, function (idx, item) {
+                return BI.contains(v, item.value);
+            });
+            if (BI.isNull(result)) {
+                this.element.removeClass("combo-error").addClass("combo-error");
+            } else {
+                this.element.removeClass("combo-error");
+            }
+        }
+    },
+
     setValue: function (v) {
         this.trigger.setValue(v);
         this.popup.setValue(v);
+        this._checkError(v);
     },
 
     getValue: function () {
@@ -83768,6 +83802,13 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             }
         },
 
+        restoreRngAndClearRange: function () {
+            if (this.savedRange) {
+                this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
+                this.selRng(this.savedRange, this.savedSel);
+            }
+        },
+
         keyDown: function (e, t) {
             this.ne.fireEvent("keydown", e);
         },
@@ -84345,8 +84386,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
         return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
             command: "FontName",
-            width: 50,
+            width: 100,
-            height: 20
+            height: 24
         });
     },
 
@@ -84418,7 +84459,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
             command: "FontSize",
             width: 50,
-            height: 20
+            height: 24
         });
     },
 
@@ -84686,6 +84727,15 @@ BI.Segment = BI.inherit(BI.Widget, {
         });
     },
 
+    _setEnable: function (enable) {
+        BI.Segment.superclass._setEnable.apply(this, arguments);
+        if (enable === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (enable === false) {
+            this.element.addClass("base-disabled disabled");
+        }
+    },
+
     setValue: function (v) {
         this.buttonGroup.setValue(v);
     },
@@ -87639,6 +87689,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.text = BI.createWidget({
             type: "bi.label",
+            cls: "select-text-label",
             textAlign: "left",
             height: o.height,
             text: o.text,
@@ -90672,6 +90723,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                     item.el.height = self.constants.height;
                     item.el.iconCls2 = self.constants.nextIcon;
                     item.popup = {
+                        lgap: 1,
                         el: {
                             type: "bi.button_tree",
                             chooseType: 0,

dist/resource.css

@@ -319,9 +319,14 @@ textarea::-webkit-scrollbar-thumb:hover {
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
   _background: none;
 }
+.auto-color-normal-disabled-background {
+  background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
+  _background: none;
+}
 .trans-color-background {
-  background: url('images/1x/background/trans_color.png') no-repeat center center;
+  background: url('images/1x/background/trans_normal.png') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_color.png');
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
   _background: none;
 }
 @font-face {
@@ -549,7 +554,7 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .dot-e-font:hover .b-font:before,
 .dot-e-font.hover .b-font:before {
@@ -562,11 +567,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .dot-e-font.active .b-font:before {
   content: "\e762";
-  color: #232e40;
+  color: #3685f2;
 }
 .dot-e-font.disabled .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .pull-right-font .b-font {
   font-size: 16px;

dist/widget.js

@@ -2665,6 +2665,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
                     item.el.height = self.constants.height;
                     item.el.iconCls2 = self.constants.nextIcon;
                     item.popup = {
+                        lgap: 1,
                         el: {
                             type: "bi.button_tree",
                             chooseType: 0,

public/css/background.css

@@ -248,8 +248,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
   _background: none;
 }
+.auto-color-normal-disabled-background {
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
+  _background: none;
+}
 .trans-color-background {
-  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png') no-repeat center center;
+  background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_color.png');
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/trans_normal.png');
   _background: none;
 }

public/css/font.css

@@ -223,7 +223,7 @@
 }
 .dot-e-font .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .dot-e-font:hover .b-font:before,
 .dot-e-font.hover .b-font:before {
@@ -236,11 +236,11 @@
 }
 .dot-e-font.active .b-font:before {
   content: "\e762";
-  color: #232e40;
+  color: #3685f2;
 }
 .dot-e-font.disabled .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .pull-right-font .b-font {
   font-size: 16px;

src/base/single/button/button.basic.js

@@ -302,9 +302,9 @@ BI.BasicButton = BI.inherit(BI.Single, {
             this.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.CLICK, v, this);
             this.fireEvent(BI.BasicButton.EVENT_CHANGE, v, this);
             if (o.action) {
-                BI.Actions.runAction(o.action, o);
+                BI.Actions.runAction(o.action, "click", o);
             }
-            BI.Actions.runGlobalAction(o);
+            BI.Actions.runGlobalAction("click", o);
         }
     },
 

src/base/single/single.js

@@ -19,7 +19,7 @@ BI.Single = BI.inherit(BI.Widget, {
             warningTitle: null,
             tipType: null, // success或warning
             value: null,
-            belowMouse: false   // title是否跟随鼠标
+            belowMouse: false   // title是否跟随鼠标,
         });
     },
 
@@ -30,6 +30,10 @@ BI.Single = BI.inherit(BI.Widget, {
         var title = type === "success" ? this.getTitle() : (this.getWarningTitle() || this.getTitle());
         if (BI.isKey(title)) {
             BI.Tooltips.show(e, this.getName(), title, type, this, opt);
+            if (opt.action) {
+                BI.Actions.runAction(opt.action, "hover", opt, title);
+            }
+            BI.Actions.runGlobalAction("hover", opt, title);
         }
     },
 

src/case/colorchooser/colorpicker/editor.colorpicker.js

@@ -171,15 +171,30 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
     },
 
     _showPreColor: function (color) {
-        if (color === "") {
+        if(this.isEnabled()) {
-            this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
+            if (color === "") {
-        } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-background").addClass("auto-color-normal-background");
-            this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-background").addClass("trans-color-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            }
         } else {
-            this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-background").removeClass("trans-color-background");
+            if (color === "") {
+                this.colorShow.element.css("background-color", "").removeClass("trans-color-disabled-background").addClass("auto-color-normal-disabled-background");
+            } else if (color === "transparent") {
+                this.colorShow.element.css("background-color", "").removeClass("auto-color-normal-disabled-background").addClass("trans-color-disabled-background");
+            } else {
+                this.colorShow.element.css({"background-color": color}).removeClass("auto-color-normal-disabled-background").removeClass("trans-color-disabled-background");
+            }
         }
     },
 
+    _setEnable: function (enable) {
+        BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
+        this.mask.setVisible(!enable);
+    },
+
     setValue: function (color) {
         if (color === "transparent") {
             this.transparent.setSelected(true);

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -5,7 +5,7 @@
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseClass: "bi-icon-text-value-combo",
+            baseCls: "bi-icon-text-value-combo",
             height: 24,
             iconHeight: null,
             iconWidth: null,
@@ -56,9 +56,24 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         }
     },
 
+    _checkError: function (v) {
+        if(BI.isNotNull(v)) {
+            v = BI.isArray(v) ? v : [v];
+            var result = BI.find(this.options.items, function (idx, item) {
+                return BI.contains(v, item.value);
+            });
+            if (BI.isNull(result)) {
+                this.element.removeClass("combo-error").addClass("combo-error");
+            } else {
+                this.element.removeClass("combo-error");
+            }
+        }
+    },
+
     setValue: function (v) {
         this.trigger.setValue(v);
         this.popup.setValue(v);
+        this._checkError(v);
     },
 
     getValue: function () {

src/case/richeditor/niceditor/niceditor.js

@@ -254,6 +254,13 @@
             }
         },
 
+        restoreRngAndClearRange: function () {
+            if (this.savedRange) {
+                this.savedRange.setStart(this.savedRange.endContainer, this.savedRange.endOffset);
+                this.selRng(this.savedRange, this.savedSel);
+            }
+        },
+
         keyDown: function (e, t) {
             this.ne.fireEvent("keydown", e);
         },

src/case/richeditor/plugins/combo.fontfamily.js

@@ -3,8 +3,8 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
         return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
             command: "FontName",
-            width: 50,
+            width: 100,
-            height: 20
+            height: 24
         });
     },
 

src/case/richeditor/plugins/combo.sizechooser.js

@@ -11,7 +11,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
             baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
             command: "FontSize",
             width: 50,
-            height: 20
+            height: 24
         });
     },
 

src/case/segment/segment.js

@@ -39,6 +39,15 @@ BI.Segment = BI.inherit(BI.Widget, {
         });
     },
 
+    _setEnable: function (enable) {
+        BI.Segment.superclass._setEnable.apply(this, arguments);
+        if (enable === true) {
+            this.element.removeClass("base-disabled disabled");
+        } else if (enable === false) {
+            this.element.addClass("base-disabled disabled");
+        }
+    },
+
     setValue: function (v) {
         this.buttonGroup.setValue(v);
     },

src/case/trigger/trigger.icon.text.js

@@ -25,6 +25,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.text = BI.createWidget({
             type: "bi.label",
+            cls: "select-text-label",
             textAlign: "left",
             height: o.height,
             text: o.text,

src/core/inject.js

@@ -177,10 +177,10 @@
     };
 
     BI.Actions = {
-        runAction: function (type, config) {
+        runAction: function (type, event, config) {
             BI.each(actions[type], function (i, act) {
                 try {
-                    act(config);
+                    act(event, config);
                 } catch (e) {
                     console.error(e);
                 }

src/css/base/combo/combo.css

@@ -130,6 +130,10 @@
   display: none;
 }
 
+.bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
+  color: #ff4949;
+}
+
 .bi-text-value-combo.combo-error .bi-select-text-trigger .select-text-label {
   color: #ff4949;
 }

src/css/base/segment/segment.css

@@ -9,14 +9,14 @@
 }
 .bi-segment > .first-element {
   border-left: 1px solid #3685f2;
-  -webkit-border-radius: 6px 0px 0px 6px;
+  -webkit-border-radius: 2px 0px 0px 2px;
-  -moz-border-radius: 6px 0px 0px 6px;
+  -moz-border-radius: 2px 0px 0px 2px;
-  border-radius: 6px 0px 0px 6px;
+  border-radius: 2px 0px 0px 2px;
 }
 .bi-segment > .last-element {
-  -webkit-border-radius: 0px 6px 6px 0px;
+  -webkit-border-radius: 0px 2px 2px 0px;
-  -moz-border-radius: 0px 6px 6px 0px;
+  -moz-border-radius: 0px 2px 2px 0px;
-  border-radius: 0px 6px 6px 0px;
+  border-radius: 0px 2px 2px 0px;
 }
 .bi-segment.disabled > .center-element,
 .bi-segment.disabled > .first-element {

src/css/core/utils/common.css

@@ -703,6 +703,55 @@ textarea {
 .bi-list-item-active3.disabled:active .bi-high-light {
   color: #9ea6b2 !important;
 }
+.bi-theme-dark .bi-list-item-active3:hover,
+.bi-theme-dark .bi-list-item-active3.hover {
+  color: #ffffff;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.hover .bi-input {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.hover .bi-textarea {
+  color: #ffffff;
+}
+.bi-theme-dark .bi-list-item-active3:active,
+.bi-theme-dark .bi-list-item-active3.active {
+  color: #3685f2;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-input,
+.bi-theme-dark .bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3:active .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-theme-dark .bi-list-item-active3.disabled,
+.bi-theme-dark .bi-list-item-active3.disabled:hover,
+.bi-theme-dark .bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-input,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-input {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-textarea {
+  color: #878d9f !important;
+}
+.bi-theme-dark .bi-list-item-active3.disabled .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-theme-dark .bi-list-item-active3.disabled:active .bi-high-light {
+  color: #878d9f !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

src/css/resource/background.css

@@ -248,8 +248,13 @@
   _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
   _background: none;
 }
+.auto-color-normal-disabled-background {
+  background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
+  _background: none;
+}
 .trans-color-background {
-  background: url('images/1x/background/trans_color.png') no-repeat center center;
+  background: url('images/1x/background/trans_normal.png') no-repeat center center;
-  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_color.png');
+  _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/trans_normal.png');
   _background: none;
 }

src/css/resource/font.css

@@ -223,7 +223,7 @@
 }
 .dot-e-font .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .dot-e-font:hover .b-font:before,
 .dot-e-font.hover .b-font:before {
@@ -236,11 +236,11 @@
 }
 .dot-e-font.active .b-font:before {
   content: "\e762";
-  color: #232e40;
+  color: #3685f2;
 }
 .dot-e-font.disabled .b-font:before {
   content: "\e762";
-  color: #ffffff;
+  color: transparent;
 }
 .pull-right-font .b-font {
   font-size: 16px;

src/less/base/combo/combo.textvalue.icon.less

@@ -0,0 +1,11 @@
+@import "../../index";
+
+.bi-icon-text-value-combo{
+  &.combo-error {
+    & .bi-text-trigger {
+      & .select-text-label{
+        color: @color-bi-text-failure;
+      }
+    }
+  }
+}

src/less/base/segment/segment.less

@@ -10,10 +10,10 @@
   }
   & > .first-element{
     border-left: 1px solid @color-bi-border-highlight;
-    .border-corner-radius(6px,0px,0px,6px)
+    .border-corner-radius(2px,0px,0px,2px)
   }
   & > .last-element{
-    .border-corner-radius(0px,6px,6px,0px)
+    .border-corner-radius(0px,2px,2px,0px)
   }
   &.disabled > .center-element, &.disabled > .first-element{
     border-color: @color-bi-border-disabled;

src/less/core/utils/common.less

@@ -707,6 +707,46 @@ textarea {
   }
 }
 
+.bi-theme-dark {
+  .bi-list-item-active3 {
+    &:hover, &.hover {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      .background-color(@color-bi-background-highlight, 6%);
+    }
+    &:active, &.active {
+      color: @color-bi-text-highlight;
+      & .bi-input {
+        color: @color-bi-text-highlight;
+      }
+      & .bi-textarea {
+        color: @color-bi-text-highlight;
+      }
+      .background-color(@color-bi-background-highlight, 6%);
+    }
+    &.disabled {
+      &, &:hover, &:active {
+        background-color: transparent !important;
+        color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-high-light {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+      }
+    }
+  }
+}
+
 // 激活和选中时背景高亮
 .bi-list-item-select {
   &:hover, &.hover {

src/less/lib/background.less

@@ -1,6 +1,8 @@
 @background-auto-color: "background/auto_color.png";
 @background-auto-color-normal: "background/auto_color_normal.png";
-@background-trans-color: "background/trans_color.png";
+@background-auto-color-normal-disabled: "background/auto_color_normal.png";
+@background-trans-color: "background/trans_normal.png";
+@background-trans-color-disabled: "background/trans_disable.png";
 
 @background-farbtastic-wheel:"background/wheel.png";
 @background-farbtastic-overlay:"background/mask.png";