vxe-gantt 3.0.7 → 3.0.8

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.7";
+_core.VxeUI.ganttVersion = "3.0.8";
 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.7",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}},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.8",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}},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.7");
+var version = "gantt v".concat("3.0.8");
 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.7"),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.8"),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.7",
+  "version": "3.0.8",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -64,7 +64,7 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.8.27",
+    "vxe-pc-ui": "^3.9.0",
     "vxe-table": "^3.18.0"
   },
   "vetur": {

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

@@ -57,12 +57,9 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
   const { treeConfig } = ganttProps
   const { taskScaleList } = ganttReactData
   const { minViewDate, maxViewDate } = reactData
-  const { scrollXStore } = internalData
   const minScale = XEUtils.last(taskScaleList)
   const fullCols: VxeGanttDefines.ViewColumn[] = []
   const groupCols: VxeGanttDefines.GroupColumn[] = []
-  scrollXStore.startIndex = 0
-  scrollXStore.endIndex = 1
   if (minScale && minViewDate && maxViewDate) {
     const minSType = minScale.type
     const weekScale = taskScaleList.find(item => item.type === 'week')
@@ -269,8 +266,11 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
     if ($xeTable) {
       const startField = $xeGantt.computeStartField
       const endField = $xeGantt.computeEndField
+      const tableReactData = $xeTable as unknown as TableReactData
+      const { isRowGroupStatus } = tableReactData
       const tableInternalData = $xeTable as unknown as TableInternalData
-      const { afterFullData, afterTreeFullData } = tableInternalData
+      const { afterFullData, afterTreeFullData, afterGroupFullData } = tableInternalData
+      const aggregateOpts = $xeTable.computeAggregateOpts
       const treeOpts = $xeTable.computeTreeOpts
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
@@ -294,7 +294,14 @@ function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttView
         }
       }
 
-      if (treeConfig) {
+      if (isRowGroupStatus) {
+      // 行分组
+        const mapChildrenField = aggregateOpts.mapChildrenField
+        if (mapChildrenField) {
+          XEUtils.eachTree(afterGroupFullData, handleParseRender, { children: mapChildrenField })
+        }
+      } else if (treeConfig) {
+      // 树结构
         XEUtils.eachTree(afterTreeFullData, handleParseRender, { children: transform ? treeOpts.mapChildrenField : childrenField })
       } else {
         afterFullData.forEach(handleParseRender)
@@ -315,6 +322,7 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
 
   const ganttProps = $xeGantt
   const { treeConfig } = ganttProps
+  const { scrollXStore } = internalData
   const $xeTable = internalData.xeTable
   const sdMaps: Record<string, any> = {}
   const edMaps: Record<string, any> = {}
@@ -323,8 +331,11 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
   if ($xeTable) {
     const startField = $xeGantt.computeStartField
     const endField = $xeGantt.computeEndField
+    const tableReactData = $xeTable as unknown as TableReactData
+    const { isRowGroupStatus } = tableReactData
     const tableInternalData = $xeTable as unknown as TableInternalData
-    const { afterFullData, afterTreeFullData } = tableInternalData
+    const { afterFullData, afterTreeFullData, afterGroupFullData } = tableInternalData
+    const aggregateOpts = $xeTable.computeAggregateOpts
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
@@ -344,12 +355,21 @@ function handleUpdateData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewP
       }
     }
 
-    if (treeConfig) {
+    if (isRowGroupStatus) {
+      // 行分组
+      const mapChildrenField = aggregateOpts.mapChildrenField
+      if (mapChildrenField) {
+        XEUtils.eachTree(afterGroupFullData, handleMinMaxData, { children: mapChildrenField })
+      }
+    } else if (treeConfig) {
+      // 树结构
       XEUtils.eachTree(afterTreeFullData, handleMinMaxData, { children: transform ? treeOpts.mapChildrenField : childrenField })
     } else {
       afterFullData.forEach(handleMinMaxData)
     }
   }
+  scrollXStore.startIndex = 0
+  scrollXStore.endIndex = Math.max(1, scrollXStore.visibleSize)
   reactData.minViewDate = minDate
   reactData.maxViewDate = maxDate
   internalData.startMaps = sdMaps
@@ -401,10 +421,8 @@ function updateChart ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivat
       }
       const rowid = rowEl.getAttribute('rowid')
       const rowRest = rowid ? chartMaps[rowid] : null
-      if (rowRest) {
-        barEl.style.left = `${viewCellWidth * rowRest.oLeftSize}px`
-        barEl.style.width = `${viewCellWidth * rowRest.oWidthSize}px`
-      }
+      barEl.style.left = `${rowRest ? viewCellWidth * rowRest.oLeftSize : 0}px`
+      barEl.style.width = `${rowRest ? viewCellWidth * rowRest.oWidthSize : 0}px`
     })
   }
   return $xeGanttView.$nextTick()

package/packages/gantt/src/gantt.ts

@@ -2221,9 +2221,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (props.expandConfig) {
       warnLog('vxe.error.notProp', ['expand-config'])
     }
-    if (props.aggregateConfig) {
-      warnLog('vxe.error.notProp', ['aggregate-config'])
-    }
 
     $xeGantt.$nextTick(() => {
       if (props.formConfig) {