vxe-table 4.3.4 → 4.3.6-beta.0

package/es/export/style.css

@@ -24,36 +24,39 @@
 /*switch*/
 /*pulldown*/
 .vxe-export--panel-column-option .vxe-checkbox--icon {
-  font-size: 1.34em; }
-
+  font-size: 1.34em;
+}
 .vxe-export--panel-column-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-export--panel-column-option, .is--indeterminate.vxe-export--panel-column-option {
-  color: #409eff; }
-  .is--checked.vxe-export--panel-column-option .vxe-checkbox--icon, .is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon {
-    color: #409eff; }
-
+  color: #409eff;
+}
+.is--checked.vxe-export--panel-column-option .vxe-checkbox--icon, .is--indeterminate.vxe-export--panel-column-option .vxe-checkbox--icon {
+  color: #409eff;
+}
 .vxe-export--panel-column-option:not(.is--disabled) {
-  cursor: pointer; }
-  .vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon {
-    color: #409eff; }
-
+  cursor: pointer;
+}
+.vxe-export--panel-column-option:not(.is--disabled):hover .vxe-checkbox--icon {
+  color: #409eff;
+}
 .is--disabled.vxe-export--panel-column-option {
   color: #BFBFBF;
-  cursor: not-allowed; }
-  .is--disabled.vxe-export--panel-column-option .vxe-checkbox--icon {
-    color: #dcdfe6; }
-
+  cursor: not-allowed;
+}
+.is--disabled.vxe-export--panel-column-option .vxe-checkbox--icon {
+  color: #dcdfe6;
+}
 .vxe-export--panel-column-option .vxe-checkbox--label {
   padding-left: 0.5em;
-  vertical-align: middle; }
+  vertical-align: middle;
+}
 
 .vxe-export--panel-column > ul {
   list-style-type: none;
@@ -62,33 +65,38 @@
   padding: 0;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-  .vxe-export--panel-column > ul > li {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    cursor: pointer; }
+          user-select: none;
+}
+.vxe-export--panel-column > ul > li {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer;
+}
 
 .vxe-export--panel > table {
   width: 100%;
   border: 0;
-  table-layout: fixed; }
-  .vxe-export--panel > table tr td {
-    padding: 0 10px; }
-    .vxe-export--panel > table tr td:nth-child(1) {
-      text-align: right;
-      width: 30%;
-      font-weight: 700;
-      padding: 8px 10px; }
-    .vxe-export--panel > table tr td:nth-child(2) {
-      width: 70%; }
-    .vxe-export--panel > table tr td > .vxe-input,
-    .vxe-export--panel > table tr td > .vxe-select {
-      width: 80%; }
-    .vxe-export--panel > table tr td > .vxe-export--panel-option-row {
-      padding: 0.25em 0; }
-
+  table-layout: fixed;
+}
+.vxe-export--panel > table tr td {
+  padding: 0 10px;
+}
+.vxe-export--panel > table tr td:nth-child(1) {
+  text-align: right;
+  width: 30%;
+  font-weight: 700;
+  padding: 8px 10px;
+}
+.vxe-export--panel > table tr td:nth-child(2) {
+  width: 70%;
+}
+.vxe-export--panel > table tr td > .vxe-input, .vxe-export--panel > table tr td > .vxe-select {
+  width: 80%;
+}
+.vxe-export--panel > table tr td > .vxe-export--panel-option-row {
+  padding: 0.25em 0;
+}
 .vxe-export--panel .vxe-export--panel-column {
   width: 80%;
   border: 1px solid #dcdfe6;
@@ -96,48 +104,64 @@
   border-radius: 4px;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-  .vxe-export--panel .vxe-export--panel-column > ul > li {
-    padding: 0.2em 1em 0.2em 1em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--2 {
-      padding-left: 3.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--2 .vxe-checkbox--icon {
-        left: 1.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--3 {
-      padding-left: 4.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--3 .vxe-checkbox--icon {
-        left: 2.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--4 {
-      padding-left: 5.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--4 .vxe-checkbox--icon {
-        left: 3.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--5 {
-      padding-left: 6.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--5 .vxe-checkbox--icon {
-        left: 4.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--6 {
-      padding-left: 7.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--6 .vxe-checkbox--icon {
-        left: 5.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--7 {
-      padding-left: 8.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--7 .vxe-checkbox--icon {
-        left: 6.8em; }
-    .vxe-export--panel .vxe-export--panel-column > ul > li.level--8 {
-      padding-left: 9.5em; }
-      .vxe-export--panel .vxe-export--panel-column > ul > li.level--8 .vxe-checkbox--icon {
-        left: 7.8em; }
-  .vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-header {
-    padding: 0.1em 0;
-    background-color: #f8f8f9;
-    font-weight: 700;
-    border-bottom: 1px solid #e8eaec; }
-  .vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-body {
-    padding: 0.2em 0;
-    min-height: 10em;
-    max-height: 17.6em; }
-
+          user-select: none;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li {
+  padding: 0.2em 1em 0.2em 1em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--2 {
+  padding-left: 3.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--2 .vxe-checkbox--icon {
+  left: 1.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--3 {
+  padding-left: 4.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--3 .vxe-checkbox--icon {
+  left: 2.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--4 {
+  padding-left: 5.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--4 .vxe-checkbox--icon {
+  left: 3.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--5 {
+  padding-left: 6.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--5 .vxe-checkbox--icon {
+  left: 4.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--6 {
+  padding-left: 7.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--6 .vxe-checkbox--icon {
+  left: 5.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--7 {
+  padding-left: 8.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--7 .vxe-checkbox--icon {
+  left: 6.8em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--8 {
+  padding-left: 9.5em;
+}
+.vxe-export--panel .vxe-export--panel-column > ul > li.level--8 .vxe-checkbox--icon {
+  left: 7.8em;
+}
+.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-header {
+  padding: 0.1em 0;
+  background-color: #f8f8f9;
+  font-weight: 700;
+  border-bottom: 1px solid #e8eaec;
+}
+.vxe-export--panel .vxe-export--panel-column .vxe-export--panel-column-body {
+  padding: 0.2em 0;
+  min-height: 10em;
+  max-height: 17.6em;
+}
 .vxe-export--panel .vxe-import-selected--file {
   padding-right: 40px;
   position: relative;
@@ -146,21 +170,23 @@
   white-space: nowrap;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-  .vxe-export--panel .vxe-import-selected--file > i {
-    display: none;
-    position: absolute;
-    top: 50%;
-    right: 15px;
-    transform: translateY(-50%);
-    font-size: 16px;
-    cursor: pointer; }
-  .vxe-export--panel .vxe-import-selected--file:hover {
-    color: #409eff; }
-    .vxe-export--panel .vxe-import-selected--file:hover > i {
-      display: block; }
-
+          user-select: none;
+}
+.vxe-export--panel .vxe-import-selected--file > i {
+  display: none;
+  position: absolute;
+  top: 50%;
+  right: 15px;
+  transform: translateY(-50%);
+  font-size: 16px;
+  cursor: pointer;
+}
+.vxe-export--panel .vxe-import-selected--file:hover {
+  color: #409eff;
+}
+.vxe-export--panel .vxe-import-selected--file:hover > i {
+  display: block;
+}
 .vxe-export--panel .vxe-import-select--file {
   border: 1px dashed #dcdfe6;
   padding: 6px 34px;
@@ -169,16 +195,18 @@
   background-color: #fff;
   -webkit-user-select: none;
      -moz-user-select: none;
-      -ms-user-select: none;
           user-select: none;
-  cursor: pointer; }
-  .vxe-export--panel .vxe-import-select--file:focus {
-    border-color: #409eff;
-    box-shadow: 0 0 0.25em 0 #409eff; }
-  .vxe-export--panel .vxe-import-select--file:hover {
-    color: #409eff;
-    border-color: #409eff; }
-
+  cursor: pointer;
+}
+.vxe-export--panel .vxe-import-select--file:focus {
+  border-color: #409eff;
+  box-shadow: 0 0 0.25em 0 #409eff;
+}
+.vxe-export--panel .vxe-import-select--file:hover {
+  color: #409eff;
+  border-color: #409eff;
+}
 .vxe-export--panel .vxe-export--panel-btns {
   text-align: right;
-  padding: 0.25em; }
+  padding: 0.25em;
+}

package/es/filter/src/hook.js

@@ -258,7 +258,7 @@ var tableFilterHook = {
             getCheckedFilters: function () {
                 var tableFullColumn = internalData.tableFullColumn;
                 var filterList = [];
-                tableFullColumn.filter(function (column) {
+                tableFullColumn.forEach(function (column) {
                     var field = column.field, filters = column.filters;
                     var valueList = [];
                     var dataList = [];

package/es/filter/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/es/footer/src/footer.js

@@ -103,12 +103,12 @@ export default defineComponent({
             var fixedType = props.fixedType, 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;
             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;
             // 如果是使用优化模式
             if (fixedType) {
-                if (scrollYLoad || allColumnFooterOverflow) {
+                if (scrollXLoad || allColumnFooterOverflow) {
                     if (!mergeFooterList.length || !footerSpanMethod) {
                         tableColumn = fixedColumn;
                     }
@@ -182,7 +182,7 @@ export default defineComponent({
                             var itemIndex = _columnIndex;
                             var params = { $table: $xetable, _rowIndex: _rowIndex, $rowIndex: $rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, itemIndex: itemIndex, items: list, fixed: fixedType, type: renderType, data: footerTableData };
                             // 纵向虚拟滚动不支持动态行高
-                            if (scrollYLoad && !hasEllipsis) {
+                            if (scrollXLoad && !hasEllipsis) {
                                 showEllipsis = hasEllipsis = true;
                             }
                             if (showTitle || showTooltip || showAllTip) {

package/es/form/src/form.js

@@ -248,14 +248,15 @@ export default defineComponent({
         };
         var handleFocus = function (fields) {
             var el = refElem.value;
-            fields.some(function (property, index) {
+            for (var i = 0; i < fields.length; i++) {
+                var property = fields[i];
                 var item = getItemByField(property);
                 if (item && isEnableConf(item.itemRender)) {
                     var itemRender = item.itemRender;
                     var compConf = VXETable.renderer.get(itemRender.name);
                     var inputElem = null;
                     // 定位到第一个
-                    if (!index) {
+                    if (!i) {
                         scrollToView(el.querySelector(".".concat(item.id)));
                     }
                     // 如果指定了聚焦 class
@@ -268,10 +269,10 @@ export default defineComponent({
                     }
                     if (inputElem) {
                         inputElem.focus();
-                        return true;
+                        break;
                     }
                 }
-            });
+            }
         };
         /**
          * 校验数据