From 53aca9d50229fdcfb0f19b75eccfe42bb393b5b9 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xlz26296x@163.com>
Date: Mon, 8 Jul 2024 10:07:37 +0800
Subject: [PATCH] releases 3.8.10

---
 package.json                | 2 +-
 packages/table/src/table.js | 8 +++++---
 styles/table.scss           | 9 ++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c7768a927..99ee210f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.10-beta.1",
+  "version": "3.8.10",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
diff --git a/packages/table/src/table.js b/packages/table/src/table.js
index 69d72502a..7d60ae801 100644
--- a/packages/table/src/table.js
+++ b/packages/table/src/table.js
@@ -863,9 +863,9 @@ export default {
       if (this.mouseOpts.area && this.mouseOpts.selected) {
         warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
       }
-      if (this.mouseOpts.area && this.checkboxOpts.range) {
-        warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
-      }
+      // if (this.mouseOpts.area && this.checkboxOpts.range) {
+      //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
+      // }
       if (this.treeConfig && this.mouseOpts.area) {
         errLog('vxe.error.noTree', ['mouse-config.area'])
       }
@@ -1057,6 +1057,7 @@ export default {
       hasTip,
       columnOpts,
       rowOpts,
+      checkboxOpts,
       loadingOpts,
       editRules
     } = this
@@ -1072,6 +1073,7 @@ export default {
         'cell--area': mouseConfig && mouseOpts.area,
         'row--highlight': rowOpts.isHover || highlightHoverRow,
         'column--highlight': columnOpts.isHover || highlightHoverColumn,
+        'checkbox--range': checkboxOpts.range,
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
diff --git a/styles/table.scss b/styles/table.scss
index 423ab0532..76f68a283 100644
--- a/styles/table.scss
+++ b/styles/table.scss
@@ -611,8 +611,15 @@
       }
     }
   }
+  &.checkbox--range,
+  &.cell--selected {
+    .vxe-body--column {
+      user-select: none;
+    }
+  }
   &.cell--area {
-    .vxe-body--row {
+    .vxe-table--body-wrapper,
+    .vxe-body--column {
       user-select: none;
     }
   }