vxe-table 3.4.15 → 3.5.0-beta.0

package/packages/table/src/table.js

@@ -3,8 +3,11 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import VxeTableBody from './body'
 import vSize from '../../mixins/size'
-import { UtilTools, GlobalEvent, createResizeEvent, isEnableConf } from '../../tools'
+import { isEnableConf, getFuncText } from '../../tools/utils'
+import { createResizeEvent } from '../../tools/resize'
+import { GlobalEvent } from '../../tools/event'
 import methods from './methods'
+import { warnLog, errLog } from '../../tools/log'
 
 /**
  * 渲染浮固定列
@@ -67,7 +70,7 @@ function renderEmptyContenet (h, _vm) {
     if (renderEmpty) {
       emptyContent = renderEmpty.call(_vm, h, emptyOpts, params)
     } else {
-      emptyContent = UtilTools.getFuncText(_vm.emptyText) || GlobalConfig.i18n('vxe.table.emptyText')
+      emptyContent = getFuncText(_vm.emptyText) || GlobalConfig.i18n('vxe.table.emptyText')
     }
   }
   return emptyContent
@@ -92,7 +95,7 @@ export default {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // 所有列是否允许拖动列宽调整大小
+    // （即将废弃）所有列是否允许拖动列宽调整大小
     resizable: { type: Boolean, default: () => GlobalConfig.table.resizable },
     // 是否带有斑马纹
     stripe: { type: Boolean, default: () => GlobalConfig.table.stripe },
@@ -168,9 +171,11 @@ export default {
     showFooterOverflow: { type: [Boolean, String], default: () => GlobalConfig.table.showFooterOverflow },
 
     /** 高级属性 */
-    // 主键配置
+    // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
     columnKey: Boolean,
+    // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
     rowKey: Boolean,
+    // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
     rowId: { type: String, default: () => GlobalConfig.table.rowId },
     zIndex: Number,
     emptyText: { type: String, default: () => GlobalConfig.table.emptyText },
@@ -237,6 +242,7 @@ export default {
     scrollY: Object,
     // （即将废弃）优化相关
     animat: { type: Boolean, default: () => GlobalConfig.table.animat },
+    // （可能会被废弃的参数，不要使用）
     delayHover: { type: Number, default: () => GlobalConfig.table.delayHover },
     // 额外的参数
     params: Object
@@ -654,7 +660,7 @@ export default {
           this.handleInitDefaults()
         }
         if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
-          UtilTools.warn('vxe.error.scrollErrProp', ['column.type=expand'])
+          warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
         }
         this.recalculate()
       })
