vxe-table 3.18.4 → 3.18.6

package/es/table/module/custom/panel.js

@@ -201,12 +201,12 @@ const renderSimplePanel = (h, _vm) => {
                         }, [
                             h('span', {
                                 class: ['vxe-table-custom--sort-btn', {
-                                        'is--disabled': isDisabled || isHidden || column.renderFixed
+                                        'is--disabled': isDisabled || isHidden
                                     }],
                                 attrs: {
                                     title: getI18n('vxe.custom.setting.sortHelpTip')
                                 },
-                                on: isDisabled || isHidden || column.renderFixed
+                                on: isDisabled || isHidden
                                     ? {}
                                     : {
                                         mousedown: _vm.sortMousedownEvent,
@@ -545,12 +545,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
                             ? ((isCrossDrag ? immediate : false) || column.level === 1
                                 ? h('div', {
                                     class: ['vxe-table-custom-popup--column-sort-btn', {
-                                            'is--disabled': isDisabled || isHidden || column.renderFixed
+                                            'is--disabled': isDisabled || isHidden
                                         }],
                                     attrs: {
                                         title: getI18n('vxe.custom.setting.sortHelpTip')
                                     },
-                                    on: (isDisabled || isHidden || column.renderFixed
+                                    on: (isDisabled || isHidden
                                         ? {}
                                         : {
                                             mousedown: _vm.sortMousedownEvent,
@@ -1373,8 +1373,7 @@ export default {
                 if (!dragCol ||
                     (dragCol && dragCol.id === column.id) ||
                     (!isCrossDrag && column.level > 1) ||
-                    (!immediate && column.level > 1) ||
-                    column.renderFixed) {
+                    (!immediate && column.level > 1)) {
                     showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
                     return;
                 }

package/es/table/src/header.js

@@ -4,6 +4,20 @@ import { getClass } from '../../ui/src/utils';
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from './util';
 const { renderer, renderEmptyElement } = VxeUI;
 const cellType = 'header';
+function getColumnFirstChild(column) {
+    const { children } = column;
+    if (children && children.length) {
+        return getColumnFirstChild(children[0]);
+    }
+    return column;
+}
+function getColumnLastChild(column) {
+    const { children } = column;
+    if (children && children.length) {
+        return getColumnLastChild(children[children.length - 1]);
+    }
+    return column;
+}
 function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
     const props = _vm;
     const $xeTable = _vm.$parent;
@@ -130,6 +144,17 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
         else {
             tcStyle.minHeight = `${currCellHeight}px`;
         }
+        if (isColGroup && !isLastRow) {
+            const firstCol = getColumnFirstChild(column);
+            const lastCol = getColumnLastChild(column);
+            if (firstCol && lastCol && firstCol.id !== lastCol.id) {
+                const firstColRest = fullColumnIdData[firstCol.id];
+                const lastColRest = fullColumnIdData[lastCol.id];
+                if (firstColRest && lastColRest) {
+                    tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+                }
+            }
+        }
         return h('th', {
             class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                     [`col--${headAlign}`]: headAlign,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.18.4";
+export const version = "3.18.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.18.4"}`;
+const version = `table v${"3.18.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/index.js

@@ -7,14 +7,18 @@ exports.default = exports.VxeGrid = exports.Grid = void 0;
 var _ui = require("../ui");
 var _grid = _interopRequireDefault(require("./src/grid"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+let isReg = false;
 const VxeGrid = exports.VxeGrid = Object.assign({}, _grid.default, {
   install(app) {
+    if (!isReg) {
+      isReg = true;
+      if (_ui.VxeUI.dynamicApp) {
+        _ui.VxeUI.dynamicApp.component(_grid.default.name, _grid.default);
+      }
+    }
     app.component(_grid.default.name, _grid.default);
   }
 });
-if (_ui.VxeUI.dynamicApp) {
-  _ui.VxeUI.dynamicApp.component(_grid.default.name, _grid.default);
-}
 _ui.VxeUI.component(_grid.default);
 const Grid = exports.Grid = VxeGrid;
 var _default = exports.default = VxeGrid;

package/lib/grid/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.VxeGrid=exports.Grid=void 0;var _ui=require("../ui"),_grid=_interopRequireDefault(require("./src/grid"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let VxeGrid=exports.VxeGrid=Object.assign({},_grid.default,{install(e){e.component(_grid.default.name,_grid.default)}}),Grid=(_ui.VxeUI.dynamicApp&&_ui.VxeUI.dynamicApp.component(_grid.default.name,_grid.default),_ui.VxeUI.component(_grid.default),exports.Grid=VxeGrid);var _default=exports.default=VxeGrid;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.VxeGrid=exports.Grid=void 0;var _ui=require("../ui"),_grid=_interopRequireDefault(require("./src/grid"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let isReg=!1,VxeGrid=exports.VxeGrid=Object.assign({},_grid.default,{install(e){isReg||(isReg=!0,_ui.VxeUI.dynamicApp&&_ui.VxeUI.dynamicApp.component(_grid.default.name,_grid.default)),e.component(_grid.default.name,_grid.default)}}),Grid=(_ui.VxeUI.component(_grid.default),exports.Grid=VxeGrid);var _default=exports.default=VxeGrid;

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.4";
+const version = "3.18.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2678,7 +2678,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.18.4"}`;
+const log_version = `table v${"3.18.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -20348,6 +20348,24 @@ const {
   renderEmptyElement: header_renderEmptyElement
 } = core_.VxeUI;
 const cellType = 'header';
+function getColumnFirstChild(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getColumnFirstChild(children[0]);
+  }
+  return column;
+}
+function getColumnLastChild(column) {
+  const {
+    children
+  } = column;
+  if (children && children.length) {
+    return getColumnLastChild(children[children.length - 1]);
+  }
+  return column;
+}
 function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
   const props = _vm;
   const $xeTable = _vm.$parent;
@@ -20514,6 +20532,17 @@ function header_renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIn
     } else {
       tcStyle.minHeight = `${currCellHeight}px`;
     }
+    if (isColGroup && !isLastRow) {
+      const firstCol = getColumnFirstChild(column);
+      const lastCol = getColumnLastChild(column);
+      if (firstCol && lastCol && firstCol.id !== lastCol.id) {
+        const firstColRest = fullColumnIdData[firstCol.id];
+        const lastColRest = fullColumnIdData[lastCol.id];
+        if (firstColRest && lastColRest) {
+          tcStyle.width = `${lastColRest.oLeft - firstColRest.oLeft + lastCol.renderWidth}px`;
+        }
+      }
+    }
     return h('th', {
       class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
         [`col--${headAlign}`]: headAlign,
@@ -21494,12 +21523,12 @@ const renderSimplePanel = (h, _vm) => {
         class: 'vxe-table-custom--sort-option'
       }, [h('span', {
         class: ['vxe-table-custom--sort-btn', {
-          'is--disabled': isDisabled || isHidden || column.renderFixed
+          'is--disabled': isDisabled || isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden || column.renderFixed ? {} : {
+        on: isDisabled || isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -21795,12 +21824,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         class: 'vxe-table-custom-popup--name'
       }, [allowSort ? (isCrossDrag ? immediate : false) || column.level === 1 ? h('div', {
         class: ['vxe-table-custom-popup--column-sort-btn', {
-          'is--disabled': isDisabled || isHidden || column.renderFixed
+          'is--disabled': isDisabled || isHidden
         }],
         attrs: {
           title: panel_getI18n('vxe.custom.setting.sortHelpTip')
         },
-        on: isDisabled || isHidden || column.renderFixed ? {} : {
+        on: isDisabled || isHidden ? {} : {
           mousedown: _vm.sortMousedownEvent,
           mouseup: _vm.sortMouseupEvent
         }
@@ -22594,7 +22623,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
         evnt.preventDefault();
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y;
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom';
-        if (!dragCol || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1 || column.renderFixed) {
+        if (!dragCol || dragCol && dragCol.id === column.id || !isCrossDrag && column.level > 1 || !immediate && column.level > 1) {
           panel_showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos);
           return;
         }
@@ -34581,14 +34610,18 @@ function grid_createInternalData() {
 ;// CONCATENATED MODULE: ./packages/grid/index.ts
 
 
+let isReg = false;
 const VxeGrid = Object.assign({}, grid, {
   install(app) {
+    if (!isReg) {
+      isReg = true;
+      if (core_.VxeUI.dynamicApp) {
+        core_.VxeUI.dynamicApp.component(grid.name, grid);
+      }
+    }
     app.component(grid.name, grid);
   }
 });
-if (core_.VxeUI.dynamicApp) {
-  core_.VxeUI.dynamicApp.component(grid.name, grid);
-}
 core_.VxeUI.component(grid);
 const Grid = VxeGrid;
 /* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
@@ -35963,7 +35996,7 @@ render_renderer.mixin({
 
 
 
-let isReg = false;
+let table_isReg = false;
 const VxeTable = Object.assign({}, table, {
   install(app) {
     if (typeof window !== 'undefined') {
@@ -35995,8 +36028,8 @@ const VxeTable = Object.assign({}, table, {
       (external_commonjs_vue_commonjs2_vue_root_Vue_default()).prototype.$vxe.t = core_.VxeUI.t;
       (external_commonjs_vue_commonjs2_vue_root_Vue_default()).prototype.$vxe._t = core_.VxeUI._t;
     }
-    if (!isReg) {
-      isReg = true;
+    if (!table_isReg) {
+      table_isReg = true;
       if (core_.VxeUI.dynamicApp) {
         core_.VxeUI.dynamicApp.component(table.name, table);
       }