vxe-table 3.4.14-beta.3 → 3.5.0-beta.1

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
@@ -146,7 +148,7 @@ 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
   })
 }
 
@@ -168,7 +170,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))

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 UtilTools, { isEnableConf } from '../../tools/utils'
 import { getOffsetSize, calcTreeLine, mergeBodyMethod, removeScrollListener, restoreScrollListener } from './util'
-import { browse, setScrollLeftAndTop } from '../../tools/src/dom'
+import DomTools from '../../tools/dom'
 
 const renderType = 'body'
 
@@ -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` : ''
@@ -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,29 +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
-      let targetLeft = bodyElem.scrollLeft
-      if (fixedType === 'left') {
-        if (leftElem) {
-          targetTop = leftElem.scrollTop
-          targetLeft = leftElem.scrollLeft
-        }
-      } else if (fixedType === 'right') {
-        if (rightElem) {
-          targetTop = rightElem.scrollTop
-          targetLeft = rightElem.scrollLeft
-        }
-      }
-      setScrollLeftAndTop(bodyElem, targetLeft, targetTop)
-      setScrollLeftAndTop(leftElem, targetLeft, targetTop)
-      setScrollLeftAndTop(rightElem, targetLeft, 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)
   }
 }
@@ -749,8 +747,8 @@ export default {
       const { tableBody } = $refs
       const bodyElem = tableBody.$el
 
-      const deltaTop = browse.firefox ? deltaY * 40 : deltaY
-      const deltaLeft = browse.firefox ? deltaX * 40 : deltaX
+      const deltaTop = deltaY
+      const deltaLeft = deltaX
       const isTopWheel = deltaTop < 0
       // 如果滚动位置已经是顶部或底部，则不需要触发
       if (isTopWheel ? scrollBodyElem.scrollTop <= 0 : scrollBodyElem.scrollTop >= scrollBodyElem.scrollHeight - scrollBodyElem.clientHeight) {

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))
     ]
   },

package/packages/table/src/column.js

@@ -1,5 +1,5 @@
 import Cell from '../../table/src/cell'
-import { UtilTools } from '../../tools'
+import UtilTools from '../../tools/utils'
 
 const props = {
   // 列唯一主键
@@ -68,8 +68,10 @@ const props = {
   exportMethod: Function,
   // 表尾单元格数据导出方法
   footerExportMethod: Function,
-  // 标题帮助图标配置项
+  // 已废弃，被 titlePrefix 替换
   titleHelp: Object,
+  // 标题帮助图标配置项
+  titlePrefix: Object,
   // 单元格值类型
   cellType: String,
   // 单元格渲染配置项

package/packages/table/src/columnInfo.js

@@ -0,0 +1,149 @@
+import XEUtils from 'xe-utils'
+import GlobalConfig from '../../v-x-e-table/src/conf'
+import { formats } from '../../v-x-e-table/src/formats'
+import { toFilters } from './util'
+import { getFuncText } from '../../tools/utils'
+import { warnLog, errLog } from '../../tools/log'
+
+export class ColumnInfo {
+  /* eslint-disable @typescript-eslint/no-use-before-define */
+  constructor ($xetable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
+    const $xegrid = $xetable.$xegrid
+    const proxyOpts = $xegrid ? $xegrid.proxyOpts : null
+    const formatter = _vm.formatter
+    const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
+
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
+      if (_vm.type && types.indexOf(_vm.type) === -1) {
+        warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
+      }
+      if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+        warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
+      }
+      if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+        warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
+      }
+      if (_vm.cellRender && _vm.editRender) {
+        warnLog('vxe.error.errConflicts', ['column.cell-render', 'column.edit-render'])
+      }
+      if (_vm.type === 'expand') {
+        if ($xetable.treeConfig && $xetable.treeOpts.line) {
+          errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
+        }
+      }
+      if (_vm.remoteSort) {
+        warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote'])
+      }
+      if (_vm.sortMethod) {
+        warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod'])
+      }
+      if (formatter) {
+        if (XEUtils.isString(formatter)) {
+          const globalFunc = formats.get(formatter) || XEUtils[formatter]
+          if (!XEUtils.isFunction(globalFunc)) {
+            errLog('vxe.error.notFunc', [formatter])
+          }
+        } else if (XEUtils.isArray(formatter)) {
+          const globalFunc = formats.get(formatter[0]) || XEUtils[formatter[0]]
+          if (!XEUtils.isFunction(globalFunc)) {
+            errLog('vxe.error.notFunc', [formatter[0]])
+          }
+        }
+      }
+    }
+
+    Object.assign(this, {
+      // 基本属性
+      type: _vm.type,
+      property: _vm.field,
+      field: _vm.field,
+      title: _vm.title,
+      width: _vm.width,
+      minWidth: _vm.minWidth,
+      resizable: _vm.resizable,
+      fixed: _vm.fixed,
+      align: _vm.align,
+      headerAlign: _vm.headerAlign,
+      footerAlign: _vm.footerAlign,
+      showOverflow: _vm.showOverflow,
+      showHeaderOverflow: _vm.showHeaderOverflow,
+      showFooterOverflow: _vm.showFooterOverflow,
+      className: _vm.className,
+      headerClassName: _vm.headerClassName,
+      footerClassName: _vm.footerClassName,
+      formatter: formatter,
+      sortable: _vm.sortable,
+      sortBy: _vm.sortBy,
+      sortType: _vm.sortType,
+      sortMethod: _vm.sortMethod,
+      remoteSort: _vm.remoteSort,
+      filters: toFilters(_vm.filters),
+      filterMultiple: XEUtils.isBoolean(_vm.filterMultiple) ? _vm.filterMultiple : true,
+      filterMethod: _vm.filterMethod,
+      filterResetMethod: _vm.filterResetMethod,
+      filterRecoverMethod: _vm.filterRecoverMethod,
+      filterRender: _vm.filterRender,
+      treeNode: _vm.treeNode,
+      cellType: _vm.cellType,
+      cellRender: _vm.cellRender,
+      editRender: _vm.editRender,
+      contentRender: _vm.contentRender,
+      exportMethod: _vm.exportMethod,
+      footerExportMethod: _vm.footerExportMethod,
+      titleHelp: _vm.titleHelp,
+      titlePrefix: _vm.titlePrefix,
+      // 自定义参数
+      params: _vm.params,
+      // 渲染属性
+      id: _vm.colId || XEUtils.uniqueId('col_'),
+      parentId: null,
+      visible,
+      // 内部属性（一旦被使用，将导致不可升级版本）
+      halfVisible: false,
+      defaultVisible: visible,
+      checked: false,
+      halfChecked: false,
+      disabled: false,
+      level: 1,
+      rowSpan: 1,
+      colSpan: 1,
+      order: null,
+      sortTime: 0,
+      renderWidth: 0,
+      renderHeight: 0,
+      resizeWidth: 0,
+      renderLeft: 0,
+      renderArgs: [], // 渲染参数可用于扩展
+      model: {},
+      renderHeader: renderHeader || _vm.renderHeader,
+      renderCell: renderCell || _vm.renderCell,
+      renderFooter: renderFooter || _vm.renderFooter,
+      renderData: renderData,
+      // 单元格插槽，只对 grid 有效
+      slots: _vm.slots
+    })
+    if (proxyOpts && proxyOpts.beforeColumn) {
+      proxyOpts.beforeColumn({ $grid: $xegrid, column: this })
+    }
+  }
+
+  getTitle () {
+    return getFuncText(this.title || (this.type === 'seq' ? GlobalConfig.i18n('vxe.table.seqTitle') : ''))
+  }
+
+  getKey () {
+    return this.property || (this.type ? `type=${this.type}` : null)
+  }
+
+  update (name, value) {
+    // 不支持双向的属性
+    if (name !== 'filters') {
+      if (name === 'field') {
+        // 兼容旧属性
+        this.property = value
+      }
+      this[name] = value
+    }
+  }
+}