vxe-table 3.17.10 → 3.18.0-beta.1

package/lib/table/src/methods.js

@@ -378,8 +378,11 @@ function cacheColumnMap($xeTable) {
       }
       fullColFieldData[field] = rest;
     } else {
-      if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-        (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
+      if (storage && !type) {
+        (0, _log.errLog)('vxe.error.reqSupportProp', ['storage', `${column.getTitle() || type || ''} -> field=?`]);
+      }
+      if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
+        (0, _log.errLog)('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -4446,9 +4449,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
@@ -4469,10 +4474,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;
   },
   /**
    * 获取父容器的高度
@@ -4480,6 +4487,8 @@ const Methods = {
   getParentHeight() {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const props = $xeTable;
     const {
       height
@@ -4490,8 +4499,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;
         }
@@ -4508,7 +4517,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;
   },
   /**
    * 重置表格的一切数据状态
@@ -7014,6 +7025,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') {
@@ -7028,8 +7040,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) {
@@ -7057,6 +7070,8 @@ const Methods = {
   handleGlobalMousedownEvent(evnt) {
     const $xeTable = this;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
+    const $xeGGWrapper = $xeGrid || $xeGantt;
     const {
       $el,
       $refs,
@@ -7157,7 +7172,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();
         }
@@ -7181,7 +7196,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 = {};
@@ -7259,6 +7274,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, () => {
@@ -7484,7 +7500,8 @@ const Methods = {
               column: selected.column,
               columnIndex: $xeTable.getColumnIndex(selected.column),
               $table: $xeTable,
-              $grid: $xeGrid
+              $grid: $xeGrid,
+              $gantt: $xeGantt
             };
             // 是否被禁用
             if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7512,7 +7529,8 @@ const Methods = {
                 column: selected.column,
                 columnIndex: $xeTable.getColumnIndex(selected.column),
                 $table: $xeTable,
-                $grid: $xeGrid
+                $grid: $xeGrid,
+                $gantt: $xeGantt
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
@@ -7543,7 +7561,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));
           }
@@ -7564,7 +7583,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) {
@@ -8835,18 +8855,22 @@ const Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow(row) {
-    const {
-      $el,
-      rowOpts
-    } = this;
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    const rowOpts = $xeTable.computeRowOpts;
     this.clearCurrentRow();
     // this.clearCurrentColumn()
     this.currentRow = row;
     if (rowOpts.isCurrent || this.highlightCurrentRow) {
-      if ($el) {
-        _xeUtils.default.arrayEach($el.querySelectorAll(`[rowid="${(0, _util.getRowid)(this, row)}"]`), elem => (0, _dom.addClass)(elem, 'row--current'));
+      if (el) {
+        _xeUtils.default.arrayEach(el.querySelectorAll(`[rowid="${(0, _util.getRowid)($xeTable, row)}"]`), elem => (0, _dom.addClass)(elem, 'row--current'));
       }
     }
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateCurrentRow(row);
+    }
     return this.$nextTick();
   },
   isCheckedByRadioRow(row) {
@@ -8899,15 +8923,20 @@ const Methods = {
    * 用于当前行，手动清空当前高亮的状态
    */
   clearCurrentRow() {
-    const {
-      $el
-    } = this;
-    this.currentRow = null;
-    this.hoverRow = null;
-    if ($el) {
-      _xeUtils.default.arrayEach($el.querySelectorAll('.row--current'), elem => (0, _dom.removeClass)(elem, 'row--current'));
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    reactData.currentRow = null;
+    internalData.hoverRow = null;
+    if (el) {
+      _xeUtils.default.arrayEach(el.querySelectorAll('.row--current'), elem => (0, _dom.removeClass)(elem, 'row--current'));
     }
-    return this.$nextTick();
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateCurrentRow();
+    }
+    return $xeTable.$nextTick();
   },
   /**
    * 用于单选行，手动清空用户的选择
@@ -8978,24 +9007,31 @@ const Methods = {
     this.setHoverRow(row);
   },
   setHoverRow(row) {
-    const {
-      $el
-    } = this;
-    const rowid = (0, _util.getRowid)(this, row);
-    this.clearHoverRow();
-    if ($el) {
-      _xeUtils.default.arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => (0, _dom.addClass)(elem, 'row--hover'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    $xeTable.clearHoverRow();
+    if (el) {
+      _xeUtils.default.arrayEach(el.querySelectorAll(`.vxe-body--row[rowid="${(0, _util.getRowid)($xeTable, row)}"]`), elem => (0, _dom.addClass)(elem, 'row--hover'));
+    }
+    internalData.hoverRow = row;
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateHoverRow(row);
     }
-    this.hoverRow = row;
   },
   clearHoverRow() {
-    const {
-      $el
-    } = this;
-    if ($el) {
-      _xeUtils.default.arrayEach($el.querySelectorAll('.vxe-body--row.row--hover'), elem => (0, _dom.removeClass)(elem, 'row--hover'));
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const $xeGanttView = internalData.xeGanttView;
+    const el = $xeTable.$refs.refElem;
+    if (el) {
+      _xeUtils.default.arrayEach(el.querySelectorAll('.vxe-body--row.row--hover'), elem => (0, _dom.removeClass)(elem, 'row--hover'));
+    }
+    internalData.hoverRow = null;
+    if ($xeGanttView) {
+      $xeGanttView.handleUpdateHoverRow();
     }
-    this.hoverRow = null;
   },
   triggerHeaderCellClickEvent(evnt, params) {
     const $xeTable = this;
@@ -12521,6 +12557,7 @@ const Methods = {
     const reactData = $xeTable;
     const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
+    const $xeGantt = $xeTable.$xeGantt;
     const {
       showFooter,
       footerData,
@@ -12538,7 +12575,8 @@ const Methods = {
         columns: visibleColumn,
         data: afterFullData,
         $table: $xeTable,
-        $grid: $xeGrid
+        $grid: $xeGrid,
+        $gantt: $xeGantt
       }) : [];
     }
     reactData.footerTableData = footData;
@@ -12706,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;