aloudata-gantt 0.0.7 → 0.0.9

package/dist/index.esm.js

@@ -106,8 +106,6 @@ var holiday = {
   '2023-01-25': true,
   '2023-01-26': true,
   '2023-01-27': true,
-  '2023-01-28': true,
-  '2023-01-29': true,
   '2023-02-04': true,
   '2023-02-05': true,
   '2023-02-11': true,
@@ -132,13 +130,11 @@ var holiday = {
   '2023-04-15': true,
   '2023-04-16': true,
   '2023-04-22': true,
-  '2023-04-23': true,
   '2023-04-29': true,
   '2023-04-30': true,
   '2023-05-01': true,
   '2023-05-02': true,
   '2023-05-03': true,
-  '2023-05-06': true,
   '2023-05-07': true,
   '2023-05-13': true,
   '2023-05-14': true,
@@ -155,7 +151,6 @@ var holiday = {
   '2023-06-22': true,
   '2023-06-23': true,
   '2023-06-24': true,
-  '2023-06-25': true,
   '2023-07-01': true,
   '2023-07-02': true,
   '2023-07-08': true,
@@ -190,8 +185,6 @@ var holiday = {
   '2023-10-04': true,
   '2023-10-05': true,
   '2023-10-06': true,
-  '2023-10-07': true,
-  '2023-10-08': true,
   '2023-10-14': true,
   '2023-10-15': true,
   '2023-10-21': true,
@@ -308,14 +301,23 @@ function transverseData() {
   }
   return result;
 }
+var hasHolidayLists = ['2023'];
 function getWeekday(first, last) {
   var _first = first.valueOf();
   var _last = last.valueOf();
   var count = 0;
   for (var i = _first; i <= _last; i += 24 * 3600 * 1000) {
-    var d = dayjs(i).format("YYYY-MM-DD");
-    if (!holiday[d]) {
-      count++;
+    var year = dayjs(i).format("YYYY");
+    if (hasHolidayLists.includes(year)) {
+      var d = dayjs(i).format("YYYY-MM-DD");
+      if (!holiday[d]) {
+        count++;
+      }
+    } else {
+      var _d = new Date(i);
+      if (_d.getDay() >= 1 && _d.getDay() <= 5) {
+        count++;
+      }
     }
   }
   return count;
@@ -6077,10 +6079,6 @@ var Chart = function Chart() {
     translateX = store.translateX,
     chartElementRef = store.chartElementRef;
   var minorList = store.getMinorList();
-  console.log("**********************");
-  console.log({
-    minorList: minorList
-  });
   var handleMouseMove = useCallback(function (event) {
     event.persist();
     store.handleMouseMove(event);
@@ -6123,7 +6121,14 @@ var Chart = function Chart() {
     strokeWidth: '1px',
     y2: '10'
   }))), minorList.map(function (item) {
-    return item.isWeek || holiday[dayjs(item.key).format("YYYY-MM-DD")] ? /*#__PURE__*/React.createElement("g", {
+    var isWeek = false;
+    var year = dayjs(item.key).format("YYYY");
+    if (hasHolidayLists.includes(year)) {
+      isWeek = !!holiday[dayjs(item.key).format("YYYY-MM-DD")];
+    } else {
+      isWeek = item.isWeek;
+    }
+    return isWeek ? /*#__PURE__*/React.createElement("g", {
       key: item.key,
       stroke: '#f0f0f0'
     }, /*#__PURE__*/React.createElement("path", {
@@ -6940,4 +6945,4 @@ var GanttComponent = function GanttComponent(props) {
   }, /*#__PURE__*/React.createElement(SelectionIndicator$1, null), /*#__PURE__*/React.createElement(TableBody$1, null), /*#__PURE__*/React.createElement(Chart$1, null)), /*#__PURE__*/React.createElement(Divider$1, null), showBackToday && /*#__PURE__*/React.createElement(TimeIndicator$1, null), showUnitSwitch && /*#__PURE__*/React.createElement(TimeAxisScaleSelect$1, null), /*#__PURE__*/React.createElement(ScrollBar$1, null), scrollTop && /*#__PURE__*/React.createElement(ScrollTop$1, null)));
 };
 
-export { Gantt, GanttComponent as default, flattenDeep, getMaxRange, getWeekday, transverseData };
+export { Gantt, GanttComponent as default, flattenDeep, getMaxRange, getWeekday, hasHolidayLists, transverseData };

package/dist/types/config/holiday.d.ts

@@ -12,8 +12,6 @@ export declare const holiday: {
     '2023-01-25': boolean;
     '2023-01-26': boolean;
     '2023-01-27': boolean;
-    '2023-01-28': boolean;
-    '2023-01-29': boolean;
     '2023-02-04': boolean;
     '2023-02-05': boolean;
     '2023-02-11': boolean;
@@ -38,13 +36,11 @@ export declare const holiday: {
     '2023-04-15': boolean;
     '2023-04-16': boolean;
     '2023-04-22': boolean;
-    '2023-04-23': boolean;
     '2023-04-29': boolean;
     '2023-04-30': boolean;
     '2023-05-01': boolean;
     '2023-05-02': boolean;
     '2023-05-03': boolean;
-    '2023-05-06': boolean;
     '2023-05-07': boolean;
     '2023-05-13': boolean;
     '2023-05-14': boolean;
@@ -61,7 +57,6 @@ export declare const holiday: {
     '2023-06-22': boolean;
     '2023-06-23': boolean;
     '2023-06-24': boolean;
-    '2023-06-25': boolean;
     '2023-07-01': boolean;
     '2023-07-02': boolean;
     '2023-07-08': boolean;
@@ -96,8 +91,6 @@ export declare const holiday: {
     '2023-10-04': boolean;
     '2023-10-05': boolean;
     '2023-10-06': boolean;
-    '2023-10-07': boolean;
-    '2023-10-08': boolean;
     '2023-10-14': boolean;
     '2023-10-15': boolean;
     '2023-10-21': boolean;

package/dist/types/utils.d.ts

@@ -11,4 +11,5 @@ export declare function getMaxRange(bar: Gantt.Bar): {
     width: number;
 };
 export declare function transverseData(data: Gantt.Record[], startDateKey: string, endDateKey: string): Gantt.Item<import("./types").DefaultRecordType>[];
+export declare const hasHolidayLists: string[];
 export declare function getWeekday(first: Dayjs, last: Dayjs): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aloudata-gantt",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "license": "MIT",
   "module": "dist/index.esm.js",
   "typings": "dist/types/index.d.ts",