vxe-table 3.8.19 → 3.8.21

package/lib/table/src/methods.js

@@ -1437,6 +1437,11 @@ var Methods = {
     var fullColumnFieldData = this.fullColumnFieldData;
     return fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
   },
+  getParentColumn: function getParentColumn(fieldOrColumn) {
+    var fullColumnIdData = this.fullColumnIdData;
+    var column = (0, _util.handleFieldOrColumn)(this, fieldOrColumn);
+    return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
+  },
   /**
    * 获取当前表格的列
    * 收集到的全量列、全量表头列、处理条件之后的全量表头列、当前渲染中的表头列
@@ -2380,6 +2385,7 @@ var Methods = {
     var resizeList = [];
     var pxList = [];
     var pxMinList = [];
+    var autoMinList = [];
     var scaleList = [];
     var scaleMinList = [];
     var autoList = [];
@@ -2402,6 +2408,8 @@ var Methods = {
           scaleList.push(column);
         } else if (_dom.default.isPx(column.minWidth)) {
           pxMinList.push(column);
+        } else if (column.minWidth === 'auto') {
+          autoMinList.push(column);
         } else if (_dom.default.isScale(column.minWidth)) {
           scaleMinList.push(column);
         } else {
@@ -2413,6 +2421,7 @@ var Methods = {
       resizeList: resizeList,
       pxList: pxList,
       pxMinList: pxMinList,
+      autoMinList: autoMinList,
       scaleList: scaleList,
       scaleMinList: scaleMinList,
       autoList: autoList,
@@ -2498,11 +2507,11 @@ var Methods = {
             var cellStyle = getComputedStyle(firstCellEl);
             paddingSize = Math.floor(_xeUtils.default.toNumber(cellStyle.paddingLeft) + _xeUtils.default.toNumber(cellStyle.paddingRight)) + 2;
           }
-          var colWidth = column.renderAutoWidth - paddingSize + 2;
+          var colWidth = column.renderAutoWidth - paddingSize;
           _xeUtils.default.arrayEach(cellElList, function (cellEl) {
             var labelEl = cellEl.firstChild;
             if (labelEl) {
-              colWidth = Math.max(colWidth, labelEl.offsetWidth);
+              colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
             }
           });
           column.renderAutoWidth = colWidth + paddingSize;
@@ -2533,6 +2542,7 @@ var Methods = {
     var resizeList = columnStore.resizeList,
       pxMinList = columnStore.pxMinList,
       pxList = columnStore.pxList,
+      autoMinList = columnStore.autoMinList,
       scaleList = columnStore.scaleList,
       scaleMinList = columnStore.scaleMinList,
       autoList = columnStore.autoList,
@@ -2543,6 +2553,12 @@ var Methods = {
       tableWidth += minWidth;
       column.renderWidth = minWidth;
     });
+    // 最小自适应
+    autoMinList.forEach(function (column) {
+      var scaleWidth = Math.max(60, _xeUtils.default.toInteger(column.renderAutoWidth));
+      tableWidth += scaleWidth;
+      column.renderWidth = scaleWidth;
+    });
     // 最小百分比
     scaleMinList.forEach(function (column) {
       var scaleWidth = Math.floor(parseInt(column.minWidth) * meanWidth);
@@ -2574,10 +2590,10 @@ var Methods = {
       column.renderWidth = width;
     });
     remainWidth -= tableWidth;
-    meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
+    meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
     if (fit) {
       if (remainWidth > 0) {
-        scaleMinList.concat(pxMinList).forEach(function (column) {
+        scaleMinList.concat(pxMinList).concat(autoMinList).forEach(function (column) {
           tableWidth += meanWidth;
           column.renderWidth += meanWidth;
         });
@@ -2596,7 +2612,7 @@ var Methods = {
        * 偏移量算法
        * 如果所有列足够放的情况下，从最后动态列开始分配
        */
