mirror of
https://github.com/PanJiaChen/vue-element-admin.git
synced 2025-08-12 22:29:59 +08:00
core: Upgrade npm packages to latest version. (#543)
* core: Upgrade npm packages to latest version. * minimal changes. Co-authored-by: EdwinBetanc0urt <EdwinBetanco0urt@outlook.com>
This commit is contained in:
parent
e4452504ba
commit
4754cd82c3
3
.github/ISSUE_TEMPLATE/bug_report.md
vendored
3
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@ -31,8 +31,9 @@ A clear and concise description of what you expected to happen.
|
|||||||
|
|
||||||
#### Other relevant information
|
#### Other relevant information
|
||||||
- Your OS:
|
- Your OS:
|
||||||
|
- Web Browser:
|
||||||
- Node.js version:
|
- Node.js version:
|
||||||
- vue-element-admin version:
|
- adempiere-vue version:
|
||||||
|
|
||||||
#### Additional context
|
#### Additional context
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
2
.github/ISSUE_TEMPLATE/question.md
vendored
2
.github/ISSUE_TEMPLATE/question.md
vendored
@ -37,7 +37,7 @@ Please only use Codepen, JSFiddle, CodeSandbox or a github repo
|
|||||||
- Your OS:
|
- Your OS:
|
||||||
- Web Browser:
|
- Web Browser:
|
||||||
- Node.js version:
|
- Node.js version:
|
||||||
- vue-element-admin version:
|
- adempiere-vue version:
|
||||||
|
|
||||||
#### Additional context
|
#### Additional context
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
3
.github/PULL_REQUEST_TEMPLATE.md
vendored
3
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -23,8 +23,9 @@ A clear and concise description of what you expected to happen.
|
|||||||
|
|
||||||
#### Other relevant information
|
#### Other relevant information
|
||||||
- Your OS:
|
- Your OS:
|
||||||
|
- Web Browser:
|
||||||
- Node.js version:
|
- Node.js version:
|
||||||
- vue-element-admin version:
|
- adempiere-vue version:
|
||||||
|
|
||||||
#### Additional context
|
#### Additional context
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
16
README.es.md
16
README.es.md
@ -76,12 +76,17 @@ docker pull erpya/adempiere-vue
|
|||||||
|
|
||||||
## Patrocinantes
|
## Patrocinantes
|
||||||
|
|
||||||
<a href="http://erpya.com/"><img width="250px" src="https://erpya.com/wp-content/uploads/2017/11/ERP-logotipo-H-color.png" /></a>
|
<a href="http://erpya.com/">
|
||||||
<a href="http://www.e-evolution.com/"><img width="250px" src="https://i0.wp.com/mysmart.business/evolution/wp-content/uploads/sites/29/2017/10/e-evolution-logo-v2.png?fit=150%2C92" /></a>
|
<img alt="ERP Consultores y Asociados" width="250px" src="https://erpya.com/wp-content/uploads/2017/11/ERP-logotipo-H-color.png" />
|
||||||
<a href="http://westfalia-it.com/"><img width="150px" src="https://i1.wp.com/spin-suite.com/westfalia/wp-content/uploads/sites/30/2017/12/logo_copy.jpg?fit=265%2C357" /></a>
|
</a>
|
||||||
<a href="http://erpya.com/"><img width="250px" src="https://i0.wp.com/spin-suite.com/openupsolutions/wp-content/uploads/sites/32/2017/05/Openup-Solutions-Logo-2017-80x200px.png" /></a>
|
<a href="http://westfalia-it.com/">
|
||||||
|
<img width="150px" src="https://i2.wp.com/www.westfalia-it.com/wp-content/uploads/sites/30/2017/12/logo_copy.jpg?fit=265%2C357" />
|
||||||
|
</a>
|
||||||
|
<a href="http://openupsolutions.com/">
|
||||||
|
<img width="250px" src="https://i2.wp.com/openupsolutions.com/wp-content/uploads/sites/32/2017/05/Openup-Solutions-Logo-2017-80x200px.png?fit=243%2C40" />
|
||||||
|
</a>
|
||||||
|
|
||||||
Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace directo a su sitio web. [Sea un Patrocinante](https://www.paypal.me/?)
|
Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace directo a su sitio web. [Sea un Patrocinante](https://www.paypal.me/YamelSenih)
|
||||||
|
|
||||||
## Características
|
## Características
|
||||||
|
|
||||||
@ -150,6 +155,7 @@ Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace d
|
|||||||
- Reporte
|
- Reporte
|
||||||
- Consulta Inteligente
|
- Consulta Inteligente
|
||||||
- Formulario
|
- Formulario
|
||||||
|
- Flujo de Trabajo
|
||||||
|
|
||||||
- Ejemplo Avanzado
|
- Ejemplo Avanzado
|
||||||
- Registro de Errores
|
- Registro de Errores
|
||||||
|
17
README.md
17
README.md
@ -76,10 +76,15 @@ docker pull erpya/adempiere-vue
|
|||||||
|
|
||||||
## Sponsors
|
## Sponsors
|
||||||
|
|
||||||
<a href="http://erpya.com/"><img width="250px" src="https://erpya.com/wp-content/uploads/2017/11/ERP-logotipo-H-color.png" /></a>
|
<a href="http://erpya.com/">
|
||||||
<a href="http://www.e-evolution.com/"><img width="250px" src="https://i0.wp.com/mysmart.business/evolution/wp-content/uploads/sites/29/2017/10/e-evolution-logo-v2.png?fit=150%2C92" /></a>
|
<img alt="ERP Consultores y Asociados" width="250px" src="https://erpya.com/wp-content/uploads/2017/11/ERP-logotipo-H-color.png" />
|
||||||
<a href="http://westfalia-it.com/"><img width="150px" src="https://i1.wp.com/spin-suite.com/westfalia/wp-content/uploads/sites/30/2017/12/logo_copy.jpg?fit=265%2C357" /></a>
|
</a>
|
||||||
<a href="http://openupsolutions.com/"><img width="250px" src="https://i0.wp.com/spin-suite.com/openupsolutions/wp-content/uploads/sites/32/2017/05/Openup-Solutions-Logo-2017-80x200px.png" /></a>
|
<a href="http://westfalia-it.com/">
|
||||||
|
<img width="150px" src="https://i2.wp.com/www.westfalia-it.com/wp-content/uploads/sites/30/2017/12/logo_copy.jpg?fit=265%2C357" />
|
||||||
|
</a>
|
||||||
|
<a href="http://openupsolutions.com/">
|
||||||
|
<img width="250px" src="https://i2.wp.com/openupsolutions.com/wp-content/uploads/sites/32/2017/05/Openup-Solutions-Logo-2017-80x200px.png?fit=243%2C40" />
|
||||||
|
</a>
|
||||||
|
|
||||||
Become a sponsor and get your logo on our README on GitHub with a link to your site. [Become a sponsor](https://www.paypal.me/YamelSenih)
|
Become a sponsor and get your logo on our README on GitHub with a link to your site. [Become a sponsor](https://www.paypal.me/YamelSenih)
|
||||||
|
|
||||||
@ -149,6 +154,8 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
|
|||||||
- Process
|
- Process
|
||||||
- Report
|
- Report
|
||||||
- Smart Browser
|
- Smart Browser
|
||||||
|
- Form
|
||||||
|
- Workflow
|
||||||
|
|
||||||
- Advanced Example
|
- Advanced Example
|
||||||
- Error Log
|
- Error Log
|
||||||
@ -165,7 +172,7 @@ Use [gRPC ADempiere Server](https://github.com/adempiere/adempiere-gRPC-Server)
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
# clone the project
|
# clone the project
|
||||||
git clone -b develop git@github.com:adempiere/vue-element-admin.git
|
git clone -b develop git@github.com:adempiere/adempiere-vue-.git
|
||||||
|
|
||||||
# enter the project directory
|
# enter the project directory
|
||||||
cd adempiere-vue
|
cd adempiere-vue
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"baseUrl": "./",
|
"baseUrl": "./",
|
||||||
"paths": {
|
"paths": {
|
||||||
@ -6,4 +6,4 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"exclude": ["node_modules", "dist"]
|
"exclude": ["node_modules", "dist"]
|
||||||
}
|
}
|
||||||
|
64
package.json
64
package.json
@ -26,74 +26,74 @@
|
|||||||
"test:ci": "npm run lint && npm run test:unit"
|
"test:ci": "npm run lint && npm run test:unit"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@toast-ui/vue-editor": "^2.4.0",
|
"@toast-ui/vue-editor": "^2.5.0",
|
||||||
"axios": "0.19.2",
|
"axios": "0.21.0",
|
||||||
"clipboard": "2.0.6",
|
"clipboard": "2.0.6",
|
||||||
"codemirror": "5.56.0",
|
"codemirror": "5.58.2",
|
||||||
"core-js": "3.6.5",
|
"core-js": "3.7.0",
|
||||||
"driver.js": "0.9.8",
|
"driver.js": "0.9.8",
|
||||||
"dropzone": "5.7.2",
|
"dropzone": "5.7.2",
|
||||||
"echarts": "4.8.0",
|
"echarts": "4.9.0",
|
||||||
"element-ui": "2.13.2",
|
"element-ui": "2.14.1",
|
||||||
"file-saver": "2.0.2",
|
"file-saver": "2.0.2",
|
||||||
"fuse.js": "3.4.4",
|
"fuse.js": "6.4.3",
|
||||||
"js-cookie": "2.2.1",
|
"js-cookie": "2.2.1",
|
||||||
"jsonlint": "1.6.3",
|
"jsonlint": "1.6.3",
|
||||||
"jszip": "3.5.0",
|
"jszip": "3.5.0",
|
||||||
"moment": "^2.27.0",
|
"moment": "^2.29.1",
|
||||||
"normalize.css": "8.0.1",
|
"normalize.css": "8.0.1",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"path-to-regexp": "2.4.0",
|
"path-to-regexp": "6.2.0",
|
||||||
"pinyin": "2.9.1",
|
"pinyin": "2.9.1",
|
||||||
"screenfull": "5.0.2",
|
"screenfull": "5.0.2",
|
||||||
"script-loader": "0.7.2",
|
"script-loader": "0.7.2",
|
||||||
"sortablejs": "1.10.2",
|
"sortablejs": "1.10.2",
|
||||||
"tui-editor": "1.4.10",
|
"tui-editor": "1.4.10",
|
||||||
"v-markdown": "^1.0.2",
|
"v-markdown": "^1.0.2",
|
||||||
"vue": "2.6.11",
|
"vue": "2.6.12",
|
||||||
"vue-content-loading": "^1.6.0",
|
"vue-content-loading": "^1.6.0",
|
||||||
"vue-count-to": "1.0.13",
|
"vue-count-to": "1.0.13",
|
||||||
"vue-i18n": "8.19.0",
|
"vue-i18n": "8.22.1",
|
||||||
"vue-multipane": "^0.9.5",
|
"vue-multipane": "^0.9.5",
|
||||||
"vue-resize": "^0.5.0",
|
"vue-resize": "^0.5.0",
|
||||||
"vue-router": "3.4.3",
|
"vue-router": "3.4.9",
|
||||||
"vue-shortkey": "^3.1.7",
|
"vue-shortkey": "^3.1.7",
|
||||||
"vue-split-panel": "^1.0.4",
|
"vue-split-panel": "^1.0.4",
|
||||||
"vue-splitpane": "1.0.6",
|
"vue-splitpane": "1.0.6",
|
||||||
"vuedraggable": "^2.24.0",
|
"vuedraggable": "^2.24.3",
|
||||||
"vuex": "3.5.1",
|
"vuex": "3.5.1",
|
||||||
"xlsx": "0.16.4"
|
"xlsx": "0.16.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vue/cli-plugin-babel": "4.4.6",
|
"@vue/cli-plugin-babel": "4.5.8",
|
||||||
"@vue/cli-plugin-eslint": "4.4.6",
|
"@vue/cli-plugin-eslint": "4.5.8",
|
||||||
"@vue/cli-plugin-pwa": "4.5.6",
|
"@vue/cli-plugin-pwa": "4.5.8",
|
||||||
"@vue/cli-plugin-unit-jest": "4.4.6",
|
"@vue/cli-plugin-unit-jest": "4.5.8",
|
||||||
"@vue/cli-service": "4.4.6",
|
"@vue/cli-service": "4.5.8",
|
||||||
"@vue/test-utils": "1.0.3",
|
"@vue/test-utils": "1.1.1",
|
||||||
"autoprefixer": "9.8.5",
|
"autoprefixer": "9.8.6",
|
||||||
"babel-eslint": "10.1.0",
|
"babel-eslint": "10.1.0",
|
||||||
"babel-jest": "26.1.0",
|
"babel-jest": "26.6.3",
|
||||||
"babel-plugin-dynamic-import-node": "2.3.3",
|
"babel-plugin-dynamic-import-node": "2.3.3",
|
||||||
"chalk": "4.1.0",
|
"chalk": "4.1.0",
|
||||||
"chokidar": "3.4.1",
|
"chokidar": "3.4.3",
|
||||||
"connect": "3.7.0",
|
"connect": "3.7.0",
|
||||||
"eslint": "7.5.0",
|
"eslint": "7.13.0",
|
||||||
"eslint-plugin-vue": "6.2.2",
|
"eslint-plugin-vue": "6.2.2",
|
||||||
"fs": "0.0.1-security",
|
"fs": "0.0.1-security",
|
||||||
"html-webpack-plugin": "4.3.0",
|
"html-webpack-plugin": "4.5.0",
|
||||||
"husky": "4.2.5",
|
"husky": "4.3.0",
|
||||||
"lint-staged": "10.2.11",
|
"lint-staged": "10.5.1",
|
||||||
"mockjs": "1.1.0",
|
"mockjs": "1.1.0",
|
||||||
"plop": "2.7.3",
|
"plop": "2.7.4",
|
||||||
"sass": "1.26.10",
|
"sass": "1.29.0",
|
||||||
"sass-loader": "8.0.2",
|
"sass-loader": "10.1.0",
|
||||||
"script-ext-html-webpack-plugin": "2.1.4",
|
"script-ext-html-webpack-plugin": "2.1.5",
|
||||||
"serve-static": "1.14.1",
|
"serve-static": "1.14.1",
|
||||||
"svg-sprite-loader": "5.0.0",
|
"svg-sprite-loader": "5.0.0",
|
||||||
"svgo": "1.3.2",
|
"svgo": "1.3.2",
|
||||||
"tasksfile": "5.1.1",
|
"tasksfile": "5.1.1",
|
||||||
"vue-template-compiler": "2.6.11"
|
"vue-template-compiler": "2.6.12"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"> 1%",
|
"> 1%",
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<!-- Use 2.5 slot syntax. If you use Vue 2.6, please use new slot syntax-->
|
<!-- Use 2.5 slot syntax. If you use Vue 2.6, please use new slot syntax-->
|
||||||
<template
|
<template
|
||||||
slot="dateCell"
|
slot="dateCell"
|
||||||
slot-scope="{ date, data }"
|
slot-scope="{ data }"
|
||||||
>
|
>
|
||||||
<p :class="data.isSelected ? 'is-selected' : ''">
|
<p :class="data.isSelected ? 'is-selected' : ''">
|
||||||
{{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : '' }}
|
{{ data.day.split('-').slice(2).join('-') }} {{ data.isSelected ? '✔️' : '' }}
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { generateTitle } from '@/utils/i18n'
|
import { generateTitle } from '@/utils/i18n'
|
||||||
import pathToRegexp from 'path-to-regexp'
|
import { compile } from 'path-to-regexp'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
@ -90,12 +90,17 @@ export default {
|
|||||||
pathCompile(path) {
|
pathCompile(path) {
|
||||||
// To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
|
// To solve this problem https://github.com/PanJiaChen/vue-element-admin/issues/561
|
||||||
const { params } = this.$route
|
const { params } = this.$route
|
||||||
var toPath = pathToRegexp.compile(path)
|
const toPath = compile(path)
|
||||||
return toPath(params)
|
return toPath(params)
|
||||||
},
|
},
|
||||||
handleLink(item) {
|
handleLink(item) {
|
||||||
if (this.$route.name !== item.name) {
|
if (this.$route.name !== item.name) {
|
||||||
this.$router.push({ name: item.name, params: { childs: item.meta.childs }})
|
this.$router.push({
|
||||||
|
name: item.name,
|
||||||
|
params: {
|
||||||
|
childs: item.meta.childs
|
||||||
|
}
|
||||||
|
}, () => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,12 @@
|
|||||||
class="header-search-select"
|
class="header-search-select"
|
||||||
@change="change"
|
@change="change"
|
||||||
>
|
>
|
||||||
<el-option v-for="(item, key) in options" :key="key" :value="item" :label="item.title.join(' > ')" />
|
<el-option
|
||||||
|
v-for="element in options"
|
||||||
|
:key="element.item.path"
|
||||||
|
:value="element.item"
|
||||||
|
:label="element.item.title.join(' > ')"
|
||||||
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="navbar">
|
<div class="navbar">
|
||||||
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
|
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
|
||||||
<el-button v-if="isMenuMobile && isMobile" type="text" icon="el-icon-close" style="padding-top: 13px; color: #000000;font-size: 121%;font-weight: 615!important;" @click="isMenuOption()" />
|
<el-button
|
||||||
|
v-if="isMenuMobile && isMobile"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-close"
|
||||||
|
style="padding-top: 13px; color: #000000;font-size: 121%;font-weight: 615!important;"
|
||||||
|
@click="isMenuOption()"
|
||||||
|
/>
|
||||||
<breadcrumb v-show="!isMenuMobile || device!=='mobile'" id="breadcrumb-container" class="breadcrumb-container" :style="isMobile ? { width: '40%' } : { width: 'auto' } " />
|
<breadcrumb v-show="!isMenuMobile || device!=='mobile'" id="breadcrumb-container" class="breadcrumb-container" :style="isMobile ? { width: '40%' } : { width: 'auto' } " />
|
||||||
<div v-show="isMenuMobile && isMobile" style="display: inline-flex; float: right;">
|
<div v-show="isMenuMobile && isMobile" style="display: inline-flex; float: right;">
|
||||||
<search id="header-search" class="right-menu-item" style="padding-top: 10px;" />
|
<search id="header-search" class="right-menu-item" style="padding-top: 10px;" />
|
||||||
|
@ -215,7 +215,7 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
closeOthersTags() {
|
closeOthersTags() {
|
||||||
this.$router.push(this.selectedTag)
|
this.$router.push(this.selectedTag, () => {})
|
||||||
this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
|
this.$store.dispatch('tagsView/delOthersViews', this.selectedTag).then(() => {
|
||||||
this.moveToCurrentTag()
|
this.moveToCurrentTag()
|
||||||
})
|
})
|
||||||
@ -231,15 +231,17 @@ export default {
|
|||||||
toLastView(visitedViews, view) {
|
toLastView(visitedViews, view) {
|
||||||
const latestView = visitedViews.slice(-1)[0]
|
const latestView = visitedViews.slice(-1)[0]
|
||||||
if (latestView) {
|
if (latestView) {
|
||||||
this.$router.push(latestView.fullPath)
|
this.$router.push(latestView.fullPath, () => {})
|
||||||
} else {
|
} else {
|
||||||
// now the default is to redirect to the home page if there is no tags-view,
|
// now the default is to redirect to the home page if there is no tags-view,
|
||||||
// you can adjust it according to your needs.
|
// you can adjust it according to your needs.
|
||||||
if (view.name === 'Dashboard') {
|
if (view.name === 'Dashboard') {
|
||||||
// to reload home page
|
// to reload home page
|
||||||
this.$router.replace({ path: '/redirect' + view.fullPath })
|
this.$router.replace({
|
||||||
|
path: '/redirect' + view.fullPath
|
||||||
|
}, () => {})
|
||||||
} else {
|
} else {
|
||||||
this.$router.push('/')
|
this.$router.push('/', () => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -8,9 +8,9 @@
|
|||||||
<SplitArea :size="sizePanel" :min-size="100">
|
<SplitArea :size="sizePanel" :min-size="100">
|
||||||
<el-aside width="100%">
|
<el-aside width="100%">
|
||||||
<split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical">
|
<split-pane :min-percent="10" :default-percent="defaultPorcentSplitPane" split="vertical">
|
||||||
<template>
|
<template slot="paneL">
|
||||||
<!-- this slot is 'paneL' (with 'L' in uppercase) do not change -->
|
<!-- this slot is 'paneL' (with 'L' in uppercase) do not change -->
|
||||||
<div slot="paneL" class="left-container">
|
<div class="left-container">
|
||||||
<el-aside v-show="isShowedRecordNavigation" width="100%">
|
<el-aside v-show="isShowedRecordNavigation" width="100%">
|
||||||
<div class="small-4 columns">
|
<div class="small-4 columns">
|
||||||
<div class="w">
|
<div class="w">
|
||||||
@ -326,6 +326,19 @@ export default {
|
|||||||
WorkflowLogs,
|
WorkflowLogs,
|
||||||
WorkflowStatusBar
|
WorkflowStatusBar
|
||||||
},
|
},
|
||||||
|
beforeRouteUpdate(to, from, next) {
|
||||||
|
this.$store.dispatch('setWindowOldRoute', {
|
||||||
|
path: from.path,
|
||||||
|
fullPath: from.fullPath,
|
||||||
|
params: {
|
||||||
|
...from.params
|
||||||
|
},
|
||||||
|
query: {
|
||||||
|
...from.query
|
||||||
|
}
|
||||||
|
})
|
||||||
|
next()
|
||||||
|
},
|
||||||
props: {
|
props: {
|
||||||
styleSteps: {
|
styleSteps: {
|
||||||
type: Object,
|
type: Object,
|
||||||
@ -345,19 +358,6 @@ export default {
|
|||||||
isShowedRecordPanel: false
|
isShowedRecordPanel: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeRouteUpdate(to, from, next) {
|
|
||||||
this.$store.dispatch('setWindowOldRoute', {
|
|
||||||
path: from.path,
|
|
||||||
fullPath: from.fullPath,
|
|
||||||
params: {
|
|
||||||
...from.params
|
|
||||||
},
|
|
||||||
query: {
|
|
||||||
...from.query
|
|
||||||
}
|
|
||||||
})
|
|
||||||
next()
|
|
||||||
},
|
|
||||||
computed: {
|
computed: {
|
||||||
showContextMenu() {
|
showContextMenu() {
|
||||||
return this.$store.state.settings.showContextMenu
|
return this.$store.state.settings.showContextMenu
|
||||||
|
@ -12,7 +12,9 @@ export default {
|
|||||||
components: { SwitchRoles },
|
components: { SwitchRoles },
|
||||||
methods: {
|
methods: {
|
||||||
handleRolesChange() {
|
handleRolesChange() {
|
||||||
this.$router.push({ path: '/permission/index?' + +new Date() })
|
this.$router.push({
|
||||||
|
path: '/permission/index?' + +new Date()
|
||||||
|
}, () => {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,7 +32,7 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
activeName(val) {
|
activeName(val) {
|
||||||
this.$router.push(`${this.$route.path}?tab=${val}`)
|
this.$router.push(`${this.$route.path}?tab=${val}`, () => {})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user