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

package/lib/vxe-table-export-module/style/style.min.css

@@ -1 +1 @@
-.vxe-export--panel-column>ul{list-style-type:none;overflow:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel-column>ul>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.vxe-export--panel>table{width:100%;border:0;table-layout:fixed}.vxe-export--panel>table tr td{padding:0 10px}.vxe-export--panel>table tr td:nth-child(1){text-align:right;width:30%;font-weight:700;padding:8px 10px}.vxe-export--panel>table tr td:nth-child(2){width:70%}.vxe-export--panel>table tr td>.vxe-input,.vxe-export--panel>table tr td>.vxe-select{width:80%}.vxe-export--panel>table tr td>.vxe-export--panel-option-row{padding:.25em 0}.vxe-export--panel .vxe-export--panel-column{width:80%;border:1px solid #dcdfe6;margin:3px 0;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel .vxe-export--panel-column>ul>li{padding:.2em 1em .2em 1em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--2{padding-left:3.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--3{padding-left:4.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--4{padding-left:5.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--5{padding-left:6.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--6{padding-left:7.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--7{padding-left:8.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--8{padding-left:9.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-header{padding:.1em 0;background-color:#f8f8f9;font-weight:700;border-bottom:1px solid #e8eaec}.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-body{padding:.2em 0;min-height:10em;max-height:17.6em}.vxe-export--panel .vxe-import-selected--file{padding-right:40px;position:relative;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel .vxe-import-selected--file>i{display:none;position:absolute;top:50%;right:15px;transform:translateY(-50%);font-size:16px;cursor:pointer}.vxe-export--panel .vxe-import-selected--file:hover{color:#409eff}.vxe-export--panel .vxe-import-selected--file:hover>i{display:block}.vxe-export--panel .vxe-import-select--file{border:1px dashed #dcdfe6;padding:6px 34px;outline:0;border-radius:4px;background-color:#fff;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-export--panel .vxe-import-select--file:focus{border-color:#409eff;box-shadow:0 0 .25em 0 #409eff}.vxe-export--panel .vxe-import-select--file:hover{color:#409eff;border-color:#409eff}.vxe-export--panel .vxe-export--panel-btns{text-align:right;padding:.25em}.vxe-export--panel-column-option .vxe-checkbox--icon{font-size:1.34em}.vxe-export--panel-column-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel-column-option.is--checked,.vxe-export--panel-column-option.is--indeterminate{color:#409eff}.vxe-export--panel-column-option.is--checked .vxe-checkbox--icon,.vxe-export--panel-column-option.is--indeterminate .vxe-checkbox--icon{color:#409eff}.vxe-export--panel-column-option:not(.is--disabled){cursor:pointer}.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.vxe-export--panel-column-option.is--disabled{color:#bfbfbf;cursor:not-allowed}.vxe-export--panel-column-option.is--disabled .vxe-checkbox--icon{color:#dcdfe6}.vxe-export--panel-column-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}
+.vxe-export--panel-column>ul{list-style-type:none;overflow:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel-column>ul>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.vxe-export--panel>table{width:100%;border:0;table-layout:fixed}.vxe-export--panel>table tr td{padding:0 10px}.vxe-export--panel>table tr td:nth-child(1){text-align:right;width:30%;font-weight:700;padding:8px 10px}.vxe-export--panel>table tr td:nth-child(2){width:70%}.vxe-export--panel>table tr td>.vxe-input,.vxe-export--panel>table tr td>.vxe-select{width:80%}.vxe-export--panel>table tr td>.vxe-export--panel-option-row{padding:.25em 0}.vxe-export--panel .vxe-export--panel-column{width:80%;border:1px solid #dcdfe6;margin:3px 0;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel .vxe-export--panel-column>ul>li{padding:.2em 1em .2em 1em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--2{padding-left:3.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--3{padding-left:4.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--4{padding-left:5.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--5{padding-left:6.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--6{padding-left:7.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--7{padding-left:8.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--8{padding-left:9.5em}.vxe-export--panel .vxe-export--panel-column>ul>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-header{padding:.1em 0;background-color:#f8f8f9;font-weight:700;border-bottom:1px solid #e8eaec}.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-body{padding:.2em 0;min-height:10em;max-height:17.6em}.vxe-export--panel .vxe-import-selected--file{padding-right:40px;position:relative;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel .vxe-import-selected--file>i{display:none;position:absolute;top:50%;right:15px;transform:translateY(-50%);font-size:16px;cursor:pointer}.vxe-export--panel .vxe-import-selected--file:hover{color:#409eff}.vxe-export--panel .vxe-import-selected--file:hover>i{display:block}.vxe-export--panel .vxe-import-select--file{border:1px dashed #dcdfe6;padding:6px 34px;outline:0;border-radius:4px;background-color:#fff;color:inherit;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-export--panel .vxe-import-select--file:focus{border-color:#409eff;box-shadow:0 0 .25em 0 #409eff}.vxe-export--panel .vxe-import-select--file:hover{color:#409eff;border-color:#409eff}.vxe-export--panel .vxe-export--panel-btns{text-align:right;padding:.25em}.vxe-export--panel-column-option .vxe-checkbox--icon{font-size:1.34em}.vxe-export--panel-column-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-export--panel-column-option.is--checked,.vxe-export--panel-column-option.is--indeterminate{color:#409eff}.vxe-export--panel-column-option.is--checked .vxe-checkbox--icon,.vxe-export--panel-column-option.is--indeterminate .vxe-checkbox--icon{color:#409eff}.vxe-export--panel-column-option:not(.is--disabled){cursor:pointer}.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.vxe-export--panel-column-option.is--disabled{color:#bfbfbf;cursor:not-allowed}.vxe-export--panel-column-option.is--disabled .vxe-checkbox--icon{color:#dcdfe6}.vxe-export--panel-column-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}

package/package.json

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

package/packages/all.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
 import { VXETable } from './v-x-e-table'
+import { setTheme } from './v-x-e-table/src/theme'
 
 import { Filter } from './filter'
 import { Menu } from './menu'
@@ -84,6 +85,9 @@ const components = [
 export function install (Vue, options) {
   if (XEUtils.isPlainObject(options)) {
     VXETable.config(options)
+    if (options.theme) {
+      setTheme(options)
+    }
   }
   components.map(component => component.install(Vue))
 }

package/packages/custom/src/panel.js

@@ -1,3 +1,4 @@
+import VXETable from '../../v-x-e-table'
 import UtilTools from '../../tools/utils'
 import DomTools from '../../tools/dom'
 import GlobalConfig from '../../v-x-e-table/src/conf'
@@ -457,7 +458,19 @@ export default {
       $xetable.emitCustomEvent('reset', evnt)
     },
     resetPopupCustomEvent  (evnt) {
-      this.resetCustomEvent(evnt)
+      if (VXETable.modal) {
+        VXETable.modal.confirm({
+          content: GlobalConfig.i18n('vxe.custom.cstmConfirmRestore'),
+          className: 'vxe-table--ignore-clear',
+          escClosable: true
+        }).then(type => {
+          if (type === 'confirm') {
+            this.resetCustomEvent(evnt)
+          }
+        })
+      } else {
+        this.resetCustomEvent(evnt)
+      }
     },
     handleOptionCheck (column) {
       const { $xetable } = this

package/packages/input/src/input.js

@@ -1995,6 +1995,7 @@ export default {
           }
           const { boundingTop, boundingLeft, visibleHeight, visibleWidth } = DomTools.getAbsolutePos(targetElem)
           let panelPlacement = 'bottom'
+          console.log(DomTools.getAbsolutePos(targetElem))
           if (transfer) {
             let left = boundingLeft
             let top = boundingTop + targetHeight

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/tools/dom.js

@@ -133,11 +133,9 @@ export const DomTools = {
     return getNodeOffset(elem, container, { left: 0, top: 0 })
   },
   getAbsolutePos (elem) {
-    // 当主页面嵌套在iframe时，elem.getBoundingClientRect()仅计算在当前body内的边界距离，忽略了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 }
   },

package/packages/v-x-e-table/index.js

@@ -7,6 +7,7 @@ import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
 import { config } from './src/config'
+import { setTheme } from './src/theme'
 import { UtilTools } from '../tools/utils'
 import { errLog } from '../tools/log'
 
@@ -114,6 +115,8 @@ export const VXETable = {
   globalConfs
 }
 
+setTheme(globalStore)
+
 export * from './src/interceptor'
 export * from './src/renderer'
 export * from './src/commands'

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

@@ -1,13 +1,19 @@
 import GlobalConfig from './conf'
 import DomZIndex from 'dom-zindex'
 import XEUtils from 'xe-utils'
+import { setTheme } from './theme'
 
 /**
  * 全局参数设置
  */
 export function config (options) {
-  if (options && options.zIndex) {
-    DomZIndex.setCurrent(options.zIndex)
+  if (options) {
+    if (options.theme) {
+      setTheme(options)
+    }
+    if (options.zIndex) {
+      DomZIndex.setCurrent(options.zIndex)
+    }
   }
   return XEUtils.merge(GlobalConfig, options)
 }

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

@@ -0,0 +1,11 @@
+import GlobalConfig from '../../v-x-e-table/src/conf'
+
+export function setTheme (options) {
+  const theme = (options ? options.theme : null) || GlobalConfig.theme || 'default'
+  if (typeof document !== 'undefined') {
+    const documentElement = document.documentElement
+    if (documentElement) {
+      documentElement.setAttribute('data-vxe-table-theme', theme)
+    }
+  }
+}

package/styles/export.scss

@@ -103,6 +103,7 @@
     outline: 0;
     border-radius: $vxe-border-radius;
     background-color: $vxe-input-background-color;
+    color: inherit;
     user-select: none;
     cursor: pointer;
     &:focus {

package/styles/table.scss

@@ -33,6 +33,9 @@
   border: 0;
 }
 
+.vxe-table--render-wrapper {
+  background-color: $vxe-table-body-background-color;
+}
 .vxe-table--body-wrapper {
   scroll-behavior: auto;
 }
@@ -610,6 +613,11 @@
       user-select: none;
     }
   }
+  &.drag--range {
+    .vxe-cell--checkbox {
+      user-select: none;
+    }
+  }
   .vxe-header--column,
   .vxe-body--column,
   .vxe-footer--column {