diff --git a/build/index.js b/build/index.js index baf3807a..0c57de2a 100644 --- a/build/index.js +++ b/build/index.js @@ -26,7 +26,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) { app.listen(port, function () { console.log(chalk.green(`> Preview at http://localhost:${port}${publicPath}`)) if (report) { - console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}/report.html`)) + console.log(chalk.green(`> Report at http://localhost:${port}${publicPath}report.html`)) } }) diff --git a/mock/mock-server.js b/mock/mock-server.js index 99346afb..af7e67ee 100644 --- a/mock/mock-server.js +++ b/mock/mock-server.js @@ -3,12 +3,16 @@ const bodyParser = require('body-parser') const chalk = require('chalk') function registerRoutes(app) { + let mockStartIndex const { default: mocks } = require('./index.js') for (const mock of mocks) { app[mock.type](mock.url, mock.response) + mockStartIndex = app._router.stack.length } + const mockRoutesLength = Object.keys(mocks).length return { - mockRoutesLength: Object.keys(mocks).length + mockRoutesLength: mockRoutesLength, + mockStartIndex: mockStartIndex - mockRoutesLength } } @@ -20,28 +24,6 @@ function unregisterRoutes() { }) } -function getPath(path) { - var match = path.toString() - .replace('\\/?', '') - .replace('(?=\\/|$)', '$') - .match(/^\/\^((?:\\[.*+?^${}()|[\]\\\/]|[^.*+?^${}()|[\]\\\/])*)\$\//) - return match - ? match[1].replace(/\\(.)/g, '$1').split('/') - : path.toString() -} - -function getMockRoutesIndex(app) { - for (let index = 0; index <= app._router.stack.length; index++) { - const r = app._router.stack[index] - if (r.route && r.route.path) { - const path = getPath(r.route.path) - if (path.includes('mock')) { - return index - } - } - } -} - module.exports = app => { // es6 polyfill require('@babel/register') @@ -53,7 +35,9 @@ module.exports = app => { extended: true })) - const { mockRoutesLength } = registerRoutes(app) + const mockRoutes = registerRoutes(app) + var mockRoutesLength = mockRoutes.mockRoutesLength + var mockStartIndex = mockRoutes.mockStartIndex // watch files, hot reload mock server chokidar.watch(('./mock'), { @@ -62,16 +46,15 @@ module.exports = app => { ignoreInitial: true }).on('all', (event, path) => { if (event === 'change' || event === 'add') { - // find mock routes stack index - const index = getMockRoutesIndex(app) - // remove mock routes stack - app._router.stack.splice(index, mockRoutesLength) + app._router.stack.splice(mockStartIndex, mockRoutesLength) // clear routes cache unregisterRoutes() - registerRoutes(app) + const mockRoutes = registerRoutes(app) + mockRoutesLength = mockRoutes.mockRoutesLength + mockStartIndex = mockRoutes.mockStartIndex console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed ${path}`)) } diff --git a/package.json b/package.json index f37f48ba..b3d436e0 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "@babel/core": "7.0.0", "@babel/register": "7.0.0", "@vue/cli-plugin-babel": "3.5.3", + "@vue/cli-plugin-eslint": "3.5.1", "@vue/cli-plugin-unit-jest": "3.5.3", "@vue/cli-service": "3.5.3", "@vue/test-utils": "1.0.0-beta.29", diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index 8c9c4328..b4422cf8 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -86,6 +86,9 @@ export default { if (isExternal(routePath)) { return routePath } + if (isExternal(this.basePath)) { + return this.basePath + } return path.resolve(this.basePath, routePath) }, diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index f06f5156..19d3083f 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -145,7 +145,7 @@ export default { closeSelectedTag(view) { this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => { if (this.isActive(view)) { - this.toLastView(visitedViews) + this.toLastView(visitedViews, view) } }) }, @@ -160,16 +160,22 @@ export default { if (this.affixTags.some(tag => tag.path === view.path)) { return } - this.toLastView(visitedViews) + this.toLastView(visitedViews, view) }) }, - toLastView(visitedViews) { + toLastView(visitedViews, view) { const latestView = visitedViews.slice(-1)[0] if (latestView) { this.$router.push(latestView) } else { - // You can set another route - this.$router.push('/') + // now the default is to redirect to the home page if there is no tags-view, + // you can adjust it according to your needs. + if (view.name === 'Dashboard') { + // to reload home page + this.$router.replace({ path: '/redirect' + view.fullPath }) + } else { + this.$router.push('/') + } } }, openMenu(tag, e) { diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index e0accb83..525a65b9 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -12,6 +12,7 @@ .sidebar-container { transition: width 0.28s; width: $sideBarWidth !important; + background-color: $menuBg; height: 100%; position: fixed; font-size: 0px; diff --git a/src/views/svg-icons/element-icon.json b/src/views/svg-icons/element-icon.json new file mode 100644 index 00000000..15072a4c --- /dev/null +++ b/src/views/svg-icons/element-icon.json @@ -0,0 +1 @@ +["info","error","success","warning","question","back","arrow-left","arrow-down","arrow-right","arrow-up","caret-left","caret-bottom","caret-top","caret-right","d-arrow-left","d-arrow-right","minus","plus","remove","circle-plus","remove-outline","circle-plus-outline","close","check","circle-close","circle-check","circle-close-outline","circle-check-outline","zoom-out","zoom-in","d-caret","sort","sort-down","sort-up","tickets","document","goods","sold-out","news","message","date","printer","time","bell","mobile-phone","service","view","menu","more","more-outline","star-on","star-off","location","location-outline","phone","phone-outline","picture","picture-outline","delete","search","edit","edit-outline","rank","refresh","share","setting","upload","upload2","download","loading"] diff --git a/src/views/svg-icons/index.vue b/src/views/svg-icons/index.vue index b14d4be6..665b1d03 100644 --- a/src/views/svg-icons/index.vue +++ b/src/views/svg-icons/index.vue @@ -4,37 +4,57 @@ Add and use

-
-
- -
- {{ generateIconCode(item) }} -
-
- - {{ item }} -
- -
-
+ + +
+ +
+ {{ generateIconCode(item) }} +
+
+ + {{ item }} +
+ +
+ + +
+ +
+ {{ generateElementIconCode(item) }} +
+
+ + {{ item }} +
+ +
+ +