vxe-table 4.10.6-beta.32 → 4.10.6-beta.34

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.6-beta.32";
+const version = "4.10.6-beta.34";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3583,7 +3583,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.6-beta.32"}`;
+const log_version = `table v${"4.10.6-beta.34"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6198,7 +6198,8 @@ const renderType = 'body';
       computeRowDragOpts,
       computeColumnDragOpts,
       computeLeftFixedWidth,
-      computeRightFixedWidth
+      computeRightFixedWidth,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refBodyScroll = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -6274,6 +6275,8 @@ const renderType = 'body';
       } = tableInternalData;
       const {
         columnKey,
+        resizable: allResizable,
+        border,
         height,
         cellClassName: allCellClassName,
         cellStyle,
@@ -6308,6 +6311,11 @@ const renderType = 'body';
       const checkboxOpts = computeCheckboxOpts.value;
       const editOpts = computeEditOpts.value;
       const tooltipOpts = computeTooltipOpts.value;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        isAllColumnDrag,
+        isAllRowDrag
+      } = resizableOpts;
       const rowOpts = computeRowOpts.value;
       const rowDragOpts = computeRowDragOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
@@ -6361,6 +6369,7 @@ const renderType = 'body';
       const showTitle = cellOverflow === 'title';
       const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
       const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
+      const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
       const isCsHeight = !!customCellHeight;
       const isRsHeight = resizeHeight > 0;
       let isDirty;
@@ -6575,7 +6584,17 @@ const renderType = 'body';
           showAreaRowStatus = true;
         }
       }
-      if (rowResize && rowOpts.resizable) {
+      if (!fixedHiddenColumn && showResizable && isAllColumnDrag) {
+        tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          key: 'tcc',
+          class: ['vxe-cell--col-resizable', {
+            'is--line': !border || border === 'none'
+          }],
+          onMousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+          onDblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+        }));
+      }
+      if ((rowResize || isAllRowDrag) && rowOpts.resizable) {
         tdVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           key: 'tcr',
           class: 'vxe-cell--row-resizable',
@@ -7552,7 +7571,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       computeColumnDragOpts,
       computeCellOpts,
       computeFooterCellOpts,
-      computeDefaultRowHeight
+      computeDefaultRowHeight,
+      computeResizableOpts
     } = $xeTable.getComputeMaps();
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refFooterScroll = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -7565,6 +7585,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         fixedType
       } = props;
       const {
+        resizable: allResizable,
+        border,
         footerCellClassName,
         footerCellStyle,
         footerAlign: allFooterAlign,
@@ -7584,6 +7606,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         scrollXStore
       } = tableInternalData;
       const tooltipOpts = computeTooltipOpts.value;
+      const resizableOpts = computeResizableOpts.value;
+      const {
+        isAllColumnDrag
+      } = resizableOpts;
       const columnOpts = computeColumnOpts.value;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const cellOpts = computeCellOpts.value;
@@ -7612,6 +7638,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         const showTitle = footOverflow === 'title';
         const showTooltip = footOverflow === true || footOverflow === 'tooltip';
         let hasEllipsis = showTitle || showTooltip || showEllipsis;
+        const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
         const attrs = {
           colid
         };
@@ -7737,7 +7764,17 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         }, isVNPreEmptyStatus ? [] : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
           colid,
           class: 'vxe-cell--wrapper'
-        }, column.renderFooter(cellParams))])]);
+        }, column.renderFooter(cellParams))]),
+        /**
+         * 列宽拖动
+         */
+        !fixedHiddenColumn && showResizable && isAllColumnDrag ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+          class: ['vxe-cell--col-resizable', {
+            'is--line': !border || border === 'none'
+          }],
+          onMousedown: evnt => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+          onDblclick: evnt => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+        }) : footer_renderEmptyElement($xeTable)]);
       });
     };
     const renderHeads = renderColumnList => {