vxe-table 4.1.20 → 4.2.0-beta.2

package/packages/radio-button/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const RadioButton = Object.assign(VxeRadioButtonComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
     app.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
   }
 })
 
+dynamicApp.component(VxeRadioButtonComponent.name, VxeRadioButtonComponent)
+
 export default RadioButton

package/packages/radio-group/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const RadioGroup = Object.assign(VxeRadioGroupComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
     app.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
   }
 })
 
+dynamicApp.component(VxeRadioGroupComponent.name, VxeRadioGroupComponent)
+
 export default RadioGroup

package/packages/select/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Select = Object.assign(VxeSelectComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeSelectComponent.name, VxeSelectComponent)
     app.component(VxeSelectComponent.name, VxeSelectComponent)
   }
 })
 
+dynamicApp.component(VxeSelectComponent.name, VxeSelectComponent)
+
 export default Select

package/packages/switch/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Switch = Object.assign(VxeSwitchComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent)
     app.component(VxeSwitchComponent.name, VxeSwitchComponent)
   }
 })
 
+dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent)
+
 export default Switch

package/packages/table/index.ts

@@ -4,9 +4,10 @@ import { dynamicApp } from '../dynamics'
 
 export const Table = Object.assign(VxeTableComponent, {
   install: function (app: App) {
-    dynamicApp.component(VxeTableComponent.name, VxeTableComponent)
     app.component(VxeTableComponent.name, VxeTableComponent)
   }
 })
 
+dynamicApp.component(VxeTableComponent.name, VxeTableComponent)
+
 export default Table

package/packages/table/src/body.ts

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { mergeBodyMethod, getRowid, getPropClass, removeScrollListener, restoreScrollListener, XEBodyScrollElement } from './util'
-import { browse, updateCellTitle } from '../../tools/dom'
+import { updateCellTitle } from '../../tools/dom'
 import { isEnableConf } from '../../tools/utils'
 
 import { VxeTablePrivateMethods, VxeTableConstructor, VxeTableDefines, VxeTableMethods, VxeGlobalRendererHandles, VxeColumnPropTypes, SizeType } from '../../../types/all'
