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

* commit '90d87b9c9bae154a22eb2f7fa3af221b7a380d1b':
  update
  BI-24616

dist/base.js

@@ -20523,7 +20523,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
             type: "bi.label",
             cls: "bubble-text" + (" bubble-" + o.level),
             text: o.text,
-            hgap: 10,
+            hgap: 5,
             height: 18
         }));
     },

dist/bundle.css

@@ -932,6 +932,55 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #666666 !important;
 }
+.bi-list-item-active3:hover,
+.bi-list-item-active3.hover {
+  color: #1a1a1a;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-list-item-active3:hover .bi-input,
+.bi-list-item-active3.hover .bi-input {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:hover .bi-textarea,
+.bi-list-item-active3.hover .bi-textarea {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:active,
+.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-list-item-active3:active .bi-input,
+.bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-active3:active .bi-textarea,
+.bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-active3.disabled,
+.bi-list-item-active3.disabled:hover,
+.bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-input,
+.bi-list-item-active3.disabled:hover .bi-input,
+.bi-list-item-active3.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-textarea,
+.bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-list-item-active3.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-high-light,
+.bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-list-item-active3.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/bundle.js

@@ -56293,7 +56293,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
             type: "bi.label",
             cls: "bubble-text" + (" bubble-" + o.level),
             text: o.text,
-            hgap: 10,
+            hgap: 5,
             height: 18
         }));
     },
@@ -112778,6 +112778,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
+            text: o.text,
             element: this,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
@@ -113769,6 +113770,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
             element: this,
+            text: o.text,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
             width: o.width,

dist/core.css

@@ -932,6 +932,55 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #666666 !important;
 }
+.bi-list-item-active3:hover,
+.bi-list-item-active3.hover {
+  color: #1a1a1a;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-list-item-active3:hover .bi-input,
+.bi-list-item-active3.hover .bi-input {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:hover .bi-textarea,
+.bi-list-item-active3.hover .bi-textarea {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:active,
+.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-list-item-active3:active .bi-input,
+.bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-active3:active .bi-textarea,
+.bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-active3.disabled,
+.bi-list-item-active3.disabled:hover,
+.bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-input,
+.bi-list-item-active3.disabled:hover .bi-input,
+.bi-list-item-active3.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-textarea,
+.bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-list-item-active3.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-high-light,
+.bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-list-item-active3.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/core_without_normalize.css

@@ -654,6 +654,55 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #666666 !important;
 }
+.bi-list-item-active3:hover,
+.bi-list-item-active3.hover {
+  color: #1a1a1a;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-list-item-active3:hover .bi-input,
+.bi-list-item-active3.hover .bi-input {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:hover .bi-textarea,
+.bi-list-item-active3.hover .bi-textarea {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:active,
+.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-list-item-active3:active .bi-input,
+.bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-active3:active .bi-textarea,
+.bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-active3.disabled,
+.bi-list-item-active3.disabled:hover,
+.bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-input,
+.bi-list-item-active3.disabled:hover .bi-input,
+.bi-list-item-active3.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-textarea,
+.bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-list-item-active3.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-high-light,
+.bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-list-item-active3.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/fineui.css

@@ -932,6 +932,55 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #666666 !important;
 }
+.bi-list-item-active3:hover,
+.bi-list-item-active3.hover {
+  color: #1a1a1a;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-list-item-active3:hover .bi-input,
+.bi-list-item-active3.hover .bi-input {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:hover .bi-textarea,
+.bi-list-item-active3.hover .bi-textarea {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:active,
+.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-list-item-active3:active .bi-input,
+.bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-active3:active .bi-textarea,
+.bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-active3.disabled,
+.bi-list-item-active3.disabled:hover,
+.bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-input,
+.bi-list-item-active3.disabled:hover .bi-input,
+.bi-list-item-active3.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-textarea,
+.bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-list-item-active3.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-high-light,
+.bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-list-item-active3.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

dist/fineui.js

@@ -56536,7 +56536,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
             type: "bi.label",
             cls: "bubble-text" + (" bubble-" + o.level),
             text: o.text,
-            hgap: 10,
+            hgap: 5,
             height: 18
         }));
     },
@@ -113021,6 +113021,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
+            text: o.text,
             element: this,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
@@ -114012,6 +114013,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
             element: this,
+            text: o.text,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
             width: o.width,

dist/widget.js

@@ -25126,6 +25126,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
+            text: o.text,
             element: this,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
@@ -26117,6 +26118,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
             element: this,
+            text: o.text,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
             width: o.width,

src/base/single/tip/tip.bubble.js

@@ -36,7 +36,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
             type: "bi.label",
             cls: "bubble-text" + (" bubble-" + o.level),
             text: o.text,
-            hgap: 10,
+            hgap: 5,
             height: 18
         }));
     },

