diff --git a/README.zh-CN.md b/README.zh-CN.md
index 0e15d8a4..0af0838d 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -161,7 +161,7 @@ cd vue-element-admin
# 安装依赖
npm install
-# 建议不要用 cnpm 安装 会有各种诡异的bug 可以通过如下操作解决 npm 下载速度慢的问题
+# 建议不要直接使用 cnpm 安装以来，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
npm install --registry=https://registry.npm.taobao.org
# 启动服务
diff --git a/jest.config.js b/jest.config.js
index 1ce813e1..143cdc86 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,12 +1,9 @@
module.exports = {
- verbose: true,
moduleFileExtensions: ['js', 'jsx', 'json', 'vue'],
- transformIgnorePatterns: [
- 'node_modules/(?!(babel-jest|jest-vue-preprocessor)/)'
- ],
transform: {
'^.+\\.vue$': 'vue-jest',
- '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub',
+ '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$':
+ 'jest-transform-stub',
'^.+\\.jsx?$': 'babel-jest'
},
moduleNameMapper: {
diff --git a/mock/mock-server.js b/mock/mock-server.js
index b29b7c3f..ccce04d2 100644
--- a/mock/mock-server.js
+++ b/mock/mock-server.js
@@ -1,6 +1,9 @@
const chokidar = require('chokidar')
const bodyParser = require('body-parser')
const chalk = require('chalk')
+const path = require('path')
+
+const mockDir = path.join(process.cwd(), 'mock')
function registerRoutes(app) {
let mockLastIndex
@@ -18,7 +21,7 @@ function registerRoutes(app) {
function unregisterRoutes() {
Object.keys(require.cache).forEach(i => {
- if (i.includes('/mock')) {
+ if (i.includes(mockDir)) {
delete require.cache[require.resolve(i)]
}
})
@@ -40,9 +43,8 @@ module.exports = app => {
var mockStartIndex = mockRoutes.mockStartIndex
// watch files, hot reload mock server
- chokidar.watch(('./mock'), {
- ignored: 'mock/mock-server.js',
- persistent: true,
+ chokidar.watch(mockDir, {
+ ignored: /mock-server/,
ignoreInitial: true
}).on('all', (event, path) => {
if (event === 'change' || event === 'add') {
diff --git a/package.json b/package.json
index 72e92927..6802c9b5 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src",
- "test:unit": "vue-cli-service test:unit",
+ "test:unit": "jest --clearCache && vue-cli-service test:unit",
"test:ci": "npm run lint && npm run test:unit",
"svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
"new": "plop"
diff --git a/src/api/user.js b/src/api/user.js
index a8052005..de69f707 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -22,4 +22,3 @@ export function logout() {
method: 'post'
})
}
-
diff --git a/src/components/Sticky/index.vue b/src/components/Sticky/index.vue
index fa165bc7..97ce0e96 100644
--- a/src/components/Sticky/index.vue
+++ b/src/components/Sticky/index.vue
@@ -40,14 +40,14 @@ export default {
mounted() {
this.height = this.$el.getBoundingClientRect().height
window.addEventListener('scroll', this.handleScroll)
- window.addEventListener('resize', this.handleReize)
+ window.addEventListener('resize', this.handleResize)
},
activated() {
this.handleScroll()
},
destroyed() {
window.removeEventListener('scroll', this.handleScroll)
- window.removeEventListener('resize', this.handleReize)
+ window.removeEventListener('resize', this.handleResize)
},
methods: {
sticky() {
@@ -81,7 +81,7 @@ export default {
}
this.handleReset()
},
- handleReize() {
+ handleResize() {
if (this.isSticky) {
this.width = this.$el.getBoundingClientRect().width + 'px'
}
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index a05c3b9c..284851e5 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -1,5 +1,5 @@
<template>
- <div :class="{fullscreen:fullscreen}" class="tinymce-container editor-container">
+ <div :class="{fullscreen:fullscreen}" class="tinymce-container" :style="{width:containerWidth}">
<textarea :id="tinymceId" class="tinymce-textarea" />
<div class="editor-custom-btn-container">
<editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
@@ -38,9 +38,14 @@ export default {
default: 'file edit insert view format table'
},
height: {
- type: Number,
+ type: [Number, String],
required: false,
default: 360
+ },
+ width: {
+ type: [Number, String],
+ required: false,
+ default: 'auto'
}
},
data() {
@@ -58,6 +63,13 @@ export default {
computed: {
language() {
return this.languageTypeList[this.$store.getters.language]
+ },
+ containerWidth() {
+ const width = this.width
+ if (/^[\d]+(\.[\d]+)?$/.test(width)) { // matches `100`, `'100'`
+ return `${width}px`
+ }
+ return width
}
},
watch: {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d544f079..51972166 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -36,6 +36,9 @@
{{ $t('navbar.github') }}
</el-dropdown-item>
</a>
+ <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+ <el-dropdown-item>Docs</el-dropdown-item>
+ </a>
<el-dropdown-item divided>
<span style="display:block;" @click="logout">{{ $t('navbar.logOut') }}</span>
</el-dropdown-item>
@@ -68,7 +71,6 @@ export default {
computed: {
...mapGetters([
'sidebar',
- 'name',
'avatar',
'device'
])
diff --git a/src/store/getters.js b/src/store/getters.js
index 3fb5b068..313210a0 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -11,7 +11,6 @@ const getters = {
introduction: state => state.user.introduction,
roles: state => state.user.roles,
permission_routes: state => state.permission.routes,
- addRoutes: state => state.permission.addRoutes,
errorLogs: state => state.errorLog.logs
}
export default getters
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index bd35252c..aeb5ee53 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -51,7 +51,7 @@ const actions = {
return new Promise(resolve => {
let accessedRoutes
if (roles.includes('admin')) {
- accessedRoutes = asyncRoutes
+ accessedRoutes = asyncRoutes || []
} else {
accessedRoutes = filterAsyncRoutes(asyncRoutes, roles)
}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index e04f292e..e81672bb 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,6 +1,7 @@
/**
* Created by jiachenpan on 16/11/18.
*/
+
/**
* @param {string} path
* @returns {Boolean}
diff --git a/src/views/error-page/404.vue b/src/views/error-page/404.vue
index 66cb3eae..1791f55a 100644
--- a/src/views/error-page/404.vue
+++ b/src/views/error-page/404.vue
@@ -8,22 +8,13 @@
<img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
</div>
<div class="bullshit">
- <div class="bullshit__oops">
- OOPS!
+ <div class="bullshit__oops">OOPS!</div>
+ <div class="bullshit__info">All rights reserved
+ <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
</div>
- <div class="bullshit__info">
- 版权所有
- <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
- </div>
- <div class="bullshit__headline">
- {{ message }}
- </div>
- <div class="bullshit__info">
- 请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
- </div>
- <router-link to="/" class="bullshit__return-home">
- 返回首页
- </router-link>
+ <div class="bullshit__headline">{{ message }}</div>
+ <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
+ <a href="" class="bullshit__return-home">Back to home</a>
</div>
</div>
</div>
@@ -35,7 +26,7 @@ export default {
name: 'Page404',
computed: {
message() {
- return '网管说这个页面你不能进......'
+ return 'The webmaster said that you can not enter this page...'
}
}
}
diff --git a/src/views/login/components/SocialSignin.vue b/src/views/login/components/SocialSignin.vue
index cbfb15d2..e9bf4f21 100644
--- a/src/views/login/components/SocialSignin.vue
+++ b/src/views/login/components/SocialSignin.vue
@@ -1,10 +1,12 @@
<template>
<div class="social-signup-container">
<div class="sign-btn" @click="wechatHandleClick('wechat')">
- <span class="wx-svg-container"><svg-icon icon-class="wechat" class="icon" /></span> 微信
+ <span class="wx-svg-container"><svg-icon icon-class="wechat" class="icon" /></span>
+ WeChat
</div>
<div class="sign-btn" @click="tencentHandleClick('tencent')">
- <span class="qq-svg-container"><svg-icon icon-class="qq" class="icon" /></span> QQ
+ <span class="qq-svg-container"><svg-icon icon-class="qq" class="icon" /></span>
+ QQ
</div>
</div>
</template>
diff --git a/vue.config.js b/vue.config.js
index bae56d78..7fa00992 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -86,7 +86,7 @@ module.exports = {
.end()
config
- // https://webpack.js.org/configuration/devtool/#development
+ // https://webpack.js.org/configuration/devtool/#development
.when(process.env.NODE_ENV === 'development',
config => config.devtool('cheap-source-map')
)