vxe-table 4.16.0-beta.0 → 4.16.0-beta.2

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}`
       }
@@ -3864,6 +3866,7 @@ export default defineVxeComponent({
 
     const updateScrollYStatus = (fullData?: any[]) => {
       const { treeConfig } = props
+      const $xeGanttView = internalData.xeGanttView
       const virtualYOpts = computeVirtualYOpts.value
       const treeOpts = computeTreeOpts.value
       const { transform } = treeOpts
@@ -3871,6 +3874,9 @@ export default defineVxeComponent({
       // 如果gt为0，则总是启用
       const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length)
       reactData.scrollYLoad = scrollYLoad
+      if ($xeGanttView) {
+        $xeGanttView.updateScrollYStatus(scrollYLoad)
+      }
       return scrollYLoad
     }
 
@@ -4250,7 +4256,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) => {
@@ -6895,7 +6901,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()
@@ -7264,7 +7270,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()
           }
@@ -7288,7 +7294,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 = {}
@@ -7561,7 +7567,8 @@ export default defineVxeComponent({
                 column: selected.column,
                 columnIndex: tableMethods.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               }
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7586,7 +7593,8 @@ export default defineVxeComponent({
                   column: selected.column,
                   columnIndex: $xeTable.getColumnIndex(selected.column),
                   $table: $xeTable,
-                  $grid: $xeGrid
+                  $grid: $xeGrid,
+                  $gantt: $xeGantt
                 }
                 // 是否被禁用
                 if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7610,7 +7618,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))
@@ -7631,9 +7640,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 {
@@ -7954,8 +7964,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
@@ -7981,8 +7991,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
@@ -7998,8 +8008,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
             }
@@ -8014,7 +8024,7 @@ export default defineVxeComponent({
        * 如果存在表尾合计滚动条，则需要排除滚动条高度
        */
       getExcludeHeight () {
-        return $xeGrid ? $xeGrid.getExcludeHeight() : 0
+        return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0
       },
       /**
        * 定义行数据中的列属性，如果不存在则定义
@@ -8671,7 +8681,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
@@ -10941,7 +10951,6 @@ export default defineVxeComponent({
       updateScrollXSpace () {
         const { scrollXLoad, overflowX, scrollXWidth } = reactData
         const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData
-        const $xeGanttView = internalData.xeGanttView
         const mouseOpts = computeMouseOpts.value
         const tableBody = refTableBody.value
         const tableBodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
@@ -11014,9 +11023,6 @@ export default defineVxeComponent({
           if (isScrollXBig && mouseOpts.area) {
             errLog('vxe.error.notProp', ['mouse-config.area'])
           }
-          if ($xeGanttView) {
-            $xeGanttView.updateScrollXSpace()
-          }
           return nextTick().then(() => {
             updateStyle()
           })
@@ -11312,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 {
@@ -11459,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,
@@ -11784,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
@@ -11792,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),
         /**
          * 自定义列