vxe-table 3.8.8-beta.7 → 3.8.8-beta.9

package/packages/table/src/methods.js

@@ -1103,6 +1103,63 @@ const Methods = {
     }
     return this.$nextTick()
   },
+  getCellElement (row, fieldOrColumn) {
+    const column = handleFieldOrColumn(this, fieldOrColumn)
+    if (!column) {
+      return null
+    }
+    const { $refs } = this
+    const rowid = getRowid(this, row)
+    let bodyElem = null
+    if (column) {
+      bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.tableBody
+    }
+    if (bodyElem && bodyElem.$el) {
+      return bodyElem.$el.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`)
+    }
+    return null
+  },
+  getCellLabel (row, fieldOrColumn) {
+    const column = handleFieldOrColumn(this, fieldOrColumn)
+    if (!column) {
+      return null
+    }
+    const formatter = column.formatter
+    const cellValue = UtilTools.getCellValue(row, column)
+    let cellLabel = cellValue
+    if (formatter) {
+      let rest, formatData
+      const { fullAllDataRowMap } = this
+      const colid = column.id
+      const cacheFormat = fullAllDataRowMap.has(row)
+      if (cacheFormat) {
+        rest = fullAllDataRowMap.get(row)
+        formatData = rest.formatData
+        if (!formatData) {
+          formatData = fullAllDataRowMap.get(row).formatData = {}
+        }
+        if (rest && formatData[colid]) {
+          if (formatData[colid].value === cellValue) {
+            return formatData[colid].label
+          }
+        }
+      }
+      const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
+      if (XEUtils.isString(formatter)) {
+        const gFormatOpts = formats.get(formatter)
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : ''
+      } else if (XEUtils.isArray(formatter)) {
+        const gFormatOpts = formats.get(formatter[0])
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : ''
+      } else {
+        cellLabel = formatter(formatParams)
+      }
+      if (formatData) {
+        formatData[colid] = { value: cellValue, label: cellLabel }
+      }
+    }
+    return cellLabel
+  },
   /**
    * 检查是否为临时行数据
    * @param {Row} row 行对象
@@ -1156,6 +1213,13 @@ const Methods = {
     const columns = this.visibleColumn
     return XEUtils.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex]
   },
+  /**
+   * 根据列获取列的唯一主键
+   */
+  getColid (fieldOrColumn) {
+    const column = handleFieldOrColumn(this, fieldOrColumn)
+    return column ? column.id : null
+  },
   /**
    * 根据列的唯一主键获取列
    * @param {String} colid 列主键
@@ -2734,7 +2798,7 @@ const Methods = {
         const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, currentRow, bodyCtxMenu, rowOpts } = this
         const { selected, actived } = editStore
         const { keyCode } = evnt
-        const isBack = keyCode === 8
+        const hasBackspaceKey = keyCode === 8
         const isTab = keyCode === 9
         const isEnter = keyCode === 13
         const isEsc = keyCode === 27
@@ -2854,11 +2918,11 @@ const Methods = {
           } else if (actived.row || actived.column) {
             this.moveTabSelected(actived.args, hasShiftKey, evnt)
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
           if (!isEditStatus) {
             const { delMethod, backMethod } = keyboardOpts
             // 如果是删除键
-            if (keyboardOpts.isDel && (selected.row || selected.column)) {
+            if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
               const delPaqrams = {
                 row: selected.row,
                 rowIndex: this.getRowIndex(selected.row),
@@ -2871,7 +2935,7 @@ const Methods = {
               } else {
                 setCellValue(selected.row, selected.column, null)
               }
-              if (isBack) {
+              if (hasBackspaceKey) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -2888,7 +2952,7 @@ const Methods = {
                 this.updateFooter()
               }
               this.emitEvent('cell-delete-value', delPaqrams, evnt)
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               const { parent: parentRow } = XEUtils.findTree(this.afterFullData, item => item === currentRow, { children: childrenField })
               if (parentRow) {
@@ -3423,6 +3487,7 @@ const Methods = {
     if (trigger === 'manual') {
       return
     }
+    evnt.stopPropagation()
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       const checkboxRecords = this.getCheckboxRecords()
       if (checkboxRecords.length) {
@@ -3797,6 +3862,9 @@ const Methods = {
     if (trigger === 'manual') {
       return
     }
+    if (evnt) {
+      evnt.stopPropagation()
+    }
     this.handleCheckAllEvent(evnt, value)
   },
   /**
@@ -3863,6 +3931,7 @@ const Methods = {
     if (trigger === 'manual') {
       return
     }
+    evnt.stopPropagation()
     let newValue = row
     let isChange = oldValue !== newValue
     if (isChange) {
@@ -4442,6 +4511,7 @@ const Methods = {
     if (trigger === 'manual') {
       return
     }
+    evnt.stopPropagation()
     const rowid = getRowid(this, row)
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       const expanded = !this.isRowExpandByRow(row)
@@ -4720,6 +4790,7 @@ const Methods = {
     if (trigger === 'manual') {
       return
     }
+    evnt.stopPropagation()
     const rowid = getRowid(this, row)
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       const expanded = !this.isTreeExpandByRow(row)
@@ -5290,7 +5361,7 @@ const Methods = {
         const type = 'change'
         if (this.hasCellRules) {
           if (this.hasCellRules(type, row, column)) {
-            const cell = this.getCell(row, column)
+            const cell = this.getCellElement(row, column)
             if (cell) {
               return this.validCellRules(type, row, column, cellValue)
                 .then(() => {
@@ -5435,54 +5506,12 @@ const Methods = {
   /*************************
    * Publish methods
    *************************/
+  /**
+   * 已废弃，被 getCellElement 替换
+   * @deprecated
+   */
   getCell (row, column) {
-    const { $refs } = this
-    const rowid = getRowid(this, row)
-    let bodyElem = null
-    if (column) {
-      bodyElem = $refs[`${column.fixed || 'table'}Body`] || $refs.tableBody
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(`.vxe-body--row[rowid="${rowid}"] .${column.id}`)
-    }
-    return null
-  },
-  getCellLabel (row, column) {
-    const formatter = column.formatter
-    const cellValue = UtilTools.getCellValue(row, column)
-    let cellLabel = cellValue
-    if (formatter) {
-      let rest, formatData
-      const { fullAllDataRowMap } = this
-      const colid = column.id
-      const cacheFormat = fullAllDataRowMap.has(row)
-      if (cacheFormat) {
-        rest = fullAllDataRowMap.get(row)
-        formatData = rest.formatData
-        if (!formatData) {
-          formatData = fullAllDataRowMap.get(row).formatData = {}
-        }
-        if (rest && formatData[colid]) {
-          if (formatData[colid].value === cellValue) {
-            return formatData[colid].label
-          }
-        }
-      }
-      const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
-      if (XEUtils.isString(formatter)) {
-        const gFormatOpts = formats.get(formatter)
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : ''
-      } else if (XEUtils.isArray(formatter)) {
-        const gFormatOpts = formats.get(formatter[0])
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : ''
-      } else {
-        cellLabel = formatter(formatParams)
-      }
-      if (formatData) {
-        formatData[colid] = { value: cellValue, label: cellLabel }
-      }
-    }
-    return cellLabel
+    return this.getCellElement(row, column)
   },
   findRowIndexOf (list, row) {
     return row ? XEUtils.findIndexOf(list, item => this.eqRow(item, row)) : -1

package/packages/table/src/table.js

@@ -822,11 +822,11 @@ export default {
       // }
       // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
-      if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.globalConfs.importTypes, importOpts.types)) {
-        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(VXETable.globalConfs.importTypes, type)).join(',') || VXETable.globalConfs.importTypes.join(',')])
+      if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
       }
-      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.globalConfs.exportTypes, exportOpts.types)) {
-        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(VXETable.globalConfs.exportTypes, type)).join(',') || VXETable.globalConfs.exportTypes.join(',')])
+      if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), exportOpts.types)) {
+        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')])
       }
     }
 

package/packages/textarea/index.js

@@ -1,10 +1,12 @@
 import VxeTextareaComponent from './src/textarea'
+import VxeUI from '../v-x-e-table'
 
 export const VxeTextarea = Object.assign(VxeTextareaComponent, {
   install (Vue) {
     Vue.component(VxeTextareaComponent.name, VxeTextareaComponent)
   }
 })
+VxeUI.component(VxeTextareaComponent)
 
 export const Textarea = VxeTextarea
 

package/packages/toolbar/index.js

@@ -1,10 +1,12 @@
 import VxeToolbarComponent from './src/toolbar'
+import VxeUI from '../v-x-e-table'
 
 export const VxeToolbar = Object.assign(VxeToolbarComponent, {
   install (Vue) {
     Vue.component(VxeToolbarComponent.name, VxeToolbarComponent)
   }
 })
+VxeUI.component(VxeToolbarComponent)
 
 export const Toolbar = VxeToolbar
 

package/packages/tooltip/index.js

@@ -1,12 +1,13 @@
 import VxeTooltipComponent from './src/tooltip'
-import VXETable from '../v-x-e-table'
+import VxeUI from '../v-x-e-table'
 
 export const VxeTooltip = Object.assign(VxeTooltipComponent, {
   install (Vue) {
-    VXETable._tooltip = 1
+    VxeUI._tooltip = 1
     Vue.component(VxeTooltipComponent.name, VxeTooltipComponent)
   }
 })
+VxeUI.component(VxeTooltipComponent)
 
 export const Tooltip = VxeTooltip
 

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

@@ -7,7 +7,7 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { validators } from './src/validators'
-import { setTheme } from './src/theme'
+import { setTheme, getTheme } from './src/theme'
 import { UtilTools } from '../tools/utils'
 import { errLog, warnLog } from '../tools/log'
 
@@ -17,11 +17,11 @@ export function use (Plugin, options) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   if (Plugin && Plugin.install) {
     if (installedPlugins.indexOf(Plugin) === -1) {
-      Plugin.install(VXETable, options)
+      Plugin.install(VxeUI, options)
       installedPlugins.push(Plugin)
     }
   }
-  return VXETable
+  return VxeUI
 }
 
 /**
@@ -31,22 +31,22 @@ function reg (key) {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   // 检测安装顺序是否正确
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-    if (VXETable.Table) {
+    if (VxeUI.Table) {
       errLog('vxe.error.useErr', [key])
     }
   }
-  VXETable[`_${key}`] = 1
+  VxeUI[`_${key}`] = 1
 }
 
-function getExportOrImpotType (types, flag) {
-  const rest = []
-  XEUtils.objectEach(types, (val, type) => {
-    if (val === 0 || val === flag) {
-      rest.push(type)
-    }
-  })
-  return rest
-}
+// function getExportOrImpotType (types, flag) {
+//   const rest = []
+//   XEUtils.objectEach(types, (val, type) => {
+//     if (val === 0 || val === flag) {
+//       rest.push(type)
+//     }
+//   })
+//   return rest
+// }
 
 /**
  * 全局参数设置
@@ -61,7 +61,7 @@ export const setConfig = (options) => {
     }
     XEUtils.merge(GlobalConfig, options)
   }
-  return VXETable
+  return VxeUI
 }
 
 class VXETableConfig {
@@ -83,14 +83,14 @@ class VXETableConfig {
    * 获取所有导出类型
    */
   get exportTypes () {
-    return getExportOrImpotType(GlobalConfig.export.types, 1)
+    return XEUtils.keys(GlobalConfig.table.exportConfig._typeMaps)
   }
 
   /**
    * 获取所有导入类型
    */
   get importTypes () {
-    return getExportOrImpotType(GlobalConfig.export.types, 2)
+    return XEUtils.keys(GlobalConfig.table.importConfig._typeMaps)
   }
 }
 
@@ -133,14 +133,30 @@ export function setIcon (options) {
   if (options) {
     Object.assign(GlobalConfig.icon, options)
   }
-  return VXETable
+  return VxeUI
 }
 
 export const globalStore = {}
 
-export const VXETable = {
+const components = {}
+
+export function getComponent (name) {
+  return components[name] || null
+}
+
+export function component (comp) {
+  if (comp && comp.name) {
+    components[comp.name] = comp
+  }
+}
+
+export const version = process.env.VUE_APP_VXE_TABLE_VERSION
+export const tableVersion = version
+
+export const VxeUI = {
   v,
-  version: process.env.VUE_APP_VXE_TABLE_VERSION,
+  version,
+  tableVersion,
   reg,
   use,
   setConfig,
@@ -154,6 +170,10 @@ export const VXETable = {
   validators,
   t,
   _t,
+  setTheme,
+  getTheme,
+  getComponent,
+  component,
 
   // 已废弃
   config,
@@ -161,7 +181,7 @@ export const VXETable = {
   globalConfs
 }
 
-export const VxeUI = VXETable
+export const VXETable = VxeUI
 
 setTheme('light')
 
@@ -171,4 +191,6 @@ export * from './src/commands'
 export * from './src/menus'
 export * from './src/formats'
 
-export default VXETable
+export * from './src/theme'
+
+export default VxeUI

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

@@ -100,7 +100,12 @@ export default {
       showAsterisk: true
     },
     importConfig: {
-      _typeMaps: {},
+      _typeMaps: {
+        csv: 1,
+        html: 1,
+        xml: 1,
+        txt: 1
+      },
       modes: ['insert', 'covering']
     },
     exportConfig: {

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

@@ -5,6 +5,7 @@ export function setTheme (name) {
   if (!theme || theme === 'default') {
     theme = 'light'
   }
+  GlobalConfig.theme = theme
   if (typeof document !== 'undefined') {
     const documentElement = document.documentElement
     if (documentElement) {
@@ -12,3 +13,7 @@ export function setTheme (name) {
     }
   }
 }
+
+export function getTheme () {
+  return GlobalConfig.theme
+}

package/packages/validator/src/mixin.js

@@ -221,7 +221,7 @@ export default {
               })
             }
             const posAndFinish = () => {
-              firstErrParams.cell = this.getCell(firstErrParams.row, firstErrParams.column)
+              firstErrParams.cell = this.getCellElement(firstErrParams.row, firstErrParams.column)
               DomTools.scrollToView(firstErrParams.cell)
               this.handleValidError(firstErrParams).then(finish)
             }

package/types/table.d.ts

@@ -1558,6 +1558,10 @@ export interface TableKeyboardConfig {
    * 是否开启删除键功能
    */
   isDel?: boolean;
+  /**
+   * 是否开启回退键功能
+   */
+  isBack?: boolean
   /**
    * 是否开启回车移动上下行移动
    */

package/types/v-x-e-table/index.d.ts

@@ -58,6 +58,7 @@ export interface VxeGlobalIcon {
 
 export type VxeGlobalConfigMethod = (options?: VXETableConfigOptions) => VxeGlobalStore
 export type VxeGlobalThemeMethod = (name?: '' | 'light' | 'dark') => VxeGlobalStore
+export type VxeGlobalGetThemeMethod = () => 'light' | 'dark'
 
 /**
  * @deprecated
@@ -83,6 +84,8 @@ export const globalStore: VxeGlobalStore
 
 export const setConfig: VxeGlobalConfigMethod
 export const setTheme: VxeGlobalThemeMethod
+export const getTheme: VxeGlobalGetThemeMethod
+
 /**
  * 请使用 setConfig
  * @deprecated
@@ -101,6 +104,9 @@ export const t: VxeGlobalI18n
 export const _t: VxeGlobalTranslate
 export const use: VxeGlobalUse
 
+export function getComponent (name: string): any
+export function component (comp: any): any
+
 /**
  * 请使用 setConfig
  * @deprecated
@@ -128,6 +134,7 @@ export interface VXETableCore {
    */
   setConfig: VxeGlobalConfigMethod;
   setTheme: VxeGlobalThemeMethod
+  getTheme: VxeGlobalGetThemeMethod
   setIcon: typeof setIcon
   /**
    * 读取内部数据
@@ -185,6 +192,9 @@ export interface VXETableCore {
   t: VxeGlobalI18n;
   _t: VxeGlobalTranslate;
 
+  getComponent: typeof getComponent,
+  component: typeof component,
+
   /**
    * 请使用 setConfig
    * @deprecated