@@ -700,7 +706,7 @@ export default {
     }
   },
   created () {
-    const { scrollXStore, sYOpts, scrollYStore, data, editOpts, treeOpts, treeConfig, showOverflow } = Object.assign(this, {
+    const { scrollXStore, sYOpts, scrollYStore, data, editOpts, treeOpts, treeConfig, showOverflow, rowOpts } = Object.assign(this, {
       tZindex: 0,
       elemStore: {},
       // 存放横向 X 虚拟滚动相关的信息
@@ -750,65 +756,74 @@ export default {
     })
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      if (!this.rowId && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
-        UtilTools.warn('vxe.error.reqProp', ['row-id'])
+      // if (this.rowId) {
+      //   warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
+      // }
+      // if (this.rowKey) {
+      //   warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
+      // }
+      // if (this.columnKey) {
+      //   warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
+      // }
+      if (!(this.rowId || rowOpts.keyField) && (this.checkboxOpts.reserve || this.checkboxOpts.checkRowKeys || this.radioOpts.reserve || this.radioOpts.checkRowKey || this.expandOpts.expandRowKeys || this.treeOpts.expandRowKeys)) {
+        warnLog('vxe.error.reqProp', ['row-config.keyField'])
       }
       if (this.editConfig && editOpts.showStatus && !this.keepSource) {
-        UtilTools.warn('vxe.error.reqProp', ['keep-source'])
+        warnLog('vxe.error.reqProp', ['keep-source'])
       }
-      if (treeConfig && treeOpts.line && (!this.rowKey || !showOverflow)) {
-        UtilTools.warn('vxe.error.reqProp', ['row-key | show-overflow'])
+      if (treeConfig && treeOpts.line && (!this.rowKey || !rowOpts.useKey || !showOverflow)) {
+        warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow'])
       }
       if (this.showFooter && !this.footerMethod) {
-        UtilTools.warn('vxe.error.reqProp', ['footer-method'])
+        warnLog('vxe.error.reqProp', ['footer-method'])
       }
       if (treeConfig && this.stripe) {
-        UtilTools.warn('vxe.error.noTree', ['stripe'])
+        warnLog('vxe.error.noTree', ['stripe'])
       }
       if (this.tooltipOpts.enabled) {
-        UtilTools.warn('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll'])
+        warnLog('vxe.error.delProp', ['tooltip-config.enabled', 'tooltip-config.showAll'])
       }
       // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
       const { exportConfig, exportOpts, importConfig, importOpts } = this
       if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.config.importTypes, importOpts.types)) {
-        UtilTools.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(VXETable.config.importTypes, type)).join(',') || VXETable.config.importTypes.join(',')])
+        warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => XEUtils.includes(VXETable.config.importTypes, type)).join(',') || VXETable.config.importTypes.join(',')])
       }
       if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.config.exportTypes, exportOpts.types)) {
-        UtilTools.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(VXETable.config.exportTypes, type)).join(',') || VXETable.config.exportTypes.join(',')])
+        warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => XEUtils.includes(VXETable.config.exportTypes, type)).join(',') || VXETable.config.exportTypes.join(',')])
       }
     }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       const customOpts = this.customOpts
       if (!this.id && this.customConfig && (customOpts.storage === true || (customOpts.storage && customOpts.storage.resizable) || (customOpts.storage && customOpts.storage.visible))) {
-        UtilTools.error('vxe.error.reqProp', ['id'])
+        errLog('vxe.error.reqProp', ['id'])
       }
       if (this.treeConfig && this.checkboxOpts.range) {
-        UtilTools.error('vxe.error.noTree', ['checkbox-config.range'])
+        errLog('vxe.error.noTree', ['checkbox-config.range'])
       }
       if (this.rowOpts.height && !this.showOverflow) {
-        UtilTools.warn('vxe.error.notProp', ['table.show-overflow'])
+        warnLog('vxe.error.notProp', ['table.show-overflow'])
       }
       if (!this.handleUpdateCellAreas) {
         if (this.clipConfig) {
-          UtilTools.warn('vxe.error.notProp', ['clip-config'])
+          warnLog('vxe.error.notProp', ['clip-config'])
         }
         if (this.fnrConfig) {
-          UtilTools.warn('vxe.error.notProp', ['fnr-config'])
+          warnLog('vxe.error.notProp', ['fnr-config'])
         }
         if (this.mouseOpts.area) {
-          UtilTools.error('vxe.error.notProp', ['mouse-config.area'])
+          errLog('vxe.error.notProp', ['mouse-config.area'])
           return
         }
       }
       if (this.mouseOpts.area && this.mouseOpts.selected) {
-        UtilTools.warn('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
+        warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
       }
       if (this.mouseOpts.area && this.checkboxOpts.range) {
-        UtilTools.warn('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
+        warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
       }
       if (this.treeConfig && this.mouseOpts.area) {
-        UtilTools.error('vxe.error.noTree', ['mouse-config.area'])
+        errLog('vxe.error.noTree', ['mouse-config.area'])
       }
     }
 
@@ -816,50 +831,50 @@ export default {
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       // 在 v3.0 中废弃 context-menu
       if (this.contextMenu) {
-        UtilTools.warn('vxe.error.delProp', ['context-menu', 'menu-config'])
+        warnLog('vxe.error.delProp', ['context-menu', 'menu-config'])
         if (!XEUtils.isObject(this.contextMenu)) {
-          UtilTools.warn('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}'])
+          warnLog('vxe.error.errProp', [`table.context-menu=${this.contextMenu}`, 'table.context-menu={}'])
         }
       }
       if (this.menuConfig && !XEUtils.isObject(this.menuConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}'])
+        warnLog('vxe.error.errProp', [`table.menu-config=${this.menuConfig}`, 'table.menu-config={}'])
       }
       if (this.exportConfig && !XEUtils.isObject(this.exportConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}'])
+        warnLog('vxe.error.errProp', [`table.export-config=${this.exportConfig}`, 'table.export-config={}'])
       }
       if (this.importConfig && !XEUtils.isObject(this.importConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}'])
+        warnLog('vxe.error.errProp', [`table.import-config=${this.importConfig}`, 'table.import-config={}'])
       }
       if (this.printConfig && !XEUtils.isObject(this.printConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}'])
+        warnLog('vxe.error.errProp', [`table.print-config=${this.printConfig}`, 'table.print-config={}'])
       }
       if (this.treeConfig && !XEUtils.isObject(this.treeConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}'])
+        warnLog('vxe.error.errProp', [`table.tree-config=${this.treeConfig}`, 'table.tree-config={}'])
       }
       if (this.customConfig && !XEUtils.isObject(this.customConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}'])
+        warnLog('vxe.error.errProp', [`table.custom-config=${this.customConfig}`, 'table.custom-config={}'])
       }
       if (this.editConfig && !XEUtils.isObject(this.editConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}'])
+        warnLog('vxe.error.errProp', [`table.edit-config=${this.editConfig}`, 'table.edit-config={}'])
       }
       if (this.emptyRender && !XEUtils.isObject(this.emptyRender)) {
-        UtilTools.warn('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
+        warnLog('vxe.error.errProp', [`table.empty-render=${this.emptyRender}`, 'table.empty-render={}'])
       }
     }
 
     // 检查是否有安装需要的模块
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (this.editConfig && !this._insert) {
-        UtilTools.error('vxe.error.reqModule', ['Edit'])
+        errLog('vxe.error.reqModule', ['Edit'])
       }
       if (this.editRules && !this._validate) {
-        UtilTools.error('vxe.error.reqModule', ['Validator'])
+        errLog('vxe.error.reqModule', ['Validator'])
       }
       if ((this.checkboxOpts.range || this.keyboardConfig || this.mouseConfig) && !this.triggerCellMousedownEvent) {
-        UtilTools.error('vxe.error.reqModule', ['Keyboard'])
+        errLog('vxe.error.reqModule', ['Keyboard'])
       }
       if ((this.printConfig || this.importConfig || this.exportConfig) && !this._exportData) {
-        UtilTools.error('vxe.error.reqModule', ['Export'])
+        errLog('vxe.error.reqModule', ['Export'])
       }
     }
 
