vxe-table 4.3.4 → 4.3.6-beta.0

package/es/switch/style.css

@@ -30,73 +30,93 @@
   padding: 0.4em;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
-  text-align: center; }
-  .vxe-switch.is--animat .vxe-switch--button {
-    transition: border-color .3s, background-color .3s; }
-  .vxe-switch.is--animat .vxe-switch--icon {
-    transition: all 0.3s; }
-  .vxe-switch.is--on .vxe-switch--button {
-    padding-right: 1.7em;
-    background-color: #409eff; }
-  .vxe-switch.is--on .vxe-switch--icon {
-    left: 100%;
-    transform: translateX(-1.4em); }
-  .vxe-switch.is--off .vxe-switch--button {
-    padding-left: 1.7em;
-    background-color: rgba(0, 0, 0, 0.35); }
-  .vxe-switch.is--off .vxe-switch--icon {
-    left: 0.2em;
-    transform: translateX(0); }
-  .vxe-switch.is--on .vxe-switch--label-off,
-  .vxe-switch.is--off .vxe-switch--label-on {
-    height: 0;
-    visibility: hidden;
-    overflow: hidden; }
-  .vxe-switch.is--on .vxe-switch--label, .vxe-switch.is--off .vxe-switch--label {
-    opacity: 1; }
-  .vxe-switch:not(.is--disabled) .vxe-switch--button {
-    cursor: pointer; }
-    .vxe-switch:not(.is--disabled) .vxe-switch--button:focus {
-      box-shadow: 0 0 0.4em 0 #409eff; }
-  .vxe-switch.is--disabled .vxe-switch--button {
-    cursor: no-drop; }
-  .vxe-switch.is--disabled.is--on .vxe-switch--button {
-    background-color: #a6d2ff; }
-  .vxe-switch.is--disabled.is--off .vxe-switch--button {
-    background-color: rgba(0, 0, 0, 0.15); }
-  .vxe-switch .vxe-switch--button {
-    display: block;
-    position: relative;
-    height: 1.6em;
-    line-height: 1;
-    min-width: 3.2em;
-    padding: 0 0.6em;
-    border-radius: 1em;
-    border: 0;
-    outline: 0; }
-  .vxe-switch .vxe-switch--label {
-    opacity: 0;
-    display: block;
-    color: #fff;
-    font-size: 0.8em; }
-  .vxe-switch .vxe-switch--icon {
-    position: absolute;
-    top: 0.2em;
-    left: 0;
-    width: 1.2em;
-    height: 1.2em;
-    border-radius: 50%;
-    background-color: #fff; }
-  .vxe-switch .vxe-switch--label-icon {
-    margin-right: 0.25em; }
+  text-align: center;
+}
+.vxe-switch.is--animat .vxe-switch--button {
+  transition: border-color 0.3s, background-color 0.3s;
+}
+.vxe-switch.is--animat .vxe-switch--icon {
+  transition: all 0.3s;
+}
+.vxe-switch.is--on .vxe-switch--button {
+  padding-right: 1.7em;
+  background-color: #409eff;
+}
+.vxe-switch.is--on .vxe-switch--icon {
+  left: 100%;
+  transform: translateX(-1.4em);
+}
+.vxe-switch.is--off .vxe-switch--button {
+  padding-left: 1.7em;
+  background-color: rgba(0, 0, 0, 0.35);
+}
+.vxe-switch.is--off .vxe-switch--icon {
+  left: 0.2em;
+  transform: translateX(0);
+}
+.vxe-switch.is--on .vxe-switch--label-off, .vxe-switch.is--off .vxe-switch--label-on {
+  height: 0;
+  visibility: hidden;
+  overflow: hidden;
+}
+.vxe-switch.is--on .vxe-switch--label, .vxe-switch.is--off .vxe-switch--label {
+  opacity: 1;
+}
+.vxe-switch:not(.is--disabled) .vxe-switch--button {
+  cursor: pointer;
+}
+.vxe-switch:not(.is--disabled) .vxe-switch--button:focus {
+  box-shadow: 0 0 0.4em 0 #409eff;
+}
+.vxe-switch.is--disabled .vxe-switch--button {
+  cursor: no-drop;
+}
+.vxe-switch.is--disabled.is--on .vxe-switch--button {
+  background-color: #a6d2ff;
+}
+.vxe-switch.is--disabled.is--off .vxe-switch--button {
+  background-color: rgba(0, 0, 0, 0.15);
+}
+.vxe-switch .vxe-switch--button {
+  display: block;
+  position: relative;
+  height: 1.6em;
+  line-height: 1;
+  min-width: 3.2em;
+  padding: 0 0.6em;
+  border-radius: 1em;
+  border: 0;
+  outline: 0;
+}
+.vxe-switch .vxe-switch--label {
+  opacity: 0;
+  display: block;
+  color: #fff;
+  font-size: 0.8em;
+}
+.vxe-switch .vxe-switch--icon {
+  position: absolute;
+  top: 0.2em;
+  left: 0;
+  width: 1.2em;
+  height: 1.2em;
+  border-radius: 50%;
+  background-color: #fff;
+}
+.vxe-switch .vxe-switch--label-icon {
+  margin-right: 0.25em;
+}
 
 .vxe-switch {
-  font-size: 14px; }
-  .vxe-switch.size--medium {
-    font-size: 14px; }
-  .vxe-switch.size--small {
-    font-size: 13px; }
-  .vxe-switch.size--mini {
-    font-size: 12px; }
+  font-size: 14px;
+}
+.vxe-switch.size--medium {
+  font-size: 14px;
+}
+.vxe-switch.size--small {
+  font-size: 13px;
+}
+.vxe-switch.size--mini {
+  font-size: 12px;
+}

package/es/table/src/column.js

@@ -14,6 +14,8 @@ export var columnProps = {
     width: [Number, String],
     // 列最小宽度，把剩余宽度按比例分配
     minWidth: [Number, String],
+    // 列最大宽度
+    maxWidth: [Number, String],
     // 是否允许拖动列宽调整大小
     resizable: { type: Boolean, default: null },
     // 将列固定在左侧或者右侧

package/es/table/src/columnInfo.js

@@ -57,6 +57,7 @@ var ColumnInfo = /** @class */ (function () {
             title: _vm.title,
             width: _vm.width,
             minWidth: _vm.minWidth,
+            maxWidth: _vm.maxWidth,
             resizable: _vm.resizable,
             fixed: _vm.fixed,
             align: _vm.align,

package/es/table/src/table.js

@@ -964,31 +964,31 @@ export default defineComponent({
             var resizeList = columnStore.resizeList, pxMinList = columnStore.pxMinList, pxList = columnStore.pxList, scaleList = columnStore.scaleList, scaleMinList = columnStore.scaleMinList, autoList = columnStore.autoList;
             // 最小宽
             pxMinList.forEach(function (column) {
-                var minWidth = parseInt(column.minWidth);
+                var minWidth = XEUtils.toInteger(column.minWidth);
                 tableWidth += minWidth;
                 column.renderWidth = minWidth;
             });
             // 最小百分比
             scaleMinList.forEach(function (column) {
-                var scaleWidth = Math.floor(parseInt(column.minWidth) * meanWidth);
+                var scaleWidth = Math.floor(XEUtils.toInteger(column.minWidth) * meanWidth);
                 tableWidth += scaleWidth;
                 column.renderWidth = scaleWidth;
             });
             // 固定百分比
             scaleList.forEach(function (column) {
-                var scaleWidth = Math.floor(parseInt(column.width) * meanWidth);
+                var scaleWidth = Math.floor(XEUtils.toInteger(column.width) * meanWidth);
                 tableWidth += scaleWidth;
                 column.renderWidth = scaleWidth;
             });
             // 固定宽
             pxList.forEach(function (column) {
-                var width = parseInt(column.width);
+                var width = XEUtils.toInteger(column.width);
                 tableWidth += width;
                 column.renderWidth = width;
             });
             // 调整了列宽
             resizeList.forEach(function (column) {
-                var width = parseInt(column.resizeWidth);
+                var width = XEUtils.toInteger(column.resizeWidth);
                 tableWidth += width;
                 column.renderWidth = width;
             });
@@ -1336,27 +1336,21 @@ export default defineComponent({
                         // 表头体样式处理
                         // 横向滚动渲染
                         var tWidth = tableWidth;
-                        // 如果是使用优化模式
-                        var isOptimize = false;
-                        if (!isGroup) {
+                        var renderColumnList = tableColumn;
+                        if (isGroup) {
+                            renderColumnList = visibleColumn;
+                        }
+                        else {
+                            // 如果是使用优化模式
                             if (fixedType) {
                                 if (scrollXLoad || allColumnHeaderOverflow) {
-                                    isOptimize = true;
+                                    renderColumnList = fixedColumn;
                                 }
                             }
                         }
-                        if (isOptimize) {
-                            tableColumn = fixedColumn;
-                        }
-                        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 中高度无法自适应问题
-                            if (browse.msie) {
-                                XEUtils.arrayEach(tableElem.querySelectorAll('.vxe-resizable'), function (resizeElem) {
-                                    resizeElem.style.height = "".concat(resizeElem.parentNode.offsetHeight, "px");
-                                });
-                            }
                         }
                         var repairRef = elemStore["".concat(name, "-").concat(layout, "-repair")];
                         var repairElem = repairRef ? repairRef.value : null;
@@ -1416,21 +1410,22 @@ export default defineComponent({
                             fixedWrapperElem.style.width = "".concat(fixedColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, isFixedLeft ? 0 : scrollbarWidth), "px");
                         }
                         var tWidth = tableWidth;
+                        var renderColumnList = tableColumn;
                         // 如果是使用优化模式
                         if (fixedType) {
                             if (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) { return previous + column.renderWidth; }, 0);
+                        tWidth = renderColumnList.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
                         if (tableElem) {
                             tableElem.style.width = tWidth ? "".concat(tWidth, "px") : '';
                             // 兼容性处理
@@ -1442,21 +1437,22 @@ export default defineComponent({
                     }
                     else if (layout === 'footer') {
                         var tWidth = tableWidth;
+                        var renderColumnList = tableColumn;
                         // 如果是使用优化模式
                         if (fixedType) {
                             if (scrollXLoad || allColumnFooterOverflow) {
                                 if (!mergeFooterList.length || !footerSpanMethod) {
-                                    tableColumn = fixedColumn;
+                                    renderColumnList = fixedColumn;
                                 }
                                 else {
-                                    tableColumn = visibleColumn;
+                                    renderColumnList = visibleColumn;
                                 }
                             }
                             else {
-                                tableColumn = visibleColumn;
+                                renderColumnList = visibleColumn;
                             }
                         }
-                        tWidth = tableColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
+                        tWidth = renderColumnList.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
                         if (isNodeElement(wrapperElem)) {
                             // 如果是固定列
                             if (fixedWrapperElem) {
@@ -1846,7 +1842,7 @@ export default defineComponent({
                 // 计算 X 逻辑
                 if (scrollXLoad) {
                     var visibleXSize = computeVirtualX().visibleSize;
-                    var offsetXSize = sXOpts.oSize ? XEUtils.toNumber(sXOpts.oSize) : browse.msie ? 10 : (browse.edge ? 5 : 0);
+                    var offsetXSize = sXOpts.oSize ? XEUtils.toNumber(sXOpts.oSize) : (browse.edge ? 5 : 0);
                     scrollXStore.offsetSize = offsetXSize;
                     scrollXStore.visibleSize = visibleXSize;
                     scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
@@ -1859,7 +1855,7 @@ export default defineComponent({
                 var _a = computeVirtualY(), rowHeight = _a.rowHeight, visibleYSize = _a.visibleSize;
                 scrollYStore.rowHeight = rowHeight;
                 if (scrollYLoad) {
-                    var offsetYSize = sYOpts.oSize ? XEUtils.toNumber(sYOpts.oSize) : browse.msie ? 20 : (browse.edge ? 10 : 0);
+                    var offsetYSize = sYOpts.oSize ? XEUtils.toNumber(sYOpts.oSize) : (browse.edge ? 10 : 0);
                     scrollYStore.offsetSize = offsetYSize;
                     scrollYStore.visibleSize = visibleYSize;
                     scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
@@ -2131,12 +2127,6 @@ export default defineComponent({
             var scrollXLoad = !!sXOpts.enabled && sXOpts.gt > -1 && sXOpts.gt < tableFullColumn.length;
             reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
             Object.assign(columnStore, { leftList: leftList, centerList: centerList, rightList: rightList });
-            if (scrollXLoad && isGroup) {
-                scrollXLoad = false;
-                if (process.env.NODE_ENV === 'development') {
-                    warnLog('vxe.error.scrollXNotGroup');
-                }
-            }
             if (scrollXLoad) {
                 if (process.env.NODE_ENV === 'development') {
                     if (props.showHeader && !props.showHeaderOverflow) {
@@ -3812,7 +3802,13 @@ export default defineComponent({
                     setScrollTop(rightBodyElem || tableBodyElem, scrollTop);
                 }
                 if (reactData.scrollXLoad || reactData.scrollYLoad) {
-                    return new Promise(function (resolve) { return setTimeout(function () { return resolve(nextTick()); }, 50); });
+                    return new Promise(function (resolve) {
+                        setTimeout(function () {
+                            nextTick(function () {
+                                resolve();
+                            });
+                        }, 50);
+                    });
                 }
                 return nextTick();
             },
@@ -4507,7 +4503,7 @@ export default defineComponent({
             var showAll = tooltipOpts.showAll, contentMethod = tooltipOpts.contentMethod;
             var customContent = contentMethod ? contentMethod(params) : null;
             var useCustom = contentMethod && !XEUtils.eqNull(customContent);
-            var content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
+            var content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
             var isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
             if (content && (showAll || useCustom || isCellOverflow)) {
                 Object.assign(tooltipStore, {
@@ -5037,7 +5033,7 @@ export default defineComponent({
                     else {
                         tipElem = cell.querySelector(column.type === 'html' ? '.vxe-cell--html' : '.vxe-cell--label');
                     }
-                    handleTooltip(evnt, cell, overflowElem || cell.children[0], tipElem, params);
+                    handleTooltip(evnt, cell, (overflowElem || cell.children[0]), tipElem, params);
                 }
             },
             /**
@@ -5370,7 +5366,7 @@ export default defineComponent({
             },
             // 更新横向 X 可视渲染上下剩余空间大小
             updateScrollXSpace: function () {
-                var scrollXLoad = reactData.scrollXLoad, scrollbarWidth = reactData.scrollbarWidth;
+                var isGroup = reactData.isGroup, scrollXLoad = reactData.scrollXLoad, scrollbarWidth = reactData.scrollbarWidth;
                 var visibleColumn = internalData.visibleColumn, scrollXStore = internalData.scrollXStore, elemStore = internalData.elemStore, tableWidth = internalData.tableWidth;
                 var tableHeader = refTableHeader.value;
                 var tableBody = refTableBody.value;
@@ -5388,7 +5384,7 @@ export default defineComponent({
                         marginLeft = "".concat(leftSpaceWidth, "px");
                     }
                     if (headerElem) {
-                        headerElem.style.marginLeft = marginLeft;
+                        headerElem.style.marginLeft = isGroup ? '' : marginLeft;
                     }
                     bodyElem.style.marginLeft = marginLeft;
                     if (footerElem) {