-      var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
+      var dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
       var dynamicSize = dynamicList.length - 1;
       if (dynamicSize > 0) {
         var odiffer = bodyWidth - tableWidth;
@@ -3208,7 +3224,7 @@ var Methods = {
         var isUpArrow = keyCode === 38;
         var isRightArrow = keyCode === 39;
         var isDwArrow = keyCode === 40;
-        var isDel = keyCode === 46;
+        var hasDeleteKey = keyCode === 46;
         var isF2 = keyCode === 113;
         var isContextMenu = keyCode === 93;
         var hasMetaKey = evnt.metaKey;
@@ -3219,6 +3235,7 @@ var Methods = {
         var operCtxMenu = isCtxMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
         var isEditStatus = (0, _utils.isEnableConf)(editConfig) && actived.column && actived.row;
         var childrenField = treeOpts.children || treeOpts.childrenField;
+        var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
         var params;
         if (filterStore.visible) {
           if (isEsc) {
@@ -3326,25 +3343,43 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this31.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (treeConfig || (0, _utils.isEnableConf)(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
+        } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
+          // 如果是删除键
           if (!isEditStatus) {
-            var delMethod = keyboardOpts.delMethod,
-              backMethod = keyboardOpts.backMethod;
+            var delMethod = keyboardOpts.delMethod;
+            var delPaqrams = {
+              row: selected.row,
+              rowIndex: _this31.getRowIndex(selected.row),
+              column: selected.column,
+              columnIndex: _this31.getColumnIndex(selected.column),
+              $table: _this31
+            };
+            // 是否被禁用
+            if (!beforeEditMethod || beforeEditMethod(params)) {
+              if (delMethod) {
+                delMethod(delPaqrams);
+              } else {
+                setCellValue(selected.row, selected.column, null);
+              }
+              // 如果按下 del 键，更新表尾数据
+              _this31.updateFooter();
+              _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
+            }
+          }
+        } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
+          if (!isEditStatus) {
+            var backMethod = keyboardOpts.backMethod;
             // 如果是删除键
             if (keyboardOpts.isDel && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
-              var delPaqrams = {
+              var _delPaqrams = {
                 row: selected.row,
                 rowIndex: _this31.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: _this31.getColumnIndex(selected.column),
                 $table: _this31
               };
-              if (delMethod) {
-                delMethod(delPaqrams);
-              } else {
-                setCellValue(selected.row, selected.column, null);
-              }
-              if (hasBackspaceKey) {
+              // 是否被禁用
+              if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -3354,35 +3389,35 @@ var Methods = {
                     $table: _this31
                   });
                 } else {
+                  setCellValue(selected.row, selected.column, null);
                   _this31.handleActived(selected.args, evnt);
                 }
-              } else if (isDel) {
-                // 如果按下 del 键，更新表尾数据
-                _this31.updateFooter();
-              }
-              _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
-            } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
-              // 如果树形表格回退键关闭当前行返回父节点
-              var _XEUtils$findTree = _xeUtils.default.findTree(_this31.afterFullData, function (item) {
-                  return item === currentRow;
-                }, {
-                  children: childrenField
-                }),
-                parentRow = _XEUtils$findTree.parent;
-              if (parentRow) {
-                evnt.preventDefault();
-                params = {
-                  $table: _this31,
-                  row: parentRow
-                };
-                _this31.setTreeExpand(parentRow, false).then(function () {
-                  return _this31.scrollToRow(parentRow);
-                }).then(function () {
-                  return _this31.triggerCurrentRowEvent(evnt, params);
-                });
+                _this31.emitEvent('cell-backspace-value', _delPaqrams, evnt);
               }
             }
           }
+        } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+          // 如果树形表格回退键关闭当前行返回父节点
+          var _XEUtils$findTree = _xeUtils.default.findTree(_this31.afterTreeFullData, function (item) {
+              return item === currentRow;
+            }, {
+              children: childrenField
+            }),
+            parentRow = _XEUtils$findTree.parent;
+          if (parentRow) {
+            evnt.preventDefault();
+            params = {
+              $table: _this31,
+              row: parentRow,
+              rowIndex: _this31.getRowIndex(parentRow),
+              $rowIndex: _this31.getVMRowIndex(parentRow)
+            };
+            _this31.setTreeExpand(parentRow, false).then(function () {
+              return _this31.scrollToRow(parentRow);
+            }).then(function () {
+              return _this31.triggerCurrentRowEvent(evnt, params);
+            });
+          }
         } else if (keyboardConfig && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
           var editMethod = keyboardOpts.editMethod;
           // 启用编辑后，空格键功能将失效
@@ -3391,8 +3426,8 @@ var Methods = {
           // }
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
-            var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-            if (!beforeEditMethod || beforeEditMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
+            var _beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+            if (!_beforeEditMethod || _beforeEditMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
               $table: _this31,
               $grid: _this31.$xegrid
             }))) {