@@ -898,10 +913,10 @@ export default {
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       const { $listeners } = this
       if (!this.menuConfig && ($listeners['menu-click'] || $listeners['cell-menu'] || $listeners['header-cell-menu'] || $listeners['footer-cell-menu'])) {
-        UtilTools.warn('vxe.error.reqProp', ['menu-config'])
+        warnLog('vxe.error.reqProp', ['menu-config'])
       }
       if (!this.tooltipConfig && ($listeners['cell-mouseenter'] || $listeners['cell-mouseleave'])) {
-        UtilTools.warn('vxe.error.reqProp', ['tooltip-config'])
+        warnLog('vxe.error.reqProp', ['tooltip-config'])
       }
     }
     if (this.autoResize) {

package/packages/table/src/util.js

@@ -1,6 +1,7 @@
 import VXETable from '../../v-x-e-table'
 import XEUtils from 'xe-utils'
-import { DomTools } from '../../tools'
+import { ColumnInfo } from './columnInfo'
+import DomTools from '../../tools/dom'
 
 const lineOffsetSizes = {
   mini: 3,
@@ -67,6 +68,15 @@ function queryCellElement (cell, selector) {
   return cell.querySelector('.vxe-cell' + selector)
 }
 
+export function toFilters (filters) {
+  if (filters && XEUtils.isArray(filters)) {
+    return filters.map(({ label, value, data, resetValue, checked }) => {
+      return { label, value, data, resetValue, checked: !!checked, _checked: !!checked }
+    })
+  }
+  return filters
+}
+
 export function getColMinWidth (params) {
   const { $table, column, cell } = params
   const { showHeaderOverflow: allColumnHeaderOverflow, resizableOpts } = $table
@@ -187,3 +197,11 @@ export function clearTableAllStatus (_vm) {
   }
   return clearTableDefaultStatus(_vm)
 }
+
+export function isColumnInfo (column) {
+  return column instanceof ColumnInfo
+}
+
+export function getColumnConfig ($xetable, _vm, options) {
+  return isColumnInfo(_vm) ? _vm : new ColumnInfo($xetable, _vm, options)
+}

package/packages/textarea/src/textarea.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 
 let autoTxtElem
 
@@ -84,7 +84,7 @@ export default {
       cols
     }
     if (placeholder) {
-      attrs.placeholder = UtilTools.getFuncText(placeholder)
+      attrs.placeholder = getFuncText(placeholder)
     }
     return h('div', {
       class: ['vxe-textarea', className, {

package/packages/toolbar/src/toolbar.js

@@ -2,7 +2,10 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
+import { warnLog, errLog } from '../../tools/log'
 
 const renderDropdowns = (h, _vm, item, isBtn) => {
   const { _e } = _vm
@@ -313,7 +316,7 @@ export default {
     this.$nextTick(() => {
       const $xetable = this.fintTable()
       if (refresh && !this.$xegrid && !refreshOpts.query) {
-        UtilTools.warn('vxe.error.notFunc', ['query'])
+        warnLog('vxe.error.notFunc', ['query'])
       }
       if ($xetable) {
         $xetable.connect(this)
@@ -324,7 +327,7 @@ export default {
             const { buttonRender } = item
             const compConf = buttonRender ? VXETable.renderer.get(buttonRender.name) : null
             if (compConf && compConf.renderButton) {
-              UtilTools.warn('vxe.error.delFunc', ['renderButton', 'renderToolbarButton'])
+              warnLog('vxe.error.delFunc', ['renderButton', 'renderToolbarButton'])
             }
           })
         }
@@ -434,7 +437,7 @@ export default {
       if (this.$xetable) {
         return true
       }
-      UtilTools.error('vxe.error.barUnableLink')
+      errLog('vxe.error.barUnableLink')
     },
     showCustom () {
       this.customStore.visible = true

package/packages/tools/{src/event.js → event.js}

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import { browse } from '../../tools/src/dom'
+import { browse } from './dom'
 
 export const EVENT_KEYS = {
   F2: 'F2',
@@ -80,5 +80,3 @@ if (browse.isDoc) {
   window.addEventListener('resize', GlobalEvent.trigger, false)
   window.addEventListener(wheelName, XEUtils.throttle(GlobalEvent.trigger, 100, { leading: true, trailing: false }), false)
 }
-
-export default GlobalEvent

package/packages/tools/log.js

@@ -0,0 +1,16 @@
+import GlobalConfig from '../v-x-e-table/src/conf'
+
+export function getLog (message, params) {
+  return `[vxe-table v${process.env.VUE_APP_VXE_TABLE_VERSION}] ${GlobalConfig.i18n(message, params)}`
+}
+
+function outLog (type) {
+  return function (message, params) {
+    const msg = getLog(message, params)
+    console[type](msg)
+    return msg
+  }
+}
+
+export const warnLog = outLog('warn')
+export const errLog = outLog('error')

package/packages/tools/{src/resize.js → resize.js}

@@ -1,5 +1,5 @@
 import XEUtils from 'xe-utils'
-import GlobalConfig from '../../v-x-e-table/src/conf'
+import GlobalConfig from '../v-x-e-table/src/conf'
 
 /**
  * 监听 resize 事件

package/packages/tools/utils.js

@@ -0,0 +1,108 @@
+import XEUtils from 'xe-utils'
+import GlobalConfig from '../v-x-e-table/src/conf'
+import { warnLog, errLog } from '../tools/log'
+
+let zindexIndex = 0
+let lastZindex = 1
+
+export function isEnableConf (conf) {
+  return conf && conf.enabled !== false
+}
+
+/**
+ * 判断值为：'' | null | undefined 时都属于空值
+ */
+export function eqEmptyValue (cellValue) {
+  return cellValue === '' || XEUtils.eqNull(cellValue)
+}
+
+export function getFuncText (content) {
+  return XEUtils.isFunction(content) ? content() : (GlobalConfig.translate ? GlobalConfig.translate(content) : content)
+}
+
+// 行主键 key
+export function getRowkey ($xetable) {
+  return $xetable.rowOpts.keyField || $xetable.rowId || '_X_ID'
+}
+
+// 获取所有的列，排除分组
+export function getColumnList (columns) {
+  const result = []
+  columns.forEach(column => {
+    result.push(...(column.children && column.children.length ? getColumnList(column.children) : [column]))
+  })
+  return result
+}
+
+export const UtilTools = {
+  nextZIndex () {
+    lastZindex = GlobalConfig.zIndex + zindexIndex++
+    return lastZindex
+  },
+  getLastZIndex () {
+    return lastZindex
+  },
+  getRowkey,
+  // 行主键 value
+  getRowid ($xetable, row) {
+    const rowid = XEUtils.get(row, getRowkey($xetable))
+    return XEUtils.eqNull(rowid) ? '' : encodeURIComponent(rowid)
+  },
+  getColumnList,
+  getClass (property, params) {
+    return property ? XEUtils.isFunction(property) ? property(params) : property : ''
+  },
+  formatText (value, placeholder) {
+    return '' + (value === '' || value === null || value === undefined ? (placeholder ? GlobalConfig.emptyCell : '') : value)
+  },
+  getCellValue (row, column) {
+    return XEUtils.get(row, column.property)
+  },
+  setCellValue (row, column, value) {
+    return XEUtils.set(row, column.property, value)
+  },
+  // 组装列配置
+  assemColumn (_vm) {
+    const { $el, $xetable, $xecolumn, columnConfig } = _vm
+    const groupConfig = $xecolumn ? $xecolumn.columnConfig : null
+    columnConfig.slots = _vm.$scopedSlots
+    if (groupConfig) {
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if ($xecolumn.$options._componentTag === 'vxe-table-column') {
+          errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`])
+        } else if ($xecolumn.$options._componentTag === 'vxe-column') {
+          warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`])
+        }
+      }
+      if (!groupConfig.children) {
+        groupConfig.children = []
+      }
+      groupConfig.children.splice([].indexOf.call($xecolumn.$el.children, $el), 0, columnConfig)
+    } else {
+      $xetable.staticColumns.splice([].indexOf.call($xetable.$refs.hideColumn.children, $el), 0, columnConfig)
+    }
+  },
+  // 销毁列
+  destroyColumn (_vm) {
+    const { $xetable, columnConfig } = _vm
+    const matchObj = XEUtils.findTree($xetable.staticColumns, column => column === columnConfig)
+    if (matchObj) {
+      matchObj.items.splice(matchObj.index, 1)
+    }
+  },
+  hasChildrenList (item) {
+    return item && item.children && item.children.length > 0
+  },
+  parseFile (file) {
+    const name = file.name
+    const tIndex = XEUtils.lastIndexOf(name, '.')
+    const type = name.substring(tIndex + 1, name.length)
+    const filename = name.substring(0, tIndex)
+    return { filename, type }
+  },
+  isNumVal (num) {
+    return !isNaN(parseFloat('' + num))
+  }
+}
+
+export default UtilTools

package/packages/tooltip/src/tooltip.js

@@ -1,7 +1,8 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
 
 function updateTipStyle (_vm) {
   const { $el: wrapperElem, tipTarget, tipStore } = _vm

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

@@ -6,7 +6,8 @@ import { commands } from './src/commands'
 import { menus } from './src/menus'
 import { formats } from './src/formats'
 import { setup } from './src/setup'
-import { UtilTools } from '../tools'
+import { UtilTools } from '../tools/utils'
+import { errLog } from '../tools/log'
 
 const installedPlugins = []
 
@@ -29,7 +30,7 @@ function reg (key) {
   // 检测安装顺序是否正确
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
     if (VXETable.Table) {
-      UtilTools.error('vxe.error.useErr', [key])
+      errLog('vxe.error.useErr', [key])
     }
   }
   VXETable[`_${key}`] = 1
@@ -88,6 +89,7 @@ export const v = 'v3'
 
 export const VXETable = {
   v,
+  version: process.env.VUE_APP_VXE_TABLE_VERSION,
   reg,
   use,
   setup,

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

@@ -26,6 +26,9 @@ export default {
     // emptyRender: {
     //   name: ''
     // },
+    // rowConfig: {
+    //   keyField: '_X_ID' // 行数据的唯一主键字段名
+    // },
     radioConfig: {
       // trigger: 'default'
       strict: true
@@ -49,7 +52,6 @@ export default {
     //  storage: false,
     //  checkMethod () {}
     // },
-    // rowId: '_X_ID', // 行数据的唯一主键字段名
     sortConfig: {
       // remote: false,
       // trigger: 'default',

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

@@ -1,5 +1,5 @@
-import { UtilTools } from '../../tools'
 import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
 function toType (type) {
   return XEUtils.toValueString(type).replace('_', '').toLowerCase()
@@ -22,7 +22,7 @@ export const interceptor = {
     // 检测类型
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (eventTypes.indexOf(type) === -1) {
-        UtilTools.warn('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')])
+        warnLog('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')])
       }
     }
 
@@ -35,7 +35,7 @@ export const interceptor = {
       // 检测重复
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (eList.indexOf(callback) > -1) {
-          UtilTools.warn('vxe.error.coverProp', ['Interceptor', type])
+          warnLog('vxe.error.coverProp', ['Interceptor', type])
         }
       }
 

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

@@ -1,6 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
-import { UtilTools } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import { warnLog } from '../../tools/log'
 
 const defaultCompProps = { transfer: true }
 
@@ -92,7 +93,7 @@ function getCellLabelVNs (h, renderOpts, params, cellLabel) {
     }, placeholder && isEmptyValue(cellLabel) ? [
       h('span', {
         class: 'vxe-cell--placeholder'
-      }, UtilTools.formatText(UtilTools.getFuncText(placeholder), 1))
+      }, UtilTools.formatText(getFuncText(placeholder), 1))
     ] : UtilTools.formatText(cellLabel, 1))
   ]
 }
@@ -672,7 +673,7 @@ export const renderer = {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           XEUtils.each(options, (val, key) => {
             if (!XEUtils.eqNull(renders[key]) && renders[key] !== val) {
-              UtilTools.warn('vxe.error.coverProp', [`Renderer.${name}`, key])
+              warnLog('vxe.error.coverProp', [`Renderer.${name}`, key])
             }
           })
         }

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

@@ -1,5 +1,5 @@
-import { UtilTools } from '../../tools'
 import XEUtils from 'xe-utils'
+import { warnLog } from '../../tools/log'
 
 /**
  * 创建数据仓库
@@ -22,7 +22,7 @@ class Store {
     // 检测是否覆盖
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (!XEUtils.eqNull(this.store[name]) && this.store[name] !== render) {
-        UtilTools.warn('vxe.error.coverProp', [this._name, name])
+        warnLog('vxe.error.coverProp', [this._name, name])
       }
     }
     this.store[name] = render

package/packages/validator/src/mixin.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
-import { UtilTools, DomTools } from '../../tools'
-import { eqEmptyValue } from '../../tools/src/utils'
+import { eqEmptyValue, getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
 
 /**
  * 校验规则
@@ -26,7 +26,7 @@ class Rule {
    * 支持国际化翻译
    */
   get content () {
-    return UtilTools.getFuncText(this.$options.content || this.$options.message)
+    return getFuncText(this.$options.content || this.$options.message)
   }
 
   get message () {

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

@@ -38,7 +38,15 @@ export type VXETableVersion = 'v1' | 'v2' | 'v3' | 'v4'
 export const v: VXETableVersion
 
 export interface VXETableCore {
+  /**
+   * 已被 version 替换
+   * @deprecated
+   */
   v: VXETableVersion;
+  /**
+   * 版本号
+   */
+  version: string;
   /**
    * 设置全局参数/获取所有参数
    */