vxe-gantt 3.1.20 → 3.2.1

package/lib/ui/index.js

@@ -13,7 +13,7 @@ exports.default = void 0;
 var _core = require("@vxe-ui/core");
 var setConfig = _core.VxeUI.setConfig,
   setIcon = _core.VxeUI.setIcon;
-_core.VxeUI.ganttVersion = "3.1.20";
+_core.VxeUI.ganttVersion = "3.2.1";
 var ymdFormat = 'yyyy-MM-dd';
 var ymdhmsFormat = 'yyyy-MM-dd HH:mm:ss';
 setConfig({

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"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.1.20","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(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"}},taskBarTooltipConfig:{enterable:!0},taskLinkConfig:{enabled:!0,isHover:!0,showArrow:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0,gridding:{leftSpacing:1,rightSpacing:1}},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",GANTT_VIEW_TASK_MILESTONE:iconPrefix+"square-fill rotate45"}),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"),setConfig=_core.VxeUI.setConfig,setIcon=_core.VxeUI.setIcon,ymdFormat=(_core.VxeUI.ganttVersion="3.2.1","yyyy-MM-dd"),ymdhmsFormat="yyyy-MM-dd HH:mm:ss",iconPrefix=(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"}},taskBarTooltipConfig:{enterable:!0},taskLinkConfig:{enabled:!0,isHover:!0,showArrow:!0},taskViewScaleConfig:{year:{valueFormat:ymdFormat},quarter:{valueFormat:ymdFormat},month:{valueFormat:ymdFormat},week:{startDay:1,valueFormat:ymdFormat},day:{valueFormat:ymdFormat},date:{valueFormat:ymdFormat},hour:{valueFormat:ymdhmsFormat},minute:{valueFormat:ymdhmsFormat},second:{valueFormat:ymdhmsFormat}},taskViewConfig:{showNowLine:!0,gridding:{leftSpacing:1,rightSpacing:1}},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",GANTT_VIEW_TASK_MILESTONE:iconPrefix+"square-fill rotate45"}),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.1.20");
+var version = "gantt v".concat("3.2.1");
 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.1.20"),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.2.1"),warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-gantt",
-  "version": "3.1.20",
+  "version": "3.2.1",
   "description": "A vue based gantt component",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -60,8 +60,8 @@
     "vue": "~2.6.14",
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
-    "vxe-pc-ui": "^3.11.23",
-    "vxe-table": "^3.19.35"
+    "vxe-pc-ui": "^3.11.27",
+    "vxe-table": "^3.19.39"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -41,6 +41,44 @@ function createInternalData (): GanttViewInternalData {
     lastScrollLeft: 0
   }
 }
+
+function createReactData (): GanttViewReactData {
+  return {
+    // 是否启用了横向 X 可视渲染方式加载
+    scrollXLoad: false,
+    // 是否启用了纵向 Y 可视渲染方式加载
+    scrollYLoad: false,
+    // 是否存在纵向滚动条
+    overflowY: true,
+    // 是否存在横向滚动条
+    overflowX: true,
+    // 纵向滚动条的宽度
+    scrollbarWidth: 0,
+    // 横向滚动条的高度
+    scrollbarHeight: 0,
+
+    // 最后滚动时间戳
+    lastScrollTime: 0,
+    lazScrollLoading: false,
+
+    scrollVMLoading: false,
+    scrollYHeight: 0,
+    scrollYTop: 0,
+    isScrollYBig: false,
+    scrollXLeft: 0,
+    scrollXWidth: 0,
+    isScrollXBig: false,
+
+    minViewDate: null,
+    maxViewDate: null,
+    tableData: [],
+    tableColumn: [],
+    headerGroups: [],
+
+    viewCellWidth: 40
+  }
+}
+
 const maxYHeight = 5e6
 // const maxXWidth = 5e6
 
@@ -985,30 +1023,35 @@ function updateScrollXSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
   //   footerTableElem.style.transform = `translate(${xSpaceLeft}px, 0px)`
   // }
 
+  const ySpaceWidth = scrollXWidth
+
   const layoutList = ['header', 'body', 'footer']
   layoutList.forEach(layout => {
     const xSpaceElem = getRefElem(elemStore[`main-${layout}-xSpace`])
     if (xSpaceElem) {
-      xSpaceElem.style.width = scrollXLoad ? `${scrollXWidth}px` : ''
+      xSpaceElem.style.width = scrollXLoad ? `${ySpaceWidth}px` : ''
     }
   })
 
   const scrollXSpaceEl = $xeGanttView.$refs.refScrollXSpaceElem as HTMLDivElement
   if (scrollXSpaceEl) {
-    scrollXSpaceEl.style.width = `${scrollXWidth}px`
+    scrollXSpaceEl.style.width = `${ySpaceWidth}px`
   }
 
   const beforeWrapper = getRefElem(elemStore['main-chart-before-wrapper'])
   const beforeSvgElem = beforeWrapper ? beforeWrapper.firstElementChild as HTMLDivElement : null
   if (beforeSvgElem) {
-    beforeSvgElem.style.width = `${scrollXWidth}px`
+    beforeSvgElem.style.width = `${ySpaceWidth}px`
   }
   const afterWrapper = getRefElem(elemStore['main-chart-after-wrapper'])
   const afterSvgElem = afterWrapper ? afterWrapper.firstElementChild as HTMLDivElement : null
   if (afterSvgElem) {
-    afterSvgElem.style.width = `${scrollXWidth}px`
+    afterSvgElem.style.width = `${ySpaceWidth}px`
   }
 
