vxe-table 3.16.4 → 3.16.6

package/es/table/src/columnInfo.js

@@ -9,6 +9,7 @@ export class ColumnInfo {
     constructor($xeTable, _vm, { renderHeader, renderCell, renderFooter, renderData } = {}) {
         const tableProps = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
+        const { field, editRender } = _vm;
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
@@ -53,11 +54,19 @@ export class ColumnInfo {
                 errLog('vxe.error.errProp', [`column.agg-func=${_vm.aggFunc}`, 'column.agg-func=true']);
             }
         }
+        if (field && editRender) {
+            if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+            }
+            if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
+                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+            }
+        }
         Object.assign(this, {
             // 基本属性
             type: _vm.type,
             property: _vm.field,
-            field: _vm.field,
+            field: field,
             title: _vm.title,
             width: _vm.width,
             minWidth: _vm.minWidth,
@@ -94,7 +103,7 @@ export class ColumnInfo {
             rowResize: _vm.rowResize,
             cellType: _vm.cellType,
             cellRender: _vm.cellRender,
-            editRender: _vm.editRender,
+            editRender: editRender,
             contentRender: _vm.contentRender,
             headerExportMethod: _vm.headerExportMethod,
             exportMethod: _vm.exportMethod,

package/es/table/src/footer.js

@@ -122,7 +122,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         const isLastColumn = $columnIndex === tableColumn.length - 1;
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (isOptimizeMode && !isMergeCell) {
+        if (isOptimizeMode && overflowX && !isMergeCell) {
             if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                 isVNPreEmptyStatus = true;
             }

package/es/table/src/header.js

@@ -92,7 +92,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (isOptimizeMode && !isGroup) {
+        if (isOptimizeMode && overflowX && !isGroup) {
             if (!dragCol || dragCol.id !== colid) {
                 if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                     isVNPreEmptyStatus = true;

package/es/table/src/methods.js

@@ -8670,8 +8670,7 @@ const Methods = {
     },
     setSort(sortConfs, isUpdate) {
         const $xeTable = this;
-        // 已废弃，即将去掉事件触发 new Event('click') -> null
-        return handleSortEvent($xeTable, new Event('click'), sortConfs, isUpdate);
+        return handleSortEvent($xeTable, null, sortConfs, isUpdate);
     },
     setSortByEvent(evnt, sortConfs, isUpdate) {
         const $xeTable = this;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.16.4";
+export const version = "3.16.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.16.4"}`;
+const version = `table v${"3.16.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.common.js

@@ -17,6 +17,5 @@ Object.keys(VxeTableExport).forEach(function (key) {
     }
   });
 });
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 var _default = exports.default = VxeTableExport;