vxe-table 3.8.6-beta.1 → 3.8.6-beta.2

package/lib/v-x-e-table/src/config.js

@@ -14,7 +14,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  */
 function config(options) {
   if (options) {
-    (0, _theme.setTheme)(options);
+    if (options.theme) {
+      (0, _theme.setTheme)(options);
+    }
     if (options.zIndex) {
       _domZindex.default.setCurrent(options.zIndex);
     }

package/lib/v-x-e-table/src/config.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.config=config;var _conf=_interopRequireDefault(require("./conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_xeUtils=_interopRequireDefault(require("xe-utils")),_theme=require("./theme");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function config(e){return e&&((0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.config=config;var _conf=_interopRequireDefault(require("./conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_xeUtils=_interopRequireDefault(require("xe-utils")),_theme=require("./theme");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function config(e){return e&&(e.theme&&(0,_theme.setTheme)(e),e.zIndex)&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.6-beta.1",
+  "version": "3.8.6-beta.2",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/all.js

@@ -85,7 +85,9 @@ const components = [
 export function install (Vue, options) {
   if (XEUtils.isPlainObject(options)) {
     VXETable.config(options)
-    setTheme(options)
+    if (options.theme) {
+      setTheme(options)
+    }
   }
   components.map(component => component.install(Vue))
 }

package/packages/table/src/body.js

@@ -15,7 +15,7 @@ function isVMScrollProcess ($xetable) {
 
 function renderLine (h, _vm, $xetable, params) {
   const { row, column } = params
-  const { treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
+  const { afterFullData, treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
   const { slots, treeNode } = column
   const rowid = getRowid($xetable, row)
   const rest = fullAllDataRowIdData[rowid]
@@ -30,6 +30,7 @@ function renderLine (h, _vm, $xetable, params) {
   if (slots && slots.line) {
     return $xetable.callSlot(slots.line, params, h)
   }
+  const isFirstRow = $xetable.eqRow(afterFullData[0], row)
   if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
     return [
       h('div', {
@@ -38,7 +39,7 @@ function renderLine (h, _vm, $xetable, params) {
         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($xetable) : 0) + 16}px`
           }
         })

package/packages/table/src/methods.js

@@ -2491,7 +2491,7 @@ const Methods = {
    * 全局按下事件处理
    */
   handleGlobalMousedownEvent (evnt) {
-    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, filterStore, customStore, getRowNode } = this
+    const { $el, $refs, $xegrid, $toolbar, mouseConfig, editStore, ctxMenuStore, editRules, editOpts, validOpts, areaOpts, filterStore, customStore, getRowNode } = this
     const { actived } = editStore
     const { ctxWrapper, filterWrapper, customWrapper, validTip } = $refs
     // 筛选
@@ -2572,11 +2572,13 @@ const Methods = {
         if (this.clearSelected) {
           this.clearSelected()
         }
-        if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
-          this.preventEvent(evnt, 'event.clearAreas', {}, () => {
-            this.clearCellAreas()
-            this.clearCopyCellArea()
-          })
+        if (areaOpts.autoClear) {
+          if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
+            this.preventEvent(evnt, 'event.clearAreas', {}, () => {
+              this.clearCellAreas()
+              this.clearCopyCellArea()
+            })
+          }
         }
       }
     }

package/packages/v-x-e-table/src/conf.js

@@ -110,6 +110,7 @@ export default {
       isEsc: true
     },
     areaConfig: {
+      autoClear: true,
       selectCellByHeader: true
     },
     clipConfig: {

package/packages/v-x-e-table/src/config.js

@@ -8,7 +8,9 @@ import { setTheme } from './theme'
  */
 export function config (options) {
   if (options) {
-    setTheme(options)
+    if (options.theme) {
+      setTheme(options)
+    }
     if (options.zIndex) {
       DomZIndex.setCurrent(options.zIndex)
     }