vxe-gantt 3.0.0-beta.2 → 3.0.0-beta.4

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.0-beta.2";
+_core.VxeUI.ganttVersion = "3.0.0-beta.4";
 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.0-beta.2",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"}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),_default=(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"}),checkVersion(_core.VxeUI.tableVersion,3,18)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v3.18+"]),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.0-beta.4",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"}},taskSplitConfig:{enabled:!0,resize:!0,showCollapseTableButton:!0,showCollapseTaskButton:!0}}}),"vxe-icon-"),_default=(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"}),checkVersion(_core.VxeUI.tableVersion,3,18)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@".concat(_core.VxeUI.tableVersion||"?"),"vxe-table v3.18+"]),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.0-beta.2");
+var version = "gantt v".concat("3.0.0-beta.4");
 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.0-beta.2"),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.0-beta.4"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/ui/src/vn.js

@@ -1 +1,17 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSlotVNs = getSlotVNs;
+var _xeUtils = _interopRequireDefault(require("xe-utils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function getSlotVNs(vns) {
+  if (vns === null || vns === undefined) {
+    return [];
+  }
+  if (_xeUtils.default.isArray(vns)) {
+    return vns;
+  }
+  return [vns];
+}

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

@@ -0,0 +1 @@
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.getSlotVNs=getSlotVNs;var _xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getSlotVNs(e){return null==e?[]:_xeUtils.default.isArray(e)?e:[e]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.4",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

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

@@ -42,7 +42,7 @@ function createInternalData (): GanttViewInternalData {
   }
 }
 const maxYHeight = 5e6
-const maxXWidth = 5e6
+// const maxXWidth = 5e6
 
 function handleParseColumn ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
   const $xeGantt = $xeGanttView.$xeGantt
@@ -361,61 +361,61 @@ function handleLazyRecalculate ($xeGanttView: VxeGanttViewConstructor & VxeGantt
   return $xeGanttView.$nextTick()
 }
 
-function updateScrollXSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
-  const reactData = $xeGanttView.reactData
-  const internalData = $xeGanttView.internalData
-
-  const { scrollXLoad, scrollXWidth } = reactData
-  const { elemStore } = internalData
-  const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
-  const bodyTableElem = getRefElem(elemStore['main-body-table'])
-
-  let xSpaceLeft = 0
-
-  let clientWidth = 0
-  if (bodyScrollElem) {
-    clientWidth = bodyScrollElem.clientWidth
-  }
-  // 虚拟渲染
-  let isScrollXBig = false
-  let ySpaceWidth = scrollXWidth
-  if (scrollXWidth > maxXWidth) {
-    // 触右
-    if (bodyScrollElem && bodyTableElem && bodyScrollElem.scrollLeft + clientWidth >= maxXWidth) {
-      xSpaceLeft = maxXWidth - bodyTableElem.clientWidth
-    } else {
-      xSpaceLeft = (maxXWidth - clientWidth) * (xSpaceLeft / (scrollXWidth - clientWidth))
-    }
-    ySpaceWidth = maxXWidth
-    isScrollXBig = true
-  }
-
-  if (bodyTableElem) {
-    bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`
-  }
-
-  const layoutList = ['header', 'body', 'footer']
-  layoutList.forEach(layout => {
-    const xSpaceElem = getRefElem(elemStore[`main-${layout}-xSpace`])
-    if (xSpaceElem) {
-      xSpaceElem.style.width = scrollXLoad ? `${ySpaceWidth}px` : ''
-    }
-  })
-
-  reactData.scrollXLeft = xSpaceLeft
-  reactData.scrollXWidth = ySpaceWidth
-  reactData.isScrollXBig = isScrollXBig
-
-  const scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem as HTMLDivElement
-  if (scrollXSpaceEl) {
-    scrollXSpaceEl.style.width = `${ySpaceWidth}px`
-  }
-
-  calcScrollbar($xeGanttView)
-  return $xeGanttView.$nextTick().then(() => {
-    updateStyle($xeGanttView)
-  })
-}
+// function updateScrollXSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
+//   const reactData = $xeGanttView.reactData
+//   const internalData = $xeGanttView.internalData
+
+//   const { scrollXLoad, scrollXWidth } = reactData
+//   const { elemStore } = internalData
+//   const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
+//   const bodyTableElem = getRefElem(elemStore['main-body-table'])
+
+//   let xSpaceLeft = 0
+
+//   let clientWidth = 0
+//   if (bodyScrollElem) {
+//     clientWidth = bodyScrollElem.clientWidth
+//   }
+//   // 虚拟渲染
+//   let isScrollXBig = false
+//   let ySpaceWidth = scrollXWidth
+//   if (scrollXWidth > maxXWidth) {
+//     // 触右
+//     if (bodyScrollElem && bodyTableElem && bodyScrollElem.scrollLeft + clientWidth >= maxXWidth) {
+//       xSpaceLeft = maxXWidth - bodyTableElem.clientWidth
+//     } else {
+//       xSpaceLeft = (maxXWidth - clientWidth) * (xSpaceLeft / (scrollXWidth - clientWidth))
+//     }
+//     ySpaceWidth = maxXWidth
+//     isScrollXBig = true
+//   }
+
+//   if (bodyTableElem) {
+//     bodyTableElem.style.transform = `translate(${xSpaceLeft}px, ${reactData.scrollYTop || 0}px)`
+//   }
+
+//   const layoutList = ['header', 'body', 'footer']
+//   layoutList.forEach(layout => {
+//     const xSpaceElem = getRefElem(elemStore[`main-${layout}-xSpace`])
+//     if (xSpaceElem) {
+//       xSpaceElem.style.width = scrollXLoad ? `${ySpaceWidth}px` : ''
+//     }
+//   })
+
+//   reactData.scrollXLeft = xSpaceLeft
+//   reactData.scrollXWidth = ySpaceWidth
+//   reactData.isScrollXBig = isScrollXBig
+
+//   const scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem as HTMLDivElement
+//   if (scrollXSpaceEl) {
+//     scrollXSpaceEl.style.width = `${ySpaceWidth}px`
+//   }
+
+//   calcScrollbar($xeGanttView)
+//   return $xeGanttView.$nextTick().then(() => {
+//     updateStyle($xeGanttView)
+//   })
+// }
 
 function updateScrollYSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttViewPrivateMethods) {
   const reactData = $xeGanttView.reactData
@@ -457,17 +457,18 @@ function updateScrollYSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
     scrollYTop = 0
   }
 
+  const bodyChartWrapperElem = getRefElem(elemStore['main-chart-wrapper'])
   if (bodyTableElem) {
     bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`
   }
+  if (bodyChartWrapperElem) {
+    bodyChartWrapperElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`
+  }
 
-  const layoutList = ['header', 'body', 'footer']
-  layoutList.forEach(layout => {
-    const ySpaceElem = getRefElem(elemStore[`main-${layout}-ySpace`])
-    if (ySpaceElem) {
-      ySpaceElem.style.height = ySpaceHeight ? `${ySpaceHeight}px` : ''
-    }
-  })
+  const bodyYSpaceElem = getRefElem(elemStore['main-body-ySpace'])
+  if (bodyYSpaceElem) {
+    bodyYSpaceElem.style.height = ySpaceHeight ? `${ySpaceHeight}px` : ''
+  }
 
   const scrollYSpaceEl = $xeGanttView.$refs.refScrollYSpaceElem as HTMLDivElement
   if (scrollYSpaceEl) {
@@ -552,9 +553,9 @@ export default defineVxeComponent({
       // 是否启用了纵向 Y 可视渲染方式加载
       scrollYLoad: false,
       // 是否存在纵向滚动条
-      overflowY: false,
+      overflowY: true,
       // 是否存在横向滚动条
-      overflowX: false,
+      overflowX: true,
       // 纵向滚动条的宽度
       scrollbarWidth: 0,
       // 横向滚动条的高度
@@ -789,15 +790,16 @@ export default defineVxeComponent({
         handleScrollEvent($xeGanttView, evnt, isRollY, isRollX, currTopNum, wrapperEl.scrollLeft)
       }
     },
-    updateScrollXSpace () {
+    updateScrollYSpace () {
       const $xeGanttView = this
 
-      return updateScrollXSpace($xeGanttView)
+      return updateScrollYSpace($xeGanttView)
     },
-    updateScrollYSpace () {
+    updateScrollYStatus (sYLoad: boolean) {
       const $xeGanttView = this
+      const reactData = $xeGanttView.reactData
 
-      return updateScrollYSpace($xeGanttView)
+      reactData.scrollYLoad = sYLoad
     },
     handleGlobalResizeEvent () {
       const $xeGanttView = this

package/packages/gantt/src/gantt.ts

@@ -4,15 +4,16 @@ import { VxeUI } from '@vxe-ui/core'
 import XEUtils from 'xe-utils'
 import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode, toCssUnit, addClass, removeClass } from '../../ui/src/dom'
+import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 import GanttViewComponent from './gantt-view'
 import { VxeTable as VxeTableComponent } from 'vxe-table'
 
 import type { ValueOf, VxeFormInstance, VxeFormItemProps, VxePagerInstance, VxePagerDefines, VxeComponentStyleType, VxeComponentSizeType, VxeFormDefines, VxeFormItemPropTypes } from 'vxe-pc-ui'
 import type { VxeTableMethods, VxeToolbarPropTypes, VxeTableProps, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, VxeToolbarInstance, TableInternalData, VxeTablePropTypes, VxeGridPropTypes } from 'vxe-table'
-import type { VxeGanttEmits, GanttReactData, GanttInternalData, VxeGanttPropTypes, VxeGanttViewInstance, VxeGanttDefines } from '../../../types'
+import type { VxeGanttEmits, GanttReactData, GanttInternalData, VxeGanttPropTypes, VxeGanttViewInstance, VxeGanttDefines, VxeGanttConstructor } from '../../../types'
 
-const { getConfig, getIcon, getI18n, commands, globalMixins, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement, getSlotVNs } = VxeUI
+const { getConfig, getIcon, getI18n, commands, globalMixins, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
 
 const tableProps = (VxeTableComponent as any).props
 
@@ -21,12 +22,18 @@ const propKeys = Object.keys(tableProps) as (keyof VxeTableProps)[]
 
 const defaultLayouts: VxeGanttPropTypes.Layouts = [['Form'], ['Toolbar', 'Top', 'Gantt', 'Bottom', 'Pager']]
 
-function getTableOns (_vm: any) {
-  const { $listeners, proxyConfig, proxyOpts } = _vm
+function getTableOns ($xeGantt: VxeGanttConstructor) {
+  const _vm = $xeGantt as any
+  const $listeners = _vm.$listeners
+
+  const props = $xeGantt
+
+  const { proxyConfig } = props
+  const proxyOpts = $xeGantt.computeProxyOpts
   const ons: any = {}
   XEUtils.each($listeners, (cb: any, type: any) => {
     ons[type] = (...args: any[]) => {
-      _vm.$emit(type, ...args)
+      $xeGantt.$emit(type, ...args)
     }
   })
   if (proxyConfig) {
@@ -100,8 +107,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
   },
   provide () {
     const $xeGantt = this
+    const $xeGrid = null
 
     return {
+      $xeGrid,
       $xeGantt
     }
   },
@@ -1794,7 +1803,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         h(VxeTableComponent as Component, {
           key: 'table',
           props: tableProps,
-          on: getTableOns($xeGantt),
+          on: getTableOns($xeGantt as VxeGanttConstructor),
           scopedSlots: slots,
           ref: 'refTable'
         })

package/packages/ui/src/vn.ts

@@ -0,0 +1,13 @@
+import XEUtils from 'xe-utils'
+
+import type { VxeComponentSlotType } from '../../../types'
+
+export function getSlotVNs (vns: VxeComponentSlotType | VxeComponentSlotType[] | undefined) {
+  if (vns === null || vns === undefined) {
+    return []
+  }
+  if (XEUtils.isArray(vns)) {
+    return vns
+  }
+  return [vns]
+}