@@ -31,7 +31,7 @@ export default defineComponent({
 
     const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xetable
     const { refTableHeader, refTableBody, refTableFooter, refTableLeftBody, refTableRightBody, refValidTooltip } = $xetable.getRefMaps()
-    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts, computeRowOpts } = $xetable.getComputeMaps()
+    const { computeEditOpts, computeMouseOpts, computeSYOpts, computeEmptyOpts, computeKeyboardOpts, computeTooltipOpts, computeRadioOpts, computeTreeOpts, computeCheckboxOpts, computeValidOpts, computeRowOpts, computeColumnOpts } = $xetable.getComputeMaps()
 
     const refElem = ref() as Ref<XEBodyScrollElement>
     const refBodyTable = ref() as Ref<HTMLTableElement>
@@ -131,6 +131,7 @@ export default defineComponent({
       const tooltipOpts = computeTooltipOpts.value
       const rowOpts = computeRowOpts.value
       const sYOpts = computeSYOpts.value
+      const columnOpts = computeColumnOpts.value
       const { type, cellRender, editRender, align, showOverflow, className, treeNode } = column
       const { actived } = editStore
       const { rHeight: scrollYRHeight } = sYOpts
@@ -295,7 +296,7 @@ export default defineComponent({
           'col--valid-error': hasValidError,
           'col--current': currentColumn === column
         }, getPropClass(className, params), getPropClass(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` : ''
@@ -362,7 +363,7 @@ export default defineComponent({
             }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''],
             rowid: rowid,
             style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-            key: rowKey || treeConfig ? rowid : $rowIndex,
+            key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex,
             ...trOn
           }, tableColumn.map((column: any, $columnIndex: any) => {
             return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData)
@@ -418,7 +419,7 @@ export default defineComponent({
      * 同步滚动条
      */
     let scrollProcessTimeout: any
-    const syncBodyScroll = (scrollTop: number, elem1: XEBodyScrollElement | null, elem2: XEBodyScrollElement | null) => {
+    const syncBodyScroll = (fixedType: VxeColumnPropTypes.Fixed, scrollTop: number, elem1: XEBodyScrollElement | null, elem2: XEBodyScrollElement | null) => {
       if (elem1 || elem2) {
         if (elem1) {
           removeScrollListener(elem1)
@@ -429,9 +430,29 @@ export default defineComponent({
           elem2.scrollTop = scrollTop
         }
         clearTimeout(scrollProcessTimeout)
-        scrollProcessTimeout = setTimeout(function () {
+        scrollProcessTimeout = setTimeout(() => {
+          // const tableBody = refTableBody.value
+          // const leftBody = refTableLeftBody.value
+          // const rightBody = refTableRightBody.value
+          // const bodyElem = tableBody.$el as XEBodyScrollElement
+          // const leftElem = leftBody ? leftBody.$el as XEBodyScrollElement : null
+          // const rightElem = rightBody ? rightBody.$el as XEBodyScrollElement : 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)
         }, 300)
       }
     }
@@ -475,10 +496,10 @@ export default defineComponent({
       }
       if (leftElem && fixedType === 'left') {
         scrollTop = leftElem.scrollTop
-        syncBodyScroll(scrollTop, bodyElem, rightElem)
+        syncBodyScroll(fixedType, scrollTop, bodyElem, rightElem)
       } else if (rightElem && fixedType === 'right') {
         scrollTop = rightElem.scrollTop
-        syncBodyScroll(scrollTop, bodyElem, leftElem)
+        syncBodyScroll(fixedType, scrollTop, bodyElem, leftElem)
       } else {
         if (isRollX) {
           if (headerElem) {
@@ -491,7 +512,7 @@ export default defineComponent({
         if (leftElem || rightElem) {
           $xetable.checkScrolling()
           if (isRollY) {
-            syncBodyScroll(scrollTop, leftElem, rightElem)
+            syncBodyScroll(fixedType, scrollTop, leftElem, rightElem)
           }
         }
       }
@@ -593,8 +614,8 @@ export default defineComponent({
       const scrollBodyElem = refElem.value
       const bodyElem = tableBody.$el as HTMLDivElement
 
-      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) {
@@ -708,7 +729,7 @@ export default defineComponent({
         ref: refElem,
         class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
         xid: xID,
-        ...(scrollYLoad && sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})
+        ...(sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})
       }, [
         fixedType ? createCommentVNode() : h('div', {
           ref: refBodyXSpace,

package/packages/table/src/cell.ts

@@ -10,10 +10,10 @@ import { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods } from '..
 
 function renderHelpIcon (params: VxeTableDefines.CellRenderHeaderParams) {
   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],
       onMouseenter (evnt: MouseEvent) {
         $table.triggerHeaderHelpEvent(evnt, params)
       },

package/packages/table/src/column.ts

@@ -67,8 +67,10 @@ export const columnProps = {
   exportMethod: Function as PropType<VxeColumnPropTypes.ExportMethod>,
   // 表尾单元格数据导出方法
   footerExportMethod: Function as PropType<VxeColumnPropTypes.FooterExportMethod>,
-  // 标题帮助图标配置项
+  // 已废弃，被 titlePrefix 替换
   titleHelp: Object as PropType<VxeColumnPropTypes.TitleHelp>,
+  // 标题帮助图标配置项
+  titlePrefix: Object as PropType<VxeColumnPropTypes.TitlePrefix>,
   // 单元格值类型
   cellType: String as PropType<VxeColumnPropTypes.CellType>,
   // 单元格渲染配置项

package/packages/table/src/columnInfo.ts

@@ -2,7 +2,8 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { toFilters } from './util'
-import { warnLog, errLog, getFuncText } from '../../tools/utils'
+import { getFuncText } from '../../tools/utils'
+import { warnLog, errLog } from '../../tools/log'
 
 import { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/all'
 
@@ -92,6 +93,7 @@ export class ColumnInfo {
       exportMethod: _vm.exportMethod,
       footerExportMethod: _vm.footerExportMethod,
       titleHelp: _vm.titleHelp,
+      titlePrefix: _vm.titlePrefix,
       // 自定义参数
       params: _vm.params,
       // 渲染属性
@@ -143,10 +145,10 @@ export class ColumnInfo {
     // 不支持双向的属性
     if (name !== 'filters') {
       if (name === 'field') {
+        // 兼容旧属性
         this.property = value
-      } else {
-        this[name] = value
       }
+      this[name] = value
     }
   }
 

package/packages/table/src/emits.ts

@@ -2,7 +2,9 @@ import { VxeTableEmits } from '../../../types/all'
 
 export default [
   'update:data',
+  'keydown-start',
   'keydown',
+  'keydown-end',
   'paste',
   'copy',
   'cut',
@@ -60,5 +62,7 @@ export default [
   'cell-area-extension-start',
   'cell-area-extension-end',
   'cell-area-arrows-start',
-  'cell-area-arrows-end'
+  'cell-area-arrows-end',
+  'active-cell-move-start',
+  'active-cell-move-end'
 ] as VxeTableEmits

package/packages/table/src/props.ts

@@ -12,7 +12,7 @@ export default {
   height: [Number, String] as PropType<VxeTablePropTypes.Height>,
   // 表格的最大高度
   maxHeight: [Number, String] as PropType<VxeTablePropTypes.MaxHeight>,
-  // 所有列是否允许拖动列宽调整大小
+  // （即将废弃）所有列是否允许拖动列宽调整大小
   resizable: { type: Boolean as PropType<VxeTablePropTypes.Resizable>, default: () => GlobalConfig.table.resizable },
   // 是否带有斑马纹
   stripe: { type: Boolean as PropType<VxeTablePropTypes.Stripe>, default: () => GlobalConfig.table.stripe },
@@ -88,9 +88,11 @@ export default {
   showFooterOverflow: { type: [Boolean, String] as PropType<VxeTablePropTypes.ShowFooterOverflow>, default: () => GlobalConfig.table.showFooterOverflow },
 
   /** 高级属性 */
-  // 主键配置
+  // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
   columnKey: Boolean as PropType<VxeTablePropTypes.ColumnKey>,
+  // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
   rowKey: Boolean as PropType<VxeTablePropTypes.RowKey>,
+  // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
   rowId: { type: String as PropType<VxeTablePropTypes.RowId>, default: () => GlobalConfig.table.rowId },
   zIndex: Number as PropType<VxeTablePropTypes.ZIndex>,
   emptyText: { type: String as PropType<VxeTablePropTypes.EmptyText>, default: () => GlobalConfig.table.emptyText },
@@ -155,6 +157,7 @@ export default {
   scrollY: Object as PropType<VxeTablePropTypes.ScrollY>,
   // （即将废弃）优化相关
   animat: { type: Boolean as PropType<VxeTablePropTypes.Animat>, default: () => GlobalConfig.table.animat },
+  // （可能会被废弃的参数，不要使用）
   delayHover: { type: Number as PropType<VxeTablePropTypes.DelayHover>, default: () => GlobalConfig.table.delayHover as number },
   // 额外的参数
   params: Object as PropType<VxeTablePropTypes.Params>