vxe-gantt 4.0.22 → 4.0.24

package/lib/index.umd.js

@@ -2780,7 +2780,7 @@ var core_ = __webpack_require__(4345);
 const {
   log
 } = core_.VxeUI;
-const version = `gantt v${"4.0.22"}`;
+const version = `gantt v${"4.0.24"}`;
 const warnLog = log.create('warn', version);
 const errLog = log.create('error', version);
 ;// ./packages/ui/index.ts
@@ -2791,7 +2791,7 @@ const {
   setIcon,
   checkVersion
 } = core_.VxeUI;
-core_.VxeUI.ganttVersion = "4.0.22";
+core_.VxeUI.ganttVersion = "4.0.24";
 setConfig({
   gantt: {
     // size: null,
@@ -3088,6 +3088,9 @@ function eqEmptyValue(cellValue) {
 function getStringValue(cellValue) {
   return eqEmptyValue(cellValue) ? '' : cellValue;
 }
+function getClass(property, params) {
+  return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
+}
 ;// ./packages/ui/src/dom.ts
 
 const reClsMap = {};
@@ -3130,7 +3133,7 @@ function getNodeOffset(elem, container, rest) {
   return rest;
 }
 function isPx(val) {
-  return val && /^\d+(\.\d+)?px?$/.test(val);
+  return val && /^\d+(\.\d+)?(px)?$/.test(val);
 }
 function isScale(val) {
   return val && /^\d+(\.\d+)?%$/.test(val);
@@ -3691,6 +3694,8 @@ const gantt_chart_viewType = 'chart';
 
 
 
+
+
 const gantt_body_sourceType = 'gantt';
 const gantt_body_viewType = 'body';
 /* harmony default export */ var gantt_body = (defineVxeComponent({
@@ -3741,14 +3746,20 @@ const gantt_body_viewType = 'body';
       } = internalData;
       const taskViewOpts = computeTaskViewOpts.value;
       const {
-        showNowLine
+        showNowLine,
+        viewStyle
       } = taskViewOpts;
       const {
         scaleItem
       } = headerGroups[headerGroups.length - 1] || {};
       const {
-        field
+        field,
+        dateObj
       } = column;
+      const {
+        cellClassName,
+        cellStyle
+      } = viewStyle || {};
       const todayValue = showNowLine && scaleItem ? todayDateMaps[scaleItem.type] : null;
       const rowRest = fullAllDataRowIdData[rowid] || {};
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
@@ -3790,6 +3801,7 @@ const gantt_body_viewType = 'body';
       const ctParams = {
         source: gantt_body_sourceType,
         type: gantt_body_viewType,
+        dateObj,
         row,
         column,
         $rowIndex,
@@ -3801,8 +3813,10 @@ const gantt_body_viewType = 'body';
         class: ['vxe-gantt-view--body-column', {
           'is--now': showNowLine && todayValue === field,
           'col--rs-height': isRsHeight
-        }],
-        style: {
+        }, getClass(cellClassName, ctParams)],
+        style: cellStyle ? Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(cellStyle) ? cellStyle(ctParams) : cellStyle, {
+          height: `${cellHeight}px`
+        }) : {
           height: `${cellHeight}px`
         },
         onClick(evnt) {
@@ -3857,6 +3871,14 @@ const gantt_body_viewType = 'body';
         transform
       } = treeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
+      const taskViewOpts = computeTaskViewOpts.value;
+      const {
+        viewStyle
+      } = taskViewOpts;
+      const {
+        rowClassName,
+        rowStyle
+      } = viewStyle || {};
       const {
         tableColumn,
         scrollYLoad
@@ -3895,6 +3917,14 @@ const gantt_body_viewType = 'body';
           trOns.onDragend = $xeTable.handleRowDragDragendEvent;
           trOns.onDragover = $xeTable.handleRowDragDragoverEvent;
         }
+        const rowParams = {
+          source: gantt_body_sourceType,
+          type: gantt_body_viewType,
+          row,
+          rowIndex,
+          $rowIndex,
+          _rowIndex
+        };
         trVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('tr', {
           key: treeConfig ? rowid : $rowIndex,
           class: ['vxe-gantt-view--body-row', {
@@ -3903,8 +3933,9 @@ const gantt_body_viewType = 'body';
             'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
             'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
             'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
-          }],
+          }, getClass(rowClassName, rowParams)],
           rowid,
+          style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined,
           ...trOns
         }, tableColumn.map((column, $columnIndex) => renderColumn($xeTable, row, rowid, rowIndex, $rowIndex, _rowIndex, column, $columnIndex))));
         let isExpandTree = false;
@@ -4053,6 +4084,7 @@ const gantt_footer_viewType = 'footer';
 const {
   globalEvents
 } = core_.VxeUI;
+const gantt_view_sourceType = 'gantt';
 function createInternalData() {
   return {
     xeTable: null,
@@ -4955,8 +4987,7 @@ const maxYHeight = 5e6;
         reactData.lazScrollLoading = false;
       }, 200);
     };
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const handleScrollEvent = (evnt, isRollY, isRollX, scrollTop, scrollLeft) => {
+    const handleScrollData = (isRollY, isRollX, scrollTop, scrollLeft) => {
       if (isRollX) {
         internalData.lastScrollLeft = scrollLeft;
       }
@@ -4966,6 +4997,95 @@ const maxYHeight = 5e6;
       reactData.lastScrollTime = Date.now();
       checkLastSyncScroll(isRollX, isRollY);
     };
+    const handleScrollEvent = (evnt, isRollY, isRollX, scrollTop, scrollLeft) => {
+      const $xeTable = internalData.xeTable;
+      const {
+        lastScrollLeft,
+        lastScrollTop
+      } = internalData;
+      const xHandleEl = refScrollXHandleElem.value;
+      const yHandleEl = refScrollYHandleElem.value;
+      if (!xHandleEl || !yHandleEl) {
+        return;
+      }
+      if (!$xeTable) {
+        return;
+      }
+      const {
+        computeScrollXThreshold,
+        computeScrollYThreshold
+      } = $xeTable.getComputeMaps();
+      const bodyHeight = yHandleEl.clientHeight;
+      const bodyWidth = xHandleEl.clientWidth;
+      const scrollHeight = yHandleEl.scrollHeight;
+      const scrollWidth = xHandleEl.scrollWidth;
+      let isTop = false;
+      let isBottom = false;
+      let isLeft = false;
+      let isRight = false;
+      let direction = '';
+      let isTopBoundary = false;
+      let isBottomBoundary = false;
+      let isLeftBoundary = false;
+      let isRightBoundary = false;
+      if (isRollX) {
+        const xThreshold = computeScrollXThreshold.value;
+        isLeft = scrollLeft <= 0;
+        if (!isLeft) {
+          isRight = scrollLeft + bodyWidth >= scrollWidth - 1;
+        }
+        if (scrollLeft > lastScrollLeft) {
+          direction = 'right';
+          if (scrollLeft + bodyWidth >= scrollWidth - xThreshold) {
+            isRightBoundary = true;
+          }
+        } else {
+          direction = 'left';
+          if (scrollLeft <= xThreshold) {
+            isLeftBoundary = true;
+          }
+        }
+      }
+      if (isRollY) {
+        const yThreshold = computeScrollYThreshold.value;
+        isTop = scrollTop <= 0;
+        if (!isTop) {
+          isBottom = scrollTop + bodyHeight >= scrollHeight - 1;
+        }
+        if (scrollTop > lastScrollTop) {
+          direction = 'bottom';
+          if (scrollTop + bodyHeight >= scrollHeight - yThreshold) {
+            isBottomBoundary = true;
+          }
+        } else {
+          direction = 'top';
+          if (scrollTop <= yThreshold) {
+            isTopBoundary = true;
+          }
+        }
+      }
+      handleScrollData(isRollY, isRollX, scrollTop, scrollLeft);
+      const evntParams = {
+        source: gantt_view_sourceType,
+        scrollTop,
+        scrollLeft,
+        bodyHeight,
+        bodyWidth,
+        scrollHeight,
+        scrollWidth,
+        isX: isRollX,
+        isY: isRollY,
+        isTop,
+        isBottom,
+        isLeft,
+        isRight,
+        direction
+      };
+      if (isBottomBoundary || isTopBoundary || isRightBoundary || isLeftBoundary) {
+        $xeGantt.dispatchEvent('scroll-boundary', evntParams, evnt);
+      }
+      $xeGantt.dispatchEvent('scroll', evntParams, evnt);
+    };
     const ganttViewMethods = {
       refreshData() {
         handleUpdateData();
@@ -5105,7 +5225,12 @@ const maxYHeight = 5e6;
             triggerScrollXEvent();
           }
         }
-        handleScrollEvent(evnt, isRollY, isRollX, wrapperEl.scrollTop, scrollLeft);
+        if (isRollY) {
+          handleScrollData(isRollY, isRollX, wrapperEl.scrollTop, scrollLeft);
+        }
+        if (isRollX) {
+          handleScrollEvent(evnt, isRollY, isRollX, wrapperEl.scrollTop, scrollLeft);
+        }
       },
       // triggerFooterScrollEvent (evnt) {
       //   const { inVirtualScroll, inHeaderScroll, inBodyScroll } = internalData
@@ -5169,7 +5294,7 @@ const maxYHeight = 5e6;
           internalData.inVirtualScroll = true;
           setScrollTop(bodyScrollElem, currTopNum);
           syncTableScrollTop(currTopNum);
-          handleScrollEvent(evnt, isRollY, isRollX, currTopNum, wrapperEl.scrollLeft);
+          handleScrollData(isRollY, isRollX, currTopNum, wrapperEl.scrollLeft);
         }
       },
       handleUpdateSXSpace() {