From 14f0ea2988907971d1a45cf8981c60e1da02d876 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xlz26296x@163.com>
Date: Thu, 9 May 2024 16:31:09 +0800
Subject: [PATCH] releases 4.6.11

---
 examples/App.vue                   |  2 +-
 examples/style/layout.scss         |  3 ---
 package.json                       |  2 +-
 packages/all.ts                    |  4 +++-
 packages/input/src/input.ts        |  1 +
 packages/pulldown/src/pulldown.ts  |  8 ++++----
 packages/table/src/body.ts         |  4 +++-
 packages/table/src/table.ts        | 15 +++++++++------
 packages/tools/dom.ts              |  6 ++----
 packages/v-x-e-table/src/conf.ts   |  1 +
 packages/v-x-e-table/src/config.ts |  4 +++-
 styles/theme/dark.scss             |  6 +++---
 types/table.d.ts                   |  4 ++++
 13 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index f889e2c9f8..8917573c2c 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" @click="clickEvent">
+  <div @click="clickEvent">
     <header class="page-header">
       <div class="left">
         <a href="/vxe-table/">
diff --git a/examples/style/layout.scss b/examples/style/layout.scss
index 04d2226974..3bb7d0812e 100644
--- a/examples/style/layout.scss
+++ b/examples/style/layout.scss
@@ -91,8 +91,6 @@ body,
   border-bottom: 1px solid #dcdfe6;
   box-shadow: -2px 2px 6px rgba(0, 0, 0, 0.12);
   display: flex;
