vxe-table 3.18.0-beta.0 → 3.18.0-beta.2

package/lib/table/src/methods.js

@@ -482,6 +482,7 @@ function updateScrollYStatus($xeTable, fullData) {
   const {
     treeConfig
   } = props;
+  const $xeGanttView = internalData.xeGanttView;
   const virtualYOpts = $xeTable.computeVirtualYOpts;
   const treeOpts = $xeTable.computeTreeOpts;
   const {
@@ -491,6 +492,9 @@ function updateScrollYStatus($xeTable, fullData) {
   // 如果gt为0，则总是启用
   const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
   reactData.scrollYLoad = scrollYLoad;
+  if ($xeGanttView) {
+    $xeGanttView.updateScrollYStatus(scrollYLoad);
+  }
   return scrollYLoad;
 }
 /**
@@ -4449,9 +4453,11 @@ const Methods = {
     const $xeTable = this;
     // const slots = $xeTable.$scopedSlots
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     if (slotFunc) {
-      if ($xeGrid) {
-        return $xeGrid.callSlot(slotFunc, params, h, vNodes);
+      if ($xeGGWrapper) {
+        return $xeGGWrapper.callSlot(slotFunc, params, h, vNodes);
       }
       // if (XEUtils.isString(slotFunc)) {
       //   slotFunc = slots[slotFunc] || null
@@ -4472,10 +4478,12 @@ const Methods = {
   getParentElem() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       $el
     } = this;
-    return $xeGrid ? $xeGrid.$el.parentNode : $el.parentNode;
+    return $xeGGWrapper ? $xeGGWrapper.$el.parentNode : $el.parentNode;
   },
   /**
    * 获取父容器的高度
@@ -4483,6 +4491,8 @@ const Methods = {
   getParentHeight() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const props = $xeTable;
     const {
       height
@@ -4493,8 +4503,8 @@ const Methods = {
       const parentPaddingSize = height === '100%' || height === 'auto' ? (0, _dom.getPaddingTopBottomSize)(parentElem) : 0;
       let parentWrapperHeight = 0;
       if (parentElem) {
-        if ($xeGrid && (0, _dom.hasClass)(parentElem, 'vxe-grid--table-wrapper')) {
-          parentWrapperHeight = $xeGrid.getParentHeight();
+        if ($xeGGWrapper && (0, _dom.hasClass)(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGGWrapper.getParentHeight();
         } else {
           parentWrapperHeight = parentElem.clientHeight;
         }
@@ -4511,7 +4521,9 @@ const Methods = {
   getExcludeHeight() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
-    return $xeGrid ? $xeGrid.getExcludeHeight() : 0;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
+    return $xeGGWrapper ? $xeGGWrapper.getExcludeHeight() : 0;
   },
   /**
    * 重置表格的一切数据状态
@@ -7017,6 +7029,7 @@ const Methods = {
   preventEvent(evnt, type, args, next, end) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     let evntList = interceptor.get(type);
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
@@ -7031,8 +7044,9 @@ const Methods = {
     for (let i = 0; i < evntList.length; i++) {
       const func = evntList[i];
       const fnRest = func(Object.assign({
-        $grid: $xeGrid,
         $table: $xeTable,
+        $grid: $xeGrid,
+        $gantt: $xeGantt,
         $event: evnt
       }, args));
       if (fnRest === false) {
@@ -7060,6 +7074,8 @@ const Methods = {
   handleGlobalMousedownEvent(evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       $el,
       $refs,
@@ -7160,7 +7176,7 @@ const Methods = {
         }
       }
     } else if (mouseConfig) {
-      if (!(0, _dom.getEventTargetNode)(evnt, $el).flag && !($xeGrid && (0, _dom.getEventTargetNode)(evnt, $xeGrid.$el).flag) && !(tableMenu && (0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) && !($toolbar && (0, _dom.getEventTargetNode)(evnt, $toolbar.$el).flag)) {
+      if (!(0, _dom.getEventTargetNode)(evnt, $el).flag && !($xeGGWrapper && (0, _dom.getEventTargetNode)(evnt, $xeGGWrapper.$el).flag) && !(tableMenu && (0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) && !($toolbar && (0, _dom.getEventTargetNode)(evnt, $toolbar.$el).flag)) {
         if (this.clearSelected) {
           this.clearSelected();
         }
@@ -7184,7 +7200,7 @@ const Methods = {
     if (ctxMenuStore.visible && tableMenu && !(0, _dom.getEventTargetNode)(evnt, tableMenu.$el).flag) {
       this.closeMenu();
     }
-    const isActivated = (0, _dom.getEventTargetNode)(evnt, ($xeGrid || this).$el).flag;
+    const isActivated = (0, _dom.getEventTargetNode)(evnt, ($xeGGWrapper || $xeTable).$el).flag;
     // 如果存在校验，点击了表格之外则清除
     if (!isActivated && editRules && validOpts.autoClear) {
       this.validErrorMaps = {};
@@ -7262,6 +7278,7 @@ const Methods = {
     const internalData = $xeTable;
     const reactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     // 该行为只对当前激活的表格有效
     if (internalData.isActivated) {
       $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
@@ -7487,7 +7504,8 @@ const Methods = {
               column: selected.column,
               columnIndex: $xeTable.getColumnIndex(selected.column),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7515,7 +7533,8 @@ const Methods = {
                 column: selected.column,
                 columnIndex: $xeTable.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7546,7 +7565,8 @@ const Methods = {
               rowIndex: $xeTable.getRowIndex(parentRow),
               $rowIndex: $xeTable.getVMRowIndex(parentRow),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             $xeTable.setTreeExpand(parentRow, false).then(() => $xeTable.scrollToRow(parentRow)).then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
           }
@@ -7567,7 +7587,8 @@ const Methods = {
               column: selected.column,
               columnIndex: $xeTable.getColumnIndex(selected.column),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             if (!beforeEditMethod || beforeEditMethod(params)) {
               if (editMethod) {
@@ -12152,7 +12173,6 @@ const Methods = {
       elemStore,
       fullColumnIdData
     } = internalData;
-    const $xeGanttView = internalData.xeGanttView;
     const mouseOpts = $xeTable.computeMouseOpts;
     const tableBody = $xeTable.$refs.refTableBody;
     const tableBodyElem = tableBody ? tableBody.$el : null;
@@ -12217,9 +12237,6 @@ const Methods = {
       if (isScrollXBig && mouseOpts.area) {
         (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
       }
-      if ($xeGanttView) {
-        $xeGanttView.updateScrollXSpace();
-      }
       return $xeTable.$nextTick(() => {
         updateStyle($xeTable);
       });
@@ -12540,6 +12557,7 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       showFooter,
       footerData,
@@ -12557,7 +12575,8 @@ const Methods = {
         columns: visibleColumn,
         data: afterFullData,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       }) : [];
     }
     reactData.footerTableData = footData;
@@ -12725,20 +12744,24 @@ const Methods = {
   dispatchEvent(type, params, evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     $xeTable.$emit(type, createEvent(evnt, {
       $table: $xeTable,
-      $grid: $xeGrid
+      $grid: $xeGrid,
+      $gantt: $xeGantt
     }, params));
   },
   // 已废弃，使用 dispatchEvent
   emitEvent(type, params, evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
-    this.$emit(type, Object.assign({
+    const $xeGantt = $xeTable.$xeGantt;
+    $xeTable.$emit(type, createEvent(evnt, {
       $table: $xeTable,
       $grid: $xeGrid,
+      $gantt: $xeGantt,
       $event: evnt
-    }, params));
+    }));
   },
   focus() {
     this.isActivated = true;