vxe-gantt 4.0.0-beta.4 → 4.0.0-beta.6

package/lib/ui/index.js

@@ -17,7 +17,7 @@ const {
   setIcon,
   checkVersion
 } = _core.VxeUI;
-_core.VxeUI.ganttVersion = "4.0.0-beta.4";
+_core.VxeUI.ganttVersion = "4.0.0-beta.6";
 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");let{setConfig,setIcon,checkVersion}=_core.VxeUI,iconPrefix=(_core.VxeUI.ganttVersion="4.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-");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,4,16)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@"+(_core.VxeUI.tableVersion||"?"),"vxe-table v4.16+"]);var _default=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");let{setConfig,setIcon,checkVersion}=_core.VxeUI,iconPrefix=(_core.VxeUI.ganttVersion="4.0.0-beta.6",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-");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,4,16)||(0,_log.errLog)("vxe.error.errorVersion",["vxe-table@"+(_core.VxeUI.tableVersion||"?"),"vxe-table v4.16+"]);var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `gantt v${"4.0.0-beta.4"}`;
+const version = `gantt v${"4.0.0-beta.6"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const 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");let log=_core.VxeUI.log,version="gantt v4.0.0-beta.4",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");let log=_core.VxeUI.log,version="gantt v4.0.0-beta.6",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/lib/ui/src/vn.js

@@ -1 +1,14 @@
-"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 (_xeUtils.default.isArray(vns)) {
+    return vns;
+  }
+  return vns ? [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 _xeUtils.default.isArray(e)?e:e?[e]:[]}

package/package.json

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

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

@@ -41,7 +41,7 @@ function createInternalData (): GanttViewInternalData {
   }
 }
 const maxYHeight = 5e6
-const maxXWidth = 5e6
+// const maxXWidth = 5e6
 
 export default defineVxeComponent({
   name: 'VxeGanttView',
@@ -75,9 +75,9 @@ export default defineVxeComponent({
       // 是否启用了纵向 Y 可视渲染方式加载
       scrollYLoad: false,
       // 是否存在纵向滚动条
-      overflowY: false,
+      overflowY: true,
       // 是否存在横向滚动条
-      overflowX: false,
+      overflowX: true,
       // 纵向滚动条的宽度
       scrollbarWidth: 0,
       // 横向滚动条的高度
@@ -430,61 +430,60 @@ export default defineVxeComponent({
       return nextTick()
     }
 
-    const updateScrollXSpace = () => {
-      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 = refScrollXSpaceElem.value
-      if (scrollXSpaceEl) {
-        scrollXSpaceEl.style.width = `${ySpaceWidth}px`
-      }
-
-      calcScrollbar()
-      return nextTick().then(() => {
-        updateStyle()
-      })
-    }
+    // const updateScrollXSpace = () => {
+    //   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 = refScrollXSpaceElem.value
+    //   if (scrollXSpaceEl) {
+    //     scrollXSpaceEl.style.width = `${ySpaceWidth}px`
+    //   }
+
+    //   calcScrollbar()
+    //   return nextTick().then(() => {
+    //     updateStyle()
+    //   })
+    // }
 
     const updateScrollYSpace = () => {
-      const { scrollYLoad, overflowY } = reactData
       const { elemStore } = internalData
       const $xeTable = internalData.xeTable
       const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
@@ -516,21 +515,19 @@ export default defineVxeComponent({
         }
         ySpaceHeight = maxYHeight
       }
-      if (!(scrollYLoad && overflowY)) {
-        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 = refScrollYSpaceElem.value
       if (scrollYSpaceEl) {
@@ -736,8 +733,10 @@ export default defineVxeComponent({
           handleScrollEvent(evnt, isRollY, isRollX, currTopNum, wrapperEl.scrollLeft)
         }
       },
-      updateScrollXSpace,
-      updateScrollYSpace
+      updateScrollYSpace,
+      updateScrollYStatus (sYLoad) {
+        reactData.scrollYLoad = sYLoad
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/packages/gantt/src/gantt.ts

@@ -3,6 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 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 { VxeUI } from '@vxe-ui/core'
 import { ganttEmits } from './emits'
 import { tableEmits } from './table-emits'
@@ -14,7 +15,7 @@ import type { VxeGanttConstructor, VxeGanttEmits, GanttReactData, GanttInternalD
 import type { ValueOf, VxeFormEvents, VxeFormInstance, VxePagerEvents, VxeFormItemProps, VxePagerInstance, VxeComponentStyleType } from 'vxe-pc-ui'
 import type { VxeTableMethods, VxeToolbarPropTypes, VxeTableProps, VxeTablePropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableEvents, VxeTableDefines, VxeTableEventProps, VxeToolbarInstance, VxeGridPropTypes } from 'vxe-table'
 
-const { getConfig, getIcon, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement, getSlotVNs } = VxeUI
+const { getConfig, getIcon, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
 
 const tableProps = (VxeTableComponent as any).props
 
@@ -1971,6 +1972,7 @@ export default defineVxeComponent({
 
     $xeGantt.renderVN = renderVN
 
+    provide('$xeGrid', null)
     provide('$xeGantt', $xeGantt)
 
     return $xeGantt

package/packages/ui/src/vn.ts

@@ -0,0 +1,9 @@
+import XEUtils from 'xe-utils'
+import { VxeComponentSlotType } from '@vxe-ui/core'
+
+export function getSlotVNs (vns: VxeComponentSlotType | VxeComponentSlotType[] | undefined) {
+  if (XEUtils.isArray(vns)) {
+    return vns
+  }
+  return vns ? [vns] : []
+}