vxe-table 3.4.15 → 3.5.0-beta.2

package/packages/form/src/util.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils'
 import VXETable from '../../v-x-e-table'
-import { UtilTools } from '../../tools'
+import { warnLog } from '../../tools/log'
 
 class ItemConfig {
   constructor ($xeform, item) {
@@ -31,7 +31,7 @@ class ItemConfig {
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       const compConf = item.itemRender ? VXETable.renderer.get(item.itemRender.name) : null
       if (compConf && !compConf.renderItemContent && compConf.renderItem) {
-        UtilTools.warn('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent'])
+        warnLog('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent'])
       }
     }
   }

package/packages/grid/src/grid.js

@@ -3,8 +3,10 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools, GlobalEvent, isEnableConf } from '../../tools'
-import { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/src/dom'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import DomTools, { getOffsetHeight, getPaddingTopBottomSize } from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
+import { warnLog, errLog } from '../../tools/log'
 
 const methods = {}
 const propKeys = Object.keys(Table.props)
@@ -59,7 +61,7 @@ function getFuncSlot (_vm, optSlots, slotKey) {
         return $scopedSlots[funcSlot]
       } else {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-          UtilTools.error('vxe.error.notSlot', [funcSlot])
+          errLog('vxe.error.notSlot', [funcSlot])
         }
       }
     } else {
@@ -77,10 +79,10 @@ function getToolbarSlots (_vm) {
   const slots = {}
   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
     if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
-      UtilTools.warn('vxe.error.reqProp', ['toolbar-config.slots.buttons'])
+      warnLog('vxe.error.reqProp', ['toolbar-config.slots.buttons'])
     }
     if ($scopedSlots.tools && (!toolbarOptSlots || toolbarOptSlots.tools !== 'tools')) {
-      UtilTools.warn('vxe.error.reqProp', ['toolbar-config.slots.tools'])
+      warnLog('vxe.error.reqProp', ['toolbar-config.slots.tools'])
     }
   }
   if (toolbarOptSlots) {
@@ -253,15 +255,15 @@ export default {
   created () {
     const { data, formOpts, proxyOpts, proxyConfig } = this
     if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
-      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+      errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     }
 
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       if (this.toolbar) {
-        UtilTools.warn('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
+        warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
       }
       if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
-        UtilTools.warn('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
+        warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
       }
     }
 
@@ -588,7 +590,7 @@ export default {
               })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.query'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
             }
           }
           break
@@ -614,7 +616,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
@@ -631,7 +633,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
@@ -643,7 +645,7 @@ export default {
                 // 检测弹窗模块
                 if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                   if (!VXETable.modal) {
-                    UtilTools.error('vxe.error.reqModule', ['Modal'])
+                    errLog('vxe.error.reqModule', ['Modal'])
                   }
                 }
                 VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -651,7 +653,7 @@ export default {
             }
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.delete'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
             }
           }
           break
@@ -690,7 +692,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
@@ -707,7 +709,7 @@ export default {
                       // 检测弹窗模块
                       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                         if (!VXETable.modal) {
-                          UtilTools.error('vxe.error.reqModule', ['Modal'])
+                          errLog('vxe.error.reqModule', ['Modal'])
                         }
                       }
                       VXETable.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
@@ -718,7 +720,7 @@ export default {
                   // 检测弹窗模块
                   if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
                     if (!VXETable.modal) {
-                      UtilTools.error('vxe.error.reqModule', ['Modal'])
+                      errLog('vxe.error.reqModule', ['Modal'])
                     }
                   }
                   VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.dataUnchanged'), status: 'info' })
@@ -727,7 +729,7 @@ export default {
             })
           } else {
             if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-              UtilTools.error('vxe.error.notFunc', ['proxy-config.ajax.save'])
+              errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
             }
           }
           break
