Skip to content

Commit c93e5b9

Browse files
author
chenkai22
committed
Squashed commit of the following:
commit ee287d8 Author: Baskerville* <[email protected]> Date: Thu Aug 29 10:23:45 2019 +0800 fix: typos (PanJiaChen#2532) Role Nmae => Role Name commit 12c8d85 Author: 花裤衩 <[email protected]> Date: Tue Aug 27 20:57:51 2019 +0800 fix: fixed missing icons
1 parent c2fd2d9 commit c93e5b9

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

src/views/clipboard/index.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<el-tabs v-model="activeName">
44
<el-tab-pane label="use clipboard directly" name="directly">
55
<el-input v-model="inputData" placeholder="Please input" style="width:400px;max-width:100%;" />
6-
<el-button type="primary" icon="document" @click="handleCopy(inputData,$event)">
6+
<el-button type="primary" icon="el-icon-document" @click="handleCopy(inputData,$event)">
77
copy
88
</el-button>
99
</el-tab-pane>
1010
<el-tab-pane label="use clipboard by v-directive" name="v-directive">
1111
<el-input v-model="inputData" placeholder="Please input" style="width:400px;max-width:100%;" />
12-
<el-button v-clipboard:copy="inputData" v-clipboard:success="clipboardSuccess" type="primary" icon="document">
12+
<el-button v-clipboard:copy="inputData" v-clipboard:success="clipboardSuccess" type="primary" icon="el-icon-document">
1313
copy
1414
</el-button>
1515
</el-tab-pane>

src/views/components-demo/avatar-upload.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<pan-thumb :image="image" />
99

10-
<el-button type="primary" icon="upload" style="position: absolute;bottom: 15px;margin-left: 40px;" @click="imagecropperShow=true">
10+
<el-button type="primary" icon="el-icon-upload" style="position: absolute;bottom: 15px;margin-left: 40px;" @click="imagecropperShow=true">
1111
Change Avatar
1212
</el-button>
1313

src/views/components-demo/mixin.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<div style="height:100px;">
5050
<el-form :model="demo" :rules="demoRules">
5151
<el-form-item prop="title">
52-
<md-input v-model="demo.title" icon="search" name="title" placeholder="输入标题">
52+
<md-input v-model="demo.title" icon="el-icon-search" name="title" placeholder="输入标题">
5353
标题
5454
</md-input>
5555
</el-form-item>

src/views/error-page/401.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="errPage-container">
3-
<el-button icon="arrow-left" class="pan-back-btn" @click="back">
3+
<el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">
44
返回
55
</el-button>
66
<el-row>

src/views/permission/role.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export default {
228228
dangerouslyUseHTMLString: true,
229229
message: `
230230
<div>Role Key: ${key}</div>
231-
<div>Role Nmae: ${name}</div>
231+
<div>Role Name: ${name}</div>
232232
<div>Description: ${description}</div>
233233
`,
234234
type: 'success'

src/views/tab/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
}
3737
},
3838
created() {
39-
// init the default selected tab
39+
// init the default selected tab
4040
const tab = this.$route.query.tab
4141
if (tab) {
4242
this.activeName = tab

src/views/zip/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="app-container">
33
<el-input v-model="filename" placeholder="Please enter the file name (default file)" style="width:300px;" prefix-icon="el-icon-document" />
4-
<el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="document" @click="handleDownload">
4+
<el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="el-icon-document" @click="handleDownload">
55
Export Zip
66
</el-button>
77
<el-table v-loading="listLoading" :data="list" element-loading-text="拼命加载中" border fit highlight-current-row>

0 commit comments

Comments
 (0)