vxe-table 3.17.10 → 3.18.0-beta.0

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) {
@@ -8835,18 +8838,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 +8906,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 +8990,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;