-  color: #fff;
-  background-color: #24292e;
   &:after {
     content: "";
     display: block;
@@ -109,7 +107,6 @@ body,
   .title {
     padding: 0 0.4em;
     font-weight: 700;
-    color: #fff;
   }
   .left {
     display: flex;
diff --git a/package.json b/package.json
index 3ee32d680e..2d43d56465 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.6.10",
+  "version": "4.6.11",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
diff --git a/packages/all.ts b/packages/all.ts
index 323edfec94..cd2223d3dc 100644
--- a/packages/all.ts
+++ b/packages/all.ts
@@ -93,7 +93,9 @@ config({
 export function install (app: App, options: any) {
   if (XEUtils.isPlainObject(options)) {
     config(options)
-    setTheme(options)
+    if ((options as any).theme) {
+      setTheme(options)
+    }
   }
   components.forEach(component => component.install(app))
 }
diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts
index 8cac81629d..a1ab839a53 100644
--- a/packages/input/src/input.ts
+++ b/packages/input/src/input.ts
@@ -1521,6 +1521,7 @@ export default defineComponent({
           }
           const { boundingTop, boundingLeft, visibleHeight, visibleWidth } = getAbsolutePos(targetElem)
           let panelPlacement: VxeInputPropTypes.Placement = 'bottom'
+          console.log(getAbsolutePos(targetElem))
           if (transfer) {
             let left = boundingLeft
             let top = boundingTop + targetHeight
diff --git a/packages/pulldown/src/pulldown.ts b/packages/pulldown/src/pulldown.ts
index 83fb1355b0..8c412322cc 100644
--- a/packages/pulldown/src/pulldown.ts
+++ b/packages/pulldown/src/pulldown.ts
@@ -214,9 +214,9 @@ export default defineComponent({
       if (!disabled) {
         if (visiblePanel) {
           if (getEventTargetNode(evnt, panelElem).flag) {
-            updatePlacement()
+            // updatePlacement()
           } else {
-            hidePanel()
+            // hidePanel()
             pulldownMethods.dispatchEvent('hide-panel', {}, evnt)
           }
         }
@@ -231,7 +231,7 @@ export default defineComponent({
       if (!disabled) {
         reactData.isActivated = getEventTargetNode(evnt, el).flag || getEventTargetNode(evnt, panelElem).flag
         if (visiblePanel && !reactData.isActivated) {
-          hidePanel()
+          // hidePanel()
           pulldownMethods.dispatchEvent('hide-panel', {}, evnt)
         }
       }
@@ -240,7 +240,7 @@ export default defineComponent({
     const handleGlobalBlurEvent = (evnt: Event) => {
       if (reactData.visiblePanel) {
         reactData.isActivated = false
-        hidePanel()
+        // hidePanel()
         pulldownMethods.dispatchEvent('hide-panel', {}, evnt)
       }
     }
diff --git a/packages/table/src/body.ts b/packages/table/src/body.ts
index 166e951ed0..3950af44b8 100644
--- a/packages/table/src/body.ts
+++ b/packages/table/src/body.ts
@@ -85,6 +85,7 @@ export default defineComponent({
 
     const renderLine = (params: any) => {
       const { row, column } = params
+      const { afterFullData } = tableInternalData
       const { treeConfig } = tableProps
       const treeOpts = computeTreeOpts.value
       const { slots, treeNode } = column
@@ -102,6 +103,7 @@ export default defineComponent({
       if (slots && slots.line) {
         return $xetable.callSlot(slots.line, params)
       }
+      const isFirstRow = $xetable.eqRow(afterFullData[0], row)
       if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
         return [
           h('div', {
@@ -110,7 +112,7 @@ export default defineComponent({
             h('div', {
               class: 'vxe-tree--line',
               style: {
-                height: `${calcTreeLine(params, items, rIndex)}px`,
+                height: `${isFirstRow ? 1 : calcTreeLine(params, items, rIndex)}px`,
                 left: `${(rLevel * treeOpts.indent) + (rLevel ? 2 - getOffsetSize() : 0) + 16}px`
               }
             })
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index ba40332024..b67b9cdccc 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -4524,6 +4524,7 @@ export default defineComponent({
       const el = refElem.value
       const editOpts = computeEditOpts.value
       const validOpts = computeValidOpts.value
+      const areaOpts = computeAreaOpts.value
       const { actived } = editStore
       const $validTooltip = refValidTooltip.value
       const tableFilter = refTableFilter.value
@@ -4613,12 +4614,14 @@ export default defineComponent({
           if ($xetable.clearSelected) {
             $xetable.clearSelected()
           }
-          if ($xetable.clearCellAreas) {
-            if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-              tablePrivateMethods.preventEvent(evnt, 'event.clearAreas', {}, () => {
-                $xetable.clearCellAreas()
-                $xetable.clearCopyCellArea()
-              })
+          if (areaOpts.autoClear) {
+            if ($xetable.clearCellAreas) {
+              if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+                tablePrivateMethods.preventEvent(evnt, 'event.clearAreas', {}, () => {
+                  $xetable.clearCellAreas()
+                  $xetable.clearCopyCellArea()
+                })
+              }
             }
           }
         }
diff --git a/packages/tools/dom.ts b/packages/tools/dom.ts
index 3b80b20d9c..6631a3cdee 100644
--- a/packages/tools/dom.ts
+++ b/packages/tools/dom.ts
@@ -132,11 +132,9 @@ export function getOffsetPos (elem: any, container: any) {
 }
 
 export function getAbsolutePos (elem: any) {
-  // 当主页面嵌套在iframe时，elem.getBoundingClientRect()计算在当前body内的边界距离，document.body.getBoundingClientRect计算body所在的边界距离
-  const bodyBounding = document.body.getBoundingClientRect()
   const bounding = elem.getBoundingClientRect()
-  const boundingTop = bounding.top - bodyBounding.top
-  const boundingLeft = bounding.left - bodyBounding.left
+  const boundingTop = bounding.top
+  const boundingLeft = bounding.left
   const { scrollTop, scrollLeft, visibleHeight, visibleWidth } = getDomNode()
   return { boundingTop, top: scrollTop + boundingTop, boundingLeft, left: scrollLeft + boundingLeft, visibleHeight, visibleWidth }
 }
diff --git a/packages/v-x-e-table/src/conf.ts b/packages/v-x-e-table/src/conf.ts
index a630874e08..9a65d255a6 100644
--- a/packages/v-x-e-table/src/conf.ts
+++ b/packages/v-x-e-table/src/conf.ts
@@ -112,6 +112,7 @@ const GlobalConfig: VXETableConfigOptions = {
       isEsc: true
     },
     areaConfig: {
+      autoClear: true,
       selectCellByHeader: true
     },
     clipConfig: {
diff --git a/packages/v-x-e-table/src/config.ts b/packages/v-x-e-table/src/config.ts
index 47117ee9e8..b56e47ebb6 100644
--- a/packages/v-x-e-table/src/config.ts
+++ b/packages/v-x-e-table/src/config.ts
@@ -10,7 +10,9 @@ import { VxeGlobalConfigMethod } from '../../../types/all'
  */
 export const config: VxeGlobalConfigMethod = (options) => {
   if (options) {
-    setTheme(options)
+    if (options.theme) {
+      setTheme(options)
+    }
     if (options.zIndex) {
       DomZIndex.setCurrent(options.zIndex)
     }
diff --git a/styles/theme/dark.scss b/styles/theme/dark.scss
index dfff3d932a..1f16510d0f 100644
--- a/styles/theme/dark.scss
+++ b/styles/theme/dark.scss
@@ -2,7 +2,7 @@
 
 [data-vxe-table-theme="dark"] {
   color-scheme: dark;
-  
+
   /*font*/
   --vxe-font-family: #{$vxe-font-family};
   --vxe-font-size: #{$vxe-font-size};
@@ -56,8 +56,8 @@
   --vxe-table-popup-border-color: #424242;
 
   /*table*/
-  --vxe-table-header-font-color: #{$vxe-table-header-font-color};
-  --vxe-table-footer-font-color: #{$vxe-table-footer-font-color};
+  --vxe-table-header-font-color: #98989E;
+  --vxe-table-footer-font-color: #98989E;
   --vxe-table-border-radius: #{$vxe-table-border-radius};
   --vxe-table-border-width: #{$vxe-table-border-width};
   --vxe-table-border-color: #37373A;
diff --git a/types/table.d.ts b/types/table.d.ts
index 6162da01ef..f10ec492c9 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -1898,6 +1898,10 @@ export namespace VxeTablePropTypes {
      * 只对 mouse-config.extension 启用后有效，扩展区域时将自动识别数字规则进行计算
      */
     extendByCalc?: boolean
+    /**
+     * 当点击表格之外，是否自动清除单元格的选取状态
+     */
+    autoClear?: boolean
     /**
      * 只对 extendByCalc 启用后有效，重写单元格扩展区域计算值的方法
      * @param params