vxe-gantt 3.0.23 → 3.0.24

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.23";
+_core.VxeUI.ganttVersion = "3.0.24";
 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.23",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.24",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.23");
+var version = "gantt v".concat("3.0.24");
 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.23"),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.24"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/ui/src/utils.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.eqEmptyValue = eqEmptyValue;
+exports.getClass = getClass;
 exports.getFuncText = getFuncText;
 exports.getGlobalDefaultConfig = getGlobalDefaultConfig;
 exports.getLastZIndex = getLastZIndex;
@@ -53,4 +54,7 @@ function eqEmptyValue(cellValue) {
 }
 function getStringValue(cellValue) {
   return eqEmptyValue(cellValue) ? '' : cellValue;
+}
+function getClass(property, params) {
+  return property ? _xeUtils.default.isFunction(property) ? property(params) : property : '';
 }

package/lib/ui/src/utils.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.getFuncText=getFuncText,exports.getGlobalDefaultConfig=getGlobalDefaultConfig,exports.getLastZIndex=getLastZIndex,exports.getStringValue=getStringValue,exports.getSubLastZIndex=getSubLastZIndex,exports.isEnableConf=isEnableConf,exports.nextSubZIndex=nextSubZIndex,exports.nextZIndex=nextZIndex;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var getConfig=_core.VxeUI.getConfig;function isEnableConf(e){return e&&!1!==e.enabled}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function nextSubZIndex(){return _domZindex.default.getSubNext()}function getSubLastZIndex(){return _domZindex.default.getSubCurrent()}function getGlobalDefaultConfig(e,t){return _xeUtils.default.eqNull(e)?t:e}function getFuncText(e,t){var n;return e?(n=getConfig().translate,_xeUtils.default.toValueString(n?n(""+e,t):e)):""}function eqEmptyValue(e){return null==e||""===e}function getStringValue(e){return eqEmptyValue(e)?"":e}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.eqEmptyValue=eqEmptyValue,exports.getClass=getClass,exports.getFuncText=getFuncText,exports.getGlobalDefaultConfig=getGlobalDefaultConfig,exports.getLastZIndex=getLastZIndex,exports.getStringValue=getStringValue,exports.getSubLastZIndex=getSubLastZIndex,exports.isEnableConf=isEnableConf,exports.nextSubZIndex=nextSubZIndex,exports.nextZIndex=nextZIndex;var _xeUtils=_interopRequireDefault(require("xe-utils")),_core=require("@vxe-ui/core"),_domZindex=_interopRequireDefault(require("dom-zindex"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var getConfig=_core.VxeUI.getConfig;function isEnableConf(e){return e&&!1!==e.enabled}function nextZIndex(){return _domZindex.default.getNext()}function getLastZIndex(){return _domZindex.default.getCurrent()}function nextSubZIndex(){return _domZindex.default.getSubNext()}function getSubLastZIndex(){return _domZindex.default.getSubCurrent()}function getGlobalDefaultConfig(e,t){return _xeUtils.default.eqNull(e)?t:e}function getFuncText(e,t){var n;return e?(n=getConfig().translate,_xeUtils.default.toValueString(n?n(""+e,t):e)):""}function eqEmptyValue(e){return null==e||""===e}function getStringValue(e){return eqEmptyValue(e)?"":e}function getClass(e,t){return e?_xeUtils.default.isFunction(e)?e(t):e:""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.0.23",
+  "version": "3.0.24",
   "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.10.29",
-    "vxe-table": "^3.19.18"
+    "vxe-pc-ui": "^3.10.32",
+    "vxe-table": "^3.19.20"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -1,6 +1,8 @@
 import { VNode, CreateElement } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getCellRestHeight } from './util'
+import { getClass } from '../../ui/src/utils'
+import XEUtils from 'xe-utils'
 import GanttViewChartComponent from './gantt-chart'
 
 import type { TableInternalData, TableReactData, VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods, VxeTableDefines } from 'vxe-table'
@@ -48,9 +50,10 @@ export default defineVxeComponent({
       const { headerGroups } = reactData
       const { todayDateMaps } = internalData
       const taskViewOpts = $xeGantt.computeTaskViewOpts
-      const { showNowLine } = taskViewOpts
+      const { showNowLine, viewStyle } = taskViewOpts
       const { scaleItem } = headerGroups[headerGroups.length - 1] || {}
-      const { field } = column
+      const { field, dateObj } = column
+      const { cellClassName, cellStyle } = viewStyle || {}
       const todayValue = showNowLine && scaleItem ? todayDateMaps[scaleItem.type] : null
 
       const rowRest = fullAllDataRowIdData[rowid] || {}
@@ -96,16 +99,24 @@ export default defineVxeComponent({
           })
         )
       }
-      const ctParams = { source: sourceType, type: viewType, row, column, $rowIndex, rowIndex, _rowIndex }
+      const ctParams = { source: sourceType, type: viewType, dateObj, row, column, $rowIndex, rowIndex, _rowIndex }
       return h('td', {
         key: $columnIndex,
-        class: ['vxe-gantt-view--body-column', {
-          'is--now': showNowLine && todayValue === field,
-          'col--rs-height': isRsHeight
-        }],
-        style: {
-          height: `${cellHeight}px`
-        },
+        class: [
+          'vxe-gantt-view--body-column',
+          {
+            'is--now': showNowLine && todayValue === field,
+            'col--rs-height': isRsHeight
+          },
+          getClass(cellClassName, ctParams)
+        ],
+        style: cellStyle
+          ? Object.assign({}, XEUtils.isFunction(cellStyle) ? cellStyle(ctParams) : cellStyle, {
+            height: `${cellHeight}px`
+          })
+          : {
+              height: `${cellHeight}px`
+            },
         on: {
           click (evnt: MouseEvent) {
             $xeGantt.handleTaskCellClickEvent(evnt, { row, column })
@@ -122,6 +133,7 @@ export default defineVxeComponent({
     renderRows (h: CreateElement, $xeTable: VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods, tableData: any[]) {
       const _vm = this
       const $xeGanttView = _vm.$xeGanttView
+      const $xeGantt = _vm.$xeGantt
       const { reactData } = $xeGanttView
 
       const tableProps = $xeTable
@@ -137,6 +149,10 @@ export default defineVxeComponent({
       const { transform } = treeOpts
       const childrenField = treeOpts.children || treeOpts.childrenField
 
+      const taskViewOpts = $xeGantt.computeTaskViewOpts
+      const { viewStyle } = taskViewOpts
+      const { rowClassName, rowStyle } = viewStyle || {}
+
       const { tableColumn, scrollYLoad } = reactData
 
       const trVNs:VNode[] = []
@@ -170,16 +186,22 @@ export default defineVxeComponent({
           trOns.dragend = $xeTable.handleRowDragDragendEvent
           trOns.dragover = $xeTable.handleRowDragDragoverEvent
         }
+        const rowParams = { source: sourceType, type: viewType, row, rowIndex, $rowIndex, _rowIndex }
         trVNs.push(
           h('tr', {
             key: treeConfig ? rowid : $rowIndex,
-            class: ['vxe-gantt-view--body-row', {
-              'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
-              'is--new': isNewRow,
-              'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
-              'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
-              'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
-            }],
+            class: [
+              'vxe-gantt-view--body-row',
+              {
+                'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
+                'is--new': isNewRow,
+                'row--radio': radioOpts.highlight && $xeTable.eqRow(selectRadioRow, row),
+                'row--checked': checkboxOpts.highlight && $xeTable.isCheckedByCheckboxRow(row),
+                'row--pending': !!pendingRowFlag && !!pendingRowMaps[rowid]
+              },
+              getClass(rowClassName, rowParams)
+            ],
+            style: rowStyle ? XEUtils.isFunction(rowStyle) ? rowStyle(rowParams) : rowStyle : undefined,
             attrs: {
               rowid
             },

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

@@ -13,6 +13,8 @@ import type { VxeGanttViewConstructor, GanttViewReactData, VxeGanttDefines, VxeG
 
 const { globalEvents } = VxeUI
 
+const sourceType = 'gantt'
+
 function createInternalData (): GanttViewInternalData {
   return {
     xeTable: null,
@@ -826,11 +828,106 @@ function checkLastSyncScroll ($xeGanttView: VxeGanttViewConstructor & VxeGanttVi
   }, 200)
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function handleScrollEvent ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods, evnt: Event, isRollY: boolean, isRollX: boolean, scrollTop: number, scrollLeft: number) {
+function handleScrollData ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods, isRollY: boolean, isRollX: boolean, scrollTop: number, scrollLeft: number) {
+  const reactData = $xeGanttView.reactData
+  const internalData = $xeGanttView.internalData
+
+  if (isRollX) {
+    internalData.lastScrollLeft = scrollLeft
+  }
+  if (isRollY) {
+    internalData.lastScrollTop = scrollTop
+  }
+  reactData.lastScrollTime = Date.now()
   checkLastSyncScroll($xeGanttView, isRollX, isRollY)
 }
 
+function handleScrollEvent ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods, evnt: Event, isRollY: boolean, isRollX: boolean, scrollTop: number, scrollLeft: number) {
+  const $xeGantt = $xeGanttView.$xeGantt
+  const internalData = $xeGanttView.internalData
+  const $xeTable = internalData.xeTable
+
+  const { lastScrollLeft, lastScrollTop } = internalData
+  const xHandleEl = $xeGanttView.$refs.refScrollXHandleElem as HTMLDivElement
+  const yHandleEl = $xeGanttView.$refs.refScrollYHandleElem as HTMLDivElement
+  if (!xHandleEl || !yHandleEl) {
+    return
+  }
+  if (!$xeTable) {
+    return
+  }
+  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 = $xeTable.computeScrollXThreshold
+    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 = $xeTable.computeScrollYThreshold
+    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($xeGanttView, isRollY, isRollX, scrollTop, scrollLeft)
+  const evntParams = {
+    source: 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)
+}
+
 /**
  * 同步表格滚动
  */

package/packages/ui/src/utils.ts

@@ -49,3 +49,7 @@ export function eqEmptyValue (cellValue: any) {
 export function getStringValue (cellValue: any) {
   return eqEmptyValue(cellValue) ? '' : cellValue
 }
+
+export function getClass (property: any, params: any) {
+  return property ? XEUtils.isFunction(property) ? property(params) : property : ''
+}