vxe-table 3.8.5 → 3.8.6-beta.1

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
@@ -586,9 +599,7 @@ export default {
       removeClass(trEl, 'active--drag-target')
       removeClass(trEl, 'active--drag-origin')
       // 更新顺序
-      customColumnList.forEach((column, index) => {
-        column.renderSortNumber = index
-      })
+      this.updateColumnSort()
     },
     sortDragoverEvent  (evnt) {
       const { $xetable, prevDropTrEl } = this
@@ -608,6 +619,15 @@ export default {
         this.prevDropTrEl = trEl
       }
       updateDropHint(this, evnt)
+    },
+    updateColumnSort () {
+      const { $xetable } = this
+      const { customColumnList } = $xetable
+      // 更新顺序
+      customColumnList.forEach((column, index) => {
+        const sortIndex = index + 1
+        column.renderSortNumber = sortIndex
+      })
     }
   }
 }

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/methods.js

@@ -567,12 +567,21 @@ const Methods = {
       return this.loadColumn(columns)
     })
   },
+  initColumnSort  () {
+    const { collectColumn } = this
+    collectColumn.forEach((column, index) => {
+      const sortIndex = index + 1
+      column.sortNumber = sortIndex
+      column.renderSortNumber = sortIndex
+    })
+  },
   handleColumn (collectColumn) {
     this.collectColumn = collectColumn
     const tableFullColumn = getColumnList(collectColumn)
     this.tableFullColumn = tableFullColumn
-    this.cacheColumnMap(true)
+    this.initColumnSort()
     this.restoreCustomStorage()
+    this.cacheColumnMap()
     this.parseColumns().then(() => {
       if (this.scrollXLoad) {
         this.loadScrollXData(true)
@@ -699,7 +708,7 @@ const Methods = {
    * 更新数据列的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  cacheColumnMap (isInit) {
+  cacheColumnMap () {
     const { tableFullColumn, collectColumn, fullColumnMap, showOverflow, columnOpts, rowOpts } = this
     const fullColumnIdData = this.fullColumnIdData = {}
     const fullColumnFieldData = this.fullColumnFieldData = {}
@@ -795,9 +804,6 @@ const Methods = {
       if (fullColumnIdData[colid]) {
         errLog('vxe.error.colRepet', ['colId', colid])
       }
-      if (isInit) {
-        column.sortNumber = index
-      }
       fullColumnIdData[colid] = rest
       fullColumnMap.set(column, rest)
     }
@@ -1575,6 +1581,9 @@ const Methods = {
     if (opts.resizable) {
       this.saveCustomResizable(true)
     }
+    if (opts.sort) {
+      this.saveCustomSort(true)
+    }
     if (opts.fixed) {
       this.saveCustomFixed()
     }
@@ -1592,6 +1601,7 @@ const Methods = {
       }
     }
     this.saveCustomVisible()
+    this.saveCustomSort()
     this.analyColumnWidth()
     return this.refreshColumn(true)
   },
@@ -1599,7 +1609,7 @@ const Methods = {
    * 还原自定义列操作状态
    */
   restoreCustomStorage () {
-    const { id, collectColumn, customConfig, customOpts } = this
+    const { id, customConfig, customOpts } = this
     const { storage } = customOpts
     const isAllStorage = storage === true
     const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
@@ -1637,16 +1647,18 @@ const Methods = {
         }
       }
       // 自定义顺序
+      let hasCustomSort = false
       if (isCustomSort) {
         const columnSortStorage = getCustomStorageMap(sortStorageKey)[id]
         if (columnSortStorage) {
-          const colOrderSeqs = columnSortStorage.split(',')
-          colOrderSeqs.forEach((orderConf) => {
-            const [colKey, sortNumber] = orderConf.split('|')
+          XEUtils.each(columnSortStorage, (renderSortNumber, colKey) => {
             if (customMap[colKey]) {
-              customMap[colKey].sortNumber = sortNumber
+              customMap[colKey].renderSortNumber = renderSortNumber
             } else {
-              customMap[colKey] = { sortNumber }
+              customMap[colKey] = { renderSortNumber }
+            }
+            if (!hasCustomSort) {
+              hasCustomSort = true
             }
           })
         }
@@ -1673,6 +1685,7 @@ const Methods = {
           })
         }
       }
+      let { collectColumn } = this
       const keyMap = {}
       XEUtils.eachTree(collectColumn, column => {
         const colKey = column.getKey()
@@ -1680,7 +1693,7 @@ const Methods = {
           keyMap[colKey] = column
         }
       })
-      XEUtils.each(customMap, ({ visible, resizeWidth, fixed, sortNumber }, field) => {
+      XEUtils.each(customMap, ({ visible, resizeWidth, fixed, renderSortNumber }, field) => {
         const column = keyMap[field]
         if (column) {
           if (XEUtils.isNumber(resizeWidth)) {
@@ -1692,11 +1705,17 @@ const Methods = {
           if (fixed) {
             column.fixed = fixed
           }
-          if (sortNumber) {
-            column.colSeq = Number(sortNumber)
+          if (renderSortNumber) {
+            column.renderSortNumber = Number(renderSortNumber)
           }
         }
       })
+      // 如果自定义了顺序
+      if (hasCustomSort) {
+        collectColumn = XEUtils.orderBy(collectColumn, 'renderSortNumber')
+        this.collectColumn = collectColumn
+        this.tableFullColumn = getColumnList(collectColumn)
+      }
     }
   },
   saveCustomFixed () {
@@ -1785,6 +1804,35 @@ const Methods = {
       localStorage.setItem(resizableStorageKey, XEUtils.toJSONString(columnWidthStorageMap))
     }
   },
+  saveCustomSort (isReset) {
+    const { id, collectColumn, customConfig, customOpts } = this
+    const { storage } = customOpts
+    const isAllStorage = storage === true
+    const storageOpts = isAllStorage ? {} : Object.assign({}, storage || {})
+    const isSort = isAllStorage || storageOpts.sort
+    if (customConfig && isSort) {
+      const columnSortStorageMap = getCustomStorageMap(sortStorageKey)
+      let columnWidthStorage
+      if (!id) {
+        errLog('vxe.error.reqProp', ['id'])
+        return
+      }
+      if (!isReset) {
+        columnWidthStorage = XEUtils.isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {}
+        // 排序只支持一级
+        collectColumn.forEach(column => {
+          if (column.sortNumber !== column.renderSortNumber) {
+            const colKey = column.getKey()
+            if (colKey) {
+              columnWidthStorage[colKey] = column.renderSortNumber
+            }
+          }
+        })
+      }
+      columnSortStorageMap[id] = XEUtils.isEmpty(columnWidthStorage) ? undefined : columnWidthStorage
+      localStorage.setItem(sortStorageKey, XEUtils.toJSONString(columnSortStorageMap))
+    }
+  },
   handleUpdateDataQueue () {
     this.upDataFlag++
   },

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 {