From 12c8d8587345e07bfc084cb2663d0822b9526a38 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, 27 Aug 2019 20:57:51 +0800
Subject: [PATCH 1/2] fix: fixed missing icons
---
src/views/clipboard/index.vue | 4 ++--
src/views/components-demo/avatar-upload.vue | 2 +-
src/views/components-demo/mixin.vue | 2 +-
src/views/error-page/401.vue | 2 +-
src/views/excel/export-excel.vue | 2 +-
src/views/excel/merge-header.vue | 2 +-
src/views/excel/select-excel.vue | 2 +-
src/views/tab/index.vue | 2 +-
src/views/zip/index.vue | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue
index e78c6359..4a6bdd1e 100644
--- a/src/views/clipboard/index.vue
+++ b/src/views/clipboard/index.vue
@@ -3,13 +3,13 @@
<el-tabs v-model="activeName">
<el-tab-pane label="use clipboard directly" name="directly">
<el-input v-model="inputData" placeholder="Please input" style="width:400px;max-width:100%;" />
- <el-button type="primary" icon="document" @click="handleCopy(inputData,$event)">
+ <el-button type="primary" icon="el-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="Please input" style="width:400px;max-width:100%;" />
- <el-button v-clipboard:copy="inputData" v-clipboard:success="clipboardSuccess" type="primary" icon="document">
+ <el-button v-clipboard:copy="inputData" v-clipboard:success="clipboardSuccess" type="primary" icon="el-icon-document">
copy
</el-button>
</el-tab-pane>
diff --git a/src/views/components-demo/avatar-upload.vue b/src/views/components-demo/avatar-upload.vue
index 41bb9bc7..5cb20a56 100644
--- a/src/views/components-demo/avatar-upload.vue
+++ b/src/views/components-demo/avatar-upload.vue
@@ -7,7 +7,7 @@
<pan-thumb :image="image" />
- <el-button type="primary" icon="upload" style="position: absolute;bottom: 15px;margin-left: 40px;" @click="imagecropperShow=true">
+ <el-button type="primary" icon="el-icon-upload" style="position: absolute;bottom: 15px;margin-left: 40px;" @click="imagecropperShow=true">
Change Avatar
</el-button>
diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue
index c64a073a..425cf4fb 100644
--- a/src/views/components-demo/mixin.vue
+++ b/src/views/components-demo/mixin.vue
@@ -49,7 +49,7 @@
<div style="height:100px;">
<el-form :model="demo" :rules="demoRules">
<el-form-item prop="title">
- <md-input v-model="demo.title" icon="search" name="title" placeholder="输入标题">
+ <md-input v-model="demo.title" icon="el-icon-search" name="title" placeholder="输入标题">
标题
</md-input>
</el-form-item>
diff --git a/src/views/error-page/401.vue b/src/views/error-page/401.vue
index 032e808f..a52ed23b 100644
--- a/src/views/error-page/401.vue
+++ b/src/views/error-page/401.vue
@@ -1,6 +1,6 @@
<template>
<div class="errPage-container">
- <el-button icon="arrow-left" class="pan-back-btn" @click="back">
+ <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">
返回
</el-button>
<el-row>
diff --git a/src/views/excel/export-excel.vue b/src/views/excel/export-excel.vue
index e9d8c6ab..6152e019 100644
--- a/src/views/excel/export-excel.vue
+++ b/src/views/excel/export-excel.vue
@@ -5,7 +5,7 @@
<FilenameOption v-model="filename" />
<AutoWidthOption v-model="autoWidth" />
<BookTypeOption v-model="bookType" />
- <el-button :loading="downloadLoading" style="margin:0 0 20px 20px;" type="primary" icon="document" @click="handleDownload">
+ <el-button :loading="downloadLoading" style="margin:0 0 20px 20px;" type="primary" icon="el-icon-document" @click="handleDownload">
Export Excel
</el-button>
<a href="https://panjiachen.github.io/vue-element-admin-site/feature/component/excel.html" target="_blank" style="margin-left:15px;">
diff --git a/src/views/excel/merge-header.vue b/src/views/excel/merge-header.vue
index c145932c..2646b9d0 100644
--- a/src/views/excel/merge-header.vue
+++ b/src/views/excel/merge-header.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
- <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">Export</el-button>
+ <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="el-icon-document" @click="handleDownload">Export</el-button>
<el-table
ref="multipleTable"
diff --git a/src/views/excel/select-excel.vue b/src/views/excel/select-excel.vue
index e6ac34ba..05b85fb8 100644
--- a/src/views/excel/select-excel.vue
+++ b/src/views/excel/select-excel.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-input v-model="filename" placeholder="Please enter the file name (default excel-list)" style="width:350px;" prefix-icon="el-icon-document" />
- <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">
+ <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="el-icon-document" @click="handleDownload">
Export Selected Items
</el-button>
<a href="https://panjiachen.github.io/vue-element-admin-site/feature/component/excel.html" target="_blank" style="margin-left:15px;">
diff --git a/src/views/tab/index.vue b/src/views/tab/index.vue
index 6438a47a..862a160f 100644
--- a/src/views/tab/index.vue
+++ b/src/views/tab/index.vue
@@ -36,7 +36,7 @@ export default {
}
},
created() {
- // init the default selected tab
+ // init the default selected tab
const tab = this.$route.query.tab
if (tab) {
this.activeName = tab
diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue
index 4406e057..412608f8 100644
--- a/src/views/zip/index.vue
+++ b/src/views/zip/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-input v-model="filename" placeholder="Please enter the file name (default file)" style="width:300px;" prefix-icon="el-icon-document" />
- <el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="document" @click="handleDownload">
+ <el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="el-icon-document" @click="handleDownload">
Export Zip
</el-button>
<el-table v-loading="listLoading" :data="list" element-loading-text="拼命加载中" border fit highlight-current-row>
From ee287d8314a320a68083496636fa9d3b575b4e13 Mon Sep 17 00:00:00 2001
From: Baskerville* <wszdlm@gmail.com>
Date: Thu, 29 Aug 2019 10:23:45 +0800
Subject: [PATCH 2/2] fix: typos (#2532)
Role Nmae => Role Name
---
src/views/permission/role.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/permission/role.vue b/src/views/permission/role.vue
index 38e085e5..cd7ecd4c 100644
--- a/src/views/permission/role.vue
+++ b/src/views/permission/role.vue
@@ -228,7 +228,7 @@ export default {
dangerouslyUseHTMLString: true,
message: `
<div>Role Key: ${key}</div>
- <div>Role Nmae: ${name}</div>
+ <div>Role Name: ${name}</div>
<div>Description: ${description}</div>
`,
type: 'success'