@laozei/element-ui 2.16.0 → 2.16.2

package/lib/table.js

@@ -647,7 +647,7 @@ module.exports = require("normalize-wheel");
 __webpack_require__.r(__webpack_exports__);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/table.vue?vue&type=template&id=493fe34e&
-var render = function() {
+var tablevue_type_template_id_493fe34e_render = function() {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -1083,7 +1083,7 @@ var render = function() {
   )
 }
 var staticRenderFns = []
-render._withStripped = true
+tablevue_type_template_id_493fe34e_render._withStripped = true
 
 
 // CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=493fe34e&
@@ -4076,11 +4076,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',
 
@@ -4089,13 +4092,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) {
@@ -4112,7 +4116,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)));
@@ -4121,11 +4125,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',
       {
@@ -4143,22 +4151,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' }) : '']);
+        })]
       )]
     );
   },
@@ -4235,6 +4249,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 };
     }
   }
 });
@@ -4969,7 +4999,7 @@ var tableIdSeed = 1;
 
 var table_component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  render,
+  tablevue_type_template_id_493fe34e_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -12,6 +12,7 @@ exports.getPropByPath = getPropByPath;
 exports.rafThrottle = rafThrottle;
 exports.objToArray = objToArray;
 exports.getExternalScalingRatio = getExternalScalingRatio;
+exports.isUnidimensionalArray = isUnidimensionalArray;
 
 var _vue = require('vue');
 
@@ -287,4 +288,10 @@ function getExternalScalingRatio(el) {
 
   var scaleMatch = transform.match(/scale\(([^)]+)\)/);
   return scaleMatch ? Number(scaleMatch[1]) : 1;
+}
+
+function isUnidimensionalArray(arr) {
+  return Array.isArray(arr) && !arr.every(function (item) {
+    return Array.isArray(item);
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laozei/element-ui",
-  "version": "2.16.0",
+  "version": "2.16.2",
   "description": "A Component Library for Vue.js.",
   "main": "lib/element-ui.common.js",
   "files": [
@@ -46,7 +46,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git@github.com:ElemeFE/element.git"
+    "url": "git@github.com:laozei6401/element.git"
   },
   "homepage": "http://element.eleme.io",
   "keywords": [
@@ -56,7 +56,7 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ElemeFE/element/issues"
+    "url": "https://github.com/laozei6401/element/issues"
   },
   "unpkg": "lib/index.js",
   "style": "lib/theme-chalk/index.css",

package/packages/table/src/table-footer.js

@@ -1,3 +1,4 @@
+import { isUnidimensionalArray } from 'element-ui/src/utils/util';
 import LayoutObserver from './layout-observer';
 import { mapStates } from './store/helper';
 
@@ -7,13 +8,14 @@ export default {
   mixins: [LayoutObserver],
 
   render(h) {
-    let sums = [];
+    let 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((column, index) => {
         if (index === 0) {
-          sums[index] = this.sumText;
+          rows[index] = this.sumText;
           return;
         }
         const values = this.store.states.data.map(item => Number(item[column.property]));
@@ -28,7 +30,7 @@ export default {
         });
         const precision = Math.max.apply(null, precisions);
         if (!notNumber) {
-          sums[index] = values.reduce((prev, curr) => {
+          rows[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
               return parseFloat((prev + curr).toFixed(Math.min(precision, 20)));
@@ -37,11 +39,15 @@ export default {
             }
           }, 0);
         } else {
-          sums[index] = '';
+          rows[index] = '';
         }
       });
     }
 
+    if (isUnidimensionalArray(rows)) {
+      rows = [rows];
+    }
+
     return (
       <table
         class="el-table__footer"
@@ -57,24 +63,32 @@ export default {
           }
         </colgroup>
         <tbody class={ [{ 'has-gutter': this.hasGutter }] }>
-          <tr>
-            {
-              this.columns.map((column, cellIndex) => <td
-                key={cellIndex}
-                colspan={ column.colSpan }
-                rowspan={ column.rowSpan }
-                class={ [...this.getRowClasses(column, cellIndex), 'el-table__cell'] }>
-                <div class={ ['cell', column.labelClassName] }>
-                  {
-                    sums[cellIndex]
-                  }
-                </div>
-              </td>)
-            }
-            {
-              this.hasGutter ? <th class="el-table__cell gutter"></th> : ''
-            }
-          </tr>
+          {
+            rows.map((row, $index) => (
+              <tr>
+                {
+                  this.columns.map((column, cellIndex) => {
+                    const { rowspan, colspan } = this.getSpan(row, column, $index, cellIndex);
+
+                    return (
+                      <td
+                        key={ cellIndex }
+                        rowspan={rowspan}
+                        colspan={colspan}
+                        class={ [...this.getRowClasses(column, cellIndex), 'el-table__cell'] }>
+                        <div class={ ['cell', column.labelClassName] }>
+                          { row[cellIndex] }
+                        </div>
+                      </td>
+                    );
+                  })
+                }
+                {
+                  this.hasGutter ? <th class="el-table__cell gutter"></th> : ''
+                }
+              </tr>
+            ))
+          }
         </tbody>
       </table>
     );
@@ -148,6 +162,23 @@ export default {
         classes.push('is-leaf');
       }
       return classes;
+    },
+
+    getSpan(row, column, rowIndex, columnIndex) {
+      let rowspan = 1;
+      let colspan = 1;
+      const fn = this.table.spanMethod;
+      if (typeof fn === 'function') {
+        const result = fn({ row, column, rowIndex, columnIndex });
+        if (Array.isArray(result)) {
+          rowspan = result[0];
+          colspan = result[1];
+        } else if (typeof result === 'object') {
+          rowspan = result.rowspan;
+          colspan = result.colspan;
+        }
+      }
+      return { rowspan, colspan };
     }
   }
 };

package/src/index.js

@@ -214,7 +214,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '2.16.0',
+  version: '2.16.2',
   locale: locale.use,
   i18n: locale.i18n,
   install,

package/src/utils/util.js

@@ -259,3 +259,7 @@ export function getExternalScalingRatio(el) {
   const scaleMatch = transform.match(/scale\(([^)]+)\)/);
   return scaleMatch ? Number(scaleMatch[1]) : 1;
 }
+
+export function isUnidimensionalArray(arr) {
+  return Array.isArray(arr) && !arr.every(item => Array.isArray(item));
+}