vxe-gantt 4.0.15 → 4.0.17

package/packages/gantt/src/gantt-chart.ts

@@ -11,6 +11,9 @@ import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods, VxeGanttConst
 
 const { renderEmptyElement } = VxeUI
 
+const sourceType = 'gantt'
+const viewType = 'chart'
+
 export default defineVxeComponent({
   name: 'VxeGanttViewChart',
   setup () {
@@ -22,7 +25,7 @@ export default defineVxeComponent({
 
     const refElem = ref() as Ref<HTMLDivElement>
 
-    const renderTaskBar = ($xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, $rowIndex: number) => {
+    const renderTaskBar = ($xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, rowIndex: number, $rowIndex: number, _rowIndex: number) => {
       const tableProps = $xeTable.props
       const { treeConfig } = tableProps
       const tableReactData = $xeTable.reactData
@@ -72,6 +75,7 @@ export default defineVxeComponent({
         title = getStringValue(contentMethod({ row, title }))
       }
 
+      const ctParams = { source: sourceType, type: viewType, row, $rowIndex, rowIndex, _rowIndex }
       return h('div', {
         key: treeConfig ? rowid : $rowIndex,
         rowid,
@@ -81,6 +85,9 @@ export default defineVxeComponent({
         }],
         style: {
           height: `${cellHeight}px`
+        },
+        onContextmenu (evnt) {
+          $xeGantt.handleTaskBarContextmenuEvent(evnt, ctParams)
         }
       }, [
         h('div', {
@@ -122,7 +129,7 @@ export default defineVxeComponent({
       const tableReactData = $xeTable.reactData
       const { treeExpandedFlag } = tableReactData
       const tableInternalData = $xeTable.internalData
-      const { treeExpandedMaps } = tableInternalData
+      const { fullAllDataRowIdData, treeExpandedMaps } = tableInternalData
       const { computeTreeOpts } = $xeTable.getComputeMaps()
       const treeOpts = computeTreeOpts.value
       const { transform } = treeOpts
@@ -133,7 +140,14 @@ export default defineVxeComponent({
       const trVNs: VNode[] = []
       tableData.forEach((row, $rowIndex) => {
         const rowid = $xeTable ? $xeTable.getRowid(row) : ''
-        trVNs.push(renderTaskBar($xeTable, row, rowid, $rowIndex))
+        const rowRest = fullAllDataRowIdData[rowid] || {}
+        let rowIndex = $rowIndex
+        let _rowIndex = -1
+        if (rowRest) {
+          rowIndex = rowRest.index
+          _rowIndex = rowRest._index
+        }
+        trVNs.push(renderTaskBar($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex))
         let isExpandTree = false
         let rowChildren: any[] = []
 

package/packages/gantt/src/gantt-footer.ts

@@ -1,11 +1,15 @@
 import { h, inject, ref, Ref, onMounted, onUnmounted } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 
-import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods } from '../../../types'
+import type { VxeGanttConstructor, VxeGanttPrivateMethods, VxeGanttViewConstructor, VxeGanttViewPrivateMethods } from '../../../types'
+
+const sourceType = 'gantt'
+const viewType = 'footer'
 
 export default defineVxeComponent({
   name: 'VxeGanttViewFooter',
   setup () {
+    const $xeGantt = inject('$xeGantt', {} as (VxeGanttConstructor & VxeGanttPrivateMethods))
     const $xeGanttView = inject('$xeGanttView', {} as VxeGanttViewConstructor & VxeGanttViewPrivateMethods)
 
     const { internalData } = $xeGanttView
@@ -16,7 +20,10 @@ export default defineVxeComponent({
     const renderVN = () => {
       return h('div', {
         ref: refElem,
-        class: 'vxe-gantt-view--footer-wrapper'
+        class: 'vxe-gantt-view--footer-wrapper',
+        onContextmenu (evnt) {
+          $xeGantt.handleTaskFooterContextmenuEvent(evnt, { source: sourceType, type: viewType, $rowIndex: -1 })
+        }
       }, [
         h('div', {
           ref: refHeaderScroll,

package/packages/gantt/src/gantt-header.ts

@@ -8,6 +8,9 @@ import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods, VxeGanttConst
 
 const { getI18n } = VxeUI
 
+const sourceType = 'gantt'
+const viewType = 'header'
+
 export default defineVxeComponent({
   name: 'VxeGanttViewHeader',
   setup () {
@@ -69,7 +72,7 @@ export default defineVxeComponent({
                   }
                 }
                 let cellVNs: string | VxeComponentSlotType[] = label
-                const ctParams = { scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex }
+                const ctParams = { source: sourceType, type: viewType, column, scaleObj: scaleItem, title: label, dateObj: dateObj, $rowIndex }
                 if (titleSlot) {
                   cellVNs = $xeGantt.callSlot(titleSlot, ctParams)
                 } else if (titleMethod) {
@@ -90,7 +93,10 @@ export default defineVxeComponent({
                   }],
                   colspan: childCount || null,
                   title: titleSlot ? null : label,
-                  style: cellStys
+                  style: cellStys,
+                  onContextmenu (evnt) {
+                    $xeGantt.handleTaskHeaderContextmenuEvent(evnt, ctParams)
+                  }
                 }, cellVNs)
               }))
             }))

package/packages/gantt/src/gantt.ts

@@ -1360,6 +1360,10 @@ export default defineVxeComponent({
           $pager.endPageByEvent(evnt)
         }
       },
+      getCurrentPage () {
+        const { tablePage } = reactData
+        return tablePage.currentPage
+      },
       setCurrentPage (currentPage) {
         const { tablePage } = reactData
         const pageCount = computePageCount.value
@@ -1372,6 +1376,10 @@ export default defineVxeComponent({
           $pager.setCurrentPageByEvent(evnt, currentPage)
         }
       },
+      getPageSize () {
+        const { tablePage } = reactData
+        return tablePage.pageSize
+      },
       setPageSize (pageSize) {
         const { tablePage } = reactData
         tablePage.pageSize = Math.max(1, XEUtils.toNumber(pageSize))
@@ -1546,6 +1554,50 @@ export default defineVxeComponent({
       },
       handleTaskBarDblclickEvent (evnt, params) {
         $xeGantt.dispatchEvent('task-bar-dblclick', params, evnt)
+      },
+      handleTaskHeaderContextmenuEvent (evnt, params) {
+        const $xeTable = refTable.value
+        if ($xeTable) {
+          const tableProps = $xeTable.props
+          const { menuConfig } = tableProps
+          if (isEnableConf(menuConfig)) {
+            evnt.stopPropagation()
+            $xeTable.handleOpenMenuEvent(evnt, 'header', params)
+          }
+        }
+      },
+      handleTaskBodyContextmenuEvent (evnt, params) {
+        const $xeTable = refTable.value
+        if ($xeTable) {
+          const tableProps = $xeTable.props
+          const { menuConfig } = tableProps
+          if (isEnableConf(menuConfig)) {
+            evnt.stopPropagation()
+            $xeTable.handleOpenMenuEvent(evnt, 'body', params)
+          }
+        }
+      },
+      handleTaskFooterContextmenuEvent (evnt, params) {
+        const $xeTable = refTable.value
+        if ($xeTable) {
+          const tableProps = $xeTable.props
+          const { menuConfig } = tableProps
+          if (isEnableConf(menuConfig)) {
+            evnt.stopPropagation()
+            $xeTable.handleOpenMenuEvent(evnt, 'footer', params)
+          }
+        }
+      },
+      handleTaskBarContextmenuEvent (evnt, params) {
+        const $xeTable = refTable.value
+        if ($xeTable) {
+          const tableProps = $xeTable.props
+          const { menuConfig } = tableProps
+          if (isEnableConf(menuConfig)) {
+            evnt.stopPropagation()
+            $xeTable.handleOpenMenuEvent(evnt, 'body', params)
+          }
+        }
       }
     }
 

package/packages/gantt/src/table-emits.ts

@@ -81,6 +81,7 @@ export const tableEmits: VxeTableEmits = [
   'custom-visible-change',
   'custom-visible-all',
   'custom-fixed-change',
+  'custom-sort-change',
 
   'change-fnr', // 废弃
 
@@ -106,6 +107,7 @@ export const tableEmits: VxeTableEmits = [
   'cell-area-extension-start',
   'cell-area-extension-drag',
   'cell-area-extension-end',
+  'cell-area-extension-fill',
   'cell-area-selection-all-start',
   'cell-area-selection-all-end',
   'cell-area-arrows-start',