From bddfc3489dbea5e9d8bc5c828abb2dc791107aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Wed, 26 Apr 2023 17:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=A3=80=E6=B5=8B=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/package.json | 2 +- .../components/currenButton/innerButton.vue | 4 +++- fe/PC/src/utils/request.js | 4 ++++ fe/PC/src/utils/upDateVersion.js | 24 +++++++++++++++++++ fe/PC/vue.config.js | 6 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 fe/PC/src/utils/upDateVersion.js diff --git a/fe/PC/package.json b/fe/PC/package.json index ab429e06b..b82180d51 100644 --- a/fe/PC/package.json +++ b/fe/PC/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "4.4.0", + "version": "4.4.1", "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "scripts": { diff --git a/fe/PC/src/components/currenButton/innerButton.vue b/fe/PC/src/components/currenButton/innerButton.vue index f7525c2f5..5f08da75b 100644 --- a/fe/PC/src/components/currenButton/innerButton.vue +++ b/fe/PC/src/components/currenButton/innerButton.vue @@ -33,7 +33,9 @@ export default { }, mounted(){ window.addEventListener('setItemEvent', (item) => { - this.initButtonType(item) + if (item.key.indexOf('tableColumns') > -1) { + this.initButtonType(item) + } }) }, methods:{ diff --git a/fe/PC/src/utils/request.js b/fe/PC/src/utils/request.js index 1c1750bf9..89277c7f1 100644 --- a/fe/PC/src/utils/request.js +++ b/fe/PC/src/utils/request.js @@ -7,6 +7,7 @@ import store from '@/store' import { getToken } from '@/utils/auth' +import { updateVersion } from '@/utils/upDateVersion' // create an axios instance const service = axios.create({ @@ -21,6 +22,8 @@ service.interceptors.request.use( // do something before request is sent if (store.getters.token) { + // 检测版本是否有更新 + updateVersion() // let each request carry token // ['X-Token'] is a custom headers key // please modify it according to the actual situation @@ -56,6 +59,7 @@ service.interceptors.response.use( * You can also judge the status by HTTP Status Code */ response => { + const res = response.data if(response.headers['content-disposition']){ res.disposition = response.headers['content-disposition'] diff --git a/fe/PC/src/utils/upDateVersion.js b/fe/PC/src/utils/upDateVersion.js new file mode 100644 index 000000000..c38f6bfc3 --- /dev/null +++ b/fe/PC/src/utils/upDateVersion.js @@ -0,0 +1,24 @@ +/** + * 检测版本更新 + */ +import Vue from 'vue' +export function updateVersion () { + const versionConfig = process.env.VUE_APP_INFO + let version = localStorage.getItem('upDateVersion') + if (version != versionConfig) { + localStorage.setItem('upDateVersion', versionConfig) + setTimeout(() => { + save() + }, 1000 * 3) + } +} +function save () { + var vm = new Vue() + vm.$message.success('正在更新, 预计5秒后更新完成') + setTimeout(() => { + vm.$message.success('更新完成') + }, 1000 * 3) + setTimeout(() => { + location.reload() + }, 1000 * 5) +} \ No newline at end of file diff --git a/fe/PC/vue.config.js b/fe/PC/vue.config.js index c72b2a27b..ed0970dd2 100644 --- a/fe/PC/vue.config.js +++ b/fe/PC/vue.config.js @@ -8,6 +8,12 @@ function resolve(dir) { const name = defaultSettings.title || '基础数据管理网站' // page title +const pkg = require('./package.json') +const info = { + ...pkg +} +process.env.VUE_APP_INFO = info.version + // If your port is set to 80, // use administrator privileges to execute the command line. // For example, Mac: sudo npm run