Merge branch 'master' into i18n
This commit is contained in:
Pan
commit
9083ca0abf
|
|
@ -0,0 +1,33 @@
|
|||
---
|
||||
name: Bug report（报告问题）
|
||||
about: Create a report to help us improve
|
||||
---
|
||||
<!--
|
||||
注意：为更好的解决你的问题，请参考模板提供完整信息，准确描述问题，信息不全的 issue 将被关闭。
|
||||
|
||||
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.
|
||||
-->
|
||||
|
||||
|
||||
## Bug report（问题描述）
|
||||
|
||||
#### Steps to reproduce（问题复现步骤）
|
||||
<!--
|
||||
1. [xxx]
|
||||
2. [xxx]
|
||||
3. [xxxx]
|
||||
-->
|
||||
|
||||
#### Screenshot or Gif（截图或动态图）
|
||||
|
||||
|
||||
#### Link to minimal reproduction（最小可在线还原demo）
|
||||
|
||||
<!--
|
||||
Please only use Codepen, JSFiddle, CodeSandbox or a github repo
|
||||
-->
|
||||
|
||||
#### Other relevant information（格外信息）
|
||||
- Your OS:
|
||||
- Node.js version:
|
||||
- vue-element-admin version:
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
name: Feature Request（新功能建议）
|
||||
about: Suggest an idea for this project
|
||||
---
|
||||
|
||||
## Feature request（新功能建议）
|
||||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
---
|
||||
name: Question（提问）
|
||||
about: Asking questions about use
|
||||
---
|
||||
|
||||
## Question（提问）
|
||||
|
||||
<!--
|
||||
提问之前，请确定你已经过自己的努力，尝试解决过这个问题。
|
||||
若是代码相关问题，请不要只截图，请提供在线 demo，以便节约彼此的时间。
|
||||
|
||||
Before asking a question, please make sure that you have tried your best to solve this problem.
|
||||
If it's a code-related issue, please don't just take screenshots. Please provide an online demo to save each other's time.
|
||||
-->
|
||||
|
|
@ -19,7 +19,7 @@ export const constantRoutes = [
|
|||
},
|
||||
{
|
||||
path: '/auth-redirect',
|
||||
component: 'views/login/authredirect',
|
||||
component: 'views/login/authRedirect',
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
<template>
|
||||
<div class="navbar">
|
||||
<hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
|
||||
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
|
||||
|
||||
<breadcrumb class="breadcrumb-container" />
|
||||
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
|
||||
|
||||
<div class="right-menu">
|
||||
<template v-if="device!=='mobile'">
|
||||
<search class="right-menu-item" />
|
||||
<search id="header-search" class="right-menu-item" />
|
||||
|
||||
<error-log class="errLog-container right-menu-item hover-effect" />
|
||||
|
||||
<screenfull class="right-menu-item hover-effect" />
|
||||
<screenfull id="screenfull" class="right-menu-item hover-effect" />
|
||||
|
||||
<el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
|
||||
<size-select class="right-menu-item hover-effect" />
|
||||
<size-select id="size-select" class="right-menu-item hover-effect" />
|
||||
</el-tooltip>
|
||||
|
||||
<lang-select class="right-menu-item hover-effect" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="tags-view-container">
|
||||
<div id="tags-view-container" class="tags-view-container">
|
||||
<scroll-pane ref="scrollPane" class="tags-view-wrapper">
|
||||
<router-link
|
||||
v-for="tag in visitedViews"
|
||||
|
|
@ -243,7 +243,7 @@ export default {
|
|||
.contextmenu {
|
||||
margin: 0;
|
||||
background: #fff;
|
||||
z-index: 100;
|
||||
z-index: 3000;
|
||||
position: absolute;
|
||||
list-style-type: none;
|
||||
padding: 5px 0;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ export const constantRoutes = [
|
|||
},
|
||||
{
|
||||
path: '/auth-redirect',
|
||||
component: () => import('@/views/login/authredirect'),
|
||||
component: () => import('@/views/login/authRedirect'),
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label-width="45px" label="作者:" class="postInfo-container-item">
|
||||
<el-select v-model="postForm.author" :remote-method="getRemoteUserList" filterable remote placeholder="搜索用户">
|
||||
<el-select v-model="postForm.author" :remote-method="getRemoteUserList" filterable default-first-option remote placeholder="搜索用户">
|
||||
<el-option v-for="(item,index) in userListOptions" :key="item+index" :label="item" :value="item" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
const steps = [
|
||||
{
|
||||
element: '.hamburger-container',
|
||||
element: '#hamburger-container',
|
||||
popover: {
|
||||
title: 'Hamburger',
|
||||
description: 'Open && Close sidebar',
|
||||
|
|
@ -8,7 +8,7 @@ const steps = [
|
|||
}
|
||||
},
|
||||
{
|
||||
element: '.breadcrumb-container',
|
||||
element: '#breadcrumb-container',
|
||||
popover: {
|
||||
title: 'Breadcrumb',
|
||||
description: 'Indicate the current page location',
|
||||
|
|
@ -16,31 +16,31 @@ const steps = [
|
|||
}
|
||||
},
|
||||
{
|
||||
element: '.screenfull',
|
||||
element: '#header-search',
|
||||
popover: {
|
||||
title: 'Page Search',
|
||||
description: 'Page search, quick navigation',
|
||||
position: 'left'
|
||||
}
|
||||
},
|
||||
{
|
||||
element: '#screenfull',
|
||||
popover: {
|
||||
title: 'Screenfull',
|
||||
description: 'Bring the page into fullscreen',
|
||||
description: 'Set the page into fullscreen',
|
||||
position: 'left'
|
||||
}
|
||||
},
|
||||
{
|
||||
element: '.international-icon',
|
||||
element: '#size-select',
|
||||
popover: {
|
||||
title: 'Switch language',
|
||||
description: 'Switch the system language',
|
||||
title: 'Switch Size',
|
||||
description: 'Switch the system size',
|
||||
position: 'left'
|
||||
}
|
||||
},
|
||||
{
|
||||
element: '.theme-switch',
|
||||
popover: {
|
||||
title: 'Theme Switch',
|
||||
description: 'Custom switch system theme',
|
||||
position: 'left'
|
||||
}
|
||||
},
|
||||
{
|
||||
element: '.tags-view-container',
|
||||
element: '#tags-view-container',
|
||||
popover: {
|
||||
title: 'Tags view',
|
||||
description: 'The history of the page you visited',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<script>
|
||||
export default {
|
||||
name: 'Authredirect',
|
||||
name: 'AuthRedirect',
|
||||
created() {
|
||||
const hash = window.location.search.slice(1)
|
||||
if (window.localStorage) {
|
||||
|
|
@ -77,7 +77,7 @@
|
|||
<script>
|
||||
import { validUsername } from '@/utils/validate'
|
||||
import LangSelect from '@/components/LangSelect'
|
||||
import SocialSign from './socialsignin'
|
||||
import SocialSign from './socialSignin'
|
||||
|
||||
export default {
|
||||
name: 'Login',
|
||||
|
|
|
|||
Loading…
Reference in New Issue