Pull request #2210: 无JIRA任务 修复bi-border-hover在destroyWhenDestroy计算失误的问题 + 去掉combo上的bi-focus-shadow class

Merge in VISUAL/fineui from ~TELLER/fineui:master to master

* commit 'e1e95ed2332181c40c4d3b0662300e5436527173':
  refactor: 放到if中
  fix: 去掉所有combo上的bi-focus-shadow
  BI-94929 fix: 修复bi-border-hover计算失误的问题

src/base/combination/combo.js

@@ -286,19 +286,24 @@
             if (isHide === false) {
                 return;
             }
-            this._hideView();
+            this._hideView(e);
             return true;
         },
 
-        _hideView: function () {
+        _hideView: function (e) {
             this.fireEvent(BI.Combo.EVENT_BEFORE_HIDEVIEW);
             if (this.options.destroyWhenHide === true) {
                 this.popupView && this.popupView.destroy();
                 this.popupView = null;
                 this._rendered = false;
+
+                if (!e || !this.combo.element.__isMouseInBounds__(e)) {
+                    this.element.removeClass(this.options.hoverClass);
+                }
             } else {
                 this.popupView && this.popupView.invisible();
             }
+
             this.element.removeClass(this.options.comboClass);
             delete needHideWhenAnotherComboOpen[this.getName()];
 
@@ -525,8 +530,8 @@
             }
         },
 
-        hideView: function () {
+        hideView: function (e) {
-            this._hideView();
+            this._hideView(e);
         },
 
         getView: function () {

src/widget/dynamicdate/dynamicdate.combo.js

@@ -48,7 +48,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                 items: [{
                     el: {
                         type: "bi.combo",
-                        cls: "bi-border bi-border-radius bi-focus-shadow",
+                        cls: "bi-border bi-border-radius",
                         container: opts.container,
                         ref: function () {
                             self.combo = this;

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -48,7 +48,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                 items: [{
                     el: {
                         type: "bi.combo",
-                        cls: "bi-border bi-border-radius bi-focus-shadow",
+                        cls: "bi-border bi-border-radius",
                         destroyWhenHide: true,
                         container: opts.container,
                         ref: function () {

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -75,7 +75,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -79,7 +79,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,

src/widget/multiselect/multiselect.combo.js

@@ -123,7 +123,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multiselect/multiselect.combo.nobar.js

@@ -122,7 +122,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: false,
             container: o.container,
             el: this.trigger,

src/widget/multiselect/multiselect.insert.combo.js

@@ -124,7 +124,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: !o.allowEdit,
             el: this.trigger,
             adjustLength: 1,

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -116,7 +116,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: false,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.combo.js

@@ -54,7 +54,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.insert.combo.js

@@ -69,7 +69,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/multitree/multi.tree.list.combo.js

@@ -85,7 +85,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: !o.allowEdit,
             container: o.container,
             el: this.trigger,

src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@@ -111,7 +111,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-focus-shadow bi-border-radius",
+            cls: "bi-border bi-border-radius",
             toggle: false,
             container: o.container,
             el: this.trigger,

src/widget/time/time.combo.js

@@ -65,7 +65,7 @@
                     items: [{
                         el: {
                             type: "bi.combo",
-                            cls: "bi-border bi-border-radius bi-focus-shadow",
+                            cls: "bi-border bi-border-radius",
                             container: opts.container,
                             toggle: false,
                             isNeedAdjustHeight: opts.isNeedAdjustHeight,

src/widget/year/combo.year.js

@@ -1,7 +1,7 @@
 BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-year-combo bi-border bi-border-radius bi-focus-shadow",
+        baseCls: "bi-year-combo",
         behaviors: {},
         minDate: "1900-01-01", // 最小日期
         maxDate: "2099-12-31", // 最大日期
@@ -11,15 +11,13 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
-        BI.isNumeric(o.width) && (o.width -= 2);
         BI.DynamicYearCombo.superclass._init.apply(this, arguments);
         this.storeValue = o.value;
         this.trigger = BI.createWidget({
             type: "bi.dynamic_year_trigger",
             min: o.minDate,
             max: o.maxDate,
-            height: o.height,
+            height: o.height - 2,
             value: o.value || ""
         });
         this.trigger.on(BI.DynamicYearTrigger.EVENT_KEY_DOWN, function () {
@@ -61,6 +59,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
+            cls: "bi-border bi-border-radius",
             container: o.container,
             isNeedAdjustHeight: false,
             isNeedAdjustWidth: false,

src/widget/yearmonth/combo.yearmonth.js

@@ -59,7 +59,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-border-radius bi-focus-shadow",
+            cls: "bi-border bi-border-radius",
             container: o.container,
             isNeedAdjustHeight: o.isNeedAdjustHeight,
             isNeedAdjustWidth: o.isNeedAdjustWidth,

src/widget/yearquarter/combo.yearquarter.js

@@ -59,7 +59,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            cls: "bi-border bi-border-radius bi-focus-shadow",
+            cls: "bi-border bi-border-radius",
             container: o.container,
             isNeedAdjustHeight: o.isNeedAdjustHeight,
             isNeedAdjustWidth: o.isNeedAdjustWidth,