vxe-table 4.3.4 → 4.3.6-beta.0

package/lib/filter/style/style.css

@@ -25,36 +25,39 @@
 /*switch*/
 /*pulldown*/
 .vxe-table--filter-option .vxe-checkbox--icon {
-  font-size: 1.34em; }
-
+  font-size: 1.34em;
+}
 .vxe-table--filter-option .vxe-checkbox--icon {
   color: #dcdfe6;
   vertical-align: middle;
   font-weight: 700;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-
+          user-select: none;
+}
 .is--checked.vxe-table--filter-option, .is--indeterminate.vxe-table--filter-option {
-  color: #409eff; }
-  .is--checked.vxe-table--filter-option .vxe-checkbox--icon, .is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon {
-    color: #409eff; }
-
+  color: #409eff;
+}
+.is--checked.vxe-table--filter-option .vxe-checkbox--icon, .is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon {
+  color: #409eff;
+}
 .vxe-table--filter-option:not(.is--disabled) {
-  cursor: pointer; }
-  .vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon {
-    color: #409eff; }
-
+  cursor: pointer;
+}
+.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon {
+  color: #409eff;
+}
 .is--disabled.vxe-table--filter-option {
   color: #BFBFBF;
-  cursor: not-allowed; }
-  .is--disabled.vxe-table--filter-option .vxe-checkbox--icon {
-    color: #dcdfe6; }
-
+  cursor: not-allowed;
+}
+.is--disabled.vxe-table--filter-option .vxe-checkbox--icon {
+  color: #dcdfe6;
+}
 .vxe-table--filter-option .vxe-checkbox--label {
   padding-left: 0.5em;
-  vertical-align: middle; }
+  vertical-align: middle;
+}
 
 /*筛选*/
 .vxe-cell--filter {
@@ -62,17 +65,22 @@
   text-align: center;
   vertical-align: middle;
   display: inline-block;
-  line-height: 0; }
-  .vxe-cell--filter.col--filter .vxe-filter--btn {
-    color: #606266; }
-  .vxe-cell--filter .vxe-filter--btn {
-    color: #c0c4cc;
-    cursor: pointer; }
-    .vxe-cell--filter .vxe-filter--btn:hover {
-      color: #606266; }
+  line-height: 0;
+}
+.vxe-cell--filter.col--filter .vxe-filter--btn {
+  color: #606266;
+}
+.vxe-cell--filter .vxe-filter--btn {
+  color: #c0c4cc;
+  cursor: pointer;
+}
+.vxe-cell--filter .vxe-filter--btn:hover {
+  color: #606266;
+}
 
 .is--filter-active .vxe-cell--filter .vxe-filter--btn {
-  color: #409eff; }
+  color: #409eff;
+}
 
 /*筛选容器*/
 .vxe-table--filter-wrapper {
@@ -84,58 +92,71 @@
   background-color: #fff;
   border: 1px solid #DADCE0;
   box-shadow: 0 1px 6px rgba(0, 0, 0, 0.2);
-  z-index: 10; }
-  .vxe-table--filter-wrapper:not(.is--multiple) {
-    text-align: center; }
-  .vxe-table--filter-wrapper.is--active {
-    display: block; }
-  .vxe-table--filter-wrapper .vxe-table--filter-header > li,
-  .vxe-table--filter-wrapper .vxe-table--filter-body > li {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    max-width: 360px;
-    padding: 0.25em 0.8em;
-    cursor: pointer; }
-    .vxe-table--filter-wrapper .vxe-table--filter-header > li.is--checked,
-    .vxe-table--filter-wrapper .vxe-table--filter-body > li.is--checked {
-      color: #409eff; }
-    .vxe-table--filter-wrapper .vxe-table--filter-header > li:hover,
-    .vxe-table--filter-wrapper .vxe-table--filter-body > li:hover {
-      background-color: #f5f7fa; }
-  .vxe-table--filter-wrapper .vxe-table--filter-header {
-    padding-top: 0.2em; }
-  .vxe-table--filter-wrapper .vxe-table--filter-body {
-    max-height: 200px;
-    padding-bottom: 0.2em; }
-  .vxe-table--filter-wrapper > ul {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
-    overflow: auto;
-    -webkit-user-select: none;
-       -moz-user-select: none;
-        -ms-user-select: none;
-            user-select: none; }
-  .vxe-table--filter-wrapper.is--multiple > ul > li {
-    padding: 0.25em 0.8em 0.25em 1em; }
-  .vxe-table--filter-wrapper .vxe-table--filter-footer {
-    border-top: 1px solid #DADCE0;
-    padding: 0.6em;
-    -webkit-user-select: none;
-       -moz-user-select: none;
-        -ms-user-select: none;
-            user-select: none; }
-    .vxe-table--filter-wrapper .vxe-table--filter-footer button {
-      background-color: transparent;
-      padding: 0 0.4em;
-      border: 0;
-      color: #606266;
-      cursor: pointer; }
-      .vxe-table--filter-wrapper .vxe-table--filter-footer button:focus {
-        outline: none; }
-      .vxe-table--filter-wrapper .vxe-table--filter-footer button:hover {
-        color: #409eff; }
-      .vxe-table--filter-wrapper .vxe-table--filter-footer button.is--disabled {
-        color: #BFBFBF;
-        cursor: not-allowed; }
+  z-index: 10;
+}
+.vxe-table--filter-wrapper:not(.is--multiple) {
+  text-align: center;
+}
+.vxe-table--filter-wrapper.is--active {
+  display: block;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-header > li,
+.vxe-table--filter-wrapper .vxe-table--filter-body > li {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 360px;
+  padding: 0.25em 0.8em;
+  cursor: pointer;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-header > li.is--checked,
+.vxe-table--filter-wrapper .vxe-table--filter-body > li.is--checked {
+  color: #409eff;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-header > li:hover,
+.vxe-table--filter-wrapper .vxe-table--filter-body > li:hover {
+  background-color: #f5f7fa;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-header {
+  padding-top: 0.2em;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-body {
+  max-height: 200px;
+  padding-bottom: 0.2em;
+}
+.vxe-table--filter-wrapper > ul {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
+  overflow: auto;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+.vxe-table--filter-wrapper.is--multiple > ul > li {
+  padding: 0.25em 0.8em 0.25em 1em;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-footer {
+  border-top: 1px solid #DADCE0;
+  padding: 0.6em;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+          user-select: none;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-footer button {
+  background-color: transparent;
+  padding: 0 0.4em;
+  border: 0;
+  color: #606266;
+  cursor: pointer;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-footer button:focus {
+  outline: none;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-footer button:hover {
+  color: #409eff;
+}
+.vxe-table--filter-wrapper .vxe-table--filter-footer button.is--disabled {
+  color: #BFBFBF;
+  cursor: not-allowed;
+}

package/lib/filter/style/style.min.css

@@ -1 +1 @@
-@charset "UTF-8";.vxe-table--filter-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table--filter-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.is--checked.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option{color:#409eff}.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon{color:#409eff}.vxe-table--filter-option:not(.is--disabled){cursor:pointer}.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.is--disabled.vxe-table--filter-option{color:#bfbfbf;cursor:not-allowed}.is--disabled.vxe-table--filter-option .vxe-checkbox--icon{color:#dcdfe6}.vxe-table--filter-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-cell--filter{padding:0 .1em 0 .25em;text-align:center;vertical-align:middle;display:inline-block;line-height:0}.vxe-cell--filter.col--filter .vxe-filter--btn{color:#606266}.vxe-cell--filter .vxe-filter--btn{color:#c0c4cc;cursor:pointer}.vxe-cell--filter .vxe-filter--btn:hover{color:#606266}.is--filter-active .vxe-cell--filter .vxe-filter--btn{color:#409eff}.vxe-table--filter-wrapper{display:none;position:absolute;top:0;min-width:100px;border-radius:4px;background-color:#fff;border:1px solid #dadce0;box-shadow:0 1px 6px rgba(0,0,0,.2);z-index:10}.vxe-table--filter-wrapper:not(.is--multiple){text-align:center}.vxe-table--filter-wrapper.is--active{display:block}.vxe-table--filter-wrapper .vxe-table--filter-body>li,.vxe-table--filter-wrapper .vxe-table--filter-header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:360px;padding:.25em .8em;cursor:pointer}.vxe-table--filter-wrapper .vxe-table--filter-body>li.is--checked,.vxe-table--filter-wrapper .vxe-table--filter-header>li.is--checked{color:#409eff}.vxe-table--filter-wrapper .vxe-table--filter-body>li:hover,.vxe-table--filter-wrapper .vxe-table--filter-header>li:hover{background-color:#f5f7fa}.vxe-table--filter-wrapper .vxe-table--filter-header{padding-top:.2em}.vxe-table--filter-wrapper .vxe-table--filter-body{max-height:200px;padding-bottom:.2em}.vxe-table--filter-wrapper>ul{list-style-type:none;padding:0;margin:0;overflow:auto;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table--filter-wrapper.is--multiple>ul>li{padding:.25em .8em .25em 1em}.vxe-table--filter-wrapper .vxe-table--filter-footer{border-top:1px solid #dadce0;padding:.6em;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-table--filter-wrapper .vxe-table--filter-footer button{background-color:transparent;padding:0 .4em;border:0;color:#606266;cursor:pointer}.vxe-table--filter-wrapper .vxe-table--filter-footer button:focus{outline:0}.vxe-table--filter-wrapper .vxe-table--filter-footer button:hover{color:#409eff}.vxe-table--filter-wrapper .vxe-table--filter-footer button.is--disabled{color:#bfbfbf;cursor:not-allowed}
+@charset "UTF-8";.vxe-table--filter-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table--filter-option .vxe-checkbox--icon{color:#dcdfe6;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.is--checked.vxe-table--filter-option,.is--indeterminate.vxe-table--filter-option{color:#409eff}.is--checked.vxe-table--filter-option .vxe-checkbox--icon,.is--indeterminate.vxe-table--filter-option .vxe-checkbox--icon{color:#409eff}.vxe-table--filter-option:not(.is--disabled){cursor:pointer}.vxe-table--filter-option:not(.is--disabled):hover .vxe-checkbox--icon{color:#409eff}.is--disabled.vxe-table--filter-option{color:#bfbfbf;cursor:not-allowed}.is--disabled.vxe-table--filter-option .vxe-checkbox--icon{color:#dcdfe6}.vxe-table--filter-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-cell--filter{padding:0 .1em 0 .25em;text-align:center;vertical-align:middle;display:inline-block;line-height:0}.vxe-cell--filter.col--filter .vxe-filter--btn{color:#606266}.vxe-cell--filter .vxe-filter--btn{color:#c0c4cc;cursor:pointer}.vxe-cell--filter .vxe-filter--btn:hover{color:#606266}.is--filter-active .vxe-cell--filter .vxe-filter--btn{color:#409eff}.vxe-table--filter-wrapper{display:none;position:absolute;top:0;min-width:100px;border-radius:4px;background-color:#fff;border:1px solid #dadce0;box-shadow:0 1px 6px rgba(0,0,0,.2);z-index:10}.vxe-table--filter-wrapper:not(.is--multiple){text-align:center}.vxe-table--filter-wrapper.is--active{display:block}.vxe-table--filter-wrapper .vxe-table--filter-body>li,.vxe-table--filter-wrapper .vxe-table--filter-header>li{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:360px;padding:.25em .8em;cursor:pointer}.vxe-table--filter-wrapper .vxe-table--filter-body>li.is--checked,.vxe-table--filter-wrapper .vxe-table--filter-header>li.is--checked{color:#409eff}.vxe-table--filter-wrapper .vxe-table--filter-body>li:hover,.vxe-table--filter-wrapper .vxe-table--filter-header>li:hover{background-color:#f5f7fa}.vxe-table--filter-wrapper .vxe-table--filter-header{padding-top:.2em}.vxe-table--filter-wrapper .vxe-table--filter-body{max-height:200px;padding-bottom:.2em}.vxe-table--filter-wrapper>ul{list-style-type:none;padding:0;margin:0;overflow:auto;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table--filter-wrapper.is--multiple>ul>li{padding:.25em .8em .25em 1em}.vxe-table--filter-wrapper .vxe-table--filter-footer{border-top:1px solid #dadce0;padding:.6em;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table--filter-wrapper .vxe-table--filter-footer button{background-color:transparent;padding:0 .4em;border:0;color:#606266;cursor:pointer}.vxe-table--filter-wrapper .vxe-table--filter-footer button:focus{outline:0}.vxe-table--filter-wrapper .vxe-table--filter-footer button:hover{color:#409eff}.vxe-table--filter-wrapper .vxe-table--filter-footer button.is--disabled{color:#bfbfbf;cursor:not-allowed}

package/lib/footer/index.js

@@ -4,21 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Footer = void 0;
-
 var _footer = _interopRequireDefault(require("./src/footer"));
-
 var _dynamics = require("../dynamics");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var Footer = Object.assign(_footer.default, {
-  install: function install(app) {
+  install: function (app) {
     app.component(_footer.default.name, _footer.default);
   }
 });
 exports.Footer = Footer;
-
 _dynamics.dynamicApp.component(_footer.default.name, _footer.default);
-
 var _default = Footer;
 exports.default = _default;

package/lib/footer/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Footer=void 0;var _footer=_interopRequireDefault(require("./src/footer")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Footer=Object.assign(_footer.default,{install:function(e){e.component(_footer.default.name,_footer.default)}});exports.Footer=Footer,_dynamics.dynamicApp.component(_footer.default.name,_footer.default);var _default=Footer;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Footer=void 0;var _footer=_interopRequireDefault(require("./src/footer")),_dynamics=require("../dynamics");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Footer=Object.assign(_footer.default,{install:function(e){e.component(_footer.default.name,_footer.default)}}),_default=(exports.Footer=Footer,_dynamics.dynamicApp.component(_footer.default.name,_footer.default),Footer);exports.default=_default;

package/lib/footer/src/footer.js

@@ -4,41 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _vue = require("vue");
-
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
-
 var _dom = require("../../tools/dom");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
       s = arguments[i];
-
-      for (var p in s) {
-        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
     }
-
     return t;
   };
-
   return __assign.apply(this, arguments);
 };
-
 var renderType = 'footer';
-
 function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
   for (var mIndex = 0; mIndex < mergeFooterList.length; mIndex++) {
     var _a = mergeFooterList[mIndex],
-        mergeRowIndex = _a.row,
-        mergeColIndex = _a.col,
-        mergeRowspan = _a.rowspan,
-        mergeColspan = _a.colspan;
-
+      mergeRowIndex = _a.row,
+      mergeColIndex = _a.col,
+      mergeRowspan = _a.rowspan,
+      mergeColspan = _a.colspan;
     if (mergeColIndex > -1 && mergeRowIndex > -1 && mergeRowspan && mergeColspan) {
       if (mergeRowIndex === _rowIndex && mergeColIndex === _columnIndex) {
         return {
@@ -46,7 +33,6 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           colspan: mergeColspan
         };
       }
-
       if (_rowIndex >= mergeRowIndex && _rowIndex < mergeRowIndex + mergeRowspan && _columnIndex >= mergeColIndex && _columnIndex < mergeColIndex + mergeColspan) {
         return {
           rowspan: 0,
@@ -56,25 +42,24 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     }
   }
 }
-
-var _default2 = (0, _vue.defineComponent)({
+var _default = (0, _vue.defineComponent)({
   name: 'VxeTableFooter',
   props: {
     footerTableData: {
       type: Array,
-      default: function _default() {
+      default: function () {
         return [];
       }
     },
     tableColumn: {
       type: Array,
-      default: function _default() {
+      default: function () {
         return [];
       }
     },
     fixedColumn: {
       type: Array,
-      default: function _default() {
+      default: function () {
         return [];
       }
     },
@@ -83,22 +68,19 @@ var _default2 = (0, _vue.defineComponent)({
       default: null
     }
   },
-  setup: function setup(props) {
+  setup: function (props) {
     var $xetable = (0, _vue.inject)('$xetable', {});
     var xID = $xetable.xID,
-        tableProps = $xetable.props,
-        tableReactData = $xetable.reactData,
-        tableInternalData = $xetable.internalData;
-
+      tableProps = $xetable.props,
+      tableReactData = $xetable.reactData,
+      tableInternalData = $xetable.internalData;
     var _a = $xetable.getRefMaps(),
-        refTableHeader = _a.refTableHeader,
-        refTableBody = _a.refTableBody,
-        refValidTooltip = _a.refValidTooltip;
-
+      refTableHeader = _a.refTableHeader,
+      refTableBody = _a.refTableBody,
+      refValidTooltip = _a.refValidTooltip;
     var _b = $xetable.getComputeMaps(),
-        computeTooltipOpts = _b.computeTooltipOpts,
-        computeColumnOpts = _b.computeColumnOpts;
-
+      computeTooltipOpts = _b.computeTooltipOpts,
+      computeColumnOpts = _b.computeColumnOpts;
     var refElem = (0, _vue.ref)();
     var refFooterTable = (0, _vue.ref)();
     var refFooterColgroup = (0, _vue.ref)();
@@ -109,8 +91,7 @@ var _default2 = (0, _vue.defineComponent)({
      * 如果存在列固定左侧，同步更新滚动状态
      * 如果存在列固定右侧，同步更新滚动状态
      */
-
-    var scrollEvent = function scrollEvent(evnt) {
+    var scrollEvent = function (evnt) {
       var fixedType = props.fixedType;
       var scrollXLoad = tableReactData.scrollXLoad;
       var lastScrollLeft = tableInternalData.lastScrollLeft;
@@ -124,23 +105,18 @@ var _default2 = (0, _vue.defineComponent)({
       var isX = scrollLeft !== lastScrollLeft;
       tableInternalData.lastScrollLeft = scrollLeft;
       tableInternalData.lastScrollTime = Date.now();
-
       if (headerElem) {
         headerElem.scrollLeft = scrollLeft;
       }
-
       if (bodyElem) {
         bodyElem.scrollLeft = scrollLeft;
       }
-
       if (scrollXLoad && isX) {
         $xetable.triggerScrollXEvent(evnt);
       }
-
       if (isX && validTip && validTip.reactData.visible) {
         validTip.updatePlacement();
       }
-
       $xetable.dispatchEvent('scroll', {
         type: renderType,
         fixed: fixedType,
@@ -150,7 +126,6 @@ var _default2 = (0, _vue.defineComponent)({
         isY: false
       }, evnt);
     };
-
     (0, _vue.onMounted)(function () {
       (0, _vue.nextTick)(function () {
         var fixedType = props.fixedType;
@@ -173,32 +148,31 @@ var _default2 = (0, _vue.defineComponent)({
       elemStore["".concat(prefix, "list")] = null;
       elemStore["".concat(prefix, "xSpace")] = null;
     });
-
-    var renderVN = function renderVN() {
+    var renderVN = function () {
       var fixedType = props.fixedType,
-          fixedColumn = props.fixedColumn,
-          tableColumn = props.tableColumn,
-          footerTableData = props.footerTableData;
+        fixedColumn = props.fixedColumn,
+        tableColumn = props.tableColumn,
+        footerTableData = props.footerTableData;
       var footerRowClassName = tableProps.footerRowClassName,
-          footerCellClassName = tableProps.footerCellClassName,
-          footerRowStyle = tableProps.footerRowStyle,
-          footerCellStyle = tableProps.footerCellStyle,
-          allFooterAlign = tableProps.footerAlign,
-          footerSpanMethod = tableProps.footerSpanMethod,
-          allAlign = tableProps.align,
-          columnKey = tableProps.columnKey,
-          allColumnFooterOverflow = tableProps.showFooterOverflow;
+        footerCellClassName = tableProps.footerCellClassName,
+        footerRowStyle = tableProps.footerRowStyle,
+        footerCellStyle = tableProps.footerCellStyle,
+        allFooterAlign = tableProps.footerAlign,
+        footerSpanMethod = tableProps.footerSpanMethod,
+        allAlign = tableProps.align,
+        columnKey = tableProps.columnKey,
+        allColumnFooterOverflow = tableProps.showFooterOverflow;
       var visibleColumn = tableInternalData.visibleColumn;
-      var scrollYLoad = tableReactData.scrollYLoad,
-          overflowX = tableReactData.overflowX,
-          scrollbarWidth = tableReactData.scrollbarWidth,
-          currentColumn = tableReactData.currentColumn,
-          mergeFooterList = tableReactData.mergeFooterList;
+      var scrollXLoad = tableReactData.scrollXLoad,
+        overflowX = tableReactData.overflowX,
+        scrollbarWidth = tableReactData.scrollbarWidth,
+        currentColumn = tableReactData.currentColumn,
+        mergeFooterList = tableReactData.mergeFooterList;
       var tooltipOpts = computeTooltipOpts.value;
-      var columnOpts = computeColumnOpts.value; // 如果是使用优化模式
-
+      var columnOpts = computeColumnOpts.value;
+      // 如果是使用优化模式
       if (fixedType) {
-        if (scrollYLoad || allColumnFooterOverflow) {
+        if (scrollXLoad || allColumnFooterOverflow) {
           if (!mergeFooterList.length || !footerSpanMethod) {
             tableColumn = fixedColumn;
           } else {
@@ -208,7 +182,6 @@ var _default2 = (0, _vue.defineComponent)({
           tableColumn = visibleColumn;
         }
       }
-
       return (0, _vue.h)('div', {
         ref: refElem,
         class: ['vxe-table--footer-wrapper', fixedType ? "fixed-".concat(fixedType, "--wrapper") : 'body--wrapper'],
@@ -262,12 +235,11 @@ var _default2 = (0, _vue.defineComponent)({
           }) : footerRowStyle : null
         }, tableColumn.map(function (column, $columnIndex) {
           var _a;
-
           var type = column.type,
-              showFooterOverflow = column.showFooterOverflow,
-              footerAlign = column.footerAlign,
-              align = column.align,
-              footerClassName = column.footerClassName;
+            showFooterOverflow = column.showFooterOverflow,
+            footerAlign = column.footerAlign,
+            align = column.align,
+            footerClassName = column.footerClassName;
           var showAllTip = tooltipOpts.showAll;
           var isColGroup = column.children && column.children.length;
           var fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
@@ -282,9 +254,7 @@ var _default2 = (0, _vue.defineComponent)({
           };
           var tfOns = {};
           var columnIndex = $xetable.getColumnIndex(column);
-
           var _columnIndex = $xetable.getVTColumnIndex(column);
-
           var itemIndex = _columnIndex;
           var params = {
             $table: $xetable,
@@ -299,12 +269,11 @@ var _default2 = (0, _vue.defineComponent)({
             fixed: fixedType,
             type: renderType,
             data: footerTableData
-          }; // 纵向虚拟滚动不支持动态行高
-
-          if (scrollYLoad && !hasEllipsis) {
+          };
+          // 纵向虚拟滚动不支持动态行高
+          if (scrollXLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           }
-
           if (showTitle || showTooltip || showAllTip) {
             tfOns.onMouseenter = function (evnt) {
               if (showTitle) {
@@ -314,7 +283,6 @@ var _default2 = (0, _vue.defineComponent)({
               }
             };
           }
-
           if (showTooltip || showAllTip) {
             tfOns.onMouseleave = function (evnt) {
               if (showTooltip || showAllTip) {
@@ -322,35 +290,28 @@ var _default2 = (0, _vue.defineComponent)({
               }
             };
           }
-
           tfOns.onClick = function (evnt) {
             $xetable.dispatchEvent('footer-cell-click', Object.assign({
               cell: evnt.currentTarget
             }, params), evnt);
           };
-
           tfOns.onDblclick = function (evnt) {
             $xetable.dispatchEvent('footer-cell-dblclick', Object.assign({
               cell: evnt.currentTarget
             }, params), evnt);
-          }; // 合并行或列
-
-
+          };
+          // 合并行或列
           if (mergeFooterList.length) {
             var spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
-
             if (spanRest) {
               var rowspan = spanRest.rowspan,
-                  colspan = spanRest.colspan;
-
+                colspan = spanRest.colspan;
               if (!rowspan || !colspan) {
                 return null;
               }
-
               if (rowspan > 1) {
                 attrs.rowspan = rowspan;
               }
-
               if (colspan > 1) {
                 attrs.colspan = colspan;
               }
@@ -358,24 +319,20 @@ var _default2 = (0, _vue.defineComponent)({
           } else if (footerSpanMethod) {
             // 自定义合并方法
             var _b = footerSpanMethod(params) || {},
-                _c = _b.rowspan,
-                rowspan = _c === void 0 ? 1 : _c,
-                _d = _b.colspan,
-                colspan = _d === void 0 ? 1 : _d;
-
+              _c = _b.rowspan,
+              rowspan = _c === void 0 ? 1 : _c,
+              _d = _b.colspan,
+              colspan = _d === void 0 ? 1 : _d;
             if (!rowspan || !colspan) {
               return null;
             }
-
             if (rowspan > 1) {
               attrs.rowspan = rowspan;
             }
-
             if (colspan > 1) {
               attrs.colspan = colspan;
             }
           }
-
           return (0, _vue.h)('td', __assign(__assign(__assign(__assign({
             class: ['vxe-footer--column', column.id, (_a = {}, _a["col--".concat(footAlign)] = footAlign, _a["col--".concat(type)] = type, _a['col--last'] = $columnIndex === tableColumn.length - 1, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--ellipsis'] = hasEllipsis, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(footerClassName, params), (0, _dom.getPropClass)(footerCellClassName, params)]
           }, attrs), {
@@ -394,9 +351,7 @@ var _default2 = (0, _vue.defineComponent)({
         })] : []));
       }))])]);
     };
-
     return renderVN;
   }
 });
-
-exports.default = _default2;
+exports.default = _default;

package/lib/footer/src/footer.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,o=1,l=arguments.length;o<l;o++)for(var r in t=arguments[o])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,t,o){for(var l=0;l<e.length;l++){var r=e[l],n=r.row,a=r.col,c=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&c&&r){if(n===t&&a===o)return{rowspan:c,colspan:r};if(n<=t&&t<n+c&&a<=o&&o<a+r)return{rowspan:0,colspan:0}}}}var _default2=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(i){function n(e){var t=i.fixedType,o=u.scrollXLoad,l=s.lastScrollLeft,r=p.value,n=f.value,a=d.value,c=n?n.$el:null,n=x.value,a=a.$el,l=(n=n.scrollLeft)!==l;s.lastScrollLeft=n,s.lastScrollTime=Date.now(),c&&(c.scrollLeft=n),a&&(a.scrollLeft=n),o&&l&&q.triggerScrollXEvent(e),l&&r&&r.reactData.visible&&r.updatePlacement(),q.dispatchEvent("scroll",{type:renderType,fixed:t,scrollTop:a.scrollTop,scrollLeft:n,isX:l,isY:!1},e)}var q=(0,_vue.inject)("$xetable",{}),a=q.xID,c=q.props,u=q.reactData,s=q.internalData,e=q.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=q.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),m=(0,_vue.ref)(),g=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=i.fixedType,t=s.elemStore,e="".concat(e||"main","-footer-");t["".concat(e,"wrapper")]=x,t["".concat(e,"table")]=m,t["".concat(e,"colgroup")]=g,t["".concat(e,"list")]=y,t["".concat(e,"xSpace")]=h})}),(0,_vue.onUnmounted)(function(){var e=i.fixedType,t=s.elemStore,e="".concat(e||"main","-footer-");t["".concat(e,"wrapper")]=null,t["".concat(e,"table")]=null,t["".concat(e,"colgroup")]=null,t["".concat(e,"list")]=null,t["".concat(e,"xSpace")]=null});return function(){var b=i.fixedType,e=i.fixedColumn,T=i.tableColumn,C=i.footerTableData,t=c.footerRowClassName,I=c.footerCellClassName,o=c.footerRowStyle,S=c.footerCellStyle,F=c.footerAlign,D=c.footerSpanMethod,L=c.align,M=c.columnKey,O=c.showFooterOverflow,l=s.visibleColumn,$=u.scrollYLoad,U=u.overflowX,r=u.scrollbarWidth,k=u.currentColumn,j=u.mergeFooterList,A=v.value,E=_.value;return b&&(T=!$&&!O||j.length&&D?l:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",b?"fixed-".concat(b,"--wrapper"):"body--wrapper"],xid:a,onScroll:n},[b?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:m,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:g},T.map(function(e,t){return(0,_vue.h)("col",{name:e.id,key:t})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},C.map(function(y,h){var w=h;return(0,_vue.h)("tr",{class:["vxe-footer--row",t?_xeUtils.default.isFunction(t)?t({$table:q,_rowIndex:h,$rowIndex:w,fixed:b,type:renderType}):t:""],style:o?_xeUtils.default.isFunction(o)?o({$table:q,_rowIndex:h,$rowIndex:w,fixed:b,type:renderType}):o:null},T.map(function(t,e){var o=t.type,l=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,c=A.showAll,i=t.children&&t.children.length,u=b?t.fixed!==b&&!i:t.fixed&&U,s=_xeUtils.default.isUndefined(l)||_xeUtils.default.isNull(l)?O:l,f=r||n||F||L,d="ellipsis"===s,p="title"===s,v=!0===s||"tooltip"===s,i=p||v||d,l={colid:t.id},r={},n=q.getColumnIndex(t),s=q.getVTColumnIndex(t),_={$table:q,_rowIndex:h,$rowIndex:w,column:t,columnIndex:n,$columnIndex:e,_columnIndex:s,itemIndex:s,items:y,fixed:b,type:renderType,data:C};if($&&!i&&(d=i=!0),(p||v||c)&&(r.onMouseenter=function(e){p?(0,_dom.updateCellTitle)(e.currentTarget,t):(v||c)&&q.triggerFooterTooltipEvent(e,_)}),(v||c)&&(r.onMouseleave=function(e){(v||c)&&q.handleTargetLeaveEvent(e)}),r.onClick=function(e){q.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},r.onDblclick=function(e){q.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},j.length){var x=mergeFooterMethod(j,h,s);if(x){var m=x.rowspan,g=x.colspan;if(!m||!g)return null;1<m&&(l.rowspan=m),1<g&&(l.colspan=g)}}else if(D){var s=D(_)||{},x=s.rowspan,m=void 0===x?1:x,s=s.colspan,g=void 0===s?1:s;if(!m||!g)return null;1<m&&(l.rowspan=m),1<g&&(l.colspan=g)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",t.id,((g={})["col--".concat(f)]=f,g["col--".concat(o)]=o,g["col--last"]=e===T.length-1,g["fixed--hidden"]=u,g["col--ellipsis"]=i,g["col--current"]=k===t,g),(0,_dom.getPropClass)(a,_),(0,_dom.getPropClass)(I,_)]},l),{style:S?_xeUtils.default.isFunction(S)?S(_):S:null}),r),{key:M||E.useKey?t.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":p,"c--tooltip":v,"c--ellipsis":d}]},t.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,o=1,l=arguments.length;o<l;o++)for(var r in t=arguments[o])Object.prototype.hasOwnProperty.call(t,r)&&(e[r]=t[r]);return e}).apply(this,arguments)},renderType="footer";function mergeFooterMethod(e,t,o){for(var l=0;l<e.length;l++){var r=e[l],n=r.row,a=r.col,c=r.rowspan,r=r.colspan;if(-1<a&&-1<n&&c&&r){if(n===t&&a===o)return{rowspan:c,colspan:r};if(n<=t&&t<n+c&&a<=o&&o<a+r)return{rowspan:0,colspan:0}}}}var _default=(0,_vue.defineComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:function(){return[]}},tableColumn:{type:Array,default:function(){return[]}},fixedColumn:{type:Array,default:function(){return[]}},fixedType:{type:String,default:null}},setup:function(i){function n(e){var t=i.fixedType,o=u.scrollXLoad,l=s.lastScrollLeft,r=p.value,n=f.value,a=d.value,n=n?n.$el:null,c=x.value,a=a.$el,l=(c=c.scrollLeft)!==l;s.lastScrollLeft=c,s.lastScrollTime=Date.now(),n&&(n.scrollLeft=c),a&&(a.scrollLeft=c),o&&l&&E.triggerScrollXEvent(e),l&&r&&r.reactData.visible&&r.updatePlacement(),E.dispatchEvent("scroll",{type:renderType,fixed:t,scrollTop:a.scrollTop,scrollLeft:c,isX:l,isY:!1},e)}var E=(0,_vue.inject)("$xetable",{}),a=E.xID,c=E.props,u=E.reactData,s=E.internalData,e=E.getRefMaps(),f=e.refTableHeader,d=e.refTableBody,p=e.refValidTooltip,e=E.getComputeMaps(),v=e.computeTooltipOpts,_=e.computeColumnOpts,x=(0,_vue.ref)(),m=(0,_vue.ref)(),g=(0,_vue.ref)(),y=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=i.fixedType,t=s.elemStore,e="".concat(e||"main","-footer-");t["".concat(e,"wrapper")]=x,t["".concat(e,"table")]=m,t["".concat(e,"colgroup")]=g,t["".concat(e,"list")]=y,t["".concat(e,"xSpace")]=h})}),(0,_vue.onUnmounted)(function(){var e=i.fixedType,t=s.elemStore,e="".concat(e||"main","-footer-");t["".concat(e,"wrapper")]=null,t["".concat(e,"table")]=null,t["".concat(e,"colgroup")]=null,t["".concat(e,"list")]=null,t["".concat(e,"xSpace")]=null});return function(){var w=i.fixedType,e=i.fixedColumn,b=i.tableColumn,T=i.footerTableData,t=c.footerRowClassName,C=c.footerCellClassName,o=c.footerRowStyle,I=c.footerCellStyle,S=c.footerAlign,F=c.footerSpanMethod,D=c.align,L=c.columnKey,M=c.showFooterOverflow,l=s.visibleColumn,O=u.scrollXLoad,$=u.overflowX,r=u.scrollbarWidth,U=u.currentColumn,k=u.mergeFooterList,j=v.value,A=_.value;return w&&(b=!O&&!M||k.length&&F?l:e),(0,_vue.h)("div",{ref:x,class:["vxe-table--footer-wrapper",w?"fixed-".concat(w,"--wrapper"):"body--wrapper"],xid:a,onScroll:n},[w?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:h,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:m,class:"vxe-table--footer",xid:a,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:g},b.map(function(e,t){return(0,_vue.h)("col",{name:e.id,key:t})}).concat(r?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("tfoot",{ref:y},T.map(function(g,y){var h=y;return(0,_vue.h)("tr",{class:["vxe-footer--row",t?_xeUtils.default.isFunction(t)?t({$table:E,_rowIndex:y,$rowIndex:h,fixed:w,type:renderType}):t:""],style:o?_xeUtils.default.isFunction(o)?o({$table:E,_rowIndex:y,$rowIndex:h,fixed:w,type:renderType}):o:null},b.map(function(t,e){var o=t.type,l=t.showFooterOverflow,r=t.footerAlign,n=t.align,a=t.footerClassName,c=j.showAll,i=t.children&&t.children.length,i=w?t.fixed!==w&&!i:t.fixed&&$,l=_xeUtils.default.isUndefined(l)||_xeUtils.default.isNull(l)?M:l,r=r||n||S||D,n="ellipsis"===l,u="title"===l,s=!0===l||"tooltip"===l,l=u||s||n,f={colid:t.id},d={},p=E.getColumnIndex(t),v=E.getVTColumnIndex(t),_={$table:E,_rowIndex:y,$rowIndex:h,column:t,columnIndex:p,$columnIndex:e,_columnIndex:v,itemIndex:v,items:g,fixed:w,type:renderType,data:T};if(O&&!l&&(n=l=!0),(u||s||c)&&(d.onMouseenter=function(e){u?(0,_dom.updateCellTitle)(e.currentTarget,t):(s||c)&&E.triggerFooterTooltipEvent(e,_)}),(s||c)&&(d.onMouseleave=function(e){(s||c)&&E.handleTargetLeaveEvent(e)}),d.onClick=function(e){E.dispatchEvent("footer-cell-click",Object.assign({cell:e.currentTarget},_),e)},d.onDblclick=function(e){E.dispatchEvent("footer-cell-dblclick",Object.assign({cell:e.currentTarget},_),e)},k.length){p=mergeFooterMethod(k,y,v);if(p){var x=p.rowspan,m=p.colspan;if(!x||!m)return null;1<x&&(f.rowspan=x),1<m&&(f.colspan=m)}}else if(F){var v=F(_)||{},p=v.rowspan,x=void 0===p?1:p,p=v.colspan,m=void 0===p?1:p;if(!x||!m)return null;1<x&&(f.rowspan=x),1<m&&(f.colspan=m)}return(0,_vue.h)("td",__assign(__assign(__assign(__assign({class:["vxe-footer--column",t.id,((v={})["col--".concat(r)]=r,v["col--".concat(o)]=o,v["col--last"]=e===b.length-1,v["fixed--hidden"]=i,v["col--ellipsis"]=l,v["col--current"]=U===t,v),(0,_dom.getPropClass)(a,_),(0,_dom.getPropClass)(C,_)]},f),{style:I?_xeUtils.default.isFunction(I)?I(_):I:null}),d),{key:L||A.useKey?t.id:e}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":u,"c--tooltip":s,"c--ellipsis":n}]},t.renderFooter(_))])}).concat(r?[(0,_vue.h)("td",{class:"vxe-footer--gutter col--gutter"})]:[]))}))])])}}});exports.default=_default;