vxe-table 3.18.3 → 3.18.5

package/es/table/render/index.js

@@ -294,7 +294,7 @@ function nativeEditRender(h, renderOpts, params) {
     const { name } = renderOpts;
     const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
     return [
-        h(name, {
+        h(`${name}`, {
             class: `vxe-default-${name}`,
             attrs: getNativeAttrs(renderOpts),
             domProps: {
@@ -374,7 +374,8 @@ function oldButtonEditRender(h, renderOpts, params) {
  * @deprecated
  */
 function oldButtonsEditRender(h, renderOpts, params) {
-    return renderOpts.children.map((childRenderOpts) => oldButtonEditRender(h, childRenderOpts, params)[0]);
+    const { children } = renderOpts;
+    return children ? children.map((childRenderOpts) => oldButtonEditRender(h, childRenderOpts, params)[0]) : [];
 }
 function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
     const { optionGroups, optionGroupProps = {} } = renderOpts;
@@ -424,7 +425,7 @@ function nativeFilterRender(h, renderOpts, params) {
     const { name } = renderOpts;
     const attrs = getNativeAttrs(renderOpts);
     return column.filters.map((option, oIndex) => {
-        return h(name, {
+        return h(`${name}`, {
             key: oIndex,
             class: `vxe-default-${name}`,
             attrs,

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/table/src/methods.js

@@ -8647,11 +8647,20 @@ const Methods = {
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const { isCrossTableDrag } = rowDragOpts;
         if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
-            const { $oldTable } = crossTableDragRowObj;
-            if ($oldTable && $oldTable.xID !== $xeTable.xID) {
-                evnt.preventDefault();
-                crossTableDragRowObj.$newTable = $xeTable;
-                internalData.prevDragRow = null;
+            const { $oldTable, $newTable } = crossTableDragRowObj;
+            if ($oldTable) {
+                const oldTableReactData = $oldTable;
+                if ($oldTable.xID !== $xeTable.xID) {
+                    if ($newTable && $newTable.xID !== $xeTable.xID) {
+                        $newTable.hideCrossTableRowDropClearStatus();
+                    }
+                    evnt.preventDefault();
+                    $oldTable.hideCrossTableRowDropClearStatus();
+                    crossTableDragRowObj.$newTable = $xeTable;
+                    internalData.prevDragRow = null;
+                    reactData.dragTipText = oldTableReactData.dragTipText;
+                    showDropTip($xeTable, evnt, evnt.currentTarget, null, true, '');
+                }
             }
         }
     },
@@ -8885,6 +8894,9 @@ const Methods = {
                         crossTableDragRowObj.$newTable = null;
                     }
                     else if (!treeConfig || isCrossDrag) {
+                        if ($newTable && $newTable.xID !== $xeTable.xID) {
+                            $newTable.hideCrossTableRowDropClearStatus();
+                        }
                         $oldTable.hideCrossTableRowDropClearStatus();
                         oldTableReactData.isCrossDragRow = true;
                         reactData.dragTipText = oldTableReactData.dragTipText;

package/es/table/src/table.js

@@ -1889,9 +1889,11 @@ export default {
         const scrollbarXToTop = $xeTable.computeScrollbarXToTop;
         const scrollbarYToLeft = $xeTable.computeScrollbarYToLeft;
         const { isCrossTableDrag } = rowDragOpts;
-        const rwOns = {};
+        const tbOns = {
+            keydown: this.keydownEvent
+        };
         if (isCrossTableDrag && !tableData.length) {
-            rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
+            tbOns.dragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
         }
         return h('div', {
             ref: 'refElem',
@@ -1929,9 +1931,7 @@ export default {
             attrs: {
                 spellcheck: false
             },
-            on: {
-                keydown: this.keydownEvent
-            }
+            on: tbOns
         }, [
             /**
              * 隐藏列
@@ -1959,8 +1959,7 @@ export default {
             ]),
             h('div', {
                 key: 'tw',
-                class: 'vxe-table--render-wrapper',
-                on: rwOns
+                class: 'vxe-table--render-wrapper'
             }, scrollbarXToTop
                 ? [
                     renderScrollX(h, $xeTable),

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.3";
+export const version = "3.18.5";
 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.3"}`;
+const version = `table v${"3.18.5"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/es/ui/src/vn.js

@@ -2,24 +2,29 @@ import XEUtils from 'xe-utils';
 export function getOnName(type) {
     return XEUtils.kebabCase(type);
 }
-export function getModelEvent(name) {
-    switch (name) {
+export function getModelEvent(renderOpts) {
+    switch (renderOpts.name) {
         case 'VxeInput':
         case 'VxeTextarea':
         case 'VxeNumberInput':
+        case 'VxePasswordInput':
         case 'VxeSelect':
         case 'VxeTreeSelect':
         case 'VxeTableSelect':
         case 'VxeDatePicker':
         case 'VxeDateRangePicker':
+        case 'VxeIconPicker':
+        case 'VxeColorPicker':
+        case 'VxeSlider':
+        case 'VxeUpload':
             return 'modelValue';
         case 'select':
             return 'change';
     }
     return 'input';
 }
-export function getChangeEvent(name) {
-    switch (name) {
+export function getChangeEvent(renderOpts) {
+    switch (renderOpts.name) {
         case 'input':
         case 'textarea':
         case 'VxeInput':

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.18.3";
+const version = "3.18.5";
 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.3"}`;
+const log_version = `table v${"3.18.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3687,24 +3687,29 @@ function colToVisible($xeTable, column, row) {
 function getOnName(type) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().kebabCase(type);
 }
-function getModelEvent(name) {
-  switch (name) {
+function getModelEvent(renderOpts) {
+  switch (renderOpts.name) {
     case 'VxeInput':
     case 'VxeTextarea':
     case 'VxeNumberInput':
+    case 'VxePasswordInput':
     case 'VxeSelect':
     case 'VxeTreeSelect':
     case 'VxeTableSelect':
     case 'VxeDatePicker':
     case 'VxeDateRangePicker':
+    case 'VxeIconPicker':
+    case 'VxeColorPicker':
+    case 'VxeSlider':
+    case 'VxeUpload':
       return 'modelValue';
     case 'select':
       return 'change';
   }
   return 'input';
 }
-function getChangeEvent(name) {
-  switch (name) {
+function getChangeEvent(renderOpts) {
+  switch (renderOpts.name) {
     case 'input':
     case 'textarea':
     case 'VxeInput':
@@ -15958,12 +15963,22 @@ const Methods = {
     } = rowDragOpts;
     if (isCrossTableDrag && crossTableDragRowObj && !tableData.length) {
       const {
-        $oldTable
+        $oldTable,
+        $newTable
       } = crossTableDragRowObj;
-      if ($oldTable && $oldTable.xID !== $xeTable.xID) {
-        evnt.preventDefault();
-        crossTableDragRowObj.$newTable = $xeTable;
-        internalData.prevDragRow = null;
+      if ($oldTable) {
+        const oldTableReactData = $oldTable;
+        if ($oldTable.xID !== $xeTable.xID) {
+          if ($newTable && $newTable.xID !== $xeTable.xID) {
+            $newTable.hideCrossTableRowDropClearStatus();
+          }
+          evnt.preventDefault();
+          $oldTable.hideCrossTableRowDropClearStatus();
+          crossTableDragRowObj.$newTable = $xeTable;
+          internalData.prevDragRow = null;
+          reactData.dragTipText = oldTableReactData.dragTipText;
+          showDropTip($xeTable, evnt, evnt.currentTarget, null, true, '');
+        }
       }
     }
   },
@@ -16246,6 +16261,9 @@ const Methods = {
             oldTableReactData.isCrossDragRow = false;
             crossTableDragRowObj.$newTable = null;
           } else if (!treeConfig || isCrossDrag) {
+            if ($newTable && $newTable.xID !== $xeTable.xID) {
+              $newTable.hideCrossTableRowDropClearStatus();
+            }
             $oldTable.hideCrossTableRowDropClearStatus();
             oldTableReactData.isCrossDragRow = true;
             reactData.dragTipText = oldTableReactData.dragTipText;
@@ -20330,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;
@@ -20496,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,
@@ -31488,9 +31535,11 @@ function renderBody(h, $xeTable) {
     const {
       isCrossTableDrag
     } = rowDragOpts;
-    const rwOns = {};
+    const tbOns = {
+      keydown: this.keydownEvent
+    };
     if (isCrossTableDrag && !tableData.length) {
-      rwOns.onDragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
+      tbOns.dragover = $xeTable.handleCrossTableRowDragoverEmptyEvent;
     }
     return h('div', {
       ref: 'refElem',
@@ -31528,9 +31577,7 @@ function renderBody(h, $xeTable) {
       attrs: {
         spellcheck: false
       },
-      on: {
-        keydown: this.keydownEvent
-      }
+      on: tbOns
     }, [
     /**
      * 隐藏列
@@ -31551,8 +31598,7 @@ function renderBody(h, $xeTable) {
       class: 'vxe-table-var-mini'
     })]), h('div', {
       key: 'tw',
-      class: 'vxe-table--render-wrapper',
-      on: rwOns
+      class: 'vxe-table--render-wrapper'
     }, scrollbarXToTop ? [renderScrollX(h, $xeTable), renderBody(h, $xeTable)] : [renderBody(h, $xeTable), renderScrollX(h, $xeTable)]),
     /**
      * 空数据
@@ -34928,7 +34974,7 @@ function nativeEditRender(h, renderOpts, params) {
     name
   } = renderOpts;
   const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value;
-  return [h(name, {
+  return [h(`${name}`, {
     class: `vxe-default-${name}`,
     attrs: getNativeAttrs(renderOpts),
     domProps: {
@@ -35012,7 +35058,10 @@ function oldButtonEditRender(h, renderOpts, params) {
  * @deprecated
  */
 function oldButtonsEditRender(h, renderOpts, params) {
-  return renderOpts.children.map(childRenderOpts => oldButtonEditRender(h, childRenderOpts, params)[0]);
+  const {
+    children
+  } = renderOpts;
+  return children ? children.map(childRenderOpts => oldButtonEditRender(h, childRenderOpts, params)[0]) : [];
 }
 function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
   const {
@@ -35074,7 +35123,7 @@ function nativeFilterRender(h, renderOpts, params) {
   } = renderOpts;
   const attrs = getNativeAttrs(renderOpts);
   return column.filters.map((option, oIndex) => {
-    return h(name, {
+    return h(`${name}`, {
       key: oIndex,
       class: `vxe-default-${name}`,
       attrs,