Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
b7cb072d
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
332
Star
18154
Fork
5505
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
b7cb072d
编写于
10月 26, 2020
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改 workflow数据结构
上级
64cbca17
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
6 addition
and
37 deletion
+6
-37
server/initialize/gorm.go
server/initialize/gorm.go
+5
-3
server/initialize/router.go
server/initialize/router.go
+0
-1
server/model/wf_process.go
server/model/wf_process.go
+0
-1
server/router/sys_workflow.go
server/router/sys_workflow.go
+0
-14
server/service/sys_workflow.go
server/service/sys_workflow.go
+0
-17
web/src/view/workflow/workflowCreate/workflowCreate.vue
web/src/view/workflow/workflowCreate/workflowCreate.vue
+1
-1
未找到文件。
server/initialize/gorm.go
浏览文件 @
b7cb072d
...
@@ -29,8 +29,6 @@ func MysqlTables(db *gorm.DB) {
...
@@ -29,8 +29,6 @@ func MysqlTables(db *gorm.DB) {
model
.
SysBaseMenu
{},
model
.
SysBaseMenu
{},
model
.
SysBaseMenuParameter
{},
model
.
SysBaseMenuParameter
{},
model
.
JwtBlacklist
{},
model
.
JwtBlacklist
{},
model
.
SysWorkflow
{},
model
.
SysWorkflowStepInfo
{},
model
.
SysDictionary
{},
model
.
SysDictionary
{},
model
.
SysDictionaryDetail
{},
model
.
SysDictionaryDetail
{},
model
.
ExaFileUploadAndDownload
{},
model
.
ExaFileUploadAndDownload
{},
...
@@ -39,6 +37,10 @@ func MysqlTables(db *gorm.DB) {
...
@@ -39,6 +37,10 @@ func MysqlTables(db *gorm.DB) {
model
.
ExaSimpleUploader
{},
model
.
ExaSimpleUploader
{},
model
.
ExaCustomer
{},
model
.
ExaCustomer
{},
model
.
SysOperationRecord
{},
model
.
SysOperationRecord
{},
model
.
WorkflowProcess
{},
model
.
WorkflowNode
{},
model
.
WorkflowEdge
{},
model
.
WorkflowPoint
{},
)
)
if
err
!=
nil
{
if
err
!=
nil
{
global
.
GVA_LOG
.
Error
(
"register table failed"
,
zap
.
Any
(
"err"
,
err
))
global
.
GVA_LOG
.
Error
(
"register table failed"
,
zap
.
Any
(
"err"
,
err
))
...
...
server/initialize/router.go
浏览文件 @
b7cb072d
...
@@ -32,7 +32,6 @@ func Routers() *gin.Engine {
...
@@ -32,7 +32,6 @@ func Routers() *gin.Engine {
router
.
InitApiRouter
(
ApiGroup
)
// 注册功能api路由
router
.
InitApiRouter
(
ApiGroup
)
// 注册功能api路由
router
.
InitFileUploadAndDownloadRouter
(
ApiGroup
)
// 文件上传下载功能路由
router
.
InitFileUploadAndDownloadRouter
(
ApiGroup
)
// 文件上传下载功能路由
router
.
InitSimpleUploaderRouter
(
ApiGroup
)
// 断点续传(插件版)
router
.
InitSimpleUploaderRouter
(
ApiGroup
)
// 断点续传(插件版)
router
.
InitWorkflowRouter
(
ApiGroup
)
// 工作流相关路由
router
.
InitCasbinRouter
(
ApiGroup
)
// 权限相关路由
router
.
InitCasbinRouter
(
ApiGroup
)
// 权限相关路由
router
.
InitJwtRouter
(
ApiGroup
)
// jwt相关路由
router
.
InitJwtRouter
(
ApiGroup
)
// jwt相关路由
router
.
InitSystemRouter
(
ApiGroup
)
// system相关路由
router
.
InitSystemRouter
(
ApiGroup
)
// system相关路由
...
...
server/model/wf_process.go
浏览文件 @
b7cb072d
...
@@ -15,7 +15,6 @@ type WorkflowNode struct {
...
@@ -15,7 +15,6 @@ type WorkflowNode struct {
ID
string
`json:"id" gorm:"comment:节点id;primaryKey"`
ID
string
`json:"id" gorm:"comment:节点id;primaryKey"`
WorkflowProcessID
string
`json:"-" gorm:"comment:流程标识"`
WorkflowProcessID
string
`json:"-" gorm:"comment:流程标识"`
Clazz
string
`json:"clazz" gorm:"comment:节点类型"`
Clazz
string
`json:"clazz" gorm:"comment:节点类型"`
Size
[
2
]
int
`json:"size" gorm:"comment:节点大小"`
Label
string
`json:"label" gorm:"comment:节点名称"`
Label
string
`json:"label" gorm:"comment:节点名称"`
Type
string
`json:"type" gorm:"comment:图标类型"`
Type
string
`json:"type" gorm:"comment:图标类型"`
Shape
string
`json:"shape" gorm:"comment:形状"`
Shape
string
`json:"shape" gorm:"comment:形状"`
...
...
server/router/sys_workflow.go
已删除
100644 → 0
浏览文件 @
64cbca17
package
router
import
(
"gin-vue-admin/api/v1"
"gin-vue-admin/middleware"
"github.com/gin-gonic/gin"
)
func
InitWorkflowRouter
(
Router
*
gin
.
RouterGroup
)
{
WorkflowRouter
:=
Router
.
Group
(
"workflow"
)
.
Use
(
middleware
.
JWTAuth
())
.
Use
(
middleware
.
CasbinHandler
())
{
WorkflowRouter
.
POST
(
"createWorkFlow"
,
v1
.
CreateWorkFlow
)
// 创建工作流
}
}
server/service/sys_workflow.go
已删除
100644 → 0
浏览文件 @
64cbca17
package
service
import
(
"gin-vue-admin/global"
"gin-vue-admin/model"
)
// @title Create
// @description create a workflow, 创建工作流
// @auth (2020/04/05 20:22)
// @param wk model.SysWorkflow
// @return error
func
Create
(
wk
model
.
SysWorkflow
)
error
{
err
:=
global
.
GVA_DB
.
Create
(
&
wk
)
.
Error
return
err
}
web/src/view/workflow/workflowCreate/workflowCreate.vue
浏览文件 @
b7cb072d
...
@@ -20,7 +20,7 @@ export default {
...
@@ -20,7 +20,7 @@ export default {
data
()
{
data
()
{
return
{
return
{
lang
:
"
zh
"
,
lang
:
"
zh
"
,
demoData
:
{
"
nodes
"
:[{
"
clazz
"
:
"
start
"
,
"
size
"
:[
55
,
55
],
"
label
"
:
"
发起请假
"
,
"
type
"
:
"
start-node
"
,
"
shape
"
:
"
start-node
"
,
"
x
"
:
110
,
"
y
"
:
195
,
"
id
"
:
"
start1603681292875
"
,
"
style
"
:{}},{
"
clazz
"
:
"
parallelGateway
"
,
"
size
"
:[
55
,
55
],
"
label
"
:
"
会签
"
,
"
type
"
:
"
parallel-gateway-node
"
,
"
shape
"
:
"
parallel-gateway-node
"
,
"
x
"
:
228
,
"
y
"
:
195
,
"
id
"
:
"
parallelGateway1603681296419
"
,
"
style
"
:{}},{
"
clazz
"
:
"
userTask
"
,
"
size
"
:[
100
,
55
],
"
label
"
:
"
审批人1
"
,
"
type
"
:
"
user-task-node
"
,
"
shape
"
:
"
user-task-node
"
,
"
x
"
:
372
,
"
y
"
:
84
,
"
id
"
:
"
userTask1603681299962
"
,
"
style
"
:{},
"
assignValue
"
:
1
,
"
assignType
"
:
"
user
"
},{
"
clazz
"
:
"
userTask
"
,
"
size
"
:[
100
,
55
],
"
label
"
:
"
审批人2
"
,
"
type
"
:
"
user-task-node
"
,
"
shape
"
:
"
user-task-node
"
,
"
x
"
:
370
,
"
y
"
:
321
,
"
id
"
:
"
userTask1603681302372
"
,
"
style
"
:{},
"
assignValue
"
:
2
,
"
assignType
"
:
"
user
"
},{
"
clazz
"
:
"
parallelGateway
"
,
"
size
"
:[
55
,
55
],
"
label
"
:
"
会签结果检测
"
,
"
type
"
:
"
parallel-gateway-node
"
,
"
shape
"
:
"
parallel-gateway-node
"
,
"
x
"
:
519
,
"
y
"
:
195
,
"
id
"
:
"
parallelGateway1603681338222
"
,
"
style
"
:{}},{
"
clazz
"
:
"
end
"
,
"
size
"
:[
55
,
55
],
"
label
"
:
"
请假失败
"
,
"
type
"
:
"
end-node
"
,
"
shape
"
:
"
end-node
"
,
"
x
"
:
704
,
"
y
"
:
317
,
"
id
"
:
"
end1603681358043
"
,
"
style
"
:{}},{
"
clazz
"
:
"
end
"
,
"
size
"
:[
55
,
55
]
,
"
label
"
:
"
请假成功
"
,
"
type
"
:
"
end-node
"
,
"
shape
"
:
"
end-node
"
,
"
x
"
:
706.5
,
"
y
"
:
55.5
,
"
id
"
:
"
end1603681360882
"
,
"
style
"
:{}}],
"
edges
"
:[{
"
id
"
:
"
flow1603681320738
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681296419
"
,
"
target
"
:
"
userTask1603681299962
"
,
"
sourceAnchor
"
:
0
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
228
,
"
y
"
:
169
,
"
index
"
:
0
},
"
endPoint
"
:{
"
x
"
:
321.5
,
"
y
"
:
84
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681321969
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681296419
"
,
"
target
"
:
"
userTask1603681302372
"
,
"
sourceAnchor
"
:
2
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
228
,
"
y
"
:
221
,
"
index
"
:
2
},
"
endPoint
"
:{
"
x
"
:
319.5
,
"
y
"
:
321
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681323274
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
start1603681292875
"
,
"
target
"
:
"
parallelGateway1603681296419
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
138
,
"
y
"
:
195
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
202
,
"
y
"
:
195
,
"
index
"
:
3
},
"
label
"
:
"
发起
"
,
"
conditionExpression
"
:
"
complete
"
},{
"
id
"
:
"
flow1603681341777
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
userTask1603681299962
"
,
"
target
"
:
"
parallelGateway1603681338222
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
422.5
,
"
y
"
:
84
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
493
,
"
y
"
:
195
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681343425
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
userTask1603681302372
"
,
"
target
"
:
"
parallelGateway1603681338222
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
420.5
,
"
y
"
:
321
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
493
,
"
y
"
:
195
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681362913
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681338222
"
,
"
target
"
:
"
end1603681360882
"
,
"
sourceAnchor
"
:
0
,
"
targetAnchor
"
:
2
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
519
,
"
y
"
:
169
,
"
index
"
:
0
},
"
endPoint
"
:{
"
x
"
:
678.5
,
"
y
"
:
55.5
,
"
index
"
:
2
},
"
conditionExpression
"
:
"
complete
"
,
"
label
"
:
"
所有人同意
"
},{
"
id
"
:
"
flow1603681392729
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681338222
"
,
"
target
"
:
"
end1603681358043
"
,
"
sourceAnchor
"
:
2
,
"
targetAnchor
"
:
2
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
519
,
"
y
"
:
221
,
"
index
"
:
2
},
"
endPoint
"
:{
"
x
"
:
676
,
"
y
"
:
317
,
"
index
"
:
2
},
"
conditionExpression
"
:
"
reject
"
,
"
label
"
:
"
任何一人拒绝
"
}],
"
combos
"
:[],
"
groups
"
:[]},
demoData
:
{
"
nodes
"
:[{
"
clazz
"
:
"
start
"
,
"
label
"
:
"
发起请假
"
,
"
type
"
:
"
start-node
"
,
"
shape
"
:
"
start-node
"
,
"
x
"
:
110
,
"
y
"
:
195
,
"
id
"
:
"
start1603681292875
"
,
"
style
"
:{}},{
"
clazz
"
:
"
parallelGateway
"
,
"
label
"
:
"
会签
"
,
"
type
"
:
"
parallel-gateway-node
"
,
"
shape
"
:
"
parallel-gateway-node
"
,
"
x
"
:
228
,
"
y
"
:
195
,
"
id
"
:
"
parallelGateway1603681296419
"
,
"
style
"
:{}},{
"
clazz
"
:
"
userTask
"
,
"
label
"
:
"
审批人1
"
,
"
type
"
:
"
user-task-node
"
,
"
shape
"
:
"
user-task-node
"
,
"
x
"
:
372
,
"
y
"
:
84
,
"
id
"
:
"
userTask1603681299962
"
,
"
style
"
:{},
"
assignValue
"
:
1
,
"
assignType
"
:
"
user
"
},{
"
clazz
"
:
"
userTask
"
,
"
label
"
:
"
审批人2
"
,
"
type
"
:
"
user-task-node
"
,
"
shape
"
:
"
user-task-node
"
,
"
x
"
:
370
,
"
y
"
:
321
,
"
id
"
:
"
userTask1603681302372
"
,
"
style
"
:{},
"
assignValue
"
:
2
,
"
assignType
"
:
"
user
"
},{
"
clazz
"
:
"
parallelGateway
"
,
"
label
"
:
"
会签结果检测
"
,
"
type
"
:
"
parallel-gateway-node
"
,
"
shape
"
:
"
parallel-gateway-node
"
,
"
x
"
:
519
,
"
y
"
:
195
,
"
id
"
:
"
parallelGateway1603681338222
"
,
"
style
"
:{}},{
"
clazz
"
:
"
end
"
,
"
label
"
:
"
请假失败
"
,
"
type
"
:
"
end-node
"
,
"
shape
"
:
"
end-node
"
,
"
x
"
:
704
,
"
y
"
:
317
,
"
id
"
:
"
end1603681358043
"
,
"
style
"
:{}},{
"
clazz
"
:
"
end
"
,
"
label
"
:
"
请假成功
"
,
"
type
"
:
"
end-node
"
,
"
shape
"
:
"
end-node
"
,
"
x
"
:
706.5
,
"
y
"
:
55.5
,
"
id
"
:
"
end1603681360882
"
,
"
style
"
:{}}],
"
edges
"
:[{
"
id
"
:
"
flow1603681320738
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681296419
"
,
"
target
"
:
"
userTask1603681299962
"
,
"
sourceAnchor
"
:
0
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
228
,
"
y
"
:
169
,
"
index
"
:
0
},
"
endPoint
"
:{
"
x
"
:
321.5
,
"
y
"
:
84
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681321969
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681296419
"
,
"
target
"
:
"
userTask1603681302372
"
,
"
sourceAnchor
"
:
2
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
228
,
"
y
"
:
221
,
"
index
"
:
2
},
"
endPoint
"
:{
"
x
"
:
319.5
,
"
y
"
:
321
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681323274
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
start1603681292875
"
,
"
target
"
:
"
parallelGateway1603681296419
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
138
,
"
y
"
:
195
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
202
,
"
y
"
:
195
,
"
index
"
:
3
},
"
label
"
:
"
发起
"
,
"
conditionExpression
"
:
"
complete
"
},{
"
id
"
:
"
flow1603681341777
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
userTask1603681299962
"
,
"
target
"
:
"
parallelGateway1603681338222
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
422.5
,
"
y
"
:
84
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
493
,
"
y
"
:
195
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681343425
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
userTask1603681302372
"
,
"
target
"
:
"
parallelGateway1603681338222
"
,
"
sourceAnchor
"
:
1
,
"
targetAnchor
"
:
3
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
420.5
,
"
y
"
:
321
,
"
index
"
:
1
},
"
endPoint
"
:{
"
x
"
:
493
,
"
y
"
:
195
,
"
index
"
:
3
}},{
"
id
"
:
"
flow1603681362913
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681338222
"
,
"
target
"
:
"
end1603681360882
"
,
"
sourceAnchor
"
:
0
,
"
targetAnchor
"
:
2
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
519
,
"
y
"
:
169
,
"
index
"
:
0
},
"
endPoint
"
:{
"
x
"
:
678.5
,
"
y
"
:
55.5
,
"
index
"
:
2
},
"
conditionExpression
"
:
"
complete
"
,
"
label
"
:
"
所有人同意
"
},{
"
id
"
:
"
flow1603681392729
"
,
"
clazz
"
:
"
flow
"
,
"
source
"
:
"
parallelGateway1603681338222
"
,
"
target
"
:
"
end1603681358043
"
,
"
sourceAnchor
"
:
2
,
"
targetAnchor
"
:
2
,
"
shape
"
:
"
flow-polyline-round
"
,
"
style
"
:{},
"
startPoint
"
:{
"
x
"
:
519
,
"
y
"
:
221
,
"
index
"
:
2
},
"
endPoint
"
:{
"
x
"
:
676
,
"
y
"
:
317
,
"
index
"
:
2
},
"
conditionExpression
"
:
"
reject
"
,
"
label
"
:
"
任何一人拒绝
"
}],
"
combos
"
:[],
"
groups
"
:[]},
users
:
[],
users
:
[],
authorities
:[],
authorities
:[],
groups
:
[{
id
:
'
1
'
,
name
:
'
组1
'
},{
id
:
'
2
'
,
name
:
'
组2
'
},{
id
:
'
3
'
,
name
:
'
组3
'
}],
groups
:
[{
id
:
'
1
'
,
name
:
'
组1
'
},{
id
:
'
2
'
,
name
:
'
组2
'
},{
id
:
'
3
'
,
name
:
'
组3
'
}],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录