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

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,7 @@ const components = [
 export function install (Vue, options) {
   if (XEUtils.isPlainObject(options)) {
     VXETable.config(options)
+    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/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/config.js

@@ -1,13 +1,17 @@
 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) {
+    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 {