vxe-table 3.11.17 → 3.11.19

package/lib/table/src/methods.js

@@ -755,6 +755,7 @@ const Methods = {
    * @param {Array} datas 数据
    */
   loadTableData(datas) {
+    const $xeTable = this;
     const {
       keepSource,
       showOverflow,
@@ -770,6 +771,7 @@ const Methods = {
       sYOpts
     } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
+    const rowOpts = $xeTable.computeRowOpts;
     let treeData = [];
     let fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -831,9 +833,11 @@ const Methods = {
     }
     if (sYLoad) {
       if (showOverflow) {
-        const errColumn = this.tableFullColumn.find(column => column.showOverflow === false);
-        if (errColumn) {
-          (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+        if (!rowOpts.height) {
+          const errColumn = this.tableFullColumn.find(column => column.showOverflow === false);
+          if (errColumn) {
+            (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+          }
         }
       }
       if (process.env.NODE_ENV === 'development') {
@@ -2679,7 +2683,7 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
-    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+    if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return;
@@ -2786,10 +2790,13 @@ const Methods = {
     return storeData;
   },
   saveCustomStore(type) {
+    const $xeTable = this;
+    const props = $xeTable;
     const {
-      tableId,
-      customOpts
-    } = this;
+      customConfig
+    } = props;
+    const tableId = $xeTable.computeTableId;
+    const customOpts = $xeTable.computeCustomOpts;
     const {
       updateStore,
       storage
@@ -2800,7 +2807,7 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
-    if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
+    if ((customConfig ? (0, _utils.isEnableConf)(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         (0, _log.errLog)('vxe.error.reqProp', ['id']);
         return this.$nextTick();
@@ -2851,6 +2858,13 @@ const Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      showOverflow
+    } = props;
+    const rowOpts = $xeTable.computeRowOpts;
     const leftList = [];
     const centerList = [];
     const rightList = [];
@@ -2925,6 +2939,14 @@ const Methods = {
       rightList
     });
     if (scrollXLoad) {
+      if (showOverflow) {
+        if (!rowOpts.height) {
+          const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
+          if (errColumn) {
+            (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+          }
+        }
+      }
       if (process.env.NODE_ENV === 'development') {
         // if (this.showHeader && !this.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
@@ -3092,13 +3114,8 @@ const Methods = {
   calcCellWidth() {
     const $xeTable = this;
     const {
-      autoWidthColumnList,
-      tableData
+      autoWidthColumnList
     } = this;
-    if (!tableData.length || !autoWidthColumnList.length) {
-      this.isCalcColumn = false;
-      return this.$nextTick();
-    }
     this.isCalcColumn = true;
     return this.$nextTick().then(() => {
       const internalData = $xeTable;
@@ -3917,9 +3934,14 @@ const Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent(evnt) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
+        const {
+          afterFullData
+        } = internalData;
         const {
           filterStore,
           isCtxMenu,
@@ -4007,6 +4029,11 @@ const Methods = {
             this._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
+          const {
+            isLastEnterAppendRow,
+            beforeEnterMethod,
+            enterMethod
+          } = keyboardOpts;
           // 退出选中
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -4021,18 +4048,52 @@ const Methods = {
           } else {
             // 如果是激活状态，退则出到上一行/下一行
             if (selected.row || actived.row) {
-              const targetArgs = selected.row ? selected.args : actived.args;
+              const activeParams = selected.row ? selected.args : actived.args;
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  const activeRow = selected.row || actived.row;
+                  const activeColumn = selected.column || actived.column;
+                  const _rowIndex = $xeTable.getVTRowIndex(activeRow);
+                  const etrParams = {
+                    row: activeRow,
+                    rowIndex: $xeTable.getRowIndex(activeRow),
+                    $rowIndex: $xeTable.getVMRowIndex(activeRow),
+                    _rowIndex,
+                    column: activeColumn,
+                    columnIndex: $xeTable.getColumnIndex(activeColumn),
+                    $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
+                    _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
+                    $table: $xeTable
+                  };
+                  if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
+                    // 最后一行按下回车键，自动追加一行
+                    if (isLastEnterAppendRow) {
+                      if (_rowIndex >= afterFullData.length - 1) {
+                        $xeTable.insertAt({}, -1).then(({
+                          row: newRow
+                        }) => {
+                          $xeTable.scrollToRow(newRow, selected.column);
+                          $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), {
+                            row: newRow
+                          }), evnt);
+                        });
+                        $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
+                        return;
+                      }
+                    }
+                    this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                    if (enterMethod) {
+                      enterMethod(etrParams);
+                    }
+                  }
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -4095,6 +4156,7 @@ const Methods = {
         } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
           if (!isEditStatus) {
             const {
+              editMode,
               backMethod
             } = keyboardOpts;
             // 如果是删除键
@@ -4112,7 +4174,10 @@ const Methods = {
                 if (backMethod) {
                   backMethod(params);
                 } else {
-                  (0, _util.setCellValue)(selected.row, selected.column, null);
+                  // 追加方式与覆盖式
+                  if (editMode !== 'insert') {
+                    (0, _util.setCellValue)(selected.row, selected.column, null);
+                  }
                   this.handleEdit(selected.args, evnt);
                 }
                 this.emitEvent('cell-backspace-value', params, evnt);
@@ -7331,7 +7396,8 @@ const Methods = {
       }
       $xeTable.checkScrolling();
       internalData.lastScrollLeft = scrollLeft;
-    } else {
+    }
+    if (isRollY) {
       const yThreshold = $xeTable.computeScrollYThreshold;
       isTop = scrollTop <= 0;
       if (!isTop) {
@@ -7460,7 +7526,8 @@ const Methods = {
     const internalData = $xeTable;
     const {
       inFooterScroll,
-      inBodyScroll
+      inBodyScroll,
+      lastScrollTop
     } = internalData;
     if (inFooterScroll) {
       return;
@@ -7474,13 +7541,18 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const headerElem = tableHeader ? tableHeader.$el : null;
     const footerElem = tableFooter ? tableFooter.$el : null;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     const wrapperEl = evnt.currentTarget;
     const {
-      scrollTop,
       scrollLeft
     } = wrapperEl;
+    const yBodyEl = yHandleEl || bodyElem;
+    let scrollTop = 0;
+    if (yBodyEl) {
+      scrollTop = yBodyEl.scrollTop;
+    }
     const isRollX = true;
-    const isRollY = false;
+    const isRollY = scrollTop !== lastScrollTop;
     internalData.inVirtualScroll = true;
     (0, _dom.setScrollLeft)(bodyElem, scrollLeft);
     (0, _dom.setScrollLeft)(headerElem, scrollLeft);
@@ -7496,7 +7568,8 @@ const Methods = {
     const internalData = $xeTable;
     const {
       inFooterScroll,
-      inBodyScroll
+      inBodyScroll,
+      lastScrollLeft
     } = internalData;
     if (inFooterScroll) {
       return;
@@ -7510,12 +7583,17 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const leftElem = leftBody ? leftBody.$el : null;
     const rightElem = rightBody ? rightBody.$el : null;
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const wrapperEl = evnt.currentTarget;
     const {
-      scrollTop,
-      scrollLeft
+      scrollTop
     } = wrapperEl;
-    const isRollX = false;
+    const xBodyEl = xHandleEl || bodyElem;
+    let scrollLeft = 0;
+    if (xBodyEl) {
+      scrollLeft = xBodyEl.scrollLeft;
+    }
+    const isRollX = scrollLeft !== lastScrollLeft;
     const isRollY = true;
     internalData.inVirtualScroll = true;
     (0, _dom.setScrollTop)(bodyElem, scrollTop);
@@ -7820,7 +7898,7 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));
+      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
     }
     return this.$nextTick();
   },