Merge pull request #3624 from dataease/dev

Merge

backend/src/main/resources/db/migration/V42__1.16.sql

@@ -288,5 +288,3 @@ WHERE `id` = 'system_2';
 
 UPDATE `dataset_table_function` SET `func` = 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN r2] [ELSE rn] END' WHERE `id` = 47;
 UPDATE `dataset_table_function` SET `func` = 'CASE expr WHEN v1 THEN r1 [WHEN v2 THEN r2] [ELSE rn] END' WHERE `id` = 96;
-ALTER TABLE `panel_app_template`
-    MODIFY COLUMN `icon` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL AFTER `version`;

frontend/src/components/ElTreeSelect/index.vue

@@ -262,12 +262,22 @@ export default {
     this._updateH()
     this.$nextTick(() => {
       on(document, 'mouseup', this._popoverHideFun)
+      this.bindScroll()
     })
   },
   beforeDestroy() {
     off(document, 'mouseup', this._popoverHideFun)
+    this.unbindScroll()
   },
   methods: {
+    bindScroll() {
+      window.onmousewheel = this._popoverHideFun
+      on(document, 'DOMMouseScroll', this._popoverHideFun)
+    },
+    unbindScroll() {
+      window.onmousewheel = null
+      off(document, 'DOMMouseScroll', this._popoverHideFun)
+    },
     showPopover() {
       this.$nextTick(() => {
         this.$refs.input.focus()