DEC-3303

dist/base.js

@@ -3271,7 +3271,7 @@ BI.Combo = BI.inherit(BI.Widget, {
         //     return;
         // }
         // BI-10290 公式combo双击公式内容会收起
-        if (this.element.find(e.target).length > 0
+        if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
             || (this.popupView && this.popupView.element.find(e.target).length > 0)
             || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;

dist/bundle.css

@@ -4601,6 +4601,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,

dist/bundle.js

@@ -39079,7 +39079,7 @@ BI.Combo = BI.inherit(BI.Widget, {
         //     return;
         // }
         // BI-10290 公式combo双击公式内容会收起
-        if (this.element.find(e.target).length > 0
+        if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
             || (this.popupView && this.popupView.element.find(e.target).length > 0)
             || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;

dist/fineui.css

@@ -4601,6 +4601,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,

dist/fineui.js

@@ -39328,7 +39328,7 @@ BI.Combo = BI.inherit(BI.Widget, {
         //     return;
         // }
         // BI-10290 公式combo双击公式内容会收起
-        if (this.element.find(e.target).length > 0
+        if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
             || (this.popupView && this.popupView.element.find(e.target).length > 0)
             || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;

dist/resource.css

@@ -25,6 +25,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,

public/css/app.css

@@ -25,6 +25,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,

src/base/combination/combo.js

@@ -261,7 +261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
         //     return;
         // }
         // BI-10290 公式combo双击公式内容会收起
-        if (this.element.find(e.target).length > 0
+        if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel")
             || (this.popupView && this.popupView.element.find(e.target).length > 0)
             || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
             return;

src/css/resource/app.css

@@ -25,6 +25,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,

src/less/resource/app.less

@@ -23,6 +23,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 

ui/css/app.css

@@ -25,6 +25,7 @@ body {
   -kthml-user-focus: normal;
   -moz-user-focus: normal;
   -moz-outline: 0 none;
+  -ms-overflow-style: -ms-autohiding-scrollbar;
   outline: 0 none;
 }
 div::-webkit-scrollbar,