vxe-table 3.6.3 → 3.6.6-beta.0

package/lib/index.umd.js

@@ -8812,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.3", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.6-beta.0", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10093,7 +10093,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.3",
+  version: "3.6.6-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -10921,6 +10921,15 @@ function colToVisible($xetable, column) {
 
   return Promise.resolve();
 }
+// CONCATENATED MODULE: ./packages/tools/vn.js
+
+function getSlotVNs(vns) {
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
+    return vns;
+  }
+
+  return [vns];
+}
 // CONCATENATED MODULE: ./packages/table/src/body.js
 
 
@@ -10936,6 +10945,7 @@ function colToVisible($xetable, column) {
 
 
 
+
 var renderType = 'body'; // 滚动、拖动过程中不需要触发
 
 function isOperateMouse($xetable) {
@@ -11558,9 +11568,9 @@ function syncBodyScroll(_vm, fixedType, scrollTop, elem1, elem2) {
       var renderEmpty = compConf ? compConf.renderEmpty : null;
 
       if (renderEmpty) {
-        emptyContent = renderEmpty.call(this, h, emptyOpts, {
+        emptyContent = getSlotVNs(renderEmpty.call(this, h, emptyOpts, {
           $table: $xetable
-        });
+        }));
       } else {
         emptyContent = $xetable.emptyText || src_conf.i18n('vxe.table.emptyText');
       }
@@ -12004,10 +12014,12 @@ var cellType = 'header';
         $xetable = this.$parent,
         fixedType = this.fixedType,
         headerColumn = this.headerColumn,
+        tableColumn = this.tableColumn,
         fixedColumn = this.fixedColumn;
     var tableListeners = $xetable.$listeners,
         tId = $xetable.tId,
         isGroup = $xetable.isGroup,
+        visibleColumn = $xetable.visibleColumn,
         resizable = $xetable.resizable,
         border = $xetable.border,
         columnKey = $xetable.columnKey,
@@ -12026,17 +12038,20 @@ var cellType = 'header';
         sortOpts = $xetable.sortOpts,
         mouseConfig = $xetable.mouseConfig,
         columnOpts = $xetable.columnOpts;
-    var tableColumn = this.tableColumn;
-    var headerGroups = headerColumn; // 如果是使用优化模式
+    var headerGroups = headerColumn;
+    var renderColumnList = tableColumn;
 
-    if (!isGroup) {
+    if (isGroup) {
+      renderColumnList = visibleColumn;
+    } else {
+      // 如果是使用优化模式
       if (fixedType) {
         if (scrollXLoad || allColumnHeaderOverflow) {
-          tableColumn = fixedColumn;
+          renderColumnList = fixedColumn;
         }
       }
 
-      headerGroups = [tableColumn];
+      headerGroups = [renderColumnList];
     }
 
     return h('div', {
@@ -12062,7 +12077,7 @@ var cellType = 'header';
      */
     h('colgroup', {
       ref: 'colgroup'
-    }, tableColumn.map(function (column, $columnIndex) {
+    }, renderColumnList.map(function (column, $columnIndex) {
       return h('col', {
         attrs: {
           name: column.id
@@ -12534,15 +12549,6 @@ var es_array_sort = __webpack_require__("4e82");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
 var es_promise_finally = __webpack_require__("a79d");
 
-// CONCATENATED MODULE: ./packages/tools/vn.js
-
-function getSlotVNs(vns) {
-  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
-    return vns;
-  }
-
-  return [vns];
-}
 // CONCATENATED MODULE: ./packages/table/src/cell.js
 
 
@@ -15690,12 +15696,6 @@ var Methods = {
       rightList: rightList
     });
 
-    if (scrollXLoad && isGroup) {
-      scrollXLoad = false;
-
-      if (false) {}
-    }
-
     if (scrollXLoad) {
       if (false) {}
 
@@ -16045,27 +16045,23 @@ var Methods = {
         if (layout === 'header') {
           // 表头体样式处理
           // 横向滚动渲染
-          var tWidth = tableWidth; // 如果是使用优化模式
+          var tWidth = tableWidth;
+          var renderColumnList = tableColumn;
 
-          var isOptimize = false;
-
-          if (!isGroup) {
+          if (isGroup) {
+            renderColumnList = visibleColumn;
+          } else {
+            // 如果是使用优化模式
             if (fixedType) {
               if (scrollXLoad || allColumnHeaderOverflow) {
-                isOptimize = true;
+                renderColumnList = fixedColumn;
               }
             }
           }
 
-          if (isOptimize) {
-            tableColumn = fixedColumn;
-          }
-
-          if (isOptimize || scrollXLoad) {
-            tWidth = tableColumn.reduce(function (previous, column) {
-              return previous + column.renderWidth;
-            }, 0);
-          }
+          tWidth = renderColumnList.reduce(function (previous, column) {
+            return previous + column.renderWidth;
+          }, 0);
 
           if (tableElem) {
             tableElem.style.width = tWidth ? "".concat(tWidth + scrollbarWidth, "px") : ''; // 修复 IE 中高度无法自适应问题
@@ -16144,21 +16140,22 @@ var Methods = {
             }, isRightFixed ? scrollbarWidth : 0), "px");
           }
 
-          var _tWidth = tableWidth; // 如果是使用优化模式
+          var _tWidth = tableWidth;
+          var _renderColumnList = tableColumn; // 如果是使用优化模式
 
           if (fixedType) {
             if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
               if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
-                tableColumn = fixedColumn;
+                _renderColumnList = fixedColumn;
               } else {
-                tableColumn = visibleColumn;
+                _renderColumnList = visibleColumn;
               }
             } else {
-              tableColumn = visibleColumn;
+              _renderColumnList = visibleColumn;
             }
           }
 
-          _tWidth = tableColumn.reduce(function (previous, column) {
+          _tWidth = _renderColumnList.reduce(function (previous, column) {
             return previous + column.renderWidth;
           }, 0);
 
@@ -16172,21 +16169,22 @@ var Methods = {
             emptyBlockElem.style.width = _tWidth ? "".concat(_tWidth, "px") : '';
           }
         } else if (layout === 'footer') {
-          var _tWidth2 = tableWidth; // 如果是使用优化模式
+          var _tWidth2 = tableWidth;
+          var _renderColumnList2 = tableColumn; // 如果是使用优化模式
 
           if (fixedType) {
             if (scrollXLoad || allColumnFooterOverflow) {
               if (!mergeFooterList.length || !footerSpanMethod) {
-                tableColumn = fixedColumn;
+                _renderColumnList2 = fixedColumn;
               } else {
-                tableColumn = visibleColumn;
+                _renderColumnList2 = visibleColumn;
               }
             } else {
-              tableColumn = visibleColumn;
+              _renderColumnList2 = visibleColumn;
             }
           }
 
-          _tWidth2 = tableColumn.reduce(function (previous, column) {
+          _tWidth2 = _renderColumnList2.reduce(function (previous, column) {
             return previous + column.renderWidth;
           }, 0);
 
@@ -19315,6 +19313,7 @@ var Methods = {
   // 更新横向 X 可视渲染上下剩余空间大小
   updateScrollXSpace: function updateScrollXSpace() {
     var $refs = this.$refs,
+        isGroup = this.isGroup,
         elemStore = this.elemStore,
         visibleColumn = this.visibleColumn,
         scrollXStore = this.scrollXStore,
@@ -19342,7 +19341,7 @@ var Methods = {
       }
 
       if (headerElem) {
-        headerElem.style.marginLeft = marginLeft;
+        headerElem.style.marginLeft = isGroup ? '' : marginLeft;
       }
 
       bodyElem.style.marginLeft = marginLeft;
@@ -19936,6 +19935,7 @@ var Loading = Object.assign(src_loading, {
 
 
 
+
 
 
 /**
@@ -20007,7 +20007,7 @@ function renderEmptyContenet(h, _vm) {
     var renderEmpty = compConf ? compConf.renderEmpty : null;
 
     if (renderEmpty) {
-      emptyContent = renderEmpty.call(_vm, h, emptyOpts, params);
+      emptyContent = getSlotVNs(renderEmpty.call(_vm, h, emptyOpts, params));
     } else {
       emptyContent = getFuncText(_vm.emptyText) || src_conf.i18n('vxe.table.emptyText');
     }
@@ -21202,6 +21202,7 @@ var Table = Object.assign(table, {
 
 
 
+
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilter',
   props: {
@@ -21257,10 +21258,10 @@ var Table = Object.assign(table, {
       } else if (compConf && compConf.renderFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
+        }, getSlotVNs(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
-        }, args)))];
+        }, args))))];
       }
 
       var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
@@ -23025,6 +23026,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
 
         if (!autofocus && compRender) {
           autofocus = compRender.autofocus;
+        }
+
+        if (!autoselect && compRender) {
+          autoselect = compRender.autoselect;
         } // 如果指定了聚焦 class
 
 
@@ -32374,14 +32379,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         if (!mergeFooterList.length || !footerSpanMethod) {
           tableColumn = fixedColumn;
         } else {
-          tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
-          // if (mergeFooterList.length && !isMergeFooterLeftFixedExceeded && fixedType === 'left') {
-          //   tableColumn = fixedColumn
-          // } else if (mergeFooterList.length && !isMergeFooterRightFixedExceeded && fixedType === 'right') {
-          //   tableColumn = fixedColumn
-          // } else {
-          //   tableColumn = visibleColumn
-          // }
+          tableColumn = visibleColumn;
         }
       } else {
         tableColumn = visibleColumn;
@@ -34098,6 +34096,7 @@ var Grid = Object.assign(grid, {
 
 
 
+
 var renderDropdowns = function renderDropdowns(h, _vm, item, isBtn) {
   var _e = _vm._e;
   var dropdowns = item.dropdowns;
@@ -34162,11 +34161,11 @@ function renderBtns(h, _vm) {
       if (renderToolbarButton) {
         return h('span', {
           class: 'vxe-button--item'
-        }, renderToolbarButton.call(_vm, h, buttonRender, {
+        }, getSlotVNs(renderToolbarButton.call(_vm, h, buttonRender, {
           $grid: $xegrid,
           $table: $xetable,
           button: item
-        }));
+        })));
       }
     }
 
@@ -34233,11 +34232,11 @@ function renderRightTools(h, _vm) {
       if (renderToolbarTool) {
         return h('span', {
           class: 'vxe-tool--item'
-        }, renderToolbarTool.call(_vm, h, toolRender, {
+        }, getSlotVNs(renderToolbarTool.call(_vm, h, toolRender, {
           $grid: $xegrid,
           $table: $xetable,
           tool: item
-        }));
+        })));
       }
     }
 
@@ -37099,6 +37098,7 @@ function assemItem(_vm) {
 
 
 
+
 function renderPrefixIcon(h, titlePrefix) {
   return h('span', {
     class: 'vxe-form--item-title-prefix'
@@ -37144,7 +37144,7 @@ function renderTitle(h, _vm, item) {
 
   titVNs.push(h('span', {
     class: 'vxe-form--item-title-label'
-  }, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
+  }, compConf && compConf.renderItemTitle ? getSlotVNs(compConf.renderItemTitle(itemRender, params)) : slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)));
   contVNs.push(h('div', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -39332,7 +39332,6 @@ var Pulldown = Object.assign(pulldown, {
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
-      scrollXNotGroup: '横向虚拟滚动不支持分组表头，需要设置 "scroll-x.enabled=false" 参数，否则可能会导致出现错误',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
@@ -39380,6 +39379,7 @@ var Pulldown = Object.assign(pulldown, {
       },
       combination: {
         menus: {
+          clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
           fixedColumn: '锁定列',