vxe-gantt 3.0.15 → 3.0.17

package/lib/ui/index.js

@@ -15,7 +15,7 @@ var _log = require("./src/log");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon,
   checkVersion = _core.VxeUI.checkVersion;
-_core.VxeUI.ganttVersion = "3.0.15";
+_core.VxeUI.ganttVersion = "3.0.17";
 setConfig({
   gantt: {
     // size: null,

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,iconPrefix=(_core.VxeUI.ganttVersion="3.0.15",setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskViewScaleConfs:{week:{startDay:1}},taskViewConfig:{showNowLine:!0},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),exports.default=_core.VxeUI);
+Object.defineProperty(exports,"__esModule",{value:!0}),Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.default=void 0;var _core=require("@vxe-ui/core"),_log=require("./src/log"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,checkVersion=_core.VxeUI.checkVersion,iconPrefix=(_core.VxeUI.ganttVersion="3.0.17",setConfig({gantt:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showLoading:!0,showResponseMsg:!0,showActionMsg:!0,response:{list:null,result:"result",total:"page.total",message:"message"}},taskViewScaleConfs:{week:{startDay:1}},taskViewConfig:{showNowLine:!0},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),pVersion=(setIcon({GANTT_VIEW_LEFT_OPEN:iconPrefix+"arrow-left",GANTT_VIEW_LEFT_CLOSE:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_OPEN:iconPrefix+"arrow-right",GANTT_VIEW_RIGHT_CLOSE:iconPrefix+"arrow-left"}),3),sVersion=18,_default=(checkVersion?checkVersion(_core.VxeUI.tableVersion,pVersion,sVersion)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v".concat(pVersion,".").concat(sVersion,"+")]):(0,_log.errLog)("Requires vxe-table v".concat(pVersion,".").concat(sVersion,"+")),exports.default=_core.VxeUI);

package/lib/ui/src/log.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.warnLog = exports.errLog = void 0;
 var _core = require("@vxe-ui/core");
 var log = _core.VxeUI.log;
-var version = "gantt v".concat("3.0.15");
+var version = "gantt v".concat("3.0.17");
 var warnLog = exports.warnLog = log.create('warn', version);
 var errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.0.15"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core"),log=_core.VxeUI.log,version="gantt v".concat("3.0.17"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.0.15",
+  "version": "3.0.17",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -64,8 +64,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.9.45",
-    "vxe-table": "^3.18.20"
+    "vxe-pc-ui": "^3.10.2",
+    "vxe-table": "^3.19.0"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -4,7 +4,10 @@ import { getCellRestHeight } from './util'
 import GanttViewChartComponent from './gantt-chart'
 
 import type { TableInternalData, TableReactData, VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods, VxeTableDefines } from 'vxe-table'
-import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods, VxeGanttConstructor, VxeGanttPrivateMethods, VxeGanttPropTypes } from '../../../types'
+import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods, VxeGanttConstructor, VxeGanttPrivateMethods, VxeGanttDefines } from '../../../types'
+
+const sourceType = 'gantt'
+const viewType = 'body'
 
 export default defineVxeComponent({
   name: 'VxeGanttViewBody',
@@ -26,7 +29,7 @@ export default defineVxeComponent({
     //
     // Render
     //
-    renderColumn (h: CreateElement, $xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, rowIndex: number, $rowIndex: number, _rowIndex: number, column: VxeGanttPropTypes.Column, $columnIndex: number) {
+    renderColumn (h: CreateElement, $xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, rowIndex: number, $rowIndex: number, _rowIndex: number, column: VxeGanttDefines.ViewColumn, $columnIndex: number) {
       const _vm = this
       const $xeGanttView = _vm.$xeGanttView
       const $xeGantt = _vm.$xeGantt
@@ -72,7 +75,8 @@ export default defineVxeComponent({
           $columnIndex: 0,
           _columnIndex: 0,
           fixed: '',
-          type: '',
+          source: sourceType,
+          type: viewType,
           isHidden: false,
           isEdit: false,
           level: -1,
@@ -92,6 +96,7 @@ export default defineVxeComponent({
           })
         )
       }
+      const ctParams = { source: sourceType, type: viewType, row, column, $rowIndex, rowIndex, _rowIndex }
       return h('td', {
         key: $columnIndex,
         class: ['vxe-gantt-view--body-column', {
@@ -107,6 +112,9 @@ export default defineVxeComponent({
           },
           dblclick (evnt: MouseEvent) {
             $xeGantt.handleTaskCellDblclickEvent(evnt, { row, column })
+          },
+          contextmenu (evnt: Event) {
+            $xeGantt.handleTaskBodyContextmenuEvent(evnt, ctParams)
           }
         }
       }, tdVNs)
@@ -194,6 +202,7 @@ export default defineVxeComponent({
     },
     renderVN (h: CreateElement) {
       const _vm = this
+      const $xeGantt = _vm.$xeGantt
       const $xeGanttView = _vm.$xeGanttView
       const { reactData } = $xeGanttView
 
@@ -208,7 +217,10 @@ export default defineVxeComponent({
           ref: 'refBodyScroll',
           class: 'vxe-gantt-view--body-inner-wrapper',
           on: {
-            scroll: $xeGanttView.triggerBodyScrollEvent
+            scroll: $xeGanttView.triggerBodyScrollEvent,
+            contextmenu (evnt: Event) {
+              $xeGantt.handleTaskBodyContextmenuEvent(evnt, { source: sourceType, type: viewType, rowIndex: -1, $rowIndex: -1, _rowIndex: -1 })
+            }
           }
         }, [
           h('div', {

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',
   inject: {
@@ -35,7 +38,7 @@ export default defineVxeComponent({
     //
     // Render
     //
-    renderTaskBar (h: CreateElement, $xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, $rowIndex: number) {
+    renderTaskBar (h: CreateElement, $xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, row: any, rowid: string, rowIndex: number, $rowIndex: number, _rowIndex: number) {
       const _vm = this
       const $xeGantt = _vm.$xeGantt
 
@@ -87,6 +90,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,
         attrs: {
@@ -98,6 +102,11 @@ export default defineVxeComponent({
         }],
         style: {
           height: `${cellHeight}px`
+        },
+        on: {
+          contextmenu (evnt: Event) {
+            $xeGantt.handleTaskBarContextmenuEvent(evnt, ctParams)
+          }
         }
       }, [
         h('div', {
@@ -146,7 +155,7 @@ export default defineVxeComponent({
       const tableReactData = $xeTable as unknown as TableReactData
       const { treeExpandedFlag } = tableReactData
       const tableInternalData = $xeTable as unknown as TableInternalData
-      const { treeExpandedMaps } = tableInternalData
+      const { fullAllDataRowIdData, treeExpandedMaps } = tableInternalData
       const treeOpts = $xeTable.computeTreeOpts
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -156,7 +165,14 @@ export default defineVxeComponent({
       const trVNs: VNode[] = []
       tableData.forEach((row, $rowIndex) => {
         const rowid = $xeTable ? $xeTable.getRowid(row) : ''
-        trVNs.push(_vm.renderTaskBar(h, $xeTable, row, rowid, $rowIndex))
+        const rowRest = fullAllDataRowIdData[rowid] || {}
+        let rowIndex = $rowIndex
+        let _rowIndex = -1
+        if (rowRest) {
+          rowIndex = rowRest.index
+          _rowIndex = rowRest._index
+        }
+        trVNs.push(_vm.renderTaskBar(h, $xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex))
         let isExpandTree = false
         let rowChildren: any[] = []
 

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

@@ -3,6 +3,9 @@ import { defineVxeComponent } from '../../ui/src/comp'
 
 import type { VxeGanttViewConstructor, VxeGanttViewPrivateMethods, VxeGanttConstructor, VxeGanttPrivateMethods } from '../../../types'
 
+const sourceType = 'gantt'
+const viewType = 'footer'
+
 export default defineVxeComponent({
   name: 'VxeGanttViewHeader',
   inject: {
@@ -25,13 +28,21 @@ export default defineVxeComponent({
     // Render
     //
     renderVN (h: CreateElement) {
+      const _vm = this
+      const $xeGantt = _vm.$xeGantt
+
       return h('div', {
         ref: 'refElem',
         class: 'vxe-gantt-view--footer-wrapper'
       }, [
         h('div', {
           ref: 'refHeaderScroll',
-          class: 'vxe-gantt-view--footer-inner-wrapper'
+          class: 'vxe-gantt-view--footer-inner-wrapper',
+          on: {
+            contextmenu (evnt: Event) {
+              $xeGantt.handleTaskFooterContextmenuEvent(evnt, { source: sourceType, type: viewType, $rowIndex: -1 })
+            }
+          }
         }, [])
       ])
     }

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',
   inject: {
@@ -83,7 +86,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, h)
                 } else if (titleMethod) {
@@ -106,7 +109,12 @@ export default defineVxeComponent({
                     colspan: childCount || null,
                     title: titleSlot ? null : label
                   },
-                  style: cellStys
+                  style: cellStys,
+                  on: {
+                    contextmenu (evnt: Event) {
+                      $xeGantt.handleTaskHeaderContextmenuEvent(evnt, ctParams)
+                    }
+                  }
                 }, cellVNs)
               }))
             }))

package/packages/gantt/src/gantt.ts

@@ -1459,6 +1459,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
         $pager.endPageByEvent(evnt)
       }
     },
+    getCurrentPage () {
+      const $xeGantt = this
+      const reactData = $xeGantt.reactData
+
+      const { tablePage } = reactData
+      return tablePage.currentPage
+    },
     setCurrentPage (currentPage: number | string | null | undefined) {
       const $xeGantt = this
       const reactData = $xeGantt.reactData
@@ -1476,6 +1483,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
         $pager.setCurrentPageByEvent(evnt, currentPage)
       }
     },
+    getPageSize () {
+      const $xeGantt = this
+      const reactData = $xeGantt.reactData
+
+      const { tablePage } = reactData
+      return tablePage.pageSize
+    },
     setPageSize (pageSize: number | string | null | undefined) {
       const $xeGantt = this
       const reactData = $xeGantt.reactData
@@ -1683,6 +1697,58 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       $xeGantt.dispatchEvent('task-bar-dblclick', params, evnt)
     },
+    handleTaskHeaderContextmenuEvent (evnt: Event, params: VxeGanttDefines.TaskHeaderContextmenuParams) {
+      const $xeGantt = this
+      const $xeTable = $xeGantt.$refs.refTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      if ($xeTable) {
+        const tableProps = $xeTable
+        const { menuConfig } = tableProps
+        if (isEnableConf(menuConfig)) {
+          evnt.stopPropagation()
+          $xeTable.handleOpenMenuEvent(evnt, 'header', params)
+        }
+      }
+    },
+    handleTaskBodyContextmenuEvent (evnt: Event, params: VxeGanttDefines.TaskBodyContextmenuParams) {
+      const $xeGantt = this
+      const $xeTable = $xeGantt.$refs.refTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      if ($xeTable) {
+        const tableProps = $xeTable
+        const { menuConfig } = tableProps
+        if (isEnableConf(menuConfig)) {
+          evnt.stopPropagation()
+          $xeTable.handleOpenMenuEvent(evnt, 'body', params)
+        }
+      }
+    },
+    handleTaskFooterContextmenuEvent (evnt: Event, params: VxeGanttDefines.TaskFooterContextmenuParams) {
+      const $xeGantt = this
+      const $xeTable = $xeGantt.$refs.refTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      if ($xeTable) {
+        const tableProps = $xeTable
+        const { menuConfig } = tableProps
+        if (isEnableConf(menuConfig)) {
+          evnt.stopPropagation()
+          $xeTable.handleOpenMenuEvent(evnt, 'footer', params)
+        }
+      }
+    },
+    handleTaskBarContextmenuEvent (evnt: Event, params: VxeGanttDefines.TaskBarContextmenuParams) {
+      const $xeGantt = this
+      const $xeTable = $xeGantt.$refs.refTable as VxeTableConstructor & VxeTablePrivateMethods
+
+      if ($xeTable) {
+        const tableProps = $xeTable
+        const { menuConfig } = tableProps
+        if (isEnableConf(menuConfig)) {
+          evnt.stopPropagation()
+          $xeTable.handleOpenMenuEvent(evnt, 'body', params)
+        }
+      }
+    },
     loadColumn (columns: any[]) {
       const $xeGantt = this
       const slots = $xeGantt.$scopedSlots