vxe-table 4.17.4 → 4.17.6

package/packages/table/module/export/hook.ts

@@ -312,15 +312,17 @@ hooks.add('tableExportModule', {
 
     const getSeq = (cellValue: any, row: any, $rowIndex: number, column: VxeTableDefines.ColumnInfo, $columnIndex: number) => {
       const seqOpts = computeSeqOpts.value
-      const seqMethod = seqOpts.seqMethod || (column as any).seqMethod
-      if (seqMethod) {
-        return seqMethod({
+      const seqMd = seqOpts.seqMethod || (column as any).seqMethod
+      if (seqMd) {
+        return seqMd({
           $table: $xeTable,
           row,
           rowIndex: $xeTable.getRowIndex(row),
+          _rowIndex: $xeTable.getVTRowIndex(row),
           $rowIndex,
           column,
           columnIndex: $xeTable.getColumnIndex(column),
+          _columnIndex: $xeTable.getVTColumnIndex(column),
           $columnIndex
         })
       }

package/packages/table/src/cell.ts

@@ -662,9 +662,9 @@ export const Cell = {
       return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params))
     }
     const { seq } = params
-    const seqMethod = seqOpts.seqMethod
+    const seqMd = seqOpts.seqMethod
     return renderCellBaseVNs(params, [
-      h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + (seq as number), 1)}`)
+      h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + (seq as number), 1)}`)
     ])
   },
   renderDeepIndexCell (params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {

package/packages/table/src/table.ts

@@ -1,7 +1,7 @@
 import { h, ComponentPublicInstance, reactive, ref, Ref, provide, inject, nextTick, Teleport, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey } from '../../ui/src/dom'
+import { initTpImg, getTpImg, isPx, isScale, hasClass, addClass, removeClass, getEventTargetNode, getPaddingTopBottomSize, setScrollTop, setScrollLeft, toCssUnit, hasControlKey, checkTargetElement } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils'
 import { VxeUI } from '../../ui'
 import { createInternalData, getRowUniqueId, clearTableAllStatus, getColumnList, toFilters, hasDeepKey, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getRefElem, getColReMinWidth, createHandleUpdateRowId, createHandleGetRowId, getCalcHeight, getCellRestHeight, getLastChildColumn } from './util'
@@ -62,6 +62,7 @@ export default defineVxeComponent({
     const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip')
 
     const $xeTabs = inject<(VxeTabsConstructor & VxeTabsPrivateMethods) | null>('$xeTabs', null)
+    const $xeParentTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
     const $xeGrid = inject<(VxeGridConstructor & VxeGridPrivateMethods) | null>('$xeGrid', null)
     const $xeGantt = inject<(VxeGanttConstructor & VxeGanttPrivateMethods) | null>('$xeGantt', null)
     const $xeGGWrapper = $xeGrid || $xeGantt
@@ -11594,6 +11595,22 @@ export default defineVxeComponent({
           }
         }
 
+        // 展开行处理，如果展开行嵌入表格中
+        if ($xeParentTable) {
+          if (isRollY) {
+            if (checkTargetElement(evnt.target, [leftScrollElem, bodyScrollElem, rightScrollElem], evnt.currentTarget)) {
+              evnt.stopPropagation()
+              return
+            }
+          }
+          if (isRollX) {
+            if (checkTargetElement(evnt.target, [headerScrollElem, bodyScrollElem, footerScrollElem], evnt.currentTarget)) {
+              evnt.stopPropagation()
+              return
+            }
+          }
+        }
+
         if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
           return
         }
@@ -12850,7 +12867,7 @@ export default defineVxeComponent({
     watch(dataFlag, () => {
       const { initStatus } = internalData
       const value = props.data || []
-      if (value && value.length >= 50000) {
+      if (value && value.length >= 20000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
       loadTableData(value, true).then(() => {

package/packages/toolbar/src/toolbar.ts

@@ -380,7 +380,7 @@ export default defineVxeComponent({
             ? h(VxeUIButtonComponent, {
               key: index,
               ...Object.assign({}, child, {
-                content: child.name,
+                content: child.content || child.name,
                 options: undefined
               }),
               onClick: (eventParams) => isBtn ? btnEvent(eventParams, child) : tolEvent(eventParams, child)
@@ -424,7 +424,7 @@ export default defineVxeComponent({
                   h(VxeUIButtonComponent, {
                     key: `bd${item.code || index}`,
                     ...Object.assign({}, item, {
-                      content: item.name,
+                      content: item.content || item.name,
                       options: undefined
                     }),
                     onClick: (eventParams) => btnEvent(eventParams, item)
@@ -479,7 +479,7 @@ export default defineVxeComponent({
                   h(VxeUIButtonComponent, {
                     key: tIndex,
                     ...Object.assign({}, item, {
-                      content: item.name,
+                      content: item.content || item.name,
                       options: undefined
                     }),
                     onClick: (eventParams) => tolEvent(eventParams, item)

package/packages/ui/src/dom.ts

@@ -140,6 +140,24 @@ export function updateCellTitle (overflowElem: any, column: any) {
   }
 }
 
+export function checkTargetElement (target: HTMLElement | EventTarget | null, exEls: (HTMLElement | null)[], endEl?: HTMLElement | EventTarget | null) {
+  let targetEl = target
+  if (!exEls || !exEls.length) {
+    return false
+  }
+  const [exEl1, exEl2, exEl3] = exEls
+  while (targetEl) {
+    if (exEl1 === targetEl || (exEl2 && targetEl === exEl2) || (exEl3 && targetEl === exEl3)) {
+      return true
+    }
+    if (endEl && targetEl === endEl) {
+      return false
+    }
+    targetEl = (targetEl as HTMLElement).parentElement
+  }
+  return false
+}
+
 /**
  * 检查触发源是否属于目标节点
  */

package/styles/components/table.scss

@@ -2223,16 +2223,28 @@ $btnThemeList: (
       left: 50%;
       font-size: 12px;
       line-height: 1em;
-      transform: translate(-50%, -50%);
+      transform: translate(-50%, -2px);
       text-align: left;
       z-index: 4;
       padding: 0 var(--vxe-ui-table-cell-padding-default);
       pointer-events: none;
     }
     .vxe-cell--valid-error-wrapper {
+      position: relative;
       display: inline-block;
       border-radius: var(--vxe-ui-border-radius);
       pointer-events: auto;
+      // &::before {
+      //   content: "";
+      //   position: absolute;
+      //   top: -0.75em;
+      //   left: 50%;
+      //   bottom: auto;
+      //   transform: translateX(-50%);
+      //   border-width: 0.5em;
+      //   border-style: solid;
+      //   border-color: transparent transparent var(--vxe-ui-table-validate-error-color) transparent;
+      // }
     }
     .vxe-cell--valid-error-theme-beautify {
       padding: 0.2em 0.6em 0.25em 0.6em;
@@ -2267,12 +2279,26 @@ $btnThemeList: (
       &:last-child {
         .vxe-cell--valid-error-tip {
           bottom: calc(100%);
-          transform: translate(-50%, 50%);
+          transform: translate(-50%, 0);
+          // .vxe-cell--valid-error-wrapper {
+          //   &::before {
+          //     bottom: -0.75em;
+          //     top: auto;
+          //     border-color: var(--vxe-ui-table-validate-error-color) transparent transparent transparent;
+          //   }
+          // }
         }
         &:first-child {
           .vxe-cell--valid-error-tip {
             bottom: auto;
-            transform: translate(-50%, -50%);
+            transform: translate(-50%, -2px);
+            // .vxe-cell--valid-error-wrapper {
+            //   &::before {
+            //     top: -0.75em;
+            //     bottom: auto;
+            //     border-color: transparent transparent var(--vxe-ui-table-validate-error-color) transparent;
+            //   }
+            // }
           }
         }
       }
@@ -2308,6 +2334,11 @@ $btnThemeList: (
             background-color: #f56c6c;
             pointer-events: auto;
           }
+          // .vxe-cell--valid-error-wrapper {
+          //   &::before {
+          //     display: none;
+          //   }
+          // }
         }
       }
     }