vxe-gantt 3.2.3 → 3.2.5

package/lib/index.umd.js

@@ -8286,7 +8286,7 @@ var core_ = __webpack_require__(4345);
 
 var setConfig = core_.VxeUI.setConfig,
   setIcon = core_.VxeUI.setIcon;
-core_.VxeUI.ganttVersion = "3.2.3";
+core_.VxeUI.ganttVersion = "3.2.5";
 var ymdFormat = 'yyyy-MM-dd';
 var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({
@@ -8400,7 +8400,7 @@ var es_array_concat = __webpack_require__(8706);
 ;// ./packages/ui/src/log.ts
 
 var log = core_.VxeUI.log;
-var version = "gantt v".concat("3.2.3");
+var version = "gantt v".concat("3.2.5");
 var warnLog = log.create('warn', version);
 var errLog = log.create('error', version);
 ;// ./packages/ui/src/depend.ts
@@ -10148,22 +10148,30 @@ function updateTodayData($xeGanttView) {
   var internalData = $xeGanttView.internalData;
   var ganttReactData = $xeGantt.reactData;
   var taskScaleList = ganttReactData.taskScaleList;
+  var minScale = $xeGantt.computeMinScale;
   var weekScale = taskScaleList.find(function (item) {
     return item.type === 'week';
   });
+  var isMinWeek = minScale.type === 'week';
   var itemDate = new Date();
-  var _XEUtils$toDateString = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-d-H-m-s').split('-'),
-    _XEUtils$toDateString2 = _slicedToArray(_XEUtils$toDateString, 6),
+  var _XEUtils$toDateString = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toDateString(itemDate, 'yyyy-M-MM-dd-HH-mm-ss').split('-'),
+    _XEUtils$toDateString2 = _slicedToArray(_XEUtils$toDateString, 7),
     yyyy = _XEUtils$toDateString2[0],
-    MM = _XEUtils$toDateString2[1],
-    dd = _XEUtils$toDateString2[2],
-    HH = _XEUtils$toDateString2[3],
-    mm = _XEUtils$toDateString2[4],
-    ss = _XEUtils$toDateString2[5];
+    M = _XEUtils$toDateString2[1],
+    MM = _XEUtils$toDateString2[2],
+    dd = _XEUtils$toDateString2[3],
+    HH = _XEUtils$toDateString2[4],
+    mm = _XEUtils$toDateString2[5],
+    ss = _XEUtils$toDateString2[6];
   var e = itemDate.getDay();
   var E = e + 1;
   var q = Math.ceil((itemDate.getMonth() + 1) / 3);
-  var W = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined);
+  var W = "".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().getYearWeek(itemDate, weekScale ? weekScale.startDay : undefined));
+  if (isMinWeek && checkWeekOfsetYear(W, M)) {
+    yyyy = "".concat(Number(yyyy) + 1);
+    M = '1';
+    MM = '0' + M;
+  }
   internalData.todayDateMaps = {
     year: yyyy,
     quarter: "".concat(yyyy, "_q").concat(q),
@@ -11801,12 +11809,9 @@ function syncTableScrollTop($xeGanttView, scrollTop) {
   beforeDestroy: function beforeDestroy() {
     var $xeGanttView = this;
     var reactData = $xeGanttView.reactData;
+    var internalData = $xeGanttView.internalData;
     globalEvents.off($xeGanttView, 'keydown');
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, createReactData());
-  },
-  destroyed: function destroyed() {
-    var $xeGanttView = this;
-    var internalData = $xeGanttView.internalData;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, createInternalData());
   },
   render: function render(h) {
@@ -14510,13 +14515,13 @@ function gantt_createReactData() {
   beforeDestroy: function beforeDestroy() {
     var $xeGantt = this;
     var reactData = $xeGantt.reactData;
+    var internalData = $xeGantt.internalData;
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, gantt_createReactData());
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, gantt_createInternalData());
   },
   destroyed: function destroyed() {
     var $xeGantt = this;
-    var internalData = $xeGantt.internalData;
     gantt_globalEvents.off($xeGantt, 'keydown');
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, gantt_createInternalData());
   },
   render: function render(h) {
     return this.renderVN(h);