From 14ff09a414cb7c673f3143e7fc64c92aab793c6c Mon Sep 17 00:00:00 2001
From: "lei.jiang" <jianglei19940909@126.com>
Date: Sat, 16 Sep 2017 21:44:43 +0800
Subject: [PATCH 01/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9MDinput=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=201.=E4=BD=BF=E4=B9=8B=E8=83=BD=E5=85=BC=E5=AE=B9elem?=
 =?UTF-8?q?entui=E7=9A=84=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=202.=E5=A2=9E=E5=8A=A0icon=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E4=BD=BF=E7=94=A8elementui=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=203.=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MDinput/index.vue | 539 +++++++++++++++----------------
 1 file changed, 268 insertions(+), 271 deletions(-)

diff --git a/src/components/MDinput/index.vue b/src/components/MDinput/index.vue
index 72658598..82c944c4 100644
--- a/src/components/MDinput/index.vue
+++ b/src/components/MDinput/index.vue
@@ -1,297 +1,294 @@
 <template>
   <div class="material-input__component" :class="computedClasses">
-    <input v-if="type === 'email'" type="email" class="material-input" :name="name" :id="id" :placeholder="placeholder" v-model="valueCopy"
-      :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :required="required" @focus="handleFocus(true)"
-      @blur="handleFocus(false)" @input="handleModelInput">
-    <input v-if="type === 'url'" type="url" class="material-input" :name="name" :id="id" :placeholder="placeholder" v-model="valueCopy"
-      :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :required="required" @focus="handleFocus(true)"
-      @blur="handleFocus(false)" @input="handleModelInput">
-    <input v-if="type === 'number'" type="number" class="material-input" :name="name" :id="id" :placeholder="placeholder" v-model="valueCopy"
-      :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :max="max" :min="min" :minlength="minlength" :maxlength="maxlength"
-      :required="required" @focus="handleFocus(true)" @blur="handleFocus(false)" @input="handleModelInput">
-    <input v-if="type === 'password'" type="password" class="material-input" :name="name" :id="id" :placeholder="placeholder"
-      v-model="valueCopy" :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :max="max" :min="min" :required="required"
-      @focus="handleFocus(true)" @blur="handleFocus(false)" @input="handleModelInput">
-    <input v-if="type === 'tel'" type="tel" class="material-input" :name="name" :id="id" :placeholder="placeholder" v-model="valueCopy"
-      :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :required="required" @focus="handleFocus(true)"
-      @blur="handleFocus(false)" @input="handleModelInput">
-    <input v-if="type === 'text'" type="text" class="material-input" :name="name" :id="id" :placeholder="placeholder" v-model="valueCopy"
-      :readonly="readonly" :disabled="disabled" :autocomplete="autocomplete" :minlength="minlength" :maxlength="maxlength"
-      :required="required" @focus="handleFocus(true)" @blur="handleFocus(false)" @input="handleModelInput">
+    <div :class="{iconClass:icon}">
+      <i class="el-input__icon material-input__icon" :class="['el-icon-' + icon]" v-if="icon"></i>
+      <input v-if="type === 'email'" type="email" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder" v-model="currentValue"
+             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
+             @focus="handleMdFocus"
+             @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'url'" type="url" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder"
+             v-model="currentValue"
+             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
+             @focus="handleMdFocus"
+             @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'number'" type="number" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder" v-model="currentValue" :step="step"
+             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max" :min="min"
+             :minlength="minlength" :maxlength="maxlength"
+             :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'password'" type="password" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder"
+             v-model="currentValue" :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max"
+             :min="min" :required="required"
+             @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'tel'" type="tel" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder"
+             v-model="currentValue"
+             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
+             @focus="handleMdFocus"
+             @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'text'" type="text" class="material-input" :name="name"
+             :placeholder="fillPlaceHolder" v-model="currentValue"
+             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :minlength="minlength"
+             :maxlength="maxlength"
+             :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
 
-    <span class="material-input-bar"></span>
+      <span class="material-input-bar"></span>
+
+      <label class="material-label">
+        <slot></slot>
+      </label>
 
-    <label class="material-label">
-            <slot></slot>
-        </label>
-    <div v-if="errorMessages" class="material-errors">
-      <div v-for="error in computedErrors" class="material-error" :key='error'>
-        {{ error }}
-      </div>
     </div>
   </div>
 </template>
 
 <script>
-	// source:https://github.com/wemake-services/vue-material-input/blob/master/src/components/MaterialInput.vue
-export default {
-  name: 'material-input',
-  computed: {
-    computedErrors() {
-      return typeof this.errorMessages === 'string'
-                        ? [this.errorMessages] : this.errorMessages
+  // source:https://github.com/wemake-services/vue-material-input/blob/master/src/components/MaterialInput.vue
+
+  export default {
+
+    name: 'md-input',
+    computed: {
+      computedClasses() {
+        return {
+          'material--active': this.focus,
+          'material--disabled': this.disabled,
+          'material--raised': Boolean(this.focus || this.currentValue) // has value
+        }
+      }
     },
-    computedClasses() {
+    data() {
       return {
-        'material--active': this.focus,
-        'material--disabled': this.disabled,
-        'material--has-errors': Boolean(!this.valid || (this.errorMessages && this.errorMessages.length)),
-        'material--raised': Boolean(this.focus || this.valueCopy || // has value
-                            (this.placeholder && !this.valueCopy)) // has placeholder
+        currentValue: this.value,
+        focus: false,
+        fillPlaceHolder: null
+      }
+    },
+    methods: {
+      handleModelInput(event) {
+        const value = event.target.value
+        this.$emit('input', value)
+        if (this.$parent.$options.componentName === 'ElFormItem') {
+          if (this.validateEvent) {
+            this.$parent.$emit('el.form.change', [value])
+          }
+        }
+        this.$emit('change', value)
+//				this.handleValidation()
+      },
+      handleMdFocus(event) {
+        this.focus = true
+        this.$emit('focus', event)
+        if (this.placeholder && this.placeholder !== '') {
+          this.fillPlaceHolder = this.placeholder
+        }
+      },
+      handleMdBlur(event) {
+        this.focus = false
+        this.$emit('blur', event)
+        this.fillPlaceHolder = null
+        if (this.$parent.$options.componentName === 'ElFormItem') {
+          if (this.validateEvent) {
+            this.$parent.$emit('el.form.blur', [this.currentValue])
+          }
+        }
+      }
+    },
+    props: {
+      icon: String,
+      name: String,
+      type: {
+        type: String,
+        default: 'text'
+      },
+      value: [String, Number],
+      placeholder: String,
+      readonly: Boolean,
+      disabled: Boolean,
+      min: String,
+      max: String,
+      step: String,
+      minlength: Number,
+      maxlength: Number,
+      required: {
+        type: Boolean,
+        default: true
+      },
+      autoComplete: {
+        type: String,
+        default: 'off'
+      },
+      validateEvent: {
+        type: Boolean,
+        default: true
       }
     }
-  },
-  data() {
-    return {
-      valueCopy: null,
-      focus: false,
-      valid: true
-    }
-  },
-  beforeMount() {
-        // Here we are following the Vue2 convention on custom v-model:
-        // https://github.com/vuejs/vue/issues/2873#issuecomment-223759341
-    this.copyValue(this.value)
-  },
-  methods: {
-    handleModelInput(event) {
-      this.$emit('input', event.target.value, event)
-      this.handleValidation()
-    },
-    handleFocus(focused) {
-      this.focus = focused
-    },
-    handleValidation() {
-      this.valid = this.$el ? this.$el.querySelector('.material-input').validity.valid : this.valid
-    },
-    copyValue(value) {
-      this.valueCopy = value
-      this.handleValidation()
-    }
-  },
-  watch: {
-    value(newValue) {
-      this.copyValue(newValue)
-    }
-  },
-  props: {
-    id: {
-      type: String,
-      default: null
-    },
-    name: {
-      type: String,
-      default: null
-    },
-    type: {
-      type: String,
-      default: 'text'
-    },
-    value: {
-      default: null
-    },
-    placeholder: {
-      type: String,
-      default: null
-    },
-    readonly: {
-      type: Boolean,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    min: {
-      type: String,
-      default: null
-    },
-    max: {
-      type: String,
-      default: null
-    },
-    minlength: {
-      type: Number,
-      default: null
-    },
-    maxlength: {
-      type: Number,
-      default: null
-    },
-    required: {
-      type: Boolean,
-      default: true
-    },
-    autocomplete: {
-      type: String,
-      default: 'off'
-    },
-    errorMessages: {
-      type: [Array, String],
-      default: null
-    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-    // Fonts:
-    $font-size-base: 16px;
-    $font-size-small: 18px;
-    $font-size-smallest: 12px;
-    $font-weight-normal: normal;
-    // Utils
-    $spacer: 12px;
-    $transition: 0.2s ease all;
-    // Base clases:
-    %base-bar-pseudo {
-        content: '';
-        height: 1px;
-        width: 0;
-        bottom: 0;
+  // Fonts:
+  $font-size-base: 16px;
+  $font-size-small: 18px;
+  $font-size-smallest: 12px;
+  $font-weight-normal: normal;
+  $font-weight-bold: bold;
+  $apixel: 1px;
+  // Utils
+  $spacer: 12px;
+  $transition: 0.2s ease all;
+  $index: 0px;
+  $index-has-icon: 30px;
+  // Theme:
+  $color-white: white;
+  $color-grey: #9E9E9E;
+  $color-grey-light: #E0E0E0;
+  $color-blue: #2196F3;
+  $color-red: #F44336;
+  $color-black: black;
+  // Base clases:
+  %base-bar-pseudo {
+    content: '';
+    height: 1px;
+    width: 0;
+    bottom: 0;
+    position: absolute;
+    transition: $transition;
+  }
+
+  // Mixins:
+  @mixin slided-top() {
+    top: - ($font-size-base + $spacer);
+    left: 0;
+    font-size: $font-size-base;
+    font-weight: $font-weight-bold;
+  }
+
+  // Component:
+  .material-input__component {
+    margin-top: 36px;
+    position: relative;
+    * {
+      box-sizing: border-box;
+    }
+    .iconClass {
+      .material-input__icon {
         position: absolute;
-        transition: $transition;
+        left: 0;
+        color: $color-blue;
+        top: $spacer;
+        width: $index-has-icon;
+        height: $font-size-base;
+        font-size: $font-size-base;
+        font-weight: $font-weight-normal;
+        pointer-events: none;
+      }
+      .material-label {
+        left: $index-has-icon;
+      }
+      .material-input {
+        text-indent: $index-has-icon;
+      }
     }
-
-    // Mixins:
-    @mixin slided-top() {
-        top: -2 * $spacer;
-        font-size: $font-size-small;
+    .material-input {
+      font-size: $font-size-base;
+      padding: $spacer $spacer $spacer - $apixel * 10 $spacer / 2;
+      display: block;
+      width: 100%;
+      border: none;
+      line-height: 1;
+      border-radius: 0;
+      &:focus {
+        outline: none;
+        border: none;
+        border-bottom: 1px solid transparent; // fixes the height issue
+      }
     }
-
-    // Component:
-    .material-input__component {
-        /*margin-top: 30px;*/
-        position: relative;
-        * {
-            box-sizing: border-box;
-        }
-        .material-input {
-            font-size: $font-size-base;
-            padding: $spacer $spacer $spacer $spacer / 2;
-            display: block;
-            width: 100%;
-            border: none;
-            border-radius: 0;
-            &:focus {
-                outline: none;
-                border: none;
-                border-bottom: 1px solid transparent; // fixes the height issue
-            }
-        }
-        .material-label {
-            font-size: $font-size-base;
-            font-weight: $font-weight-normal;
-            position: absolute;
-            pointer-events: none;
-            left: 0;
-            top: $spacer;
-            transition: $transition;
-        }
-        .material-input-bar {
-            position: relative;
-            display: block;
-            width: 100%;
-            &:before {
-                @extend %base-bar-pseudo;
-                left: 50%;
-            }
-            &:after {
-                @extend %base-bar-pseudo;
-                right: 50%;
-            }
-        }
-        // Disabled state:
-        &.material--disabled {
-            .material-input {
-                border-bottom-style: dashed;
-            }
-        }
-        // Raised state:
-        &.material--raised {
-            .material-label {
-                @include slided-top();
-            }
-        }
-        // Active state:
-        &.material--active {
-            .material-input-bar {
-                &:before,
-                &:after {
-                    width: 50%;
-                }
-            }
-        }
-        // Errors:
-        .material-errors {
-            position: relative;
-            overflow: hidden;
-            .material-error {
-                font-size: $font-size-smallest;
-                line-height: $font-size-smallest + 2px;
-                overflow: hidden;
-                margin-top: 0;
-                padding-top: $spacer / 2;
-                padding-right: $spacer / 2;
-                padding-left: 0;
-            }
-        }
+    .material-label {
+      font-weight: $font-weight-normal;
+      position: absolute;
+      pointer-events: none;
+      left: $index;
+      top: 0;
+      transition: $transition;
+      font-size: $font-size-small;
     }
+    .material-input-bar {
+      position: relative;
+      display: block;
+      width: 100%;
+      &:before {
+        @extend %base-bar-pseudo;
+        left: 50%;
+      }
+      &:after {
+        @extend %base-bar-pseudo;
+        right: 50%;
+      }
+    }
+    // Disabled state:
+    &.material--disabled {
+      .material-input {
+        border-bottom-style: dashed;
+      }
+    }
+    // Raised state:
+    &.material--raised {
+      .material-label {
+        @include slided-top();
+      }
+    }
+    // Active state:
+    &.material--active {
+      .material-input-bar {
+        &:before,
+        &:after {
+          width: 50%;
+        }
+      }
+    }
+  }
 
-    // Theme:
-    $color-white: white;
-    $color-grey: #9E9E9E;
-    $color-grey-light: #E0E0E0;
-    $color-blue: #2196F3;
-    $color-red: #F44336;
-    $color-black: black;
-    .material-input__component {
-        background: $color-white;
-        .material-input {
-            background: none;
-            color: $color-black;
-            text-indent: 30px;
-            border-bottom: 1px solid $color-grey-light;
+  .material-input__component {
+    background: $color-white;
+    .material-input {
+      background: none;
+      color: $color-black;
+      text-indent: $index;
+      border-bottom: 1px solid $color-grey-light;
+    }
+    .material-label {
+      color: $color-grey;
+    }
+    .material-input-bar {
+      &:before,
+      &:after {
+        background: $color-blue;
+      }
+    }
+    // Active state:
+    &.material--active {
+      .material-label {
+        color: $color-blue;
+      }
+    }
+    // Errors:
+    &.material--has-errors {
+      &.material--active .material-label {
+        color: $color-red;
+      }
+      .material-input-bar {
+        &:before,
+        &:after {
+          background: transparent;
         }
-        .material-label {
-            color: $color-grey;
-        }
-        .material-input-bar {
-            &:before,
-            &:after {
-                background: $color-blue;
-            }
-        }
-        // Active state:
-        &.material--active {
-            .material-label {
-                color: $color-blue;
-            }
-        }
-        // Errors:
-        &.material--has-errors {
-            &.material--active .material-label {
+      }
+      /*.material-errors {
                 color: $color-red;
-            }
-            .material-input-bar {
-                &:before,
-                &:after {
-                    background: $color-red;
-                }
-            }
-            .material-errors {
-                color: $color-red;
-            }
-        }
+            }*/
     }
+  }
 </style>

From 8945476c228953170606dc5f7c5c5ebef23f3da9 Mon Sep 17 00:00:00 2001
From: "lei.jiang" <jianglei19940909@126.com>
Date: Sat, 16 Sep 2017 21:47:04 +0800
Subject: [PATCH 02/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9MDinput=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=201.=E4=BD=BF=E4=B9=8B=E8=83=BD=E5=85=BC=E5=AE=B9elem?=
 =?UTF-8?q?entui=E7=9A=84=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=202.=E5=A2=9E=E5=8A=A0icon=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E8=83=BD=E5=A4=9F=E4=BD=BF=E7=94=A8elementui=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=203.=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MDinput/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/MDinput/index.vue b/src/components/MDinput/index.vue
index 82c944c4..96ef1eeb 100644
--- a/src/components/MDinput/index.vue
+++ b/src/components/MDinput/index.vue
@@ -286,9 +286,6 @@
           background: transparent;
         }
       }
-      /*.material-errors {
-                color: $color-red;
-            }*/
     }
   }
 </style>

From fde12e8ef99a2c4520af8afd88a1debc778d8f72 Mon Sep 17 00:00:00 2001
From: "lei.jiang" <jianglei19940909@126.com>
Date: Sat, 16 Sep 2017 22:05:57 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9MdInput=E7=9A=84demo?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E4=B9=8B=E8=83=BD=E5=B1=95=E7=8E=B0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/mixin.vue | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/components/mixin.vue b/src/views/components/mixin.vue
index f78ab1e0..7c35f69b 100644
--- a/src/views/components/mixin.vue
+++ b/src/views/components/mixin.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="components-container">
     <div class='component-item'>
-      <md-input name="name" v-model="title" required :maxlength="100">
-        标题
-      </md-input>
+      <el-form :model="demo" :rules="demoRules">
+      <el-form-item prop="title">
+        <md-input icon="search" name="title" placeholder="输入标题" v-model="demo.title">标题</md-input>
+      </el-form-item>
+      </el-form>
       <code class='code-part'>Material Design 的input</code>
     </div>
 
@@ -22,18 +24,33 @@
 </template>
 
 <script>
-import MdInput from '@/components/MDinput'
 import PanThumb from '@/components/PanThumb'
+import MdInput from '@/components/MDinput'
 import waves from '@/directive/waves.js' // 水波纹指令
 
 export default {
-  components: { MdInput, PanThumb },
+  components: {
+    PanThumb,
+    MdInput
+  },
   directives: {
     waves
   },
   data() {
+    const validate = (rule, value, callback) => {
+      if (value.length !== 6) {
+        callback(new Error('请输入六个字符'))
+      } else {
+        callback()
+      }
+    }
     return {
-      title: ''
+      demo: {
+        title: ''
+      },
+      demoRules: {
+        title: [{ required: true, trigger: 'change', validator: validate }]
+      }
     }
   }
 }

From 9c2a7e9485bab7afd3229bb258ed6adf756d3e3e Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 25 Sep 2017 14:21:42 +0800
Subject: [PATCH 04/33] refine : format code

---
 src/components/MDinput/index.vue | 193 ++++++++++++++-----------------
 src/views/components/mixin.vue   |   6 +-
 2 files changed, 90 insertions(+), 109 deletions(-)

diff --git a/src/components/MDinput/index.vue b/src/components/MDinput/index.vue
index 96ef1eeb..6d9d5e8e 100644
--- a/src/components/MDinput/index.vue
+++ b/src/components/MDinput/index.vue
@@ -2,131 +2,112 @@
   <div class="material-input__component" :class="computedClasses">
     <div :class="{iconClass:icon}">
       <i class="el-input__icon material-input__icon" :class="['el-icon-' + icon]" v-if="icon"></i>
-      <input v-if="type === 'email'" type="email" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder" v-model="currentValue"
-             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
-             @focus="handleMdFocus"
-             @blur="handleMdBlur" @input="handleModelInput">
-      <input v-if="type === 'url'" type="url" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder"
-             v-model="currentValue"
-             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
-             @focus="handleMdFocus"
-             @blur="handleMdBlur" @input="handleModelInput">
-      <input v-if="type === 'number'" type="number" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder" v-model="currentValue" :step="step"
-             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max" :min="min"
-             :minlength="minlength" :maxlength="maxlength"
-             :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
-      <input v-if="type === 'password'" type="password" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder"
-             v-model="currentValue" :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max"
-             :min="min" :required="required"
-             @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
-      <input v-if="type === 'tel'" type="tel" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder"
-             v-model="currentValue"
-             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required"
-             @focus="handleMdFocus"
-             @blur="handleMdBlur" @input="handleModelInput">
-      <input v-if="type === 'text'" type="text" class="material-input" :name="name"
-             :placeholder="fillPlaceHolder" v-model="currentValue"
-             :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :minlength="minlength"
-             :maxlength="maxlength"
-             :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
-
+      <input v-if="type === 'email'" type="email" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required" @focus="handleMdFocus"
+        @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'url'" type="url" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required" @focus="handleMdFocus"
+        @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'number'" type="number" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :step="step" :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max" :min="min" :minlength="minlength"
+        :maxlength="maxlength" :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'password'" type="password" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :max="max" :min="min" :required="required" @focus="handleMdFocus"
+        @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'tel'" type="tel" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :required="required" @focus="handleMdFocus"
+        @blur="handleMdBlur" @input="handleModelInput">
+      <input v-if="type === 'text'" type="text" class="material-input" :name="name" :placeholder="fillPlaceHolder" v-model="currentValue"
+        :readonly="readonly" :disabled="disabled" :autoComplete="autoComplete" :minlength="minlength" :maxlength="maxlength"
+        :required="required" @focus="handleMdFocus" @blur="handleMdBlur" @input="handleModelInput">
       <span class="material-input-bar"></span>
-
       <label class="material-label">
         <slot></slot>
       </label>
-
     </div>
   </div>
 </template>
 
 <script>
-  // source:https://github.com/wemake-services/vue-material-input/blob/master/src/components/MaterialInput.vue
+// source:https://github.com/wemake-services/vue-material-input/blob/master/src/components/MaterialInput.vue
 
-  export default {
-
-    name: 'md-input',
-    computed: {
-      computedClasses() {
-        return {
-          'material--active': this.focus,
-          'material--disabled': this.disabled,
-          'material--raised': Boolean(this.focus || this.currentValue) // has value
-        }
-      }
+export default {
+  name: 'md-input',
+  props: {
+    icon: String,
+    name: String,
+    type: {
+      type: String,
+      default: 'text'
     },
-    data() {
+    value: [String, Number],
+    placeholder: String,
+    readonly: Boolean,
+    disabled: Boolean,
+    min: String,
+    max: String,
+    step: String,
+    minlength: Number,
+    maxlength: Number,
+    required: {
+      type: Boolean,
+      default: true
+    },
+    autoComplete: {
+      type: String,
+      default: 'off'
+    },
+    validateEvent: {
+      type: Boolean,
+      default: true
+    }
+  },
+  computed: {
+    computedClasses() {
       return {
-        currentValue: this.value,
-        focus: false,
-        fillPlaceHolder: null
+        'material--active': this.focus,
+        'material--disabled': this.disabled,
+        'material--raised': Boolean(this.focus || this.currentValue) // has value
       }
-    },
-    methods: {
-      handleModelInput(event) {
-        const value = event.target.value
-        this.$emit('input', value)
-        if (this.$parent.$options.componentName === 'ElFormItem') {
-          if (this.validateEvent) {
-            this.$parent.$emit('el.form.change', [value])
-          }
-        }
-        this.$emit('change', value)
-//				this.handleValidation()
-      },
-      handleMdFocus(event) {
-        this.focus = true
-        this.$emit('focus', event)
-        if (this.placeholder && this.placeholder !== '') {
-          this.fillPlaceHolder = this.placeholder
-        }
-      },
-      handleMdBlur(event) {
-        this.focus = false
-        this.$emit('blur', event)
-        this.fillPlaceHolder = null
-        if (this.$parent.$options.componentName === 'ElFormItem') {
-          if (this.validateEvent) {
-            this.$parent.$emit('el.form.blur', [this.currentValue])
-          }
+    }
+  },
+  data() {
+    return {
+      currentValue: this.value,
+      focus: false,
+      fillPlaceHolder: null
+    }
+  },
+  methods: {
+    handleModelInput(event) {
+      const value = event.target.value
+      this.$emit('input', value)
+      if (this.$parent.$options.componentName === 'ElFormItem') {
+        if (this.validateEvent) {
+          this.$parent.$emit('el.form.change', [value])
         }
       }
+      this.$emit('change', value)
     },
-    props: {
-      icon: String,
-      name: String,
-      type: {
-        type: String,
-        default: 'text'
-      },
-      value: [String, Number],
-      placeholder: String,
-      readonly: Boolean,
-      disabled: Boolean,
-      min: String,
-      max: String,
-      step: String,
-      minlength: Number,
-      maxlength: Number,
-      required: {
-        type: Boolean,
-        default: true
-      },
-      autoComplete: {
-        type: String,
-        default: 'off'
-      },
-      validateEvent: {
-        type: Boolean,
-        default: true
+    handleMdFocus(event) {
+      this.focus = true
+      this.$emit('focus', event)
+      if (this.placeholder && this.placeholder !== '') {
+        this.fillPlaceHolder = this.placeholder
+      }
+    },
+    handleMdBlur(event) {
+      this.focus = false
+      this.$emit('blur', event)
+      this.fillPlaceHolder = null
+      if (this.$parent.$options.componentName === 'ElFormItem') {
+        if (this.validateEvent) {
+          this.$parent.$emit('el.form.blur', [this.currentValue])
+        }
       }
     }
   }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/components/mixin.vue b/src/views/components/mixin.vue
index 7c35f69b..4a799140 100644
--- a/src/views/components/mixin.vue
+++ b/src/views/components/mixin.vue
@@ -2,9 +2,9 @@
   <div class="components-container">
     <div class='component-item'>
       <el-form :model="demo" :rules="demoRules">
-      <el-form-item prop="title">
-        <md-input icon="search" name="title" placeholder="输入标题" v-model="demo.title">标题</md-input>
-      </el-form-item>
+        <el-form-item prop="title">
+          <md-input icon="search" name="title" placeholder="输入标题" v-model="demo.title">标题</md-input>
+        </el-form-item>
       </el-form>
       <code class='code-part'>Material Design 的input</code>
     </div>

From 582c6f4ae4d1375bc168158ab91640a5bca893d7 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 25 Sep 2017 17:11:37 +0800
Subject: [PATCH 05/33] refine:set icon-class to english

---
 src/icons/svg/{tubiao.svg => chart.svg}        |  0
 src/icons/svg/component.svg                    |  1 +
 src/icons/svg/{tuozhuai.svg => drag.svg}       |  0
 src/icons/svg/{zonghe.svg => example.svg}      |  0
 src/icons/svg/{EXCEL.svg => excel.svg}         |  0
 src/icons/svg/{yanjing.svg => eye.svg}         |  0
 src/icons/svg/form.svg                         |  1 +
 src/icons/svg/from.svg                         |  1 -
 src/icons/svg/{icons.svg => icon.svg}          |  0
 src/icons/svg/{quanxian.svg => lock.svg}       |  0
 src/icons/svg/{mima.svg => password.svg}       |  0
 src/icons/svg/{xinrenzhinan.svg => people.svg} |  0
 src/icons/svg/{QQ.svg => qq.svg}               |  0
 src/icons/svg/shouce.svg                       |  1 -
 src/icons/svg/{wujiaoxing.svg => star.svg}     |  0
 src/icons/svg/tab.svg                          |  2 +-
 src/icons/svg/{a.svg => trendChart1.svg}       |  0
 src/icons/svg/{b.svg => trendChart2.svg}       |  0
 src/icons/svg/{c.svg => trendChart3.svg}       |  0
 src/icons/svg/{yonghuming.svg => user.svg}     |  0
 src/icons/svg/{weixin.svg => wechat.svg}       |  0
 src/icons/svg/zujian.svg                       |  1 -
 src/router/index.js                            | 18 +++++++++---------
 src/views/dashboard/admin/index.vue            |  4 ++--
 src/views/example/tab/components/tabPane.vue   |  2 +-
 src/views/example/table/dragTable.vue          |  4 ++--
 src/views/example/table/inlineEditTable.vue    |  2 +-
 src/views/example/table/table.vue              |  2 +-
 src/views/login/index.vue                      |  6 +++---
 src/views/login/socialsignin.vue               |  4 ++--
 30 files changed, 24 insertions(+), 25 deletions(-)
 rename src/icons/svg/{tubiao.svg => chart.svg} (100%)
 create mode 100644 src/icons/svg/component.svg
 rename src/icons/svg/{tuozhuai.svg => drag.svg} (100%)
 rename src/icons/svg/{zonghe.svg => example.svg} (100%)
 rename src/icons/svg/{EXCEL.svg => excel.svg} (100%)
 rename src/icons/svg/{yanjing.svg => eye.svg} (100%)
 create mode 100644 src/icons/svg/form.svg
 delete mode 100644 src/icons/svg/from.svg
 rename src/icons/svg/{icons.svg => icon.svg} (100%)
 rename src/icons/svg/{quanxian.svg => lock.svg} (100%)
 rename src/icons/svg/{mima.svg => password.svg} (100%)
 rename src/icons/svg/{xinrenzhinan.svg => people.svg} (100%)
 rename src/icons/svg/{QQ.svg => qq.svg} (100%)
 delete mode 100644 src/icons/svg/shouce.svg
 rename src/icons/svg/{wujiaoxing.svg => star.svg} (100%)
 rename src/icons/svg/{a.svg => trendChart1.svg} (100%)
 rename src/icons/svg/{b.svg => trendChart2.svg} (100%)
 rename src/icons/svg/{c.svg => trendChart3.svg} (100%)
 rename src/icons/svg/{yonghuming.svg => user.svg} (100%)
 rename src/icons/svg/{weixin.svg => wechat.svg} (100%)
 delete mode 100644 src/icons/svg/zujian.svg

diff --git a/src/icons/svg/tubiao.svg b/src/icons/svg/chart.svg
similarity index 100%
rename from src/icons/svg/tubiao.svg
rename to src/icons/svg/chart.svg
diff --git a/src/icons/svg/component.svg b/src/icons/svg/component.svg
new file mode 100644
index 00000000..a8008c84
--- /dev/null
+++ b/src/icons/svg/component.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506329916765" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1661" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M64 64 448 64 448 448 64 448 64 64ZM64 576 448 576 448 960 64 960 64 576ZM576 576 960 576 960 960 576 960 576 576ZM768 448C874.038669 448 960 362.038672 960 256 960 149.961328 874.038669 64 768 64 661.961328 64 576 149.961328 576 256 576 362.038672 661.961328 448 768 448Z" p-id="1662"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/tuozhuai.svg b/src/icons/svg/drag.svg
similarity index 100%
rename from src/icons/svg/tuozhuai.svg
rename to src/icons/svg/drag.svg
diff --git a/src/icons/svg/zonghe.svg b/src/icons/svg/example.svg
similarity index 100%
rename from src/icons/svg/zonghe.svg
rename to src/icons/svg/example.svg
diff --git a/src/icons/svg/EXCEL.svg b/src/icons/svg/excel.svg
similarity index 100%
rename from src/icons/svg/EXCEL.svg
rename to src/icons/svg/excel.svg
diff --git a/src/icons/svg/yanjing.svg b/src/icons/svg/eye.svg
similarity index 100%
rename from src/icons/svg/yanjing.svg
rename to src/icons/svg/eye.svg
diff --git a/src/icons/svg/form.svg b/src/icons/svg/form.svg
new file mode 100644
index 00000000..79716f06
--- /dev/null
+++ b/src/icons/svg/form.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506330387278" class="icon" style="" viewBox="0 0 1069 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1447" xmlns:xlink="http://www.w3.org/1999/xlink" width="66.8125" height="64"><defs><style type="text/css"></style></defs><path d="M746.027944 190.083832q-11.241517 0-18.906188-7.664671t-12.774451-17.884232-7.664671-20.9501-2.55489-17.884232l0-125.700599 2.043912 0q9.197605 0 17.373253 2.043912t19.928144 9.708583 28.61477 21.461078 42.411178 36.279441q27.592814 24.526946 43.944112 41.389222t25.037924 28.61477 10.730539 19.928144 2.043912 14.307385l0 16.351297-150.227545 0zM1063.856287 671.42515q3.065868 8.175649 4.087824 20.439122t-10.219561 23.50499q-5.10978 5.10978-9.197605 9.708583t-7.153693 7.664671q-4.087824 4.087824-7.153693 6.131737l-86.866267-85.844311q6.131737-5.10978 13.796407-12.263473t12.774451-11.241517q12.263473-11.241517 26.570858-9.708583t23.50499 6.642715q10.219561 5.10978 21.972056 17.884232t17.884232 27.081836zM703.105788 766.467066q22.483034 0 37.812375-12.263473l-198.259481 206.43513-282.05988 0q-19.417166 0-42.411178-11.241517t-42.922156-29.636727-33.213573-42.411178-13.285429-49.56487l0-695.952096q0-21.461078 9.708583-44.966068t26.570858-42.411178 38.323353-31.680639 44.966068-12.774451l391.409182 0 0 127.744511q0 19.417166 6.131737 41.9002t18.906188 41.389222 33.213573 31.680639 49.053892 12.774451l149.205589 0 0 338.267465-140.007984 145.117764q11.241517-16.351297 11.241517-35.768463 0-26.570858-18.906188-45.477046t-45.477046-18.906188l-383.233533 0q-26.570858 0-44.966068 18.906188t-18.39521 45.477046 18.39521 44.966068 44.966068 18.39521l383.233533 0zM319.872255 383.233533q-26.570858 0-44.966068 18.906188t-18.39521 45.477046 18.39521 44.966068 44.966068 18.39521l383.233533 0q26.570858 0 45.477046-18.39521t18.906188-44.966068-18.906188-45.477046-45.477046-18.906188l-383.233533 0zM705.149701 895.233533l13.285429-13.285429 25.548902-25.548902q15.329341-15.329341 33.724551-34.235529t36.790419-37.301397q43.944112-43.944112 99.129741-98.107784l85.844311 85.844311-99.129741 99.129741-36.790419 36.790419-33.724551 33.724551q-14.307385 14.307385-24.015968 24.526946t-10.730539 11.241517q-5.10978 4.087824-11.241517 8.686627t-12.263473 7.664671-18.906188 7.664671-26.05988 8.686627-25.548902 7.153693-18.39521 4.087824q-12.263473 2.043912-16.351297-3.065868t-2.043912-17.373253q1.021956-6.131737 4.087824-18.39521t7.153693-25.037924 7.664671-24.015968 5.620758-15.329341q6.131737-13.285429 16.351297-23.50499z" p-id="1448"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/from.svg b/src/icons/svg/from.svg
deleted file mode 100644
index 7a4bd166..00000000
--- a/src/icons/svg/from.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503993937334" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8099" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M960 256v64H64v-64c0-35.2 28.8-64 64-64h768c35.2 0 64 28.8 64 64z m0 128v384c0 35.2-28.8 64-64 64H128c-35.2 0-64-28.8-64-64V384h896zM256 640H128v32h128v-32z m128-64H128v32h256v-32z" p-id="8100"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/icons.svg b/src/icons/svg/icon.svg
similarity index 100%
rename from src/icons/svg/icons.svg
rename to src/icons/svg/icon.svg
diff --git a/src/icons/svg/quanxian.svg b/src/icons/svg/lock.svg
similarity index 100%
rename from src/icons/svg/quanxian.svg
rename to src/icons/svg/lock.svg
diff --git a/src/icons/svg/mima.svg b/src/icons/svg/password.svg
similarity index 100%
rename from src/icons/svg/mima.svg
rename to src/icons/svg/password.svg
diff --git a/src/icons/svg/xinrenzhinan.svg b/src/icons/svg/people.svg
similarity index 100%
rename from src/icons/svg/xinrenzhinan.svg
rename to src/icons/svg/people.svg
diff --git a/src/icons/svg/QQ.svg b/src/icons/svg/qq.svg
similarity index 100%
rename from src/icons/svg/QQ.svg
rename to src/icons/svg/qq.svg
diff --git a/src/icons/svg/shouce.svg b/src/icons/svg/shouce.svg
deleted file mode 100644
index 94c68bb6..00000000
--- a/src/icons/svg/shouce.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503994075075" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8325" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M896 192v704H256.8c-71.2 0-128.8-57.6-128.8-128.8V256.8C128 185.6 185.6 128 256.8 128H768v512H257.6c-36 0-65.6 29.6-65.6 65.6v60.8c0 36 29.6 65.6 65.6 65.6H832V192h64zM768 704H256v64h512v-64z" p-id="8326"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/wujiaoxing.svg b/src/icons/svg/star.svg
similarity index 100%
rename from src/icons/svg/wujiaoxing.svg
rename to src/icons/svg/star.svg
diff --git a/src/icons/svg/tab.svg b/src/icons/svg/tab.svg
index 657057df..17aa088b 100644
--- a/src/icons/svg/tab.svg
+++ b/src/icons/svg/tab.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503994012480" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8212" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M896 320H128V160c0-17.6 14.4-32 32-32h704c17.6 0 32 14.4 32 32v160zM320 896H160c-17.6 0-32-14.4-32-32V384h192v512zM864 896H384V384h512v480c0 17.6-14.4 32-32 32z" p-id="8213"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506329761546" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1384" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M622.276923 39.384615H401.723077c-13.784615 0-23.630769 11.815385-23.630769 25.6v49.23077c0 13.784615 11.815385 25.6 23.630769 25.6h220.553846c13.784615 0 23.630769-11.815385 23.630769-25.6V64.984615c1.969231-13.784615-9.846154-25.6-23.630769-25.6z m336.738462 0H738.461538c-13.784615 0-25.6 11.815385-25.6 25.6v49.23077c0 13.784615 11.815385 25.6 25.6 25.6h220.553847c13.784615-1.969231 25.6-11.815385 25.6-25.6V64.984615c0-13.784615-11.815385-25.6-25.6-25.6z m0 165.415385H334.769231c-13.784615 0-25.6-11.815385-25.6-25.6V64.984615c0-13.784615-11.815385-25.6-25.6-25.6H64.984615C51.2 39.384615 39.384615 51.2 39.384615 64.984615v896c0 11.815385 11.815385 23.630769 25.6 23.63077h894.03077c13.784615 0 25.6-11.815385 25.6-25.6v-728.615385c0-13.784615-11.815385-25.6-25.6-25.6z" p-id="1385"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/a.svg b/src/icons/svg/trendChart1.svg
similarity index 100%
rename from src/icons/svg/a.svg
rename to src/icons/svg/trendChart1.svg
diff --git a/src/icons/svg/b.svg b/src/icons/svg/trendChart2.svg
similarity index 100%
rename from src/icons/svg/b.svg
rename to src/icons/svg/trendChart2.svg
diff --git a/src/icons/svg/c.svg b/src/icons/svg/trendChart3.svg
similarity index 100%
rename from src/icons/svg/c.svg
rename to src/icons/svg/trendChart3.svg
diff --git a/src/icons/svg/yonghuming.svg b/src/icons/svg/user.svg
similarity index 100%
rename from src/icons/svg/yonghuming.svg
rename to src/icons/svg/user.svg
diff --git a/src/icons/svg/weixin.svg b/src/icons/svg/wechat.svg
similarity index 100%
rename from src/icons/svg/weixin.svg
rename to src/icons/svg/wechat.svg
diff --git a/src/icons/svg/zujian.svg b/src/icons/svg/zujian.svg
deleted file mode 100644
index d183e56c..00000000
--- a/src/icons/svg/zujian.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503994912370" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10530" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M568.6 0h454.9v454.9H568.6V0z m0 568.6h454.9v454.9H568.6V568.6zM0 568.6h454.9v454.9H0V568.6zM0 0h454.9v454.9H0V0z" fill="" p-id="10531"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index c235005a..a705a736 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -32,7 +32,7 @@ export const constantRouterMap = [
     path: '/introduction',
     component: Layout,
     redirect: '/introduction/index',
-    icon: 'xinrenzhinan',
+    icon: 'people',
     noDropdown: true,
     children: [{ path: 'index', component: _import('introduction/index'), name: '简述' }]
   }
@@ -50,7 +50,7 @@ export const asyncRouterMap = [
     component: Layout,
     redirect: '/permission/index',
     name: '权限测试',
-    icon: 'quanxian',
+    icon: 'lock',
     meta: { role: ['admin'] },
     noDropdown: true,
     children: [{ path: 'index', component: _import('permission/index'), name: '权限测试页', meta: { role: ['admin'] }}]
@@ -58,7 +58,7 @@ export const asyncRouterMap = [
   {
     path: '/icon',
     component: Layout,
-    icon: 'icons',
+    icon: 'icon',
     noDropdown: true,
     children: [{ path: 'index', component: _import('svg-icons/index'), name: 'icons' }]
   },
@@ -67,7 +67,7 @@ export const asyncRouterMap = [
     component: Layout,
     redirect: '/components/index',
     name: '组件',
-    icon: 'zujian',
+    icon: 'component',
     children: [
       { path: 'index', component: _import('components/index'), name: '介绍 ' },
       { path: 'tinymce', component: _import('components/tinymce'), name: '富文本编辑器' },
@@ -88,7 +88,7 @@ export const asyncRouterMap = [
     component: Layout,
     redirect: '/charts/index',
     name: '图表',
-    icon: 'tubiao',
+    icon: 'chart',
     children: [
       { path: 'index', component: _import('charts/index'), name: '介绍' },
       { path: 'keyboard', component: _import('charts/keyboard'), name: '键盘图表' },
@@ -102,7 +102,7 @@ export const asyncRouterMap = [
     component: Layout,
     redirect: 'noredirect',
     name: '综合实例',
-    icon: 'zonghe',
+    icon: 'example',
     children: [
       {
         path: '/example/table',
@@ -117,8 +117,8 @@ export const asyncRouterMap = [
           { path: 'table', component: _import('example/table/table'), name: '综合table' }
         ]
       },
-      { path: 'form/edit', icon: 'shouce', component: _import('example/form'), name: '编辑Form', meta: { isEdit: true }},
-      { path: 'form/create', icon: 'from', component: _import('example/form'), name: '创建Form' },
+      { path: 'form/edit', icon: 'form', component: _import('example/form'), name: '编辑Form', meta: { isEdit: true }},
+      { path: 'form/create', icon: 'form', component: _import('example/form'), name: '创建Form' },
       { path: 'tab/index', icon: 'tab', component: _import('example/tab/index'), name: 'Tab' }
     ]
   },
@@ -147,7 +147,7 @@ export const asyncRouterMap = [
     component: Layout,
     redirect: '/excel/download',
     name: 'excel',
-    icon: 'EXCEL',
+    icon: 'excel',
     children: [
       { path: 'download', component: _import('excel/index'), name: '导出excel' },
       { path: 'download2', component: _import('excel/selectExcel'), name: '导出已选择项' },
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 9517c2a4..ad657137 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -34,12 +34,12 @@
 					<div class="info-item">
 						<count-to class="info-item-num" :startVal='0' :endVal='statisticsData.article_count' :duration='3400'></count-to>
 						<span class="info-item-text">文章</span>
-						<icon-svg icon-class="a" class="dashboard-editor-icon"></icon-svg>
+						<icon-svg icon-class="trendChart1" class="dashboard-editor-icon"></icon-svg>
 					</div>
 					<div class="info-item">
 						<count-to class="info-item-num" :startVal='0' :endVal='statisticsData.pageviews_count' :duration='3600'></count-to>
 						<span class="info-item-text">浏览量</span>
-						<icon-svg icon-class="b" class="dashboard-editor-icon"></icon-svg>
+						<icon-svg icon-class="trendChart2" class="dashboard-editor-icon"></icon-svg>
 					</div>
 				</el-card>
 			</el-col>
diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue
index 8a8575e0..efb29471 100644
--- a/src/views/example/tab/components/tabPane.vue
+++ b/src/views/example/tab/components/tabPane.vue
@@ -29,7 +29,7 @@
 
     <el-table-column width="80px" label="重要性">
       <template scope="scope">
-        <icon-svg v-for="n in +scope.row.importance" icon-class="wujiaoxing" :key="n"></icon-svg>
+        <icon-svg v-for="n in +scope.row.importance" icon-class="star" :key="n"></icon-svg>
       </template>
     </el-table-column>
 
diff --git a/src/views/example/table/dragTable.vue b/src/views/example/table/dragTable.vue
index 864e2c7b..64886f60 100644
--- a/src/views/example/table/dragTable.vue
+++ b/src/views/example/table/dragTable.vue
@@ -29,7 +29,7 @@
 
       <el-table-column width="80px" label="重要性">
         <template scope="scope">
-          <icon-svg v-for="n in +scope.row.importance" icon-class="wujiaoxing" class="meta-item__icon" :key="n"></icon-svg>
+          <icon-svg v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></icon-svg>
         </template>
       </el-table-column>
 
@@ -47,7 +47,7 @@
 
       <el-table-column align="center" label="拖拽" width="95">
         <template scope="scope">
-          <icon-svg class='drag-handler' icon-class="tuozhuai"></icon-svg>
+          <icon-svg class='drag-handler' icon-class="drag"></icon-svg>
         </template>
       </el-table-column>
 
diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue
index fc07a379..dfd53cc1 100644
--- a/src/views/example/table/inlineEditTable.vue
+++ b/src/views/example/table/inlineEditTable.vue
@@ -23,7 +23,7 @@
 
       <el-table-column width="100px" label="重要性">
         <template scope="scope">
-          <icon-svg v-for="n in +scope.row.importance" icon-class="wujiaoxing" class="meta-item__icon" :key="n"></icon-svg>
+          <icon-svg v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></icon-svg>
         </template>
       </el-table-column>
 
diff --git a/src/views/example/table/table.vue b/src/views/example/table/table.vue
index abfbb35d..3b7b8db4 100644
--- a/src/views/example/table/table.vue
+++ b/src/views/example/table/table.vue
@@ -60,7 +60,7 @@
 
       <el-table-column width="80px" label="重要性">
         <template scope="scope">
-          <icon-svg v-for="n in +scope.row.importance" icon-class="wujiaoxing" class="meta-item__icon" :key="n"></icon-svg>
+          <icon-svg v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></icon-svg>
         </template>
       </el-table-column>
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1adbc394..b4923042 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -5,18 +5,18 @@
 
       <el-form-item prop="username">
         <span class="svg-container svg-container_login">
-          <icon-svg icon-class="yonghuming" />
+          <icon-svg icon-class="user" />
         </span>
         <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="邮箱" />
       </el-form-item>
 
       <el-form-item prop="password">
         <span class="svg-container">
-          <icon-svg icon-class="mima" />
+          <icon-svg icon-class="password" />
         </span>
         <el-input name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="on"
           placeholder="密码" />
-        <span class='show-pwd' @click='showPwd'><icon-svg icon-class="yanjing" /></span>
+        <span class='show-pwd' @click='showPwd'><icon-svg icon-class="eye" /></span>
       </el-form-item>
 
       <el-button type="primary" style="width:100%;margin-bottom:30px;" :loading="loading" @click.native.prevent="handleLogin">登录</el-button>
diff --git a/src/views/login/socialsignin.vue b/src/views/login/socialsignin.vue
index 71b9d60a..70d30917 100644
--- a/src/views/login/socialsignin.vue
+++ b/src/views/login/socialsignin.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="social-signup-container">
     <div class="sign-btn" @click="wechatHandleClick('wechat')">
-      <span class="wx-svg-container"><icon-svg icon-class="weixin" class="icon"></icon-svg></span> 微信
+      <span class="wx-svg-container"><icon-svg icon-class="wechat" class="icon"></icon-svg></span> 微信
     </div>
     <div class="sign-btn" @click="tencentHandleClick('tencent')">
-      <span class="qq-svg-container"><icon-svg icon-class="QQ" class="icon"></icon-svg></span> QQ
+      <span class="qq-svg-container"><icon-svg icon-class="qq" class="icon"></icon-svg></span> QQ
     </div>
   </div>
 </template>

From db61251d897fe852ece1327baa718ce4ee5edcdb Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 25 Sep 2017 17:41:03 +0800
Subject: [PATCH 06/33] [release] 2.1.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae01ad50..073cac84 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juicy",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "A Vue.js admin",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

From 807aa548b261a03952e48c601f31d7fbf1859bc6 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 26 Sep 2017 16:08:20 +0800
Subject: [PATCH 07/33] refine:rm duplicate code && split xlsx

---
 build/webpack.prod.conf.js | 8 ++++++++
 src/vendor/Export2Excel.js | 7 ++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 05f84874..d69d0e1d 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -95,6 +95,14 @@ var webpackConfig = merge(baseWebpackConfig, {
         return context && (context.indexOf('echarts') >= 0 || context.indexOf('zrender') >= 0);
       }
     }),
+    // split xlsx into its own file
+    new webpack.optimize.CommonsChunkPlugin({
+      async: 'xlsx',
+      minChunks(module) {
+        var context = module.context;
+        return context && (context.indexOf('xlsx') >= 0);
+      }
+    }),
     // extract webpack runtime and module manifest to its own file in order to
     // prevent vendor hash from being updated whenever app bundle is updated
     new webpack.optimize.CommonsChunkPlugin({
diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js
index a121a33a..8852064e 100644
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@@ -1,7 +1,8 @@
 /* eslint-disable */
 require('script-loader!file-saver');
 require('script-loader!vendor/Blob');
-require('script-loader!xlsx/dist/xlsx.core.min');
+import XLSX from 'xlsx'
+
 function generateArray(table) {
     var out = [];
     var rows = table.querySelectorAll('tr');
@@ -93,7 +94,6 @@ function s2ab(s) {
 
 export function export_table_to_excel(id) {
     var theTable = document.getElementById(id);
-    console.log('a')
     var oo = generateArray(theTable);
     var ranges = oo[1];
 
@@ -117,9 +117,6 @@ export function export_table_to_excel(id) {
     saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
 }
 
-function formatJson(jsonData) {
-    console.log(jsonData)
-}
 export function export_json_to_excel(th, jsonData, defaultTitle) {
 
     /* original data */

From fcf7c0ba5036ca7c7e2a95bcf5b17904a0f0b89c Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Mon, 25 Sep 2017 15:49:51 +0800
Subject: [PATCH 08/33] ignore package-lock.json

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a5060b02..bb2a167e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ test/unit/coverage
 test/e2e/reports
 selenium-debug.log
 .idea
+package-lock.json

From 3cf048e80bf69f82c34dcf7c1d96b8c66609be76 Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Mon, 25 Sep 2017 16:43:56 +0800
Subject: [PATCH 09/33] add Export2Zip vendor

---
 package.json             |  3 ++-
 src/vendor/Export2Zip.js | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/vendor/Export2Zip.js

diff --git a/package.json b/package.json
index 073cac84..a80852a9 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
     "vue-splitpane": "^1.0.0",
     "vuedraggable": "2.14.1",
     "vuex": "2.3.1",
-    "xlsx": "^0.10.8"
+    "xlsx": "^0.10.8",
+    "jszip": "^3.1.4"
   },
   "devDependencies": {
     "autoprefixer": "7.1.1",
diff --git a/src/vendor/Export2Zip.js b/src/vendor/Export2Zip.js
new file mode 100644
index 00000000..4fab8aca
--- /dev/null
+++ b/src/vendor/Export2Zip.js
@@ -0,0 +1,22 @@
+/* eslint-disable */
+require('script-loader!file-saver');
+import JSZip from 'jszip'
+
+export function export_txt_to_zip(th, jsonData, txtName, zipName) {
+  const zip = new JSZip()
+  const txt_name = txtName || '文本'
+  const zip_name = zipName || '压缩包'
+  const data = jsonData
+  let txtData = `${th}\r\n`
+  data.forEach((row) => {
+    let tempStr = ''
+    tempStr = row.toString()
+    txtData += `${tempStr}\r\n`
+  })
+  zip.file(`${txt_name}.txt`, txtData)
+  zip.generateAsync({type:"blob"}).then(function (blob) {
+    saveAs(blob, `${zip_name}.zip`)
+  }, function (err) {
+    alert('导出失败')
+  })
+}

From a185412446a5bef99151101590a20f5e763a4063 Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Tue, 26 Sep 2017 13:40:07 +0800
Subject: [PATCH 10/33] add Export2Zip demo

---
 src/icons/svg/zip.svg    |  1 +
 src/router/index.js      | 11 +++++
 src/views/zip/index.vue  | 74 +++++++++++++++++++++++++++++++++
 src/views/zip/select.vue | 88 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 174 insertions(+)
 create mode 100644 src/icons/svg/zip.svg
 create mode 100644 src/views/zip/index.vue
 create mode 100644 src/views/zip/select.vue

diff --git a/src/icons/svg/zip.svg b/src/icons/svg/zip.svg
new file mode 100644
index 00000000..e9a9d012
--- /dev/null
+++ b/src/icons/svg/zip.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506326020470" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2561" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M619.364365 933.396352c1.372783 0.06385 2.681715 0.191551 4.054497 0.191551h309.291099a65.670086 65.670086 0 0 0 65.606235-65.606235V150.974154a65.670086 65.670086 0 0 0-65.606235-65.606235H623.418862c-1.372783 0-2.71364 0.127701-4.054497 0.191551V-0.031925L15.691224 80.547217v858.404116l603.673141 82.654279v-88.20926z m0-810.101325c1.340857-0.191551 2.681715-0.415027 4.054497-0.415027h309.291099c15.515635 0 28.12608 12.610444 28.12608 28.12608v717.007513a28.158005 28.158005 0 0 1-28.12608 28.12608H623.418862c-1.372783 0-2.71364-0.223476-4.054497-0.415028V123.326952zM248.329977 605.429026l-143.918691-3.671395v-23.401154l86.868402-133.255682v-1.181231l-78.919033 1.308932v-36.043523l134.564614-3.51177v26.082869l-87.506906 133.734559v1.149307l88.911614 1.404707v37.352456z m72.406297 1.85166l-44.759096-1.149306v-201.192456l44.759096-1.149306v203.491068z m171.087015-92.966111c-16.664942 15.356009-41.151551 22.060296-69.341481 21.868745a113.81325 113.81325 0 0 1-16.122213-1.05353v74.353733l-46.099954-1.181231v-202.788714c14.238628-2.809415 34.383414-5.171878 63.179923-5.938083 29.498862-0.766204 50.792954 4.309899 65.191208 15.292159 13.887451 10.439532 23.305378 27.966454 23.305378 48.845518s-7.119314 38.629462-20.080936 50.601403z m-65.925487-79.174435a80.13219 80.13219 0 0 0-19.538207 2.202837v61.392113c4.022572 0.92583 8.970974 1.213157 15.834887 1.213156 25.380514-0.031925 41.215401-12.897771 41.215401-34.479189 0-19.378581-13.63205-30.712019-37.480156-30.296992z m306.322058-296.233702h73.523679v30.328917h-73.523679v-30.328917z m-73.555604 45.397599h73.523679v30.360842h-73.523679v-30.360842z m73.555604 49.675573h73.523679v30.360842h-73.523679v-30.360842z m0 95.903227h73.523679v30.328917h-73.523679v-30.328917z m-73.555604-48.717818h73.523679v30.328917h-73.523679v-30.328917z m72.821325 376.142417a72.7894 72.7894 0 0 0 72.7894-72.821325l-13.440499-121.986095c0-40.225721-19.155105-72.821325-59.380827-72.821325s-59.348901 32.595604-59.348901 72.821325l-13.472424 121.986095a72.7894 72.7894 0 0 0 72.821325 72.821325z m-24.103508-133.862261h48.207015v101.84131h-48.207015v-101.84131z" p-id="2562"></path></svg>
diff --git a/src/router/index.js b/src/router/index.js
index a705a736..b50c7426 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -154,6 +154,17 @@ export const asyncRouterMap = [
       { path: 'upload', component: _import('excel/uploadExcel'), name: 'upload excel' }
     ]
   },
+  {
+    path: '/zip',
+    component: Layout,
+    redirect: '/zip/download',
+    name: 'zip',
+    icon: 'zip',
+    children: [
+      { path: 'download', component: _import('zip/index'), name: '导出zip' },
+      { path: 'download2', component: _import('zip/select'), name: '导出已选择项' }
+    ]
+  },
   {
     path: '/theme',
     component: Layout,
diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue
new file mode 100644
index 00000000..fa32a983
--- /dev/null
+++ b/src/views/zip/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <div class="app-container">
+    <el-button style='margin-bottom:20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">导出zip</el-button>
+    <el-table :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row>
+      <el-table-column align="center" label='ID' width="95">
+        <template scope="scope">
+          {{scope.$index}}
+        </template>
+      </el-table-column>
+      <el-table-column label="文章标题">
+        <template scope="scope">
+          {{scope.row.title}}
+        </template>
+      </el-table-column>
+      <el-table-column label="作者" width="95" align="center">
+        <template scope="scope">
+          <el-tag>{{scope.row.author}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读数" width="115" align="center">
+        <template scope="scope">
+          {{scope.row.pageviews}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="created_at" label="发布时间" width="220">
+        <template scope="scope">
+          <i class="el-icon-time"></i>
+          <span>{{scope.row.display_time}}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/article'
+
+export default {
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      fetchList().then(response => {
+        this.list = response.data.items
+        this.listLoading = false
+      })
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      require.ensure([], () => {
+        const { export_txt_to_zip } = require('vendor/Export2Zip')
+        const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
+        const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
+        const list = this.list
+        const data = this.formatJson(filterVal, list)
+        export_txt_to_zip(tHeader, data, '列表文本', '压缩文本')
+        this.downloadLoading = false
+      })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }
+  }
+}
+</script>
diff --git a/src/views/zip/select.vue b/src/views/zip/select.vue
new file mode 100644
index 00000000..fc4ac7fb
--- /dev/null
+++ b/src/views/zip/select.vue
@@ -0,0 +1,88 @@
+<template>
+  <div class="app-container">
+    <el-button style='margin-bottom:20px' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">导出已选择项</el-button>
+    <el-table :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row @selection-change="handleSelectionChange"
+      ref="multipleTable">
+      <el-table-column type="selection" align="center"></el-table-column>
+      <el-table-column align="center" label='ID' width="95">
+        <template scope="scope">
+          {{scope.$index}}
+        </template>
+      </el-table-column>
+      <el-table-column label="文章标题">
+        <template scope="scope">
+          {{scope.row.title}}
+        </template>
+      </el-table-column>
+      <el-table-column label="作者" width="95" align="center">
+        <template scope="scope">
+          <el-tag>{{scope.row.author}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读数" width="115" align="center">
+        <template scope="scope">
+          {{scope.row.pageviews}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="created_at" label="发布时间" width="220">
+        <template scope="scope">
+          <i class="el-icon-time"></i>
+          <span>{{scope.row.display_time}}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { fetchList } from '@/api/article'
+
+export default {
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      multipleSelection: [],
+      downloadLoading: false
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.items
+        this.listLoading = false
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    handleDownload() {
+      if (this.multipleSelection.length) {
+        this.downloadLoading = true
+        require.ensure([], () => {
+          const { export_txt_to_zip } = require('vendor/Export2Zip')
+          const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
+          const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
+          const list = this.multipleSelection
+          const data = this.formatJson(filterVal, list)
+          export_txt_to_zip(tHeader, data, '列表文本', '压缩文本')
+          this.$refs.multipleTable.clearSelection()
+          this.downloadLoading = false
+        })
+      } else {
+        this.$message({
+          message: '请至少选择一条记录',
+          type: 'warning'
+        })
+      }
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    }
+  }
+}
+</script>

From 8d53ae125973691978ab5f161a094760955133e9 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:03:42 +0800
Subject: [PATCH 11/33] add:add clipboard

---
 package.json                         |  1 +
 src/directive/clipboard/clipboard.js | 49 ++++++++++++++++++++++++++++
 src/directive/clipboard/index.js     | 13 ++++++++
 src/icons/svg/clipboard.svg          |  1 +
 src/router/index.js                  |  8 +++++
 src/utils/clipboard.js               | 36 ++++++++++++++++++++
 src/views/clipboard/index.vue        |  2 ++
 7 files changed, 110 insertions(+)
 create mode 100644 src/directive/clipboard/clipboard.js
 create mode 100644 src/directive/clipboard/index.js
 create mode 100644 src/icons/svg/clipboard.svg
 create mode 100644 src/utils/clipboard.js
 create mode 100644 src/views/clipboard/index.vue

diff --git a/package.json b/package.json
index a80852a9..7eb5f228 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "axios": "0.16.2",
+    "clipboard": "1.7.1",
     "codemirror": "5.26.0",
     "dropzone": "5.1.0",
     "echarts": "3.6.2",
diff --git a/src/directive/clipboard/clipboard.js b/src/directive/clipboard/clipboard.js
new file mode 100644
index 00000000..49c9b391
--- /dev/null
+++ b/src/directive/clipboard/clipboard.js
@@ -0,0 +1,49 @@
+// Inspired by https://github.com/Inndy/vue-clipboard2
+const Clipboard = require('clipboard')
+if (!Clipboard) {
+  throw new Error('you shold npm install `clipboard` --save at first ')
+}
+
+export default {
+  bind(el, binding) {
+    if (binding.arg === 'success') {
+      el._v_clipboard_success = binding.value
+    } else if (binding.arg === 'error') {
+      el._v_clipboard_error = binding.value
+    } else {
+      const clipboard = new Clipboard(el, {
+        text() { return binding.value },
+        action() { return binding.arg === 'cut' ? 'cut' : 'copy' }
+      })
+      clipboard.on('success', e => {
+        const callback = el._v_clipboard_success
+        callback && callback(e) // eslint-disable-line
+      })
+      clipboard.on('error', e => {
+        const callback = el._v_clipboard_error
+        callback && callback(e) // eslint-disable-line
+      })
+      el._v_clipboard = clipboard
+    }
+  },
+  update(el, binding) {
+    if (binding.arg === 'success') {
+      el._v_clipboard_success = binding.value
+    } else if (binding.arg === 'error') {
+      el._v_clipboard_error = binding.value
+    } else {
+      el._v_clipboard.text = function() { return binding.value }
+      el._v_clipboard.action = function() { return binding.arg === 'cut' ? 'cut' : 'copy' }
+    }
+  },
+  unbind(el, binding) {
+    if (binding.arg === 'success') {
+      delete el._v_clipboard_success
+    } else if (binding.arg === 'error') {
+      delete el._v_clipboard_error
+    } else {
+      el._v_clipboard.destroy()
+      delete el._v_clipboard
+    }
+  }
+}
diff --git a/src/directive/clipboard/index.js b/src/directive/clipboard/index.js
new file mode 100644
index 00000000..02c98163
--- /dev/null
+++ b/src/directive/clipboard/index.js
@@ -0,0 +1,13 @@
+import Clipboard from './clipboard'
+
+const install = function(Vue) {
+  Vue.directive('Clipboard', Clipboard)
+}
+
+if (window.Vue) {
+  window.clipboard = Clipboard
+  Vue.use(install); // eslint-disable-line
+}
+
+Clipboard.install = install
+export default Clipboard
diff --git a/src/icons/svg/clipboard.svg b/src/icons/svg/clipboard.svg
new file mode 100644
index 00000000..cf1c9b0c
--- /dev/null
+++ b/src/icons/svg/clipboard.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1506419860538" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4662" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M438.857143 950.857143l512 0 0-365.714286-237.714286 0q-22.820571 0-38.838857-16.018286t-16.018286-38.838857l0-237.714286-219.428571 0 0 658.285714zM585.142857 128l0-36.571429q0-7.460571-5.412571-12.873143t-12.873143-5.412571l-402.285714 0q-7.460571 0-12.873143 5.412571t-5.412571 12.873143l0 36.571429q0 7.460571 5.412571 12.873143t12.873143 5.412571l402.285714 0q7.460571 0 12.873143-5.412571t5.412571-12.873143zM731.428571 512l170.861714 0-170.861714-170.861714 0 170.861714zM1024 585.142857l0 384q0 22.820571-16.018286 38.838857t-38.838857 16.018286l-548.571429 0q-22.820571 0-38.838857-16.018286t-16.018286-38.838857l0-91.428571-310.857143 0q-22.820571 0-38.838857-16.018286t-16.018286-38.838857l0-768q0-22.820571 16.018286-38.838857t38.838857-16.018286l621.714286 0q22.820571 0 38.838857 16.018286t16.018286 38.838857l0 187.465143q11.995429 7.460571 20.553143 16.018286l233.179429 233.179429q16.018286 16.018286 27.428571 43.446857t11.410286 50.322286z" p-id="4663"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index b50c7426..8bc6642b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -174,6 +174,14 @@ export const asyncRouterMap = [
     noDropdown: true,
     children: [{ path: 'index', component: _import('theme/index'), name: '换肤' }]
   },
+  {
+    path: '/clipboard',
+    component: Layout,
+    redirect: 'noredirect',
+    icon: 'clipboard',
+    noDropdown: true,
+    children: [{ path: 'index', component: _import('clipboard/index'), name: 'clipboard' }]
+  },
 
   { path: '*', redirect: '/404', hidden: true }
 ]
diff --git a/src/utils/clipboard.js b/src/utils/clipboard.js
new file mode 100644
index 00000000..882b1251
--- /dev/null
+++ b/src/utils/clipboard.js
@@ -0,0 +1,36 @@
+import Clipboard from 'clipboard'
+import Vue from 'vue'
+
+function clipboardSuccess() {
+  Vue.prototype.$message({
+    message: '复制成功',
+    type: 'success',
+    duration: 1500
+  })
+}
+
+function clipboardError() {
+  Vue.prototype.$message({
+    message: '复制失败',
+    type: 'error'
+  })
+}
+
+export default function handleClipboard(text, event) {
+  const clipboard = new Clipboard(event.target, {
+    text: () => text
+  })
+  clipboard.on('success', () => {
+    clipboardSuccess()
+    clipboard.off('error')
+    clipboard.off('success')
+    clipboard.destroy()
+  })
+  clipboard.on('error', () => {
+    clipboardError()
+    clipboard.off('error')
+    clipboard.off('success')
+    clipboard.destroy()
+  })
+  clipboard.onClick(event)
+}
diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue
new file mode 100644
index 00000000..c1cf0c07
--- /dev/null
+++ b/src/views/clipboard/index.vue
@@ -0,0 +1,2 @@
+<template>
+  <div class="app-container">

From 4f2f136dd089cc4df9265c7edb3685a1b16ab852 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:04:06 +0800
Subject: [PATCH 12/33] add:add clipboard example

---
 src/views/clipboard/index.vue | 42 +++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue
index c1cf0c07..b0281abc 100644
--- a/src/views/clipboard/index.vue
+++ b/src/views/clipboard/index.vue
@@ -1,2 +1,44 @@
 <template>
   <div class="app-container">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="use clipboard  directly" name="directly">
+        <el-input v-model="inputData" placeholder="请输入内容" style='width:400px;'></el-input>
+        <el-button type="primary" icon="document" @click='handleCopy(inputData,$event)'>copy</el-button>
+      </el-tab-pane>
+      <el-tab-pane label="use clipboard by v-directive" name="v-directive">
+        <el-input v-model="inputData" placeholder="请输入内容" style='width:400px;'></el-input>
+        <el-button type="primary" icon="document" v-clipboard:copy='inputData' v-clipboard:success='clipboardSuccess'>copy</el-button>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import clip from '@/utils/clipboard' // use clipboard directly
+import clipboard from '@/directive/clipboard/index.js'  // use clipboard by v-directive
+
+export default {
+  directives: {
+    clipboard
+  },
+  data() {
+    return {
+      activeName: 'directly',
+      inputData: 'https://github.com/PanJiaChen/vue-element-admin'
+    }
+  },
+  methods: {
+    handleCopy(text, event) {
+      clip(text, event)
+    },
+    clipboardSuccess() {
+      this.$message({
+        message: '复制成功',
+        type: 'success',
+        duration: 1500
+      })
+    }
+  }
+}
+</script>
+

From 065eaa93a2375cec923d75f369dd575255b83669 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:13:25 +0800
Subject: [PATCH 13/33] refine:icon demo add clipboard

---
 src/views/svg-icons/index.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/views/svg-icons/index.vue b/src/views/svg-icons/index.vue
index 8cf289ef..71da22c7 100644
--- a/src/views/svg-icons/index.vue
+++ b/src/views/svg-icons/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="icons-container">
     <div class="icons-wrapper">
-      <div v-for='item of iconsMap' :key='item' class='icon-item'>
+      <div v-for='item of iconsMap' :key='item' class='icon-item' @click='handleClipboard(generateIconCode(item),$event)'>
         <el-tooltip placement="top" effect="light">
           <div slot="content">
-            {{`&lt;icon-svg :icon-class=&quot;${item}&quot; /&gt;`}}
+            {{generateIconCode(item)}}
           </div>
           <icon-svg :icon-class="item" />
         </el-tooltip>
@@ -16,6 +16,7 @@
 
 <script>
 import icons from './generateIconsView'
+import clipboard from '@/utils/clipboard' // use clipboard directly
 
 export default {
   data() {
@@ -28,6 +29,14 @@ export default {
       return i.default.id.split('-')[1]
     })
     this.iconsMap = iconsMap
+  },
+  methods: {
+    generateIconCode(symbol) {
+      return `<icon-svg :icon-class="${symbol}" />`
+    },
+    handleClipboard(text, event) {
+      clipboard(text, event)
+    }
   }
 }
 </script>

From 329f3b371457bf985e9b352a2ff11363b7866053 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:29:32 +0800
Subject: [PATCH 14/33] refine:rm export selected to zip example

---
 src/router/index.js      |  7 ++--
 src/views/zip/select.vue | 88 ----------------------------------------
 2 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 src/views/zip/select.vue

diff --git a/src/router/index.js b/src/router/index.js
index 8bc6642b..a4cc7b9b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -149,8 +149,8 @@ export const asyncRouterMap = [
     name: 'excel',
     icon: 'excel',
     children: [
-      { path: 'download', component: _import('excel/index'), name: '导出excel' },
-      { path: 'download2', component: _import('excel/selectExcel'), name: '导出已选择项' },
+      { path: 'download', component: _import('excel/index'), name: 'export excel' },
+      { path: 'download2', component: _import('excel/selectExcel'), name: 'export selected' },
       { path: 'upload', component: _import('excel/uploadExcel'), name: 'upload excel' }
     ]
   },
@@ -161,8 +161,7 @@ export const asyncRouterMap = [
     name: 'zip',
     icon: 'zip',
     children: [
-      { path: 'download', component: _import('zip/index'), name: '导出zip' },
-      { path: 'download2', component: _import('zip/select'), name: '导出已选择项' }
+      { path: 'download', component: _import('zip/index'), name: 'export zip' }
     ]
   },
   {
diff --git a/src/views/zip/select.vue b/src/views/zip/select.vue
deleted file mode 100644
index fc4ac7fb..00000000
--- a/src/views/zip/select.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-button style='margin-bottom:20px' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">导出已选择项</el-button>
-    <el-table :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row @selection-change="handleSelectionChange"
-      ref="multipleTable">
-      <el-table-column type="selection" align="center"></el-table-column>
-      <el-table-column align="center" label='ID' width="95">
-        <template scope="scope">
-          {{scope.$index}}
-        </template>
-      </el-table-column>
-      <el-table-column label="文章标题">
-        <template scope="scope">
-          {{scope.row.title}}
-        </template>
-      </el-table-column>
-      <el-table-column label="作者" width="95" align="center">
-        <template scope="scope">
-          <el-tag>{{scope.row.author}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="阅读数" width="115" align="center">
-        <template scope="scope">
-          {{scope.row.pageviews}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="created_at" label="发布时间" width="220">
-        <template scope="scope">
-          <i class="el-icon-time"></i>
-          <span>{{scope.row.display_time}}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import { fetchList } from '@/api/article'
-
-export default {
-  data() {
-    return {
-      list: null,
-      listLoading: true,
-      multipleSelection: [],
-      downloadLoading: false
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.listLoading = true
-      fetchList(this.listQuery).then(response => {
-        this.list = response.data.items
-        this.listLoading = false
-      })
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    handleDownload() {
-      if (this.multipleSelection.length) {
-        this.downloadLoading = true
-        require.ensure([], () => {
-          const { export_txt_to_zip } = require('vendor/Export2Zip')
-          const tHeader = ['序号', '文章标题', '作者', '阅读数', '发布时间']
-          const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
-          const list = this.multipleSelection
-          const data = this.formatJson(filterVal, list)
-          export_txt_to_zip(tHeader, data, '列表文本', '压缩文本')
-          this.$refs.multipleTable.clearSelection()
-          this.downloadLoading = false
-        })
-      } else {
-        this.$message({
-          message: '请至少选择一条记录',
-          type: 'warning'
-        })
-      }
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
-    }
-  }
-}
-</script>

From 2282135b442a4e03b346c57fead6af748e225c7e Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:34:48 +0800
Subject: [PATCH 15/33] refine:refine directive waves

---
 src/directive/waves/index.js        | 13 +++++++++++++
 src/directive/{ => waves}/waves.css |  0
 src/directive/{ => waves}/waves.js  |  0
 src/views/components/mixin.vue      |  2 +-
 src/views/example/table/table.vue   |  2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 src/directive/waves/index.js
 rename src/directive/{ => waves}/waves.css (100%)
 rename src/directive/{ => waves}/waves.js (100%)

diff --git a/src/directive/waves/index.js b/src/directive/waves/index.js
new file mode 100644
index 00000000..65f9b308
--- /dev/null
+++ b/src/directive/waves/index.js
@@ -0,0 +1,13 @@
+import waves from './waves'
+
+const install = function(Vue) {
+  Vue.directive('waves', waves)
+}
+
+if (window.Vue) {
+  window.waves = waves
+  Vue.use(install); // eslint-disable-line
+}
+
+waves.install = install
+export default waves
diff --git a/src/directive/waves.css b/src/directive/waves/waves.css
similarity index 100%
rename from src/directive/waves.css
rename to src/directive/waves/waves.css
diff --git a/src/directive/waves.js b/src/directive/waves/waves.js
similarity index 100%
rename from src/directive/waves.js
rename to src/directive/waves/waves.js
diff --git a/src/views/components/mixin.vue b/src/views/components/mixin.vue
index 4a799140..5f450c91 100644
--- a/src/views/components/mixin.vue
+++ b/src/views/components/mixin.vue
@@ -26,7 +26,7 @@
 <script>
 import PanThumb from '@/components/PanThumb'
 import MdInput from '@/components/MDinput'
-import waves from '@/directive/waves.js' // 水波纹指令
+import waves from '@/directive/waves/index.js' // 水波纹指令
 
 export default {
   components: {
diff --git a/src/views/example/table/table.vue b/src/views/example/table/table.vue
index 3b7b8db4..276c68e4 100644
--- a/src/views/example/table/table.vue
+++ b/src/views/example/table/table.vue
@@ -151,7 +151,7 @@
 
 <script>
 import { fetchList, fetchPv } from '@/api/article'
-import waves from '@/directive/waves.js'// 水波纹指令
+import waves from '@/directive/waves/index.js' // 水波纹指令
 import { parseTime } from '@/utils'
 
 const calendarTypeOptions = [

From a10de2e8d897cfc2443db0bb6039757c36a3e675 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 27 Sep 2017 10:43:53 +0800
Subject: [PATCH 16/33] [release] 2.2.0

---
 README-en.md | 4 +++-
 README.md    | 2 ++
 package.json | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README-en.md b/README-en.md
index 39d4c892..25459147 100644
--- a/README-en.md
+++ b/README-en.md
@@ -32,8 +32,9 @@
 - ECharts
 - 401, 404 error page
 - Error log
-- Exporting to Excel
+- Export Excel
 - Upload Excel
+- Export Zip
 - Table example
 - Interactive table example
 - Drag & drop table example
@@ -47,6 +48,7 @@
 - screenfull
 - markdown2html
 - views-tab
+- clipboard
 
 ## Development
 
diff --git a/README.md b/README.md
index 34e78b92..0e0b96d3 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@
 - 401，404错误页面
 - 错误日志
 - 导出excel
+- zip
 - 前端可视化excel
 - table example
 - 动态table example
@@ -78,6 +79,7 @@
 - screenfull
 - markdown2html
 - views-tab
+- clipboard
 
 
 ## 开发
diff --git a/package.json b/package.json
index 7eb5f228..41788727 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juicy",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "A Vue.js admin",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

From be0606ebbc40adca0be847c22e8fe079d082a4c6 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 28 Sep 2017 15:31:49 +0800
Subject: [PATCH 17/33] update echarts

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 41788727..d1498c15 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "clipboard": "1.7.1",
     "codemirror": "5.26.0",
     "dropzone": "5.1.0",
-    "echarts": "3.6.2",
+    "echarts": "3.7.2",
     "element-ui": "1.4.2",
     "file-saver": "1.3.3",
     "js-cookie": "2.1.4",

From a842a4b451571195a6d2453ca77fe8a4da2a3c5f Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 29 Sep 2017 13:39:42 +0800
Subject: [PATCH 18/33] refine:refine build_config

---
 build/build.js             |  4 +---
 build/dev-server.js        | 41 ++++++++++++++++++++++----------------
 build/webpack.base.conf.js | 16 +++++++--------
 build/webpack.prod.conf.js |  4 +++-
 config/dev.env.js          |  1 +
 config/prod.env.js         |  1 +
 config/sit.env.js          |  1 +
 package.json               |  6 +++---
 8 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/build/build.js b/build/build.js
index da9522a1..2041892b 100644
--- a/build/build.js
+++ b/build/build.js
@@ -9,9 +9,7 @@ var webpack = require('webpack');
 var config = require('../config');
 var webpackConfig = require('./webpack.prod.conf');
 
-console.log(process.env.NODE_ENV)
-
-var spinner = ora('building for ' + process.env.NODE_ENV + '...')
+var spinner = ora('building for ' + process.env.NODE_ENV + ' of ' + process.env.env_config+ ' mode...' )
 spinner.start()
 
 
diff --git a/build/dev-server.js b/build/dev-server.js
index 34c32b3c..254a3bb1 100644
--- a/build/dev-server.js
+++ b/build/dev-server.js
@@ -1,4 +1,5 @@
 require('./check-versions')(); // 检查 Node 和 npm 版本
+
 var config = require('../config');
 if (!process.env.NODE_ENV) {
     process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV)
@@ -28,8 +29,8 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
 });
 
 var hotMiddleware = require('webpack-hot-middleware')(compiler, {
-    log: () => {
-    }
+    log: false,
+    heartbeat: 2000
 });
 
 // force page reload when html-webpack-plugin template changes
@@ -40,8 +41,6 @@ compiler.plugin('compilation', function (compilation) {
     })
 });
 
-// compiler.apply(new DashboardPlugin());
-
 // proxy api requests
 Object.keys(proxyTable).forEach(function (context) {
     var options = proxyTable[context]
@@ -67,18 +66,26 @@ app.use(staticPath, express.static('./static'));
 
 var uri = 'http://localhost:' + port
 
-devMiddleware.waitUntilValid(function () {
-    console.log('> Listening at ' + uri + '\n')
-});
+var _resolve
+var readyPromise = new Promise(resolve => {
+  _resolve = resolve
+})
 
-module.exports = app.listen(port, function (err) {
-    if (err) {
-        console.log(err);
-        return
-    }
+console.log('> Starting dev server...')
+devMiddleware.waitUntilValid(() => {
+  console.log('> Listening at ' + uri + '\n')
+  // when env is testing, don't need open it
+  if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
+    opn(uri)
+  }
+  _resolve()
+})
 
-    // when env is testing, don't need open it
-    if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
-        opn(uri)
-    }
-});
+var server = app.listen(port)
+
+module.exports = {
+  ready: readyPromise,
+  close: () => {
+    server.close()
+  }
+}
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index d82a880c..0fd53f61 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -14,7 +14,7 @@ module.exports = {
   output: {
     path: config.build.assetsRoot,
     filename: '[name].js',
-    publicPath: process.env.NODE_ENV !== 'development' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
+    publicPath: process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
   },
   resolve: {
     extensions: ['.js', '.vue', '.json'],
@@ -38,13 +38,13 @@ module.exports = {
   module: {
     rules: [
       {
-          test: /\.(js|vue)$/,
-          loader: 'eslint-loader',
-          enforce: "pre",
-          include: [resolve('src'), resolve('test')],
-          options: {
-              formatter: require('eslint-friendly-formatter')
-          }
+        test: /\.(js|vue)$/,
+        loader: 'eslint-loader',
+        enforce: "pre",
+        include: [resolve('src'), resolve('test')],
+        options: {
+            formatter: require('eslint-friendly-formatter')
+        }
       },
       {
         test: /\.vue$/,
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index d69d0e1d..9b20a51b 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -9,7 +9,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 
-var env = process.env.NODE_ENV === 'production' ? config.build.prodEnv : config.build.sitEnv
+var env = config.build[process.env.config_env+'Env']
 
 function resolveApp(relativePath) {
   return path.resolve(relativePath);
@@ -117,9 +117,11 @@ var webpackConfig = merge(baseWebpackConfig, {
     }])
   ]
 })
+
 if (config.build.bundleAnalyzerReport) {
   var BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
   webpackConfig.plugins.push(new BundleAnalyzerPlugin())
 }
+
 module.exports = webpackConfig
 
diff --git a/config/dev.env.js b/config/dev.env.js
index e26486cd..f4aeda50 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -1,5 +1,6 @@
 module.exports = {
     NODE_ENV: '"development"',
+    ENV_CONFIG: '"dev"',
     BASE_API: '"https://api-dev"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }
diff --git a/config/prod.env.js b/config/prod.env.js
index cc935b9a..5cc5b18c 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 module.exports = {
     NODE_ENV: '"production"',
+    ENV_MODE: '"prod"',
     BASE_API: '"https://api-prod"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 };
diff --git a/config/sit.env.js b/config/sit.env.js
index 64cf403b..a9a041af 100644
--- a/config/sit.env.js
+++ b/config/sit.env.js
@@ -1,5 +1,6 @@
 module.exports = {
     NODE_ENV: '"production"',
+    ENV_CONFIG: '"sit"',
     BASE_API: '"https://api-sit"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 };
diff --git a/package.json b/package.json
index d1498c15..7d075335 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,9 @@
   "private": true,
   "scripts": {
     "dev": "node build/dev-server.js",
-    "build:prod": "cross-env NODE_ENV=production node build/build.js",
-    "build:sit": "cross-env NODE_ENV=sit node build/build.js",
-    "build:sit-preview": "cross-env NODE_ENV=sit npm_config_preview=true  npm_config_report=true node build/build.js",
+    "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+    "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js",
+    "build:sit-preview": "cross-env NODE_ENV=sit env_config=sit npm_config_preview=true  npm_config_report=true node build/build.js",
     "lint": "eslint --ext .js,.vue src"
   },
   "dependencies": {

From 2725285d265ded3cbe3164949e9932abc234afa5 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 29 Sep 2017 13:52:29 +0800
Subject: [PATCH 19/33] fix build_config bug

---
 build/webpack.prod.conf.js |  2 +-
 config/index.js            | 60 +++++++++++++++++++-------------------
 config/prod.env.js         |  2 +-
 package.json               |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 9b20a51b..cf50e0c9 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -9,7 +9,7 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 
-var env = config.build[process.env.config_env+'Env']
+var env = config.build[process.env.env_config+'Env']
 
 function resolveApp(relativePath) {
   return path.resolve(relativePath);
diff --git a/config/index.js b/config/index.js
index 581d53a3..c38e0b84 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,37 +3,37 @@ var path = require('path')
 
 module.exports = {
     build: {
-        sitEnv: require('./sit.env'),
-        prodEnv: require('./prod.env'),
-        index: path.resolve(__dirname, '../dist/index.html'),
-        assetsRoot: path.resolve(__dirname, '../dist'),
-        assetsSubDirectory: 'static',
-        assetsPublicPath: './',          //请根据自己路径配置更改
-        productionSourceMap: false,
-        // Gzip off by default as many popular static hosts such as
-        // Surge or Netlify already gzip all static assets for you.
-        // Before setting to `true`, make sure to:
-        // npm install --save-dev compression-webpack-plugin
-        productionGzip: false,
-        productionGzipExtensions: ['js', 'css'],
-        // Run the build command with an extra argument to
-        // View the bundle analyzer report after build finishes:
-        // `npm run build --report`
-        // Set to `true` or `false` to always turn it on or off
-        bundleAnalyzerReport: process.env.npm_config_report
+			sitEnv: require('./sit.env'),
+			prodEnv: require('./prod.env'),
+			index: path.resolve(__dirname, '../dist/index.html'),
+			assetsRoot: path.resolve(__dirname, '../dist'),
+			assetsSubDirectory: 'static',
+			assetsPublicPath: './',          //请根据自己路径配置更改
+			productionSourceMap: false,
+			// Gzip off by default as many popular static hosts such as
+			// Surge or Netlify already gzip all static assets for you.
+			// Before setting to `true`, make sure to:
+			// npm install --save-dev compression-webpack-plugin
+			productionGzip: false,
+			productionGzipExtensions: ['js', 'css'],
+			// Run the build command with an extra argument to
+			// View the bundle analyzer report after build finishes:
+			// `npm run build --report`
+			// Set to `true` or `false` to always turn it on or off
+			bundleAnalyzerReport: process.env.npm_config_report
     },
     dev: {
-        env: require('./dev.env'),
-        port: 9527,
-        autoOpenBrowser: true,
-        assetsSubDirectory: 'static',
-        assetsPublicPath: '/',
-        proxyTable: {},
-        // CSS Sourcemaps off by default because relative paths are "buggy"
-        // with this option, according to the CSS-Loader README
-        // (https://github.com/webpack/css-loader#sourcemaps)
-        // In our experience, they generally work as expected,
-        // just be aware of this issue when enabling this option.
-        cssSourceMap: false
+			env: require('./dev.env'),
+			port: 9527,
+			autoOpenBrowser: true,
+			assetsSubDirectory: 'static',
+			assetsPublicPath: '/',
+			proxyTable: {},
+			// CSS Sourcemaps off by default because relative paths are "buggy"
+			// with this option, according to the CSS-Loader README
+			// (https://github.com/webpack/css-loader#sourcemaps)
+			// In our experience, they generally work as expected,
+			// just be aware of this issue when enabling this option.
+			cssSourceMap: false
     }
 }
diff --git a/config/prod.env.js b/config/prod.env.js
index 5cc5b18c..511b341a 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,6 +1,6 @@
 module.exports = {
     NODE_ENV: '"production"',
-    ENV_MODE: '"prod"',
+    ENV_CONFIG: '"prod"',
     BASE_API: '"https://api-prod"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 };
diff --git a/package.json b/package.json
index 7d075335..01d8f376 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "dev": "node build/dev-server.js",
     "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js",
-    "build:sit-preview": "cross-env NODE_ENV=sit env_config=sit npm_config_preview=true  npm_config_report=true node build/build.js",
+    "build:sit-preview": "cross-env NODE_ENV=production env_config=sit npm_config_preview=true  npm_config_report=true node build/build.js",
     "lint": "eslint --ext .js,.vue src"
   },
   "dependencies": {

From 516897b97af5cf0983ba99e07e8497355f7ba388 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Sun, 8 Oct 2017 11:19:20 +0800
Subject: [PATCH 20/33] Fix:fix autoprefixer explanation

---
 .postcssrc.js | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.postcssrc.js b/.postcssrc.js
index ea9a5ab8..09948d63 100644
--- a/.postcssrc.js
+++ b/.postcssrc.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   "plugins": {
-    // to edit target browsers: use "browserlist" field in package.json
+    // to edit target browsers: use "browserslist" field in package.json
     "autoprefixer": {}
   }
 }
diff --git a/package.json b/package.json
index 01d8f376..168afe35 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "node": ">= 4.0.0",
     "npm": ">= 3.0.0"
   },
-  "browserlist": [
+  "browserslist": [
     "> 1%",
     "last 2 versions",
     "not ie <= 8"

From a8602e78f0e49c1f04a00dcf464aab4298e99525 Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Thu, 12 Oct 2017 13:54:29 +0800
Subject: [PATCH 21/33] refine:export adaptive colwidth in excel

---
 src/vendor/Export2Excel.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js
index 8852064e..c6aae141 100644
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@@ -100,7 +100,6 @@ export function export_table_to_excel(id) {
     /* original data */
     var data = oo[0];
     var ws_name = "SheetJS";
-    console.log(data);
 
     var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
 
@@ -127,6 +126,25 @@ export function export_json_to_excel(th, jsonData, defaultTitle) {
 
     var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
 
+    /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
+      /*判断是否为中文*/
+      if (val.toString().charCodeAt(0) > 255) {
+        return {'wch': val.toString().length * 2};
+      } else {
+        return {'wch': val.toString().length};
+      }
+    }))
+    /*以第一行为初始值*/
+    let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
+        }
+      }
+    }
+    ws['!cols'] = result;
 
     /* add worksheet to workbook */
     wb.SheetNames.push(ws_name);

From 91bd31e1e2f7593e8cc637eecad5f1a4a063ec14 Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Thu, 12 Oct 2017 13:59:01 +0800
Subject: [PATCH 22/33] refine:refine code

---
 src/vendor/Export2Zip.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vendor/Export2Zip.js b/src/vendor/Export2Zip.js
index 4fab8aca..599eda18 100644
--- a/src/vendor/Export2Zip.js
+++ b/src/vendor/Export2Zip.js
@@ -14,9 +14,9 @@ export function export_txt_to_zip(th, jsonData, txtName, zipName) {
     txtData += `${tempStr}\r\n`
   })
   zip.file(`${txt_name}.txt`, txtData)
-  zip.generateAsync({type:"blob"}).then(function (blob) {
+  zip.generateAsync({type:"blob"}).then((blob) => {
     saveAs(blob, `${zip_name}.zip`)
-  }, function (err) {
+  }, (err) => {
     alert('导出失败')
   })
 }

From 4940dd4040665d8bed4a7f1279235961cf4bcaa8 Mon Sep 17 00:00:00 2001
From: spiritree <spiritreess@gmail.com>
Date: Thu, 12 Oct 2017 16:22:39 +0800
Subject: [PATCH 23/33] fix:fix `undefined` bug in export excel

---
 src/vendor/Export2Excel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/vendor/Export2Excel.js b/src/vendor/Export2Excel.js
index c6aae141..4370da36 100644
--- a/src/vendor/Export2Excel.js
+++ b/src/vendor/Export2Excel.js
@@ -128,8 +128,12 @@ export function export_json_to_excel(th, jsonData, defaultTitle) {
 
     /*设置worksheet每列的最大宽度*/
     const colWidth = data.map(row => row.map(val => {
-      /*判断是否为中文*/
-      if (val.toString().charCodeAt(0) > 255) {
+      /*先判断是否为null/undefined*/
+      if (val == null) {
+        return {'wch': 10};
+      }
+      /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
         return {'wch': val.toString().length * 2};
       } else {
         return {'wch': val.toString().length};

From 658abf664d29c79c3f7e67d80f4860876f22f46b Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 16 Oct 2017 10:16:39 +0800
Subject: [PATCH 24/33] refine: add parseTime timestamp demo

---
 src/views/excel/index.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/excel/index.vue b/src/views/excel/index.vue
index 20e55ff1..f46fdae7 100644
--- a/src/views/excel/index.vue
+++ b/src/views/excel/index.vue
@@ -25,7 +25,7 @@
       <el-table-column align="center" prop="created_at" label="发布时间" width="220">
         <template scope="scope">
           <i class="el-icon-time"></i>
-          <span>{{scope.row.display_time}}</span>
+          <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
     </el-table>
@@ -34,6 +34,7 @@
 
 <script>
 import { fetchList } from '@/api/article'
+import { parseTime } from 'utils'
 
 export default {
   data() {
@@ -67,7 +68,13 @@ export default {
       })
     },
     formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
     }
   }
 }

From 9463c50e06ee4dfbe1956d48fc4df68bc55507fa Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 18 Oct 2017 17:02:35 +0800
Subject: [PATCH 25/33] feature: tinymce add setContent && getContent method

---
 src/components/Tinymce/index.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 0dd164b3..ef9be84f 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -150,6 +150,12 @@ export default {
     })
   },
   methods: {
+    setContent(value) {
+      window.tinymce.get(this.tinymceId).setContent(value)
+    },
+    getContent() {
+      window.tinymce.get(this.tinymceId).getContent()
+    },
     imageSuccessCBK(arr) {
       const _this = this
       arr.forEach(v => {

From 1c852db0ef1e0001bb1f70196ce2bc0b3c29f55d Mon Sep 17 00:00:00 2001
From: dingyi1993 <781745492@qq.com>
Date: Sat, 21 Oct 2017 14:12:47 +0800
Subject: [PATCH 26/33] fix:fix undone NProgress.

---
 src/permission.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/permission.js b/src/permission.js
index 1070700a..a638eb8e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -18,6 +18,7 @@ router.beforeEach((to, from, next) => {
   if (getToken()) { // 判断是否有token
     if (to.path === '/login') {
       next({ path: '/' })
+      NProgress.done()
     } else {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => { // 拉取user_info
@@ -37,6 +38,7 @@ router.beforeEach((to, from, next) => {
           next()//
         } else {
           next({ path: '/401', query: { noGoBack: true }})
+          NProgress.done()
         }
         // 可删 ↑
       }

From 87a44ae7f5fa443748a462e7ac82d789dc3e8f85 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 23 Oct 2017 10:28:19 +0800
Subject: [PATCH 27/33] doc: add  note for NProgress.done

---
 src/permission.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index a638eb8e..b7ce9b6c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
   if (getToken()) { // 判断是否有token
     if (to.path === '/login') {
       next({ path: '/' })
-      NProgress.done()
+      NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
     } else {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => { // 拉取user_info
@@ -38,7 +38,7 @@ router.beforeEach((to, from, next) => {
           next()//
         } else {
           next({ path: '/401', query: { noGoBack: true }})
-          NProgress.done()
+          NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
         }
         // 可删 ↑
       }
@@ -48,7 +48,7 @@ router.beforeEach((to, from, next) => {
       next()
     } else {
       next('/login') // 否则全部重定向到登录页
-      NProgress.done() // 在hash模式下 改变手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
+      NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
     }
   }
 })

From 76f4017470a2d5af8b0d17d16dc9ec9aeba650c4 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 25 Oct 2017 17:12:36 +0800
Subject: [PATCH 28/33] fix: fix getUserInfo by cookie bug

---
 src/mock/login.js         | 2 +-
 src/permission.js         | 2 ++
 src/store/modules/user.js | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/mock/login.js b/src/mock/login.js
index 00ce9bde..5b00b503 100644
--- a/src/mock/login.js
+++ b/src/mock/login.js
@@ -34,7 +34,7 @@ export default {
     if (userMap[token]) {
       return userMap[token]
     } else {
-      return Promise.reject('error')
+      return false
     }
   },
   logout: () => 'success'
diff --git a/src/permission.js b/src/permission.js
index b7ce9b6c..2fcc4c9c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,6 +3,7 @@ import store from './store'
 import NProgress from 'nprogress' // Progress 进度条
 import 'nprogress/nprogress.css'// Progress 进度条样式
 import { getToken } from '@/utils/auth' // 验权
+import { Message } from 'element-ui'
 
 // permissiom judge
 function hasPermission(roles, permissionRoles) {
@@ -29,6 +30,7 @@ router.beforeEach((to, from, next) => {
           })
         }).catch(() => {
           store.dispatch('FedLogOut').then(() => {
+            Message.error('验证失败,请重新登录')
             next({ path: '/login' })
           })
         })
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 9c706978..0ac425e1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -63,6 +63,9 @@ const user = {
     GetUserInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getUserInfo(state.token).then(response => {
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+            reject('error')
+          }
           const data = response.data
           commit('SET_ROLES', data.role)
           commit('SET_NAME', data.name)

From 913f6c8bec1471b35d700fdb141dc97ae8318647 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 25 Oct 2017 17:14:57 +0800
Subject: [PATCH 29/33] [release] 2.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 168afe35..a90197c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "juicy",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A Vue.js admin",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

From 74cbb26209f2c747444c8d31f0689dd45ddd7088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 31 Oct 2017 21:05:31 -0500
Subject: [PATCH 30/33] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 0e0b96d3..05fa32c5 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,10 @@
 
 **注意：该项目目前使用element-ui@1.4.2版本，所以最低兼容 Vue 2.3.0**
 
+<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/vMACqConzRGb2TuXvYSosXpP/PanJiaChen/vue-element-admin'>
+  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/vMACqConzRGb2TuXvYSosXpP/PanJiaChen/vue-element-admin.svg' />
+</a>
+
 ## 前言
 > 这半年来一直在用vue写管理后台，目前后台已经有百来个页面，十几种权限，但维护成本依然很低，所以准备开源分享一下后台开发的经验和成果。目前的技术栈主要的采用vue+element+axios由webpack2打包。由于是个人项目，所以数据请求都是用了mockjs模拟。注意：在此项目基础上改造开发时请移除mock文件。
 

From 660ff765f5f8ad29884a201e463ed68196bc94e8 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 1 Nov 2017 18:43:06 +0800
Subject: [PATCH 31/33] fix:fix tabsView path bug

---
 src/views/layout/TabsView.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/layout/TabsView.vue b/src/views/layout/TabsView.vue
index 7f1eaa9f..e0ae6b6c 100644
--- a/src/views/layout/TabsView.vue
+++ b/src/views/layout/TabsView.vue
@@ -30,13 +30,16 @@ export default {
       $event.preventDefault()
     },
     generateRoute() {
-      if (this.$route.matched[this.$route.matched.length - 1].name) {
-        return this.$route.matched[this.$route.matched.length - 1]
+      if (this.$route.name) {
+        return this.$route
       }
-      this.$route.matched[0].path = '/'
-      return this.$route.matched[0]
+      return false
     },
     addViewTabs() {
+      const route = this.generateRoute()
+      if (!route) {
+        return false
+      }
       this.$store.dispatch('addVisitedViews', this.generateRoute())
     },
     isActive(path) {

From a0d83e2ffcca486c7387f4c68faa97c233ee5a32 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 10 Nov 2017 13:59:52 +0800
Subject: [PATCH 32/33] update:update echarts version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a90197c2..2723c6a4 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "clipboard": "1.7.1",
     "codemirror": "5.26.0",
     "dropzone": "5.1.0",
-    "echarts": "3.7.2",
+    "echarts": "3.8.2",
     "element-ui": "1.4.2",
     "file-saver": "1.3.3",
     "js-cookie": "2.1.4",

From 925dbeb045bcadbaad1660d3190538c071e0a758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 14 Nov 2017 00:37:12 -0600
Subject: [PATCH 33/33] Update README.md

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 05fa32c5..34102b0c 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,7 @@
 
 **注意：该项目目前使用element-ui@1.4.2版本，所以最低兼容 Vue 2.3.0**
 
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/vMACqConzRGb2TuXvYSosXpP/PanJiaChen/vue-element-admin'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/vMACqConzRGb2TuXvYSosXpP/PanJiaChen/vue-element-admin.svg' />
-</a>
+楼主这里有一份调查[问卷](https://www.wjx.cn/m/16866569.aspx) 有空请填写一下，以表对本项目的支持~ps:不是给这个调查问卷网站做广告，所以填完问卷不用点上面抽奖有的没的那些东西
 
 ## 前言
 > 这半年来一直在用vue写管理后台，目前后台已经有百来个页面，十几种权限，但维护成本依然很低，所以准备开源分享一下后台开发的经验和成果。目前的技术栈主要的采用vue+element+axios由webpack2打包。由于是个人项目，所以数据请求都是用了mockjs模拟。注意：在此项目基础上改造开发时请移除mock文件。