Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
b3056e18
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
333
Star
18155
Fork
5506
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b3056e18
编写于
9月 01, 2021
作者:
Mr.奇淼(
提交者:
GitHub
9月 01, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #651 from flipped-aurora/gva-vue3-2.4.5
增加关闭当前标签方法
上级
893b83bc
1962bd77
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
116 addition
and
160 deletion
+116
-160
server/go.mod
server/go.mod
+0
-2
web/package-lock.json
web/package-lock.json
+80
-130
web/package.json
web/package.json
+1
-5
web/src/core/gin-vue-admin.js
web/src/core/gin-vue-admin.js
+0
-4
web/src/utils/request.js
web/src/utils/request.js
+28
-13
web/src/view/layout/aside/historyComponent/history.vue
web/src/view/layout/aside/historyComponent/history.vue
+7
-6
未找到文件。
server/go.mod
浏览文件 @
b3056e18
...
...
@@ -3,7 +3,6 @@ module github.com/flipped-aurora/gin-vue-admin/server
go 1.16
require (
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
github.com/casbin/casbin/v2 v2.11.0
...
...
@@ -18,7 +17,6 @@ require (
github.com/gookit/color v1.3.1
github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
github.com/lestrrat-go/strftime v1.0.5 // indirect
github.com/mojocn/base64Captcha v1.3.1
github.com/qiniu/api.v7/v7 v7.4.1
github.com/robfig/cron/v3 v3.0.1
...
...
web/package-lock.json
浏览文件 @
b3056e18
{
"name"
:
"g
vav3
"
,
"name"
:
"g
in-vue-admin
"
,
"version"
:
"0.1.0"
,
"lockfileVersion"
:
1
,
"requires"
:
true
,
...
...
@@ -1156,21 +1156,6 @@
"postcss"
:
"^7.0.0"
}
},
"@moefe/vue-aplayer"
:
{
"version"
:
"2.0.0-beta.5"
,
"resolved"
:
"https://registry.npmjs.org/@moefe/vue-aplayer/-/vue-aplayer-2.0.0-beta.5.tgz"
,
"integrity"
:
"sha512-ytzp4GStzjftuh7H1rIS/ziqwV1FO67iTLSkDxgN0J2bqlO+rBgDDr83Y+pZKBIgRUc30uu/UZHqmE4QiBHHeg=="
,
"requires"
:
{
"vue"
:
"^2.5.17"
},
"dependencies"
:
{
"vue"
:
{
"version"
:
"2.6.14"
,
"resolved"
:
"https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"
,
"integrity"
:
"sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
}
}
},
"@mrmlnc/readdir-enhanced"
:
{
"version"
:
"2.2.1"
,
"resolved"
:
"https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz"
,
...
...
@@ -1780,6 +1765,63 @@
"integrity"
:
"sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo="
,
"dev"
:
true
},
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"ssri"
:
{
"version"
:
"8.0.1"
,
"resolved"
:
"https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz"
,
...
...
@@ -1788,6 +1830,28 @@
"requires"
:
{
"minipass"
:
"^3.1.1"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.5.0"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz"
,
"integrity"
:
"sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
}
}
}
},
...
...
@@ -10113,11 +10177,6 @@
}
}
},
"simple-uploader.js"
:
{
"version"
:
"0.5.6"
,
"resolved"
:
"https://registry.npmjs.org/simple-uploader.js/-/simple-uploader.js-0.5.6.tgz"
,
"integrity"
:
"sha512-ukjL0wZhK1dNMaQa6sd+UpCSmnUjblaUGbAd/B8f5IFrChMzDsC/7eFSK4bs4BS5NPJFSZVLI+l6Ri7THTkQtw=="
},
"slash"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npm.taobao.org/slash/download/slash-2.0.0.tgz"
,
...
...
@@ -10962,21 +11021,6 @@
"integrity"
:
"sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30="
,
"dev"
:
true
},
"timeline-vuejs"
:
{
"version"
:
"1.1.1"
,
"resolved"
:
"https://registry.npmjs.org/timeline-vuejs/-/timeline-vuejs-1.1.1.tgz"
,
"integrity"
:
"sha512-jsdr0xNCBH/GBiW7qsOTbBxZuyk7WKD5YmtTGP1sm0su0fy+iBsEJLDyhHhQ4nTAxca8MkSbJhKGUgF5eNoEfA=="
,
"requires"
:
{
"vue"
:
"^2.5.17"
},
"dependencies"
:
{
"vue"
:
{
"version"
:
"2.6.14"
,
"resolved"
:
"https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"
,
"integrity"
:
"sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
}
}
},
"timers-browserify"
:
{
"version"
:
"2.0.12"
,
"resolved"
:
"https://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.12.tgz?cache=0&sync_timestamp=1603793712916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftimers-browserify%2Fdownload%2Ftimers-browserify-2.0.12.tgz"
,
...
...
@@ -11544,87 +11588,6 @@
}
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.5.0"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz"
,
"integrity"
:
"sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
},
"dependencies"
:
{
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.2"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
,
"integrity"
:
"sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
}
}
},
"vue-particle-line"
:
{
"version"
:
"0.1.4"
,
"resolved"
:
"https://registry.npmjs.org/vue-particle-line/-/vue-particle-line-0.1.4.tgz"
,
...
...
@@ -11648,14 +11611,6 @@
"@vue/devtools-api"
:
"^6.0.0-beta.14"
}
},
"vue-simple-uploader"
:
{
"version"
:
"0.7.6"
,
"resolved"
:
"https://registry.npmjs.org/vue-simple-uploader/-/vue-simple-uploader-0.7.6.tgz"
,
"integrity"
:
"sha512-DYddedNi+ZZzqxmKgW2t4lBN3aiB66oKOxgAfS9Hz9J1FHv7Xt+u1Pq8F48BFS4vG0+MFHCNzjzS2xaEUOIcHQ=="
,
"requires"
:
{
"simple-uploader.js"
:
"^0.5.6"
}
},
"vue-style-loader"
:
{
"version"
:
"4.1.3"
,
"resolved"
:
"https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.3.tgz?cache=0&sync_timestamp=1614758661292&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-style-loader%2Fdownload%2Fvue-style-loader-4.1.3.tgz"
,
...
...
@@ -11680,11 +11635,6 @@
"integrity"
:
"sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU="
,
"dev"
:
true
},
"vuescroll"
:
{
"version"
:
"4.17.3"
,
"resolved"
:
"https://registry.npmjs.org/vuescroll/-/vuescroll-4.17.3.tgz"
,
"integrity"
:
"sha512-5P3hje/fYjo1eAB0Y8zboLbaq/mnPNczYyZ1aPHHM6wIFKcqal9Mi42CBCZizUnEtoXtbsGlnyLcVbnalTNptA=="
},
"vuex"
:
{
"version"
:
"4.0.2"
,
"resolved"
:
"https://registry.nlark.com/vuex/download/vuex-4.0.2.tgz?cache=0&sync_timestamp=1623945253165&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvuex%2Fdownload%2Fvuex-4.0.2.tgz"
,
...
...
web/package.json
浏览文件 @
b3056e18
{
"name"
:
"g
vav3
"
,
"name"
:
"g
in-vue-admin
"
,
"version"
:
"0.1.0"
,
"private"
:
true
,
"scripts"
:
{
...
...
@@ -8,7 +8,6 @@
"lint"
:
"vue-cli-service lint"
},
"dependencies"
:
{
"@moefe/vue-aplayer"
:
"^2.0.0-beta.5"
,
"axios"
:
"^0.19.2"
,
"core-js"
:
"^3.6.5"
,
"element-plus"
:
"^1.1.0-beta.4"
,
...
...
@@ -22,12 +21,9 @@
"screenfull"
:
"^5.0.2"
,
"script-ext-html-webpack-plugin"
:
"^2.1.4"
,
"spark-md5"
:
"^3.0.1"
,
"timeline-vuejs"
:
"1.1.1"
,
"vue"
:
"^3.0.0"
,
"vue-particle-line"
:
"^0.1.4"
,
"vue-router"
:
"^4.0.0-0"
,
"vue-simple-uploader"
:
"^0.7.4"
,
"vuescroll"
:
"^4.14.4"
,
"vuex"
:
"^4.0.0-0"
,
"vuex-persist"
:
"^2.1.0"
},
...
...
web/src/core/gin-vue-admin.js
浏览文件 @
b3056e18
...
...
@@ -2,15 +2,11 @@
* gin-vue-admin web框架组
*
* */
// time line css
import
'
../../node_modules/timeline-vuejs/dist/timeline-vuejs.css
'
// 加载网站配置文件夹
import
config
from
'
./config
'
export
const
run
=
function
(
app
)
{
app
.
config
.
globalProperties
.
$GIN_VUE_ADMIN
=
config
// app.use(uploader)
console
.
log
(
`
...
...
web/src/utils/request.js
浏览文件 @
b3056e18
...
...
@@ -81,19 +81,34 @@ service.interceptors.response.use(
},
error
=>
{
closeLoading
()
ElMessageBox
.
confirm
(
`
<p>检测到接口错误
${
error
}
</p>
<p>错误码500:此类错误内容常见于后台panic,如果影响您正常使用可强制登出清理缓存</p>
<p>错误码404:此类错误多为接口未注册(或未重启)或者请求路径(方法)与api路径(方法)不符</p>
`
,
'
接口报错
'
,
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
清理缓存
'
,
cancelButtonText
:
'
取消
'
})
.
then
(()
=>
{
store
.
commit
(
'
user/LoginOut
'
)
})
switch
(
error
.
response
.
status
)
{
case
500
:
ElMessageBox
.
confirm
(
`
<p>检测到接口错误
${
error
}
</p>
<p>错误码<span style="color:red"> 500 </span>:此类错误内容常见于后台panic,请先查看后台日志,如果影响您正常使用可强制登出清理缓存</p>
`
,
'
接口报错
'
,
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
清理缓存
'
,
cancelButtonText
:
'
取消
'
})
.
then
(()
=>
{
store
.
commit
(
'
user/LoginOut
'
)
})
break
case
404
:
ElMessageBox
.
confirm
(
`
<p>检测到接口错误
${
error
}
</p>
<p>错误码<span style="color:red"> 404 </span>:此类错误多为接口未注册(或未重启)或者请求路径(方法)与api路径(方法)不符--如果为自动化代码请检查是否存在空格</p>
`
,
'
接口报错
'
,
{
dangerouslyUseHTMLString
:
true
,
distinguishCancelAndClose
:
true
,
confirmButtonText
:
'
我知道了
'
,
cancelButtonText
:
'
取消
'
})
break
}
return
error
}
)
...
...
web/src/view/layout/aside/historyComponent/history.vue
浏览文件 @
b3056e18
...
...
@@ -16,7 +16,9 @@
:tab=
"item"
class=
"gva-tab"
>
<span
slot=
"label"
:style=
"
{color: activeValue===name(item)?activeColor:'#333'}">
<i
class=
"dot"
:style=
"
{ backgroundColor:activeValue===name(item)?activeColor:'#ddd'}" />
{{
item
.
meta
.
title
}}
</span>
<template
#label
>
<span
:style=
"
{color: activeValue===name(item)?activeColor:'#333'}">
<i
class=
"dot"
:style=
"
{ backgroundColor:activeValue===name(item)?activeColor:'#ddd'}" />
{{
item
.
meta
.
title
}}
</span>
</
template
>
</el-tab-pane>
</el-tabs>
...
...
@@ -107,11 +109,10 @@ export default {
}
this
.
setTab
(
this
.
$route
)
},
mounted
(){
//全局监听 关闭当前页面函数
this
.
$bus
.
on
(
'
closeThisPage
'
,
()
=>
{
const
router
=
this
.
$route
.
path
.
split
(
"
/
"
)
this
.
removeTab
(
`
${
router
[
router
.
length
-
1
]}
`
)
mounted
()
{
// 全局监听 关闭当前页面函数
emitter
.
on
(
'
closeThisPage
'
,
()
=>
{
this
.
removeTab
(
this
.
name
(
this
.
$route
))
})
},
beforeDestroy
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录