Merge pull request #535 from xintaoLi/staging

fix: shift + click stop user-select
TencentBlueKing · May 13, 2024 · 722fedf · 722fedf
2 parents 4f0c229 + a35efcd
commit 722fedf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/components/table/table-column.js b/src/components/table/table-column.js
@@ -116,10 +116,6 @@ const forced = {
           event.stopImmediatePropagation()
 
           if (disabled) return
-          const isShift = store.table.shiftMulti.isShift()
-          if (isShift) {
-            store.table.$el.style.setProperty('user-select', 'none')
-          }
 
           const result = await beforeChange()
           result !== false && store.commit('rowSelectedChanged', row, $index)

diff --git a/src/components/table/table-store.js b/src/components/table/table-store.js
@@ -424,9 +424,6 @@ class TableStore {
               states.selection.push(child)
             }
           })
-          setTimeout(() => {
-            this.table.$el.style.setProperty('user-select', 'inherit')
-          })
         }
 
         if (changed) {

diff --git a/src/components/table/use-shift-key.js b/src/components/table/use-shift-key.js
@@ -34,12 +34,14 @@ export default (props) => {
   const handleKeyDown = (e) => {
     if (e.key === 'Shift') {
       isShiftKeyDown = true
+      document.body.style.userSelect = 'none'
     }
   }
 
   const handleKeyUp = (e) => {
     if (e.key === 'Shift') {
       isShiftKeyDown = false
+      document.body.style.userSelect = ''
       clearStore()
     }
   }