+  reactData.scrollXLeft = xSpaceLeft
+  reactData.scrollXWidth = ySpaceWidth
+
   calcScrollbar($xeGanttView)
   return $xeGanttView.$nextTick()
 }
@@ -1062,7 +1105,7 @@ function updateScrollYSpace ($xeGanttView: VxeGanttViewConstructor & VxeGanttVie
     bodyTableElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`
   }
   if (bodyChartWrapperElem) {
-    bodyChartWrapperElem.style.transform = `translate(${reactData.scrollXLeft || 0}px, ${scrollYTop}px)`
+    bodyChartWrapperElem.style.transform = `translateY(${scrollYTop}px)`
   }
 
   const bodyYSpaceElem = getRefElem(elemStore['main-body-ySpace'])
@@ -1254,40 +1297,7 @@ export default defineVxeComponent({
   data () {
     const xID = XEUtils.uniqueId()
 
-    const reactData: GanttViewReactData = {
-      // 是否启用了横向 X 可视渲染方式加载
-      scrollXLoad: false,
-      // 是否启用了纵向 Y 可视渲染方式加载
-      scrollYLoad: false,
-      // 是否存在纵向滚动条
-      overflowY: true,
-      // 是否存在横向滚动条
-      overflowX: true,
-      // 纵向滚动条的宽度
-      scrollbarWidth: 0,
-      // 横向滚动条的高度
-      scrollbarHeight: 0,
-
-      // 最后滚动时间戳
-      lastScrollTime: 0,
-      lazScrollLoading: false,
-
-      scrollVMLoading: false,
-      scrollYHeight: 0,
-      scrollYTop: 0,
-      isScrollYBig: false,
-      scrollXLeft: 0,
-      scrollXWidth: 0,
-      isScrollXBig: false,
-
-      minViewDate: null,
-      maxViewDate: null,
-      tableData: [],
-      tableColumn: [],
-      headerGroups: [],
-
-      viewCellWidth: 40
-    }
+    const reactData = createReactData()
 
     const internalData = createInternalData()
 
@@ -1406,7 +1416,7 @@ export default defineVxeComponent({
         }
       })
     },
-    updateViewData (): Promise<void> {
+    updateViewData (force?: boolean): Promise<void> {
       const $xeGanttView = this
       const reactData = $xeGanttView.reactData
       const internalData = $xeGanttView.internalData
@@ -1416,6 +1426,10 @@ export default defineVxeComponent({
         const tableReactData = $xeTable as unknown as TableReactData
         const { tableData } = tableReactData
         reactData.tableData = tableData
+        if (force) {
+          handleUpdateData($xeGanttView)
+        }
+        handleRecalculateStyle($xeGanttView)
       }
       return $xeGanttView.$nextTick()
     },
@@ -1762,13 +1776,6 @@ export default defineVxeComponent({
       ])
     }
   },
-  watch: {
-    'reactData.tableData' () {
-      const $xeGanttView = this
-
-      handleUpdateData($xeGanttView)
-    }
-  },
   mounted () {
     const $xeGanttView = this
 
@@ -1776,9 +1783,15 @@ export default defineVxeComponent({
   },
   beforeDestroy () {
     const $xeGanttView = this
-    const internalData = $xeGanttView.internalData
+    const reactData = $xeGanttView.reactData
 
     globalEvents.off($xeGanttView, 'keydown')
+    XEUtils.assign(reactData, createReactData())
+  },
+  destroyed () {
+    const $xeGanttView = this
+    const internalData = $xeGanttView.internalData
+
     XEUtils.assign(internalData, createInternalData())
   },
   render (this: any, h) {

package/packages/gantt/src/gantt.ts

@@ -15,7 +15,7 @@ import type { VxeGanttEmits, GanttReactData, GanttInternalData, VxeGanttPropType
 
 const { getConfig, getIcon, getI18n, commands, globalMixins, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI
 
-const tableProps = (VxeTableComponent as any).props
+const tableProps = VxeTableComponent.props
 
 const tableMethods: VxeTableMethods = {} as VxeTableMethods
 const propKeys = Object.keys(tableProps) as (keyof VxeTableProps)[]