Skip to content

Commit 1b96709

Browse files
PanJiaChenPanJiaChen
committed
Merge branch 'master' into deploy
2 parents 86fa7dd + 25414f1 commit 1b96709

File tree

15 files changed

+129
-66
lines changed

15 files changed

+129
-66
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report（报告问题）
3+
about: Create a report to help us improve
4+
---
5+
<!--
6+
注意：为更好的解决你的问题，请参考模板提供完整信息，准确描述问题，信息不全的 issue 将被关闭。
7+
8+
Note: In order to better solve your problem, please refer to the template to provide complete information, accurately describe the problem, and the incomplete information issue will be closed.
9+
-->
10+
11+
12+
## Bug report（问题描述）
13+
14+
#### Steps to reproduce（问题复现步骤）
15+
<!--
16+
1. [xxx]
17+
2. [xxx]
18+
3. [xxxx]
19+
-->
20+
21+
#### Screenshot or Gif（截图或动态图）
22+
23+
24+
#### Link to minimal reproduction（最小可在线还原demo）
25+
26+
<!--
27+
Please only use Codepen, JSFiddle, CodeSandbox or a github repo
28+
-->
29+
30+
#### Other relevant information（格外信息）
31+
- Your OS:
32+
- Node.js version:
33+
- vue-element-admin version:

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
name: Feature Request（新功能建议）
3+
about: Suggest an idea for this project
4+
---
5+
6+
## Feature request（新功能建议）
7+

‎.github/ISSUE_TEMPLATE/question.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Question（提问）
3+
about: Asking questions about use
4+
---
5+
6+
## Question（提问）
7+
8+
<!--
9+
提问之前，请确定你已经过自己的努力，尝试解决过这个问题。
10+
若是代码相关问题，请不要只截图，请提供在线 demo，以便节约彼此的时间。
11+
12+
Before asking a question, please make sure that you have tried your best to solve this problem.
13+
If it's a code-related issue, please don't just take screenshots. Please provide an online demo to save each other's time.
14+
-->

‎src/components/ErrorLog/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@
99
<el-dialog :visible.sync="dialogTableVisible" title="Error Log" width="80%">
1010
<el-table :data="errorLogs" border>
1111
<el-table-column label="Message">
12-
<template slot-scope="scope">
12+
<template slot-scope="{row}">
1313
<div>
1414
<span class="message-title">Msg:</span>
1515
<el-tag type="danger">
16-
{{ scope.row.err.message }}
16+
{{ row.err.message }}
1717
</el-tag>
1818
</div>
1919
<br>
2020
<div>
2121
<span class="message-title" style="padding-right: 10px;">Info: </span>
2222
<el-tag type="warning">
23-
{{ scope.row.vm.$vnode.tag }} error in {{ scope.row.info }}
23+
{{ row.vm.$vnode.tag }} error in {{ row.info }}
2424
</el-tag>
2525
</div>
2626
<br>
2727
<div>
2828
<span class="message-title" style="padding-right: 16px;">Url: </span>
2929
<el-tag type="success">
30-
{{ scope.row.url }}
30+
{{ row.url }}
3131
</el-tag>
3232
</div>
3333
</template>

‎src/layout/components/Navbar.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<template>
22
<div class="navbar">
3-
<hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
3+
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
44

5-
<breadcrumb class="breadcrumb-container" />
5+
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
66

77
<div class="right-menu">
88
<template v-if="device!=='mobile'">
9-
<search class="right-menu-item" />
9+
<search class="right-menu-item header-search" />
1010

1111
<error-log class="errLog-container right-menu-item hover-effect" />
1212

13-
<screenfull class="right-menu-item hover-effect" />
13+
<screenfull id="screenfull" class="right-menu-item hover-effect" />
1414

1515
<el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
16-
<size-select class="right-menu-item hover-effect" />
16+
<size-select id="size-select" class="right-menu-item hover-effect" />
1717
</el-tooltip>
1818

1919
<lang-select class="right-menu-item hover-effect" />

‎src/layout/components/TagsView/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="tags-view-container">
2+
<div id="tags-view-container" class="tags-view-container">
33
<scroll-pane ref="scrollPane" class="tags-view-wrapper">
44
<router-link
55
v-for="tag in visitedViews"

‎src/views/dashboard/admin/components/TransactionTable.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
</template>
1212
</el-table-column>
1313
<el-table-column label="Status" width="100" align="center">
14-
<template slot-scope="scope">
15-
<el-tag :type="scope.row.status | statusFilter">
16-
{{ scope.row.status }}
14+
<template slot-scope="{row}">
15+
<el-tag :type="row.status | statusFilter">
16+
{{ row.status }}
1717
</el-tag>
1818
</template>
1919
</el-table-column>

‎src/views/dashboard/admin/index.vue

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="dashboard-editor-container">
3-
<github-corner style="position: absolute; top: 0px; border: 0; right: 0;" />
3+
<github-corner class="github-corner" />
44

55
<panel-group @handleSetLineChartData="handleSetLineChartData" />
66

@@ -100,6 +100,15 @@ export default {
100100
.dashboard-editor-container {
101101
padding: 32px;
102102
background-color: rgb(240, 242, 245);
103+
position: relative;
104+
105+
.github-corner {
106+
position: absolute;
107+
top: 0px;
108+
border: 0;
109+
right: 0;
110+
}
111+
103112
.chart-wrapper {
104113
background: #fff;
105114
padding: 16px 16px 0;

‎src/views/example/components/ArticleDetail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<el-row>
2929
<el-col :span="8">
3030
<el-form-item label-width="45px" label="作者:" class="postInfo-container-item">
31-
<el-select v-model="postForm.author" :remote-method="getRemoteUserList" filterable remote placeholder="搜索用户">
31+
<el-select v-model="postForm.author" :remote-method="getRemoteUserList" filterable default-first-option remote placeholder="搜索用户">
3232
<el-option v-for="(item,index) in userListOptions" :key="item+index" :label="item" :value="item" />
3333
</el-select>
3434
</el-form-item>

‎src/views/example/list.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
</el-table-column>
2727

2828
<el-table-column class-name="status-col" label="Status" width="110">
29-
<template slot-scope="scope">
30-
<el-tag :type="scope.row.status | statusFilter">
31-
{{ scope.row.status }}
29+
<template slot-scope="{row}">
30+
<el-tag :type="row.status | statusFilter">
31+
{{ row.status }}
3232
</el-tag>
3333
</template>
3434
</el-table-column>
3535

3636
<el-table-column min-width="300px" label="Title">
37-
<template slot-scope="scope">
38-
<router-link :to="'/example/edit/'+scope.row.id" class="link-type">
39-
<span>{{ scope.row.title }}</span>
37+
<template slot-scope="{row}">
38+
<router-link :to="'/example/edit/'+row.id" class="link-type">
39+
<span>{{ row.title }}</span>
4040
</router-link>
4141
</template>
4242
</el-table-column>

0 commit comments

Comments
 (0)