@laozei/element-ui 2.16.0 → 2.16.2

package/lib/element-ui.common.js

@@ -13215,11 +13215,14 @@ var convertToRows = function convertToRows(originColumns) {
   }
 });
 // CONCATENATED MODULE: ./packages/table/src/table-footer.js
+var table_footer_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var table_footer_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 
 
 
+
 /* harmony default export */ var table_footer = ({
   name: 'ElTableFooter',
 
@@ -13228,13 +13231,14 @@ var table_footer_extends = Object.assign || function (target) { for (var i = 1;
   render: function render(h) {
     var _this = this;
 
-    var sums = [];
+    var rows = [];
+
     if (this.summaryMethod) {
-      sums = this.summaryMethod({ columns: this.columns, data: this.store.states.data });
+      rows = this.summaryMethod({ columns: this.columns, data: this.store.states.data });
     } else {
       this.columns.forEach(function (column, index) {
         if (index === 0) {
-          sums[index] = _this.sumText;
+          rows[index] = _this.sumText;
           return;
         }
         var values = _this.store.states.data.map(function (item) {
@@ -13251,7 +13255,7 @@ var table_footer_extends = Object.assign || function (target) { for (var i = 1;
         });
         var precision = Math.max.apply(null, precisions);
         if (!notNumber) {
-          sums[index] = values.reduce(function (prev, curr) {
+          rows[index] = values.reduce(function (prev, curr) {
             var value = Number(curr);
             if (!isNaN(value)) {
               return parseFloat((prev + curr).toFixed(Math.min(precision, 20)));
@@ -13260,11 +13264,15 @@ var table_footer_extends = Object.assign || function (target) { for (var i = 1;
             }
           }, 0);
         } else {
-          sums[index] = '';
+          rows[index] = '';
         }
       });
     }
 
+    if (Object(util_["isUnidimensionalArray"])(rows)) {
+      rows = [rows];
+    }
+
     return h(
       'table',
       {
@@ -13282,22 +13290,28 @@ var table_footer_extends = Object.assign || function (target) { for (var i = 1;
       }) : '']), h(
         'tbody',
         { 'class': [{ 'has-gutter': this.hasGutter }] },
-        [h('tr', [this.columns.map(function (column, cellIndex) {
-          return h(
-            'td',
-            {
-              key: cellIndex,
-              attrs: { colspan: column.colSpan,
-                rowspan: column.rowSpan
-              },
-              'class': [].concat(_this.getRowClasses(column, cellIndex), ['el-table__cell']) },
-            [h(
-              'div',
-              { 'class': ['cell', column.labelClassName] },
-              [sums[cellIndex]]
-            )]
-          );
-        }), this.hasGutter ? h('th', { 'class': 'el-table__cell gutter' }) : ''])]
+        [rows.map(function (row, $index) {
+          return h('tr', [_this.columns.map(function (column, cellIndex) {
+            var _getSpan = _this.getSpan(row, column, $index, cellIndex),
+                rowspan = _getSpan.rowspan,
+                colspan = _getSpan.colspan;
+
+            return h(
+              'td',
+              {
+                key: cellIndex,
+                attrs: { rowspan: rowspan,
+                  colspan: colspan
+                },
+                'class': [].concat(_this.getRowClasses(column, cellIndex), ['el-table__cell']) },
+              [h(
+                'div',
+                { 'class': ['cell', column.labelClassName] },
+                [row[cellIndex]]
+              )]
+            );
+          }), _this.hasGutter ? h('th', { 'class': 'el-table__cell gutter' }) : '']);
+        })]
       )]
     );
   },
@@ -13374,6 +13388,22 @@ var table_footer_extends = Object.assign || function (target) { for (var i = 1;
         classes.push('is-leaf');
       }
       return classes;
+    },
+    getSpan: function getSpan(row, column, rowIndex, columnIndex) {
+      var rowspan = 1;
+      var colspan = 1;
+      var fn = this.table.spanMethod;
+      if (typeof fn === 'function') {
+        var result = fn({ row: row, column: column, rowIndex: rowIndex, columnIndex: columnIndex });
+        if (Array.isArray(result)) {
+          rowspan = result[0];
+          colspan = result[1];
+        } else if ((typeof result === 'undefined' ? 'undefined' : table_footer_typeof(result)) === 'object') {
+          rowspan = result.rowspan;
+          colspan = result.colspan;
+        }
+      }
+      return { rowspan: rowspan, colspan: colspan };
     }
   }
 });
@@ -43804,7 +43834,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.16.0',
+  version: '2.16.2',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,