vxe-table 4.1.20 → 4.2.0-beta.2

package/es/switch/index.js

@@ -2,8 +2,8 @@ import VxeSwitchComponent from './src/switch';
 import { dynamicApp } from '../dynamics';
 export var Switch = Object.assign(VxeSwitchComponent, {
     install: function (app) {
-        dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent);
         app.component(VxeSwitchComponent.name, VxeSwitchComponent);
     }
 });
+dynamicApp.component(VxeSwitchComponent.name, VxeSwitchComponent);
 export default Switch;

package/es/table/index.js

@@ -2,8 +2,8 @@ import VxeTableComponent from './src/table';
 import { dynamicApp } from '../dynamics';
 export var Table = Object.assign(VxeTableComponent, {
     install: function (app) {
-        dynamicApp.component(VxeTableComponent.name, VxeTableComponent);
         app.component(VxeTableComponent.name, VxeTableComponent);
     }
 });
+dynamicApp.component(VxeTableComponent.name, VxeTableComponent);
 export default Table;

package/es/table/src/body.js

@@ -19,7 +19,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 } from './util';
-import { browse, updateCellTitle } from '../../tools/dom';
+import { updateCellTitle } from '../../tools/dom';
 import { isEnableConf } from '../../tools/utils';
 var renderType = 'body';
 var lineOffsetSizes = {
@@ -40,7 +40,7 @@ export default defineComponent({
         var xesize = inject('xesize', null);
         var xID = $xetable.xID, tableProps = $xetable.props, tableContext = $xetable.context, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refTableFooter = _a.refTableFooter, refTableLeftBody = _a.refTableLeftBody, refTableRightBody = _a.refTableRightBody, refValidTooltip = _a.refValidTooltip;
-        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts;
+        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts, computeColumnOpts = _b.computeColumnOpts;
         var refElem = ref();
         var refBodyTable = ref();
         var refBodyColgroup = ref();
@@ -134,6 +134,7 @@ export default defineComponent({
             var tooltipOpts = computeTooltipOpts.value;
             var rowOpts = computeRowOpts.value;
             var sYOpts = computeSYOpts.value;
+            var columnOpts = computeColumnOpts.value;
             var type = column.type, cellRender = column.cellRender, editRender = column.editRender, align = column.align, showOverflow = column.showOverflow, className = column.className, treeNode = column.treeNode;
             var actived = editStore.actived;
             var scrollYRHeight = sYOpts.rHeight;
@@ -291,7 +292,7 @@ export default defineComponent({
                         _a['col--actived'] = editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),
                         _a['col--valid-error'] = hasValidError,
                         _a['col--current'] = currentColumn === column,
-                        _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
+                        _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey || columnOpts.useKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
                     height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
@@ -348,7 +349,7 @@ export default defineComponent({
                             'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
                             'row--radio': radioOpts.highlight && selectRow === row,
                             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
-                        }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: rowKey || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
+                        }, rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''], rowid: rowid, style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null, key: (rowKey || rowOpts.useKey) || treeConfig ? rowid : $rowIndex }, trOn), tableColumn.map(function (column, $columnIndex) {
                     return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
                 })));
                 // 如果行被展开了
@@ -393,7 +394,7 @@ export default defineComponent({
          * 同步滚动条
          */
         var scrollProcessTimeout;
-        var syncBodyScroll = function (scrollTop, elem1, elem2) {
+        var syncBodyScroll = function (fixedType, scrollTop, elem1, elem2) {
             if (elem1 || elem2) {
                 if (elem1) {
                     removeScrollListener(elem1);
@@ -405,8 +406,28 @@ export default defineComponent({
                 }
                 clearTimeout(scrollProcessTimeout);
                 scrollProcessTimeout = setTimeout(function () {
+                    // 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);
             }
         };
@@ -449,11 +470,11 @@ 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) {
@@ -467,7 +488,7 @@ export default defineComponent({
                 if (leftElem || rightElem) {
                     $xetable.checkScrolling();
                     if (isRollY) {
-                        syncBodyScroll(scrollTop, leftElem, rightElem);
+                        syncBodyScroll(fixedType, scrollTop, leftElem, rightElem);
                     }
                 }
             }
@@ -565,8 +586,8 @@ export default defineComponent({
             var tableBody = refTableBody.value;
             var scrollBodyElem = refElem.value;
             var bodyElem = tableBody.$el;
-            var deltaTop = browse.firefox ? deltaY * 40 : deltaY;
-            var deltaLeft = browse.firefox ? deltaX * 40 : deltaX;
+            var deltaTop = deltaY;
+            var deltaLeft = deltaX;
             var isTopWheel = deltaTop < 0;
             // 如果滚动位置已经是顶部或底部，则不需要触发
             if (isTopWheel ? scrollBodyElem.scrollTop <= 0 : scrollBodyElem.scrollTop >= scrollBodyElem.scrollHeight - scrollBodyElem.clientHeight) {
@@ -674,7 +695,7 @@ export default defineComponent({
                     emptyContent = tableProps.emptyText || GlobalConfig.i18n('vxe.table.emptyText');
                 }
             }
-            return h('div', __assign({ ref: refElem, class: ['vxe-table--body-wrapper', fixedType ? "fixed-" + fixedType + "--wrapper" : 'body--wrapper'], xid: xID }, (scrollYLoad && sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})), [
+            return h('div', __assign({ ref: refElem, class: ['vxe-table--body-wrapper', fixedType ? "fixed-" + fixedType + "--wrapper" : 'body--wrapper'], xid: xID }, (sYOpts.mode === 'wheel' ? { onWheel: wheelEvent } : {})), [
                 fixedType ? createCommentVNode() : h('div', {
                     ref: refBodyXSpace,
                     class: 'vxe-body--x-space'

package/es/table/src/cell.js

@@ -18,10 +18,10 @@ import { updateCellTitle } from '../../tools/dom';
 import { createColumn } from './util';
 function renderHelpIcon(params) {
     var $table = params.$table, column = params.column;
-    var titleHelp = column.titleHelp;
-    return titleHelp ? [
+    var 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: function (evnt) {
                 $table.triggerHeaderHelpEvent(evnt, params);
             },

package/es/table/src/column.js

@@ -64,8 +64,10 @@ export var columnProps = {
     exportMethod: Function,
     // 表尾单元格数据导出方法
     footerExportMethod: Function,
-    // 标题帮助图标配置项
+    // 已废弃，被 titlePrefix 替换
     titleHelp: Object,
+    // 标题帮助图标配置项
+    titlePrefix: Object,
     // 单元格值类型
     cellType: String,
     // 单元格渲染配置项

package/es/table/src/columnInfo.js

@@ -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';
 var ColumnInfo = /** @class */ (function () {
     /* eslint-disable @typescript-eslint/no-use-before-define */
     function ColumnInfo($xetable, _vm, _a) {
@@ -85,6 +86,7 @@ var ColumnInfo = /** @class */ (function () {
             exportMethod: _vm.exportMethod,
             footerExportMethod: _vm.footerExportMethod,
             titleHelp: _vm.titleHelp,
+            titlePrefix: _vm.titlePrefix,
             // 自定义参数
             params: _vm.params,
             // 渲染属性
@@ -133,11 +135,10 @@ var ColumnInfo = /** @class */ (function () {
         // 不支持双向的属性
         if (name !== 'filters') {
             if (name === 'field') {
+                // 兼容旧属性
                 this.property = value;
             }
-            else {
-                this[name] = value;
-            }
+            this[name] = value;
         }
     };
     return ColumnInfo;

package/es/table/src/emits.js

@@ -1,6 +1,8 @@
 export default [
     'update:data',
+    'keydown-start',
     'keydown',
+    'keydown-end',
     'paste',
     'copy',
     'cut',
@@ -56,5 +58,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'
 ];

package/es/table/src/props.js

@@ -8,7 +8,7 @@ export default {
     height: [Number, String],
     // 表格的最大高度
     maxHeight: [Number, String],
-    // 所有列是否允许拖动列宽调整大小
+    // （即将废弃）所有列是否允许拖动列宽调整大小
     resizable: { type: Boolean, default: function () { return GlobalConfig.table.resizable; } },
     // 是否带有斑马纹
     stripe: { type: Boolean, default: function () { return GlobalConfig.table.stripe; } },
@@ -83,9 +83,11 @@ export default {
     // 设置表尾所有内容过长时显示为省略号
     showFooterOverflow: { type: [Boolean, String], default: function () { return GlobalConfig.table.showFooterOverflow; } },
     /** 高级属性 */
-    // 主键配置
+    // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
     columnKey: Boolean,
+    // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
     rowKey: Boolean,
+    // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
     rowId: { type: String, default: function () { return GlobalConfig.table.rowId; } },
     zIndex: Number,
     emptyText: { type: String, default: function () { return GlobalConfig.table.emptyText; } },
@@ -150,6 +152,7 @@ export default {
     scrollY: Object,
     // （即将废弃）优化相关
     animat: { type: Boolean, default: function () { return GlobalConfig.table.animat; } },
+    // （可能会被废弃的参数，不要使用）
     delayHover: { type: Number, default: function () { return GlobalConfig.table.delayHover; } },
     // 额外的参数
     params: Object