vxe-gantt 3.0.11 → 3.0.13

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.11";
+_core.VxeUI.ganttVersion = "3.0.13";
 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.11",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.13",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.11");
+var version = "gantt v".concat("3.0.13");
 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.11"),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.13"),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.11",
+  "version": "3.0.13",
   "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.7",
-    "vxe-table": "^3.18.2"
+    "vxe-pc-ui": "^3.9.22",
+    "vxe-table": "^3.18.10"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/gantt/index.ts

@@ -2,15 +2,26 @@ import { VueConstructor } from 'vue'
 import { VxeUI } from '@vxe-ui/core'
 import VxeGanttComponent from './src/gantt'
 
+let isReg = false
+
 export const VxeGantt = Object.assign({}, VxeGanttComponent, {
   install (app: VueConstructor) {
+    if (typeof window !== 'undefined') {
+      const VxeGanttExtendGanttChart = (window as any).VxeGanttExtendGanttChart
+      if (VxeGanttExtendGanttChart && VxeGanttExtendGanttChart.use) {
+        VxeGanttExtendGanttChart.use(VxeUI)
+      }
+    }
+    if (!isReg) {
+      isReg = true
+      if (VxeUI.dynamicApp) {
+        VxeUI.dynamicApp.use(VxeGantt)
+      }
+    }
     app.component(VxeGanttComponent.name as string, VxeGanttComponent)
   }
 })
 
-if (VxeUI.dynamicApp) {
-  VxeUI.dynamicApp.use(VxeGantt)
-}
 VxeUI.component(VxeGanttComponent)
 
 export const Gantt = VxeGantt

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

@@ -55,9 +55,10 @@ export default defineVxeComponent({
       const titleField = $xeGantt.computeTitleField
       const progressField = $xeGantt.computeProgressField
       const taskBarOpts = $xeGantt.computeTaskBarOpts
+      const barParams = { $gantt: $xeGantt, row }
       const { showProgress, showContent, contentMethod, barStyle } = taskBarOpts
       const isBarRowStyle = XEUtils.isFunction(barStyle)
-      const barStyObj = (barStyle ? (isBarRowStyle ? barStyle({ row, $gantt: $xeGantt }) : barStyle) : {}) || {}
+      const barStyObj = (barStyle ? (isBarRowStyle ? barStyle(barParams) : barStyle) : {}) || {}
       const { round } = barStyObj
 
       const rowRest = fullAllDataRowIdData[rowid] || {}
@@ -85,6 +86,7 @@ export default defineVxeComponent({
       if (contentMethod) {
         title = getStringValue(contentMethod({ row, title }))
       }
+
       return h('div', {
         key: treeConfig ? rowid : $rowIndex,
         attrs: {
@@ -106,14 +108,19 @@ export default defineVxeComponent({
           },
           on: {
             click (evnt: MouseEvent) {
-              $xeGantt.handleTaskBarClickEvent(evnt, { row })
+              $xeGantt.handleTaskBarClickEvent(evnt, barParams)
             },
             dblclick (evnt: MouseEvent) {
-              $xeGantt.handleTaskBarDblclickEvent(evnt, { row })
+              $xeGantt.handleTaskBarDblclickEvent(evnt, barParams)
+            },
+            mousedown (evnt: MouseEvent) {
+              if ($xeGantt.handleTaskBarMousedownEvent) {
+                $xeGantt.handleTaskBarMousedownEvent(evnt, barParams)
+              }
             }
           }
         }, taskBarSlot
-          ? $xeGantt.callSlot(taskBarSlot, { row }, h)
+          ? $xeGantt.callSlot(taskBarSlot, barParams, h)
           : [
               showProgress
                 ? h('div', {

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

@@ -530,7 +530,7 @@ function updateStyle ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivat
     const viewWidth = bodyScrollElem.clientWidth
     const remainWidth = viewWidth - viewTableWidth
     if (remainWidth > 0) {
-      viewCellWidth += Math.floor(remainWidth / visibleColumn.length)
+      viewCellWidth += remainWidth / visibleColumn.length
       viewTableWidth = viewWidth
     }
   }

package/packages/gantt/src/gantt.ts

@@ -119,6 +119,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
     taskViewConfig: Object as PropType<VxeGanttPropTypes.TaskViewConfig>,
     taskBarConfig: Object as PropType<VxeGanttPropTypes.TaskBarConfig>,
     taskSplitConfig: Object as PropType<VxeGanttPropTypes.TaskSplitConfig>,
+    taskResizeConfig: Object as PropType<VxeGanttPropTypes.TaskResizeConfig>,
+    taskDragConfig: Object as PropType<VxeGanttPropTypes.TaskDragConfig>,
     size: {
       type: String as PropType<VxeGridPropTypes.Size>,
       default: () => getConfig().gantt.size || getConfig().size