src/component/allvaluechooser/combo.allvaluechooser.js

@@ -27,6 +27,7 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
         }
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
+            text: o.text,
             element: this,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),

src/component/valuechooser/combo.valuechooser.js

@@ -28,6 +28,7 @@ BI.ValueChooserCombo = BI.inherit(BI.AbstractValueChooser, {
         this.combo = BI.createWidget({
             type: "bi.multi_select_combo",
             element: this,
+            text: o.text,
             itemsCreator: BI.bind(this._itemsCreator, this),
             valueFormatter: BI.bind(this._valueFormatter, this),
             width: o.width,

src/css/core/utils/common.css

@@ -654,6 +654,55 @@ textarea {
 .bi-theme-dark .bi-list-item-active2.disabled:active .bi-high-light {
   color: #666666 !important;
 }
+.bi-list-item-active3:hover,
+.bi-list-item-active3.hover {
+  color: #1a1a1a;
+  background-color: rgba(54, 133, 242, 0.06);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#0f3685f2,endColorstr=#0f3685f2);
+}
+.bi-list-item-active3:hover .bi-input,
+.bi-list-item-active3.hover .bi-input {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:hover .bi-textarea,
+.bi-list-item-active3.hover .bi-textarea {
+  color: #1a1a1a;
+}
+.bi-list-item-active3:active,
+.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-list-item-active3:active .bi-input,
+.bi-list-item-active3.active .bi-input {
+  color: #3685f2;
+}
+.bi-list-item-active3:active .bi-textarea,
+.bi-list-item-active3.active .bi-textarea {
+  color: #3685f2;
+}
+.bi-list-item-active3.disabled,
+.bi-list-item-active3.disabled:hover,
+.bi-list-item-active3.disabled:active {
+  background-color: transparent !important;
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-input,
+.bi-list-item-active3.disabled:hover .bi-input,
+.bi-list-item-active3.disabled:active .bi-input {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-textarea,
+.bi-list-item-active3.disabled:hover .bi-textarea,
+.bi-list-item-active3.disabled:active .bi-textarea {
+  color: #9ea6b2 !important;
+}
+.bi-list-item-active3.disabled .bi-high-light,
+.bi-list-item-active3.disabled:hover .bi-high-light,
+.bi-list-item-active3.disabled:active .bi-high-light {
+  color: #9ea6b2 !important;
+}
 .bi-list-item-select:hover,
 .bi-list-item-select.hover {
   background-color: rgba(54, 133, 242, 0.06);

src/less/core/utils/common.less

@@ -484,7 +484,7 @@ textarea {
   }
 }
 
-//文字和背景hover和active时变化
+//文字和背景hover和active时变化, hover和点击时文本和背景变化，active后文本变化，背景不变化
 .bi-list-item-active {
   &:hover, &.hover {
     color: @color-bi-text-black;
@@ -572,7 +572,7 @@ textarea {
   }
 }
 
-//文字和背景hover和active时变化
+//文字和背景hover和active时变化 hover和点击时边框变化，active后背景和边框变化
 .bi-list-item-active2 {
   &:hover, &.hover {
     color: @color-bi-text-black;
@@ -668,6 +668,45 @@ textarea {
   }
 }
 
+//文字和背景hover和active时变化 hover
+.bi-list-item-active3 {
+  &:hover, &.hover {
+    color: @color-bi-text-black;
+    & .bi-input {
+      color: @color-bi-text-black;
+    }
+    & .bi-textarea {
+      color: @color-bi-text-black;
+    }
+    .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 !important;
+      & .bi-input {
+        color: @color-bi-text-disabled !important;
+      }
+      & .bi-textarea {
+        color: @color-bi-text-disabled !important;
+      }
+      & .bi-high-light {
+        color: @color-bi-text-disabled !important;
+      }
+    }
+  }
+}
+
 // 激活和选中时背景高亮
 .bi-list-item-select {
   &:hover, &.hover {