vxe-table 4.15.8 → 4.16.0-beta.1

package/packages/table/src/table.ts

@@ -362,13 +362,15 @@ export default defineVxeComponent({
 
     const $xeGrid = inject<(VxeGridConstructor & VxeGridPrivateMethods) | null>('$xeGrid', null)
     const $xeGantt = inject('$xeGantt', null)
+    const $xeGGWrapper = $xeGrid || $xeGantt
+
     let $xeToolbar: VxeToolbarConstructor
 
     const computeTableId = computed(() => {
       const { id } = props
       if (id) {
         if (XEUtils.isFunction(id)) {
-          return `${id({ $table: $xeTable, $grid: $xeGrid }) || ''}`
+          return `${id({ $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) || ''}`
         }
         return `${id}`
       }
@@ -1625,8 +1627,11 @@ export default defineVxeComponent({
           }
           fullColFieldData[field] = rest
         } else {
-          if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-            errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`])
+          if (storage && !type) {
+            errLog('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`])
+          }
+          if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+            errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`])
           }
         }
         if (!hasFixed && fixed) {
@@ -4247,7 +4252,7 @@ export default defineVxeComponent({
     }
 
     const dispatchEvent = (type: ValueOf<VxeTableEmits>, params: Record<string, any>, evnt: Event | null) => {
-      emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid }, params))
+      emit(type, createEvent(evnt, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }, params))
     }
 
     const handleScrollToRowColumn = (fieldOrColumn: string | VxeTableDefines.ColumnInfo | null, row?: any) => {
@@ -5799,6 +5804,7 @@ export default defineVxeComponent({
        * @param {Row} row 行对象
        */
       setCurrentRow (row) {
+        const $xeGanttView = internalData.xeGanttView
         const rowOpts = computeRowOpts.value
         const el = refElem.value
         tableMethods.clearCurrentRow()
@@ -5809,6 +5815,9 @@ export default defineVxeComponent({
             XEUtils.arrayEach(el.querySelectorAll(`[rowid="${getRowid($xeTable, row)}"]`), elem => addClass(elem, 'row--current'))
           }
         }
+        if ($xeGanttView) {
+          $xeGanttView.handleUpdateCurrentRow(row)
+        }
         return nextTick()
       },
       isCheckedByRadioRow (row) {
@@ -5848,12 +5857,16 @@ export default defineVxeComponent({
        * 用于当前行，手动清空当前高亮的状态
        */
       clearCurrentRow () {
+        const $xeGanttView = internalData.xeGanttView
         const el = refElem.value
         reactData.currentRow = null
         internalData.hoverRow = null
         if (el) {
           XEUtils.arrayEach(el.querySelectorAll('.row--current'), elem => removeClass(elem, 'row--current'))
         }
+        if ($xeGanttView) {
+          $xeGanttView.handleUpdateCurrentRow()
+        }
         return nextTick()
       },
       /**
@@ -6884,7 +6897,7 @@ export default defineVxeComponent({
         if (showFooter && footerData && footerData.length) {
           footData = footerData.slice(0)
         } else if (showFooter && footerMethod) {
-          footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid }) : []
+          footData = visibleColumn.length ? footerMethod({ columns: visibleColumn, data: afterFullData, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt }) : []
         }
         reactData.footerTableData = footData
         $xeTable.handleUpdateFooterMerge()
@@ -7253,7 +7266,7 @@ export default defineVxeComponent({
           }
         }
       } else if (mouseConfig) {
-        if (!getEventTargetNode(evnt, el).flag && !($xeGrid && getEventTargetNode(evnt, $xeGrid.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
+        if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
           if ($xeTable.clearSelected) {
             $xeTable.clearSelected()
           }
@@ -7277,7 +7290,7 @@ export default defineVxeComponent({
           $xeTable.closeMenu()
         }
       }
-      const isActivated = getEventTargetNode(evnt, $xeGrid ? $xeGrid.getRefMaps().refElem.value : el).flag
+      const isActivated = getEventTargetNode(evnt, $xeGGWrapper ? $xeGGWrapper.getRefMaps().refElem.value : el).flag
       // 如果存在校验，点击了表格之外则清除
       if (!isActivated && editRules && validOpts.autoClear) {
         reactData.validErrorMaps = {}
@@ -7550,7 +7563,8 @@ export default defineVxeComponent({
                 column: selected.column,
                 columnIndex: tableMethods.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               }
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7575,7 +7589,8 @@ export default defineVxeComponent({
                   column: selected.column,
                   columnIndex: $xeTable.getColumnIndex(selected.column),
                   $table: $xeTable,
-                  $grid: $xeGrid
+                  $grid: $xeGrid,
+                  $gantt: $xeGantt
                 }
                 // 是否被禁用
                 if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7599,7 +7614,8 @@ export default defineVxeComponent({
                 rowIndex: $xeTable.getRowIndex(parentRow),
                 $rowIndex: $xeTable.getVMRowIndex(parentRow),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               }
               $xeTable.setTreeExpand(parentRow, false)
                 .then(() => $xeTable.scrollToRow(parentRow))
@@ -7620,9 +7636,10 @@ export default defineVxeComponent({
                 column: selected.column,
                 columnIndex: $xeTable.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               }
-              if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: $xeTable, $grid: $xeGrid })) {
+              if (!beforeEditMethod || beforeEditMethod({ ...selected.args, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })) {
                 if (editMethod) {
                   editMethod(params)
                 } else {
@@ -7943,8 +7960,8 @@ export default defineVxeComponent({
 
     const callSlot = <T>(slotFunc: ((params: T) => VxeComponentSlotType | VxeComponentSlotType[]) | string | null, params: T): VxeComponentSlotType[] => {
       if (slotFunc) {
-        if ($xeGrid) {
-          return $xeGrid.callSlot(slotFunc, params)
+        if ($xeGGWrapper) {
+          return $xeGGWrapper.callSlot(slotFunc, params)
         }
         // if (XEUtils.isString(slotFunc)) {
         //   slotFunc = slots[slotFunc] || null
@@ -7970,8 +7987,8 @@ export default defineVxeComponent({
        */
       getParentElem () {
         const el = refElem.value
-        if ($xeGrid) {
-          const gridEl = $xeGrid.getRefMaps().refElem.value
+        if ($xeGGWrapper) {
+          const gridEl = $xeGGWrapper.getRefMaps().refElem.value
           return gridEl ? gridEl.parentNode as HTMLElement : null
         }
         return el ? el.parentNode as HTMLElement : null
@@ -7987,8 +8004,8 @@ export default defineVxeComponent({
           const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
           let parentWrapperHeight = 0
           if (parentElem) {
-            if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
-              parentWrapperHeight = $xeGrid.getParentHeight()
+            if ($xeGGWrapper && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+              parentWrapperHeight = $xeGGWrapper.getParentHeight()
             } else {
               parentWrapperHeight = parentElem.clientHeight
             }
@@ -8003,7 +8020,7 @@ export default defineVxeComponent({
        * 如果存在表尾合计滚动条，则需要排除滚动条高度
        */
       getExcludeHeight () {
-        return $xeGrid ? $xeGrid.getExcludeHeight() : 0
+        return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0
       },
       /**
        * 定义行数据中的列属性，如果不存在则定义
@@ -8660,7 +8677,7 @@ export default defineVxeComponent({
         let isStop = false
         for (let i = 0; i < evntList.length; i++) {
           const func = evntList[i]
-          const fnRest = func(Object.assign({ $grid: $xeGrid, $table: $xeTable, $event: evnt }, args))
+          const fnRest = func(Object.assign({ $table: $xeTable, $grid: $xeGrid, gantt: $xeGantt, $event: evnt }, args))
           if (fnRest === false) {
             isStop = true
             break
@@ -11189,6 +11206,7 @@ export default defineVxeComponent({
         tablePrivateMethods.setHoverRow(row)
       },
       setHoverRow (row) {
+        const $xeGanttView = internalData.xeGanttView
         const rowid = getRowid($xeTable, row)
         const el = refElem.value
         tablePrivateMethods.clearHoverRow()
@@ -11196,13 +11214,20 @@ export default defineVxeComponent({
           XEUtils.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'))
         }
         internalData.hoverRow = row
+        if ($xeGanttView) {
+          $xeGanttView.handleUpdateHoverRow(row)
+        }
       },
       clearHoverRow () {
+        const $xeGanttView = internalData.xeGanttView
         const el = refElem.value
         if (el) {
           XEUtils.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => removeClass(elem, 'row--hover'))
         }
         internalData.hoverRow = null
+        if ($xeGanttView) {
+          $xeGanttView.handleUpdateHoverRow()
+        }
       },
       /**
        * 已废弃，被 getCellElement 替换
@@ -11293,7 +11318,7 @@ export default defineVxeComponent({
     const renderEmptyBody = () => {
       const emptyOpts = computeEmptyOpts.value
       const emptySlot = slots.empty
-      const emptyParams = { $table: $xeTable, $grid: $xeGrid }
+      const emptyParams = { $table: $xeTable, $grid: $xeGrid, gantt: $xeGantt }
       if (emptySlot) {
         return emptySlot(emptyParams)
       } else {
@@ -11440,8 +11465,9 @@ export default defineVxeComponent({
             _columnIndex = colRest._index
           }
           const expandParams: VxeTableDefines.CellRenderDataParams = {
-            $grid: $xeGrid,
             $table: $xeTable,
+            $grid: $xeGrid,
+            $gantt: $xeGantt,
             seq,
             column: expandColumn,
             columnIndex,
@@ -11765,7 +11791,7 @@ export default defineVxeComponent({
             text: loadingOpts.text
           }, loadingSlot
             ? {
-                default: () => callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading })
+                default: () => callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading })
               }
             : {})
           : loadingSlot
@@ -11773,7 +11799,7 @@ export default defineVxeComponent({
               class: ['vxe-loading--custom-wrapper', {
                 'is--visible': currLoading
               }]
-            }, callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }))
+            }, callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, loading: currLoading }))
             : renderEmptyElement($xeTable),
         /**
          * 自定义列

package/styles/components/table.scss

@@ -1223,9 +1223,6 @@ $btnThemeList: (
   // }
   
   /*边框*/
-  .vxe-table--footer-wrapper {
-    border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-  }
   &.border--default,
   &.border--full,
   &.border--outer,
@@ -1323,6 +1320,13 @@ $btnThemeList: (
     }
   }
   &.border--default,
+  &.border--full,
+  &.border--inner {
+    .vxe-table--footer-wrapper {
+      border-top: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
+    }
+  }
+  &.border--default,
   &.border--full {
     .vxe-table--scroll-y-top-corner {
       &::before {