@@ -762,7 +764,7 @@ export default {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ id: `msg_${code}`, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -817,7 +819,7 @@ export default {
           // 检测弹窗模块
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
             if (!VXETable.modal) {
-              UtilTools.error('vxe.error.reqModule', ['Modal'])
+              errLog('vxe.error.reqModule', ['Modal'])
             }
           }
           VXETable.modal.message({ id: code, content: GlobalConfig.i18n('vxe.grid.selectOneRecord'), status: 'warning' })
@@ -931,7 +933,7 @@ export default {
             XEUtils.each(column.slots, (func) => {
               if (!XEUtils.isFunction(func)) {
                 if (!$scopedSlots[func]) {
-                  UtilTools.error('vxe.error.notSlot', [func])
+                  errLog('vxe.error.notSlot', [func])
                 }
               }
             })

package/packages/header/src/header.js

@@ -1,5 +1,6 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools } from '../../tools'
+import UtilTools from '../../tools/utils'
+import DomTools from '../../tools/dom'
 import { convertToRows } from './util'
 import { getColMinWidth } from '../../table/src/util'
 
@@ -163,7 +164,7 @@ export default {
               },
               style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null,
               on: thOns,
-              key: columnKey || isColGroup ? column.id : $columnIndex
+              key: columnKey || columnOpts.useKey || isColGroup ? column.id : $columnIndex
             }, [
               h('div', {
                 class: ['vxe-cell', {

package/packages/input/src/input.js

@@ -1,9 +1,12 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 import { toStringTimeDate, getDateQuarter } from './date'
 import { handleNumber, toFloatValueFixed } from './number'
+import { warnLog } from '../../tools/log'
 
 const yearSize = 20
 const monthSize = 20
@@ -962,7 +965,7 @@ export default {
     inpPlaceholder () {
       const { placeholder } = this
       if (placeholder) {
-        return UtilTools.getFuncText(placeholder)
+        return getFuncText(placeholder)
       }
       return ''
     },
@@ -1017,7 +1020,7 @@ export default {
   },
   mounted () {
     if (this.dateConfig) {
-      UtilTools.warn('vxe.error.removeProp', ['date-config'])
+      warnLog('vxe.error.removeProp', ['date-config'])
     }
     if (this.isDatePickerType) {
       if (this.transfer) {

package/packages/keyboard/src/mixin.js

@@ -1,6 +1,5 @@
 import XEUtils from 'xe-utils'
-import { DomTools } from '../../tools'
-import { browse } from '../../tools/src/dom'
+import DomTools, { browse } from '../../tools/dom'
 
 function getTargetOffset (target, container) {
   let offsetTop = 0

package/packages/list/src/list.js

@@ -1,8 +1,9 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { GlobalEvent, createResizeEvent } from '../../tools'
-import { browse } from '../../tools/src/dom'
+import { createResizeEvent } from '../../tools/resize'
+import { GlobalEvent } from '../../tools/event'
+import { browse } from '../../tools/dom'
 
 export default {
   name: 'VxeList',

package/packages/menu/src/mixin.js

@@ -1,6 +1,8 @@
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools, isEnableConf } from '../../tools'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import DomTools from '../../tools/dom'
 import VXETable from '../../v-x-e-table'
+import { warnLog } from '../../tools/log'
 
 export default {
   methods: {
@@ -104,7 +106,7 @@ export default {
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
               if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-                UtilTools.warn('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
+                warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
               }
               this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt)
             } else {
@@ -255,7 +257,7 @@ export default {
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
           if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-            UtilTools.warn('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
+            warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
           }
           this.emitEvent('context-menu-click', params, evnt)
         } else {

package/packages/menu/src/panel.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 
 export default {
   name: 'VxeTableContextMenu',
@@ -53,7 +53,7 @@ export default {
             }),
             h('span', {
               class: 'vxe-context-menu--link-content'
-            }, UtilTools.getFuncText(item.name)),
+            }, getFuncText(item.name)),
             h('i', {
               class: ['vxe-context-menu--link-suffix', hasChildMenus ? item.suffixIcon || 'suffix--haschild' : item.suffixIcon]
             })
@@ -89,7 +89,7 @@ export default {
                 }),
                 h('span', {
                   class: 'vxe-context-menu--link-content'
-                }, UtilTools.getFuncText(child.name))
+                }, getFuncText(child.name))
               ])
             ])
           })) : null

package/packages/modal/src/modal.js

@@ -1,7 +1,10 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 import XEUtils from 'xe-utils'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
+import { errLog } from '../../tools/log'
 
 export const allActivedModals = []
 export const msgQueue = []
@@ -86,7 +89,7 @@ export default {
   },
   created () {
     if (this.storage && !this.id) {
-      UtilTools.error('vxe.error.reqProp', ['modal.id'])
+      errLog('vxe.error.reqProp', ['modal.id'])
     }
   },
   mounted () {
@@ -167,7 +170,7 @@ export default {
         }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : headerSlot.call(this, { $modal: this }, h)) : [
           titleSlot ? titleSlot.call(this, { $modal: this }, h) : h('span', {
             class: 'vxe-modal--title'
-          }, title ? UtilTools.getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
+          }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
           showZoom ? h('i', {
             class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
             attrs: {
@@ -199,7 +202,7 @@ export default {
           ]) : null,
           h('div', {
             class: 'vxe-modal--content'
-          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : UtilTools.getFuncText(content)),
+          }, defaultSlot ? (!inited || (destroyOnClose && !visible) ? [] : defaultSlot.call(this, { $modal: this }, h)) : getFuncText(content)),
           !isMsg ? h('div', {
             class: ['vxe-loading', {
               'is--visible': loading

package/packages/pulldown/src/pulldown.js

@@ -1,6 +1,8 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 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'
 
 export default {
   name: 'VxePulldown',

package/packages/radio/src/button.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 
 export default {
@@ -60,7 +60,7 @@ export default {
       }),
       h('span', {
         class: 'vxe-radio--label'
-      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])
+      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])
     ])
   },
   methods: {

package/packages/radio/src/radio.js

@@ -1,4 +1,4 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
 
@@ -63,7 +63,7 @@ export default {
       }),
       h('span', {
         class: 'vxe-radio--label'
-      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [UtilTools.getFuncText(content)])
+      }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])
     ])
   },
   methods: {

package/packages/select/src/select.js

@@ -2,7 +2,9 @@ import XEUtils from 'xe-utils'
 import VxeInput from '../../input/src/input'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { UtilTools, DomTools, GlobalEvent } from '../../tools'
+import UtilTools, { getFuncText } from '../../tools/utils'
+import DomTools from '../../tools/dom'
+import { GlobalEvent } from '../../tools/event'
 
 function isOptionVisible (option) {
   return option.visible !== false
@@ -13,7 +15,8 @@ function getOptUniqueId () {
 }
 
 function getOptkey (_vm) {
-  return _vm.optionId || '_X_ID'
+  const { optionOpts } = _vm
+  return optionOpts.keyField || _vm.optionId || '_X_OPTION_KEY'
 }
 
 function getOptid (_vm, option) {
@@ -115,7 +118,8 @@ function getSelectLabel (_vm, value) {
 }
 
 export function renderOption (h, _vm, list, group) {
-  const { isGroup, labelField, valueField, optionKey, value, multiple, currentValue } = _vm
+  const { isGroup, labelField, valueField, optionKey, value, multiple, currentValue, optionOpts } = _vm
+  const { useKey } = optionOpts
   return list.map((option, cIndex) => {
     const { slots } = option
     const isVisible = !isGroup || isOptionVisible(option)
@@ -124,7 +128,7 @@ export function renderOption (h, _vm, list, group) {
     const optid = getOptid(_vm, option)
     const defaultSlot = slots ? slots.default : null
     return isVisible ? h('div', {
-      key: optionKey ? optid : cIndex,
+      key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
         'is--selected': multiple ? (value && value.indexOf(optionValue) > -1) : value === optionValue,
@@ -146,19 +150,20 @@ export function renderOption (h, _vm, list, group) {
           }
         }
       }
-    }, defaultSlot ? _vm.callSlot(defaultSlot, { option, $select: _vm }, h) : UtilTools.formatText(UtilTools.getFuncText(option[labelField]))) : null
+    }, defaultSlot ? _vm.callSlot(defaultSlot, { option, $select: _vm }, h) : UtilTools.formatText(getFuncText(option[labelField]))) : null
   })
 }
 
 export function renderOptgroup (h, _vm) {
-  const { optionKey, visibleGroupList, groupLabelField, groupOptionsField } = _vm
+  const { optionKey, visibleGroupList, groupLabelField, groupOptionsField, optionOpts } = _vm
+  const { useKey } = optionOpts
   return visibleGroupList.map((group, gIndex) => {
     const { slots } = group
     const optid = getOptid(_vm, group)
     const isGroupDisabled = group.disabled
     const defaultSlot = slots ? slots.default : null
     return h('div', {
-      key: optionKey ? optid : gIndex,
+      key: useKey || optionKey ? optid : gIndex,
       class: ['vxe-optgroup', group.className, {
         'is--disabled': isGroupDisabled
       }],
@@ -168,7 +173,7 @@ export function renderOptgroup (h, _vm) {
     }, [
       h('div', {
         class: 'vxe-optgroup--title'
-      }, defaultSlot ? _vm.callSlot(defaultSlot, { option: group, $select: _vm }, h) : UtilTools.getFuncText(group[groupLabelField])),
+      }, defaultSlot ? _vm.callSlot(defaultSlot, { option: group, $select: _vm }, h) : getFuncText(group[groupLabelField])),
       h('div', {
         class: 'vxe-optgroup--wrapper'
       }, renderOption(h, _vm, group[groupOptionsField], group))
@@ -211,10 +216,13 @@ export default {
     optionProps: Object,
     optionGroups: Array,
     optionGroupProps: Object,
+    optionConfig: Object,
     className: [String, Function],
     size: { type: String, default: () => GlobalConfig.select.size || GlobalConfig.size },
     emptyText: String,
+    // 已废弃，被 option-config.keyField 替换
     optionId: { type: String, default: () => GlobalConfig.select.optionId },
+    // 已废弃，被 option-config.useKey 替换
     optionKey: Boolean,
     transfer: { type: Boolean, default: () => GlobalConfig.select.transfer }
   },
@@ -262,6 +270,9 @@ export default {
     groupOptionsField () {
       return this.groupPropsOpts.options || 'options'
     },
+    optionOpts () {
+      return Object.assign({}, GlobalConfig.select.optionConfig, this.optionConfig)
+    },
     isGroup () {
       return this.fullGroupList.some(item => item.options && item.options.length)
     },

package/packages/switch/src/switch.js

@@ -1,7 +1,7 @@
-import { UtilTools } from '../../tools'
+import { getFuncText } from '../../tools/utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import vSize from '../../mixins/size'
-import { browse } from '../../tools/src/dom'
+import { browse } from '../../tools/dom'
 
 export default {
   name: 'VxeSwitch',
@@ -30,10 +30,10 @@ export default {
       return this.value === this.openValue
     },
     onShowLabel () {
-      return UtilTools.getFuncText(this.openLabel)
+      return getFuncText(this.openLabel)
     },
     offShowLabel () {
-      return UtilTools.getFuncText(this.closeLabel)
+      return getFuncText(this.closeLabel)
     },
     styles () {
       return browse.msie && this.isChecked ? {

package/packages/table/src/body.js

@@ -1,9 +1,9 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools, isEnableConf } from '../../tools'
-import { getOffsetSize, calcTreeLine, mergeBodyMethod, removeScrollListener, restoreScrollListener } from './util'
-import { setScrollTop } from '../../tools/src/dom'
+import UtilTools, { isEnableConf } from '../../tools/utils'
+import { getOffsetSize, calcTreeLine, mergeBodyMethod, removeScrollListener, restoreScrollListener, getRowid } from './util'
+import DomTools from '../../tools/dom'
 
 const renderType = 'body'
 
@@ -16,7 +16,7 @@ function renderLine (h, _vm, $xetable, params) {
   const { row, column } = params
   const { treeOpts, treeConfig, fullAllDataRowIdData } = $xetable
   const { slots, treeNode } = column
-  const rowid = UtilTools.getRowid($xetable, row)
+  const rowid = getRowid($xetable, row)
   const rest = fullAllDataRowIdData[rowid]
   let rLevel = 0
   let rIndex = 0
@@ -83,7 +83,8 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
     editStore,
     validStore,
     tooltipConfig,
-    rowOpts
+    rowOpts,
+    columnOpts
   } = $xetable
   const { type, cellRender, editRender, align, showOverflow, className, treeNode } = column
   const { actived } = editStore
@@ -267,7 +268,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
       'col--valid-error': hasValidError,
       'col--current': currentColumn === column
     }, UtilTools.getClass(className, params), UtilTools.getClass(cellClassName, params)],
-    key: columnKey ? column.id : $columnIndex,
+    key: columnKey || columnOpts.useKey ? column.id : $columnIndex,
     attrs,
     style: Object.assign({
       height: hasEllipsis && (scrollYRHeight || rowHeight) ? `${scrollYRHeight || rowHeight}px` : ''
@@ -321,7 +322,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
         $xetable.clearHoverRow()
       }
     }
-    const rowid = UtilTools.getRowid($xetable, row)
+    const rowid = getRowid($xetable, row)
     const rest = fullAllDataRowIdData[rowid]
     const rowLevel = rest ? rest.level : 0
     const seq = rest ? rest.seq : -1
@@ -343,7 +344,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
           rowid: rowid
         },
         style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-        key: rowKey || treeConfig ? rowid : $rowIndex,
+        key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex,
         on: trOn
       }, tableColumn.map((column, $columnIndex) => {
         return renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
@@ -413,26 +414,26 @@ function syncBodyScroll (_vm, fixedType, scrollTop, elem1, elem2) {
     }
     clearTimeout(scrollProcessTimeout)
     scrollProcessTimeout = setTimeout(() => {
-      const { tableBody, leftBody, rightBody } = _vm.$refs
-      const bodyElem = tableBody.$el
-      const leftElem = leftBody ? leftBody.$el : null
-      const rightElem = rightBody ? rightBody.$el : null
+      // const { tableBody, leftBody, rightBody } = _vm.$refs
+      // const bodyElem = tableBody.$el
+      // const leftElem = leftBody ? leftBody.$el : null
+      // const rightElem = rightBody ? rightBody.$el : null
       restoreScrollListener(elem1)
       restoreScrollListener(elem2)
       // 检查滚动条是的同步
-      let targetTop = bodyElem.scrollTop
-      if (fixedType === 'left') {
-        if (leftElem) {
-          targetTop = leftElem.scrollTop
-        }
-      } else if (fixedType === 'right') {
-        if (rightElem) {
-          targetTop = rightElem.scrollTop
-        }
-      }
-      setScrollTop(bodyElem, targetTop)
-      setScrollTop(leftElem, targetTop)
-      setScrollTop(rightElem, targetTop)
+      // let targetTop = bodyElem.scrollTop
+      // if (fixedType === 'left') {
+      //   if (leftElem) {
+      //     targetTop = leftElem.scrollTop
+      //   }
+      // } else if (fixedType === 'right') {
+      //   if (rightElem) {
+      //     targetTop = rightElem.scrollTop
+      //   }
+      // }
+      // setScrollTop(bodyElem, targetTop)
+      // setScrollTop(leftElem, targetTop)
+      // setScrollTop(rightElem, targetTop)
     }, 300)
   }
 }

package/packages/table/src/cell.js

@@ -1,15 +1,16 @@
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
-import { UtilTools, DomTools } from '../../tools'
-import { eqEmptyValue, isEnableConf } from '../../tools/src/utils'
+import DomTools from '../../tools/dom'
+import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
+import { getColumnConfig } from './util'
 
 function renderHelpIcon (h, params) {
   const { $table, column } = params
-  const { titleHelp } = column
-  return titleHelp ? [
+  const titlePrefix = column.titlePrefix || column.titleHelp
+  return titlePrefix ? [
     h('i', {
-      class: ['vxe-cell-help-icon', titleHelp.icon || GlobalConfig.icon.TABLE_HELP],
+      class: ['vxe-cell-help-icon', titlePrefix.icon || GlobalConfig.icon.TABLE_HELP],
       on: {
         mouseenter (evnt) {
           $table.triggerHeaderHelpEvent(evnt, params)
@@ -136,7 +137,7 @@ export const Cell = {
           renMaps.renderHeader = this.renderFilterHeader
         }
     }
-    return UtilTools.getColumnConfig($xetable, _vm, renMaps)
+    return getColumnConfig($xetable, _vm, renMaps)
   },
   /**
    * 单元格
@@ -182,7 +183,7 @@ export const Cell = {
         // 如果设置占位符
         h('span', {
           class: 'vxe-cell--placeholder'
-        }, UtilTools.formatText(UtilTools.getFuncText(cellPlaceholder), 1))
+        }, UtilTools.formatText(getFuncText(cellPlaceholder), 1))
       ] : UtilTools.formatText(cellValue, 1))
     ]
   },