Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
9a0e8d2d
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,发现更多精彩内容 >>
提交
9a0e8d2d
编写于
6月 28, 2020
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
前端utils中封装了前端获取字典并缓存到内存的方法getDict
上级
d70599f6
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
71 addition
and
10 deletion
+71
-10
server/api/v1/sys_dictionary.go
server/api/v1/sys_dictionary.go
+1
-1
server/service/sys_dictionary.go
server/service/sys_dictionary.go
+16
-3
web/src/api/sysDictionary.js
web/src/api/sysDictionary.js
+0
-0
web/src/api/sysDictionaryDetail.js
web/src/api/sysDictionaryDetail.js
+0
-0
web/src/store/index.js
web/src/store/index.js
+3
-2
web/src/store/module/dictionary.js
web/src/store/module/dictionary.js
+42
-0
web/src/utils/dictionary.js
web/src/utils/dictionary.js
+6
-0
web/src/view/superAdmin/dictionary/sysDictionary.vue
web/src/view/superAdmin/dictionary/sysDictionary.vue
+2
-3
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+1
-1
未找到文件。
server/api/v1/sys_dictionary.go
浏览文件 @
9a0e8d2d
...
...
@@ -78,7 +78,7 @@ func UpdateSysDictionary(c *gin.Context) {
func
FindSysDictionary
(
c
*
gin
.
Context
)
{
var
sysDictionary
model
.
SysDictionary
_
=
c
.
ShouldBindQuery
(
&
sysDictionary
)
err
,
resysDictionary
:=
service
.
GetSysDictionary
(
sysDictionary
.
ID
)
err
,
resysDictionary
:=
service
.
GetSysDictionary
(
sysDictionary
.
Type
,
sysDictionary
.
ID
)
if
err
!=
nil
{
response
.
FailWithMessage
(
fmt
.
Sprintf
(
"查询失败,%v"
,
err
),
c
)
}
else
{
...
...
server/service/sys_dictionary.go
浏览文件 @
9a0e8d2d
package
service
import
(
"errors"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
...
...
@@ -13,6 +14,9 @@ import (
// @return err error
func
CreateSysDictionary
(
sysDictionary
model
.
SysDictionary
)
(
err
error
)
{
if
(
!
global
.
GVA_DB
.
First
(
&
model
.
SysDictionary
{},
"type = ?"
,
sysDictionary
.
Type
)
.
RecordNotFound
())
{
return
errors
.
New
(
"存在相同的type,不允许创建"
)
}
err
=
global
.
GVA_DB
.
Create
(
&
sysDictionary
)
.
Error
return
err
}
...
...
@@ -42,7 +46,16 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
"Status"
:
sysDictionary
.
Status
,
"Desc"
:
sysDictionary
.
Desc
,
}
err
=
global
.
GVA_DB
.
Where
(
"id = ?"
,
sysDictionary
.
ID
)
.
First
(
&
dict
)
.
Updates
(
sysDictionaryMap
)
.
Error
db
:=
global
.
GVA_DB
.
Where
(
"id = ?"
,
sysDictionary
.
ID
)
.
First
(
&
dict
)
if
dict
.
Type
==
sysDictionary
.
Type
{
err
=
db
.
Updates
(
sysDictionaryMap
)
.
Error
}
else
{
if
(
!
global
.
GVA_DB
.
First
(
&
model
.
SysDictionary
{},
"type = ?"
,
sysDictionary
.
Type
)
.
RecordNotFound
())
{
return
errors
.
New
(
"存在相同的type,不允许创建"
)
}
else
{
err
=
db
.
Updates
(
sysDictionaryMap
)
.
Error
}
}
return
err
}
...
...
@@ -53,8 +66,8 @@ func UpdateSysDictionary(sysDictionary *model.SysDictionary) (err error) {
// @return error
// @return SysDictionary SysDictionary
func
GetSysDictionary
(
i
d
uint
)
(
err
error
,
sysDictionary
model
.
SysDictionary
)
{
err
=
global
.
GVA_DB
.
Where
(
"
id = ?"
,
i
d
)
.
Preload
(
"SysDictionaryDetails"
)
.
First
(
&
sysDictionary
)
.
Error
func
GetSysDictionary
(
Type
string
,
I
d
uint
)
(
err
error
,
sysDictionary
model
.
SysDictionary
)
{
err
=
global
.
GVA_DB
.
Where
(
"
type = ? OR id = ?"
,
Type
,
I
d
)
.
Preload
(
"SysDictionaryDetails"
)
.
First
(
&
sysDictionary
)
.
Error
return
}
...
...
web/src/api/sys
_d
ictionary.js
→
web/src/api/sys
D
ictionary.js
浏览文件 @
9a0e8d2d
文件已移动
web/src/api/sys
_dictionary_d
etail.js
→
web/src/api/sys
DictionaryD
etail.js
浏览文件 @
9a0e8d2d
文件已移动
web/src/store/index.js
浏览文件 @
9a0e8d2d
...
...
@@ -4,7 +4,7 @@ import VuexPersistence from 'vuex-persist'
import
{
user
}
from
"
@/store/module/user
"
import
{
router
}
from
"
@/store/module/router
"
import
{
dictionary
}
from
"
@/store/module/dictionary
"
Vue
.
use
(
Vuex
)
...
...
@@ -16,7 +16,8 @@ const vuexLocal = new VuexPersistence({
export
const
store
=
new
Vuex
.
Store
({
modules
:
{
user
,
router
router
,
dictionary
},
plugins
:
[
vuexLocal
.
plugin
]
})
\ No newline at end of file
web/src/store/module/dictionary.js
0 → 100644
浏览文件 @
9a0e8d2d
import
{
findSysDictionary
}
from
'
@/api/sysDictionary
'
export
const
dictionary
=
{
namespaced
:
true
,
state
:
{
dictionaryMap
:
{},
},
mutations
:
{
setDictionaryMap
(
state
,
dictionaryMap
)
{
state
.
dictionaryMap
=
{
...
state
.
dictionaryMap
,
...
dictionaryMap
}
},
},
actions
:
{
// 从后台获取动态路由
async
getDictionary
({
commit
,
state
},
type
)
{
if
(
state
.
dictionaryMap
[
type
])
{
return
state
.
dictionaryMap
[
type
]
}
else
{
const
res
=
await
findSysDictionary
({
type
})
if
(
res
.
code
==
0
)
{
const
dictionaryMap
=
{}
const
dict
=
[]
res
.
data
.
resysDictionary
.
sysDictionaryDetails
&&
res
.
data
.
resysDictionary
.
sysDictionaryDetails
.
map
(
item
=>
{
dict
.
push
({
label
:
item
.
label
,
value
:
item
.
value
})
})
dictionaryMap
[
res
.
data
.
resysDictionary
.
type
]
=
dict
commit
(
"
setDictionaryMap
"
,
dictionaryMap
)
return
state
.
dictionaryMap
[
type
]
}
}
}
},
getters
:{
getDictionary
(
state
){
return
state
.
dictionaryMap
}
}
}
\ No newline at end of file
web/src/utils/dictionary.js
0 → 100644
浏览文件 @
9a0e8d2d
import
{
store
}
from
'
@/store/index
'
export
const
getDict
=
async
(
type
)
=>
{
await
store
.
dispatch
(
"
dictionary/getDictionary
"
,
type
)
return
store
.
getters
[
"
dictionary/getDictionary
"
][
type
]
}
\ No newline at end of file
web/src/view/superAdmin/dictionary/sys
_d
ictionary.vue
→
web/src/view/superAdmin/dictionary/sys
D
ictionary.vue
浏览文件 @
9a0e8d2d
...
...
@@ -114,10 +114,9 @@ import {
updateSysDictionary
,
findSysDictionary
,
getSysDictionaryList
}
from
"
@/api/sys
_d
ictionary
"
;
// 此处请自行替换地址
}
from
"
@/api/sys
D
ictionary
"
;
// 此处请自行替换地址
import
{
formatTimeToStr
}
from
"
@/utils/data
"
;
import
infoList
from
"
@/components/mixins/infoList
"
;
export
default
{
name
:
"
SysDictionary
"
,
mixins
:
[
infoList
],
...
...
@@ -239,7 +238,7 @@ export default {
this
.
dialogFormVisible
=
true
;
}
},
created
()
{
async
created
()
{
this
.
getTableData
();
}
};
...
...
web/src/view/superAdmin/dictionary/sys
_dictionary_d
etail.vue
→
web/src/view/superAdmin/dictionary/sys
DictionaryD
etail.vue
浏览文件 @
9a0e8d2d
...
...
@@ -113,7 +113,7 @@ import {
updateSysDictionaryDetail
,
findSysDictionaryDetail
,
getSysDictionaryDetailList
}
from
"
@/api/sys
_dictionary_d
etail
"
;
// 此处请自行替换地址
}
from
"
@/api/sys
DictionaryD
etail
"
;
// 此处请自行替换地址
import
{
formatTimeToStr
}
from
"
@/utils/data
"
;
import
infoList
from
"
@/components/mixins/infoList
"
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录