From 59e240eb9a4ac7839b69b05cb46f553589e4a28a Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 31 Oct 2017 16:25:19 +0800
Subject: [PATCH] upload:upload vue && change scope to slot-scope

---
 package.json                                   | 12 ++++++------
 src/components/ErrLog/index.vue                |  4 ++--
 src/views/example/tab/components/tabPane.vue   | 14 +++++++-------
 src/views/example/table/complexTable.vue       | 18 +++++++++---------
 src/views/example/table/dragTable.vue          | 16 ++++++++--------
 .../example/table/dynamicTable/fixedThead.vue  |  2 +-
 .../table/dynamicTable/unfixedThead.vue        |  2 +-
 src/views/example/table/inlineEditTable.vue    | 14 +++++++-------
 src/views/excel/exportExcel.vue                | 10 +++++-----
 src/views/excel/selectExcel.vue                | 10 +++++-----
 src/views/zip/index.vue                        | 10 +++++-----
 11 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/package.json b/package.json
index 43cfed4f..492709f5 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "codemirror": "5.31.0",
     "dropzone": "5.2.0",
     "echarts": "3.7.2",
-    "element-ui": "1.4.2",
+    "element-ui": "1.4.8",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
@@ -31,13 +31,13 @@
     "showdown": "1.8.0",
     "simplemde": "1.11.2",
     "sortablejs": "1.6.1",
-    "vue": "2.4.2",
+    "vue": "2.5.2",
     "vue-count-to": "1.0.5",
     "vue-multiselect": "2.0.6",
-    "vue-router": "2.7.0",
+    "vue-router": "3.0.1",
     "vue-splitpane": "1.0.0",
     "vuedraggable": "2.14.1",
-    "vuex": "2.3.1",
+    "vuex": "3.0.0",
     "xlsx": "^0.11.7"
   },
   "devDependencies": {
@@ -80,9 +80,9 @@
     "style-loader": "0.19.0",
     "svg-sprite-loader": "3.2.4",
     "url-loader": "0.6.2",
-    "vue-loader": "13.0.4",
+    "vue-loader": "13.3.0",
     "vue-style-loader": "3.0.3",
-    "vue-template-compiler": "2.4.2",
+    "vue-template-compiler": "2.5.2",
     "webpack": "3.8.1",
     "webpack-bundle-analyzer": "2.9.0",
     "webpack-dev-middleware": "1.12.0",
diff --git a/src/components/ErrLog/index.vue b/src/components/ErrLog/index.vue
index 327b43b2..08af0426 100644
--- a/src/components/ErrLog/index.vue
+++ b/src/components/ErrLog/index.vue
@@ -12,14 +12,14 @@
 		<el-dialog title="bug日志" :visible.sync="dialogTableVisible">
 			<el-table :data="logsList">
 				<el-table-column label="message">
-					<template scope="scope">
+					<template slot-scope="scope">
 						<div>msg:{{ scope.row.err.message }}</div>
 						<br/>
 						<div>url: {{scope.row.url}}</div>
 					</template>
 				</el-table-column>
 				<el-table-column label="stack">
-					<template scope="scope">
+					<template slot-scope="scope">
 						{{ scope.row.err.stack}}
 					</template>
 				</el-table-column>
diff --git a/src/views/example/tab/components/tabPane.vue b/src/views/example/tab/components/tabPane.vue
index 536c0092..8c9eb67e 100644
--- a/src/views/example/tab/components/tabPane.vue
+++ b/src/views/example/tab/components/tabPane.vue
@@ -3,44 +3,44 @@
 
     <el-table-column align="center" label="序号" width="65"  v-loading="loading"
     element-loading-text="请给我点时间！">
-      <template scope="scope">
+      <template slot-scope="scope">
         <span>{{scope.row.id}}</span>
       </template>
     </el-table-column>
 
     <el-table-column width="180px" align="center" label="时间">
-      <template scope="scope">
+      <template slot-scope="scope">
         <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
       </template>
     </el-table-column>
 
     <el-table-column min-width="300px" label="标题">
-      <template scope="scope">
+      <template slot-scope="scope">
         <span>{{scope.row.title}}</span>
         <el-tag>{{scope.row.type}}</el-tag>
       </template>
     </el-table-column>
 
     <el-table-column width="110px" align="center" label="作者">
-      <template scope="scope">
+      <template slot-scope="scope">
         <span>{{scope.row.author}}</span>
       </template>
     </el-table-column>
 
     <el-table-column width="80px" label="重要性">
-      <template scope="scope">
+      <template slot-scope="scope">
         <svg-icon v-for="n in +scope.row.importance" icon-class="star" :key="n"></svg-icon>
       </template>
     </el-table-column>
 
     <el-table-column align="center" label="阅读数" width="95">
-      <template scope="scope">
+      <template slot-scope="scope">
         <span>{{scope.row.pageviews}}</span>
       </template>
     </el-table-column>
 
     <el-table-column class-name="status-col" label="状态" width="90">
-      <template scope="scope">
+      <template slot-scope="scope">
         <el-tag :type="scope.row.status | statusFilter">{{scope.row.status}}</el-tag>
       </template>
     </el-table-column>
diff --git a/src/views/example/table/complexTable.vue b/src/views/example/table/complexTable.vue
index 3776d9b2..8e11d4c2 100644
--- a/src/views/example/table/complexTable.vue
+++ b/src/views/example/table/complexTable.vue
@@ -28,56 +28,56 @@
     <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
 
       <el-table-column align="center" label="序号" width="65">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="180px" align="center" label="时间">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
 
       <el-table-column min-width="300px" label="标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span class="link-type" @click="handleUpdate(scope.row)">{{scope.row.title}}</span>
           <el-tag>{{scope.row.type | typeFilter}}</el-tag>
         </template>
       </el-table-column>
 
       <el-table-column width="110px" align="center" label="作者">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.author}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="110px" v-if='showAuditor' align="center" label="审核人">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span style='color:red;'>{{scope.row.auditor}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="80px" label="重要性">
-        <template scope="scope">
+        <template slot-scope="scope">
           <svg-icon v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></svg-icon>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="阅读数" width="95">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span class="link-type" @click='handleFetchPv(scope.row.pageviews)'>{{scope.row.pageviews}}</span>
         </template>
       </el-table-column>
 
       <el-table-column class-name="status-col" label="状态" width="90">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag :type="scope.row.status | statusFilter">{{scope.row.status}}</el-tag>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="操作" width="150">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-button v-if="scope.row.status!='published'" size="small" type="success" @click="handleModifyStatus(scope.row,'published')">发布
           </el-button>
           <el-button v-if="scope.row.status!='draft'" size="small" @click="handleModifyStatus(scope.row,'draft')">草稿
diff --git a/src/views/example/table/dragTable.vue b/src/views/example/table/dragTable.vue
index 63e0fd41..0911e719 100644
--- a/src/views/example/table/dragTable.vue
+++ b/src/views/example/table/dragTable.vue
@@ -4,49 +4,49 @@
     <el-table :data="list" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
 
       <el-table-column align="center" label="序号" width="65">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="180px" align="center" label="时间">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
 
       <el-table-column min-width="300px" label="标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.title}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="110px" align="center" label="作者">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.author}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="80px" label="重要性">
-        <template scope="scope">
+        <template slot-scope="scope">
           <svg-icon v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></svg-icon>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="阅读数" width="95">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.pageviews}}</span>
         </template>
       </el-table-column>
 
       <el-table-column class-name="status-col" label="状态" width="90">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag :type="scope.row.status | statusFilter">{{scope.row.status}}</el-tag>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="拖拽" width="95">
-        <template scope="scope">
+        <template slot-scope="scope">
           <svg-icon class='drag-handler' icon-class="drag"></svg-icon>
         </template>
       </el-table-column>
diff --git a/src/views/example/table/dynamicTable/fixedThead.vue b/src/views/example/table/dynamicTable/fixedThead.vue
index 5c088490..cea5ed79 100644
--- a/src/views/example/table/dynamicTable/fixedThead.vue
+++ b/src/views/example/table/dynamicTable/fixedThead.vue
@@ -12,7 +12,7 @@
     <el-table :data="tableData" :key='key' style="width: 100%">
       <el-table-column prop="name" label="fruitName" width="180"></el-table-column>
       <el-table-column :key='fruit' v-for='(fruit,index) in formThead' :label="fruit">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row[fruit]}}
         </template>
       </el-table-column>
diff --git a/src/views/example/table/dynamicTable/unfixedThead.vue b/src/views/example/table/dynamicTable/unfixedThead.vue
index a5991326..e7ae43c3 100644
--- a/src/views/example/table/dynamicTable/unfixedThead.vue
+++ b/src/views/example/table/dynamicTable/unfixedThead.vue
@@ -13,7 +13,7 @@
       <el-table-column prop="name" label="fruitName" width="180">
       </el-table-column>
       <el-table-column :key='fruit' v-for='(fruit,index) in formThead' :label="fruit">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row[fruit]}}
         </template>
       </el-table-column>
diff --git a/src/views/example/table/inlineEditTable.vue b/src/views/example/table/inlineEditTable.vue
index 9dd245b3..687a5110 100644
--- a/src/views/example/table/inlineEditTable.vue
+++ b/src/views/example/table/inlineEditTable.vue
@@ -4,44 +4,44 @@
     <el-table :data="list" v-loading.body="listLoading" border fit highlight-current-row style="width: 100%">
 
       <el-table-column align="center" label="序号" width="80">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="180px" align="center" label="时间">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="120px" align="center" label="作者">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{scope.row.author}}</span>
         </template>
       </el-table-column>
 
       <el-table-column width="100px" label="重要性">
-        <template scope="scope">
+        <template slot-scope="scope">
           <svg-icon v-for="n in +scope.row.importance" icon-class="star" class="meta-item__icon" :key="n"></svg-icon>
         </template>
       </el-table-column>
 
       <el-table-column class-name="status-col" label="状态" width="100">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag :type="scope.row.status | statusFilter">{{scope.row.status}}</el-tag>
         </template>
       </el-table-column>
 
       <el-table-column min-width="300px" label="标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-input v-show="scope.row.edit" size="small" v-model="scope.row.title"></el-input>
           <span v-show="!scope.row.edit">{{ scope.row.title }}</span>
         </template>
       </el-table-column>
 
       <el-table-column align="center" label="编辑" width="120">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-button :type="scope.row.edit?'success':'primary'" @click='scope.row.edit=!scope.row.edit' size="small" icon="edit">{{scope.row.edit?'完成':'编辑'}}</el-button>
         </template>
       </el-table-column>
diff --git a/src/views/excel/exportExcel.vue b/src/views/excel/exportExcel.vue
index f1bb62ad..92f88b8a 100644
--- a/src/views/excel/exportExcel.vue
+++ b/src/views/excel/exportExcel.vue
@@ -3,27 +3,27 @@
     <el-button style='margin-bottom:20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">导出excel</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">
+        <template slot-scope="scope">
           {{scope.$index}}
         </template>
       </el-table-column>
       <el-table-column label="文章标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.title}}
         </template>
       </el-table-column>
       <el-table-column label="作者" width="95" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag>{{scope.row.author}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="阅读数" width="115" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.pageviews}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="created_at" label="发布时间" width="220">
-        <template scope="scope">
+        <template slot-scope="scope">
           <i class="el-icon-time"></i>
           <span>{{scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
         </template>
diff --git a/src/views/excel/selectExcel.vue b/src/views/excel/selectExcel.vue
index 0bb33380..5d35bda9 100644
--- a/src/views/excel/selectExcel.vue
+++ b/src/views/excel/selectExcel.vue
@@ -5,27 +5,27 @@
       ref="multipleTable">
       <el-table-column type="selection" align="center"></el-table-column>
       <el-table-column align="center" label='ID' width="95">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.$index}}
         </template>
       </el-table-column>
       <el-table-column label="文章标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.title}}
         </template>
       </el-table-column>
       <el-table-column label="作者" width="95" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag>{{scope.row.author}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="阅读数" width="115" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.pageviews}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="created_at" label="发布时间" width="220">
-        <template scope="scope">
+        <template slot-scope="scope">
           <i class="el-icon-time"></i>
           <span>{{scope.row.display_time}}</span>
         </template>
diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue
index 8a7c7b76..48b8853c 100644
--- a/src/views/zip/index.vue
+++ b/src/views/zip/index.vue
@@ -3,27 +3,27 @@
     <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">
+        <template slot-scope="scope">
           {{scope.$index}}
         </template>
       </el-table-column>
       <el-table-column label="文章标题">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.title}}
         </template>
       </el-table-column>
       <el-table-column label="作者" width="95" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           <el-tag>{{scope.row.author}}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="阅读数" width="115" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           {{scope.row.pageviews}}
         </template>
       </el-table-column>
       <el-table-column align="center" prop="created_at" label="发布时间" width="220">
-        <template scope="scope">
+        <template slot-scope="scope">
           <i class="el-icon-time"></i>
           <span>{{scope.row.display_time}}</span>
         </template>