vxe-table 3.12.1-beta.2 → 3.12.1-beta.4

package/es/table/src/cell.js

@@ -242,60 +242,83 @@ function getDefaultCellLabel(params) {
     const { $table, row, column } = params;
     return formatText($table.getCellLabel(row, column), 1);
 }
+function renderCellHandle(h, params) {
+    const { column, $table } = params;
+    const tableProps = $table;
+    const { editConfig } = tableProps;
+    const { type, treeNode, editRender } = column;
+    const checkboxOpts = $table.computeCheckboxOpts;
+    const editOpts = $table.computeEditOpts;
+    switch (type) {
+        case 'seq':
+            return treeNode ? Cell.renderTreeIndexCell(h, params) : Cell.renderSeqCell(h, params);
+        case 'radio':
+            return treeNode ? Cell.renderTreeRadioCell(h, params) : Cell.renderRadioCell(h, params);
+        case 'checkbox':
+            return checkboxOpts.checkField ? (treeNode ? Cell.renderTreeSelectionCellByProp(h, params) : Cell.renderCheckboxCellByProp(h, params)) : (treeNode ? Cell.renderTreeSelectionCell(h, params) : Cell.renderCheckboxCell(h, params));
+        case 'expand':
+            return Cell.renderExpandCell(h, params);
+        case 'html':
+            return treeNode ? Cell.renderTreeHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
+    }
+    if (editConfig && editRender) {
+        return editOpts.mode === 'cell' ? (treeNode ? Cell.renderTreeCellEdit(h, params) : Cell.renderCellEdit(h, params)) : (treeNode ? Cell.renderTreeRowEdit(h, params) : Cell.renderRowEdit(h, params));
+    }
+    return treeNode ? Cell.renderTreeCell(h, params) : Cell.renderDefaultCell(h, params);
+}
+function renderHeaderHandle(h, params) {
+    const { column, $table } = params;
+    const tableProps = $table;
+    const { editConfig } = tableProps;
+    const { type, filters, sortable, editRender } = column;
+    switch (type) {
+        case 'seq':
+            return Cell.renderSeqHeader(h, params);
+        case 'radio':
+            return Cell.renderRadioHeader(h, params);
+        case 'checkbox':
+            return Cell.renderCheckboxHeader(h, params);
+        case 'html':
+            if (filters && sortable) {
+                return Cell.renderSortAndFilterHeader(h, params);
+            }
+            else if (sortable) {
+                return Cell.renderSortHeader(h, params);
+            }
+            else if (filters) {
+                return Cell.renderFilterHeader(h, params);
+            }
+            break;
+    }
+    if (editConfig && editRender) {
+        return Cell.renderEditHeader(h, params);
+    }
+    else if (filters && sortable) {
+        return Cell.renderSortAndFilterHeader(h, params);
+    }
+    else if (sortable) {
+        return Cell.renderSortHeader(h, params);
+    }
+    else if (filters) {
+        return Cell.renderFilterHeader(h, params);
+    }
+    return Cell.renderDefaultHeader(h, params);
+}
+function renderFooterHandle(h, params) {
+    return Cell.renderDefaultFooter(h, params);
+}
 export const Cell = {
     createColumn($xetable, _vm) {
-        const { type, sortable, remoteSort, filters, editRender, treeNode } = _vm;
-        const { editConfig, editOpts, checkboxOpts } = $xetable;
-        const renMaps = {
-            renderHeader: this.renderDefaultHeader,
-            renderCell: treeNode ? this.renderTreeCell : this.renderDefaultCell,
-            renderFooter: this.renderDefaultFooter
+        const { type } = _vm;
+        const renConfs = {
+            renderHeader: renderHeaderHandle,
+            renderCell: renderCellHandle,
+            renderFooter: renderFooterHandle
         };
-        switch (type) {
-            case 'seq':
-                renMaps.renderHeader = this.renderSeqHeader;
-                renMaps.renderCell = treeNode ? this.renderTreeIndexCell : this.renderSeqCell;
-                break;
-            case 'radio':
-                renMaps.renderHeader = this.renderRadioHeader;
-                renMaps.renderCell = treeNode ? this.renderTreeRadioCell : this.renderRadioCell;
-                break;
-            case 'checkbox':
-                renMaps.renderHeader = this.renderCheckboxHeader;
-                renMaps.renderCell = checkboxOpts.checkField ? (treeNode ? this.renderTreeSelectionCellByProp : this.renderCheckboxCellByProp) : (treeNode ? this.renderTreeSelectionCell : this.renderCheckboxCell);
-                break;
-            case 'expand':
-                renMaps.renderCell = this.renderExpandCell;
-                renMaps.renderData = this.renderExpandData;
-                break;
-            case 'html':
-                renMaps.renderCell = treeNode ? this.renderTreeHTMLCell : this.renderHTMLCell;
-                if (filters && (sortable || remoteSort)) {
-                    renMaps.renderHeader = this.renderSortAndFilterHeader;
-                }
-                else if (sortable || remoteSort) {
-                    renMaps.renderHeader = this.renderSortHeader;
-                }
-                else if (filters) {
-                    renMaps.renderHeader = this.renderFilterHeader;
-                }
-                break;
-            default:
-                if (editConfig && editRender) {
-                    renMaps.renderHeader = this.renderEditHeader;
-                    renMaps.renderCell = editOpts.mode === 'cell' ? (treeNode ? this.renderTreeCellEdit : this.renderCellEdit) : (treeNode ? this.renderTreeRowEdit : this.renderRowEdit);
-                }
-                else if (filters && (sortable || remoteSort)) {
-                    renMaps.renderHeader = this.renderSortAndFilterHeader;
-                }
-                else if (sortable || remoteSort) {
-                    renMaps.renderHeader = this.renderSortHeader;
-                }
-                else if (filters) {
-                    renMaps.renderHeader = this.renderFilterHeader;
-                }
+        if (type === 'expand') {
+            renConfs.renderData = Cell.renderExpandData;
         }
-        return createColumn($xetable, _vm, renMaps);
+        return createColumn($xetable, _vm, renConfs);
     },
     /**
      * 列头标题

package/es/table/src/header.js

@@ -3,7 +3,7 @@ import { VxeUI } from '../../ui';
 import { getClass } from '../../ui/src/utils';
 import { getOffsetPos, hasClass, addClass, removeClass } from '../../ui/src/dom';
 import { convertHeaderColumnToRows, getColReMinWidth } from './util';
-const { renderer, renderEmptyElement } = VxeUI;
+const { getI18n, renderer, renderEmptyElement } = VxeUI;
 const cellType = 'header';
 const renderRows = (h, _vm, cols, $rowIndex) => {
     const $xeTable = _vm.$parent;
@@ -100,7 +100,8 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
                             'is--line': !border || border === 'none'
                         }],
                     on: {
-                        mousedown: (evnt) => _vm.resizeMousedown(evnt, params)
+                        mousedown: (evnt) => _vm.resizeMousedownEvent(evnt, params),
+                        dblclick: (evnt) => $xeTable.handleResizeDblclickEvent(evnt, params)
                     }
                 })
                 : null
@@ -321,7 +322,7 @@ export default {
             const { $parent: $xetable } = this;
             this.headerColumn = $xetable.isGroup ? convertHeaderColumnToRows(this.tableGroupColumn) : [];
         },
-        resizeMousedown(evnt, params) {
+        resizeMousedownEvent(evnt, params) {
             const $xeTable = this.$parent;
             const tableInternalData = $xeTable;
             const { column } = params;
@@ -332,15 +333,17 @@ export default {
             const resizeBarElem = $xetable.$refs.resizeBar;
             const resizeTipElem = $xetable.$refs.refCellResizeTip;
             const wrapperElem = this.$el;
-            const { target: dragBtnElem, clientX: dragClientX } = evnt;
-            const cell = params.cell = dragBtnElem.parentNode;
+            const { clientX: dragClientX } = evnt;
+            const dragBtnElem = evnt.target;
+            const cell = dragBtnElem.parentNode;
+            const cellParams = Object.assign(params, { cell });
             const resizableOpts = $xeTable.computeResizableOpts;
             let dragLeft = 0;
             const tableBodyElem = tableBody.$el;
             const pos = getOffsetPos(dragBtnElem, tableEl);
             const dragBtnWidth = dragBtnElem.clientWidth;
             const dragBtnOffsetWidth = Math.floor(dragBtnWidth / 2);
-            const minInterval = getColReMinWidth(params) - dragBtnOffsetWidth; // 列之间的最小间距
+            const minInterval = getColReMinWidth(cellParams) - dragBtnOffsetWidth; // 列之间的最小间距
             let dragMinLeft = pos.left - cell.clientWidth + dragBtnWidth + minInterval;
             let dragPosLeft = pos.left + dragBtnOffsetWidth;
             const domMousemove = document.onmousemove;
@@ -403,7 +406,7 @@ export default {
                     }
                     resizeTipElem.style.left = `${resizeTipLeft}px`;
                     resizeTipElem.style.top = `${Math.min(tableEl.clientHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
-                    resizeTipElem.textContent = `${column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)}px`;
+                    resizeTipElem.textContent = getI18n('vxe.table.resizeColTip', [column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft)]);
                 }
             };
             $xetable._isResize = true;