Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

Conflicts:
	packages/zanui-css/src/index.css

src/index.js

@@ -61,7 +61,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 
 module.exports = {
   install,
-  version: '0.0.13',
+  version: '0.0.14',
   Button,
   Switch,
   Field,

src/utils/merge.js

@@ -1,9 +1,9 @@
 export default function(target, ...sources) {
   for (let i = 0; i < sources.length; i++) {
-    let source = sources[i] || {};
-    for (let prop in source) {
+    const source = sources[i] || {};
+    for (const prop in source) {
       if (source.hasOwnProperty(prop)) {
-        let value = source[prop];
+        const value = source[prop];
         if (value !== undefined) {
           target[prop] = value;
         }

src/utils/transition.js

@@ -17,9 +17,9 @@ if (!Vue.prototype.$isServer) {
     engine = 'trident';
   }
 
-  var cssPrefix = {trident: '-ms-', gecko: '-moz-', webkit: '-webkit-', presto: '-o-'}[engine];
+  var cssPrefix = { trident: '-ms-', gecko: '-moz-', webkit: '-webkit-', presto: '-o-' }[engine];
 
-  var vendorPrefix = {trident: 'ms', gecko: 'Moz', webkit: 'Webkit', presto: 'O'}[engine];
+  var vendorPrefix = { trident: 'ms', gecko: 'Moz', webkit: 'Webkit', presto: 'O' }[engine];
 
   var helperElem = document.createElement('div');
   var perspectiveProperty = vendorPrefix + 'Perspective';
@@ -34,7 +34,7 @@ if (!Vue.prototype.$isServer) {
   }
 
   var getTranslate = function(element) {
-    var result = {left: 0, top: 0};
+    var result = { left: 0, top: 0 };
     if (element === null || element.style === null) return result;
 
     var transform = element.style[transformProperty];