@laozei/element-ui 2.16.0 → 2.16.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@laozei/element-ui",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "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/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));
+}

package/lib/alert.js

@@ -1,419 +0,0 @@
-module.exports =
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/dist/";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 99);
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ 0:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return normalizeComponent; });
-/* globals __VUE_SSR_CONTEXT__ */
-
-// IMPORTANT: Do NOT use ES2015 features in this file (except for modules).
-// This module is a runtime utility for cleaner component module output and will
-// be included in the final webpack user bundle.
-
-function normalizeComponent (
-  scriptExports,
-  render,
-  staticRenderFns,
-  functionalTemplate,
-  injectStyles,
-  scopeId,
-  moduleIdentifier, /* server only */
-  shadowMode /* vue-cli only */
-) {
-  // Vue.extend constructor export interop
-  var options = typeof scriptExports === 'function'
-    ? scriptExports.options
-    : scriptExports
-
-  // render functions
-  if (render) {
-    options.render = render
-    options.staticRenderFns = staticRenderFns
-    options._compiled = true
-  }
-
-  // functional template
-  if (functionalTemplate) {
-    options.functional = true
-  }
-
-  // scopedId
-  if (scopeId) {
-    options._scopeId = 'data-v-' + scopeId
-  }
-
-  var hook
-  if (moduleIdentifier) { // server build
-    hook = function (context) {
-      // 2.3 injection
-      context =
-        context || // cached call
-        (this.$vnode && this.$vnode.ssrContext) || // stateful
-        (this.parent && this.parent.$vnode && this.parent.$vnode.ssrContext) // functional
-      // 2.2 with runInNewContext: true
-      if (!context && typeof __VUE_SSR_CONTEXT__ !== 'undefined') {
-        context = __VUE_SSR_CONTEXT__
-      }
-      // inject component styles
-      if (injectStyles) {
-        injectStyles.call(this, context)
-      }
-      // register component module identifier for async chunk inferrence
-      if (context && context._registeredComponents) {
-        context._registeredComponents.add(moduleIdentifier)
-      }
-    }
-    // used by ssr in case component is cached and beforeCreate
-    // never gets called
-    options._ssrRegister = hook
-  } else if (injectStyles) {
-    hook = shadowMode
-      ? function () { injectStyles.call(this, this.$root.$options.shadowRoot) }
-      : injectStyles
-  }
-
-  if (hook) {
-    if (options.functional) {
-      // for template-only hot-reload because in that case the render fn doesn't
-      // go through the normalizer
-      options._injectStyles = hook
-      // register for functioal component in vue file
-      var originalRender = options.render
-      options.render = function renderWithStyleInjection (h, context) {
-        hook.call(context)
-        return originalRender(h, context)
-      }
-    } else {
-      // inject component registration as beforeCreate hook
-      var existing = options.beforeCreate
-      options.beforeCreate = existing
-        ? [].concat(existing, hook)
-        : [hook]
-    }
-  }
-
-  return {
-    exports: scriptExports,
-    options: options
-  }
-}
-
-
-/***/ }),
-
-/***/ 99:
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__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/alert/src/main.vue?vue&type=template&id=6e53341b&
-var render = function() {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-  return _c("transition", { attrs: { name: "el-alert-fade" } }, [
-    _c(
-      "div",
-      {
-        directives: [
-          {
-            name: "show",
-            rawName: "v-show",
-            value: _vm.visible,
-            expression: "visible"
-          }
-        ],
-        staticClass: "el-alert",
-        class: [
-          _vm.typeClass,
-          _vm.center ? "is-center" : "",
-          "is-" + _vm.effect
-        ],
-        attrs: { role: "alert" }
-      },
-      [
-        _vm.showIcon
-          ? _c("i", {
-              staticClass: "el-alert__icon",
-              class: [_vm.iconClass, _vm.isBigIcon]
-            })
-          : _vm._e(),
-        _c("div", { staticClass: "el-alert__content" }, [
-          _vm.title || _vm.$slots.title
-            ? _c(
-                "span",
-                { staticClass: "el-alert__title", class: [_vm.isBoldTitle] },
-                [_vm._t("title", [_vm._v(_vm._s(_vm.title))])],
-                2
-              )
-            : _vm._e(),
-          _vm.$slots.default && !_vm.description
-            ? _c(
-                "p",
-                { staticClass: "el-alert__description" },
-                [_vm._t("default")],
-                2
-              )
-            : _vm._e(),
-          _vm.description && !_vm.$slots.default
-            ? _c("p", { staticClass: "el-alert__description" }, [
-                _vm._v(_vm._s(_vm.description))
-              ])
-            : _vm._e(),
-          _c(
-            "i",
-            {
-              directives: [
-                {
-                  name: "show",
-                  rawName: "v-show",
-                  value: _vm.closable,
-                  expression: "closable"
-                }
-              ],
-              staticClass: "el-alert__closebtn",
-              class: {
-                "is-customed": _vm.closeText !== "",
-                "el-icon-close": _vm.closeText === ""
-              },
-              on: {
-                click: function($event) {
-                  _vm.close()
-                }
-              }
-            },
-            [_vm._v(_vm._s(_vm.closeText))]
-          )
-        ])
-      ]
-    )
-  ])
-}
-var staticRenderFns = []
-render._withStripped = true
-
-
-// CONCATENATED MODULE: ./packages/alert/src/main.vue?vue&type=template&id=6e53341b&
-
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/alert/src/main.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-var TYPE_CLASSES_MAP = {
-  'success': 'el-icon-success',
-  'warning': 'el-icon-warning',
-  'error': 'el-icon-error'
-};
-/* harmony default export */ var mainvue_type_script_lang_js_ = ({
-  name: 'ElAlert',
-
-  props: {
-    title: {
-      type: String,
-      default: ''
-    },
-    description: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'info'
-    },
-    closable: {
-      type: Boolean,
-      default: true
-    },
-    closeText: {
-      type: String,
-      default: ''
-    },
-    showIcon: Boolean,
-    center: Boolean,
-    effect: {
-      type: String,
-      default: 'light',
-      validator: function validator(value) {
-        return ['light', 'dark'].indexOf(value) !== -1;
-      }
-    }
-  },
-
-  data: function data() {
-    return {
-      visible: true
-    };
-  },
-
-
-  methods: {
-    close: function close() {
-      this.visible = false;
-      this.$emit('close');
-    }
-  },
-
-  computed: {
-    typeClass: function typeClass() {
-      return 'el-alert--' + this.type;
-    },
-    iconClass: function iconClass() {
-      return TYPE_CLASSES_MAP[this.type] || 'el-icon-info';
-    },
-    isBigIcon: function isBigIcon() {
-      return this.description || this.$slots.default ? 'is-big' : '';
-    },
-    isBoldTitle: function isBoldTitle() {
-      return this.description || this.$slots.default ? 'is-bold' : '';
-    }
-  }
-});
-// CONCATENATED MODULE: ./packages/alert/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(0);
-
-// CONCATENATED MODULE: ./packages/alert/src/main.vue
-
-
-
-
-
-/* normalize component */
-
-var component = Object(componentNormalizer["a" /* default */])(
-  src_mainvue_type_script_lang_js_,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* hot reload */
-if (false) { var api; }
-component.options.__file = "packages/alert/src/main.vue"
-/* harmony default export */ var main = (component.exports);
-// CONCATENATED MODULE: ./packages/alert/index.js
-
-
-/* istanbul ignore next */
-main.install = function (Vue) {
-  Vue.component(main.name, main);
-};
-
-/* harmony default export */ var packages_alert = __webpack_exports__["default"] = (main);
-
-/***/ })
-
-/******/ });