Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
9926e192
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
12 个月 前同步成功
通知
329
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,发现更多精彩内容 >>
提交
9926e192
编写于
10月 31, 2020
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加节点视图配置
上级
2c9e4468
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
50 addition
and
10 deletion
+50
-10
server/model/wf_process.go
server/model/wf_process.go
+7
-1
web/src/components/gva-wfd/components/DetailPanel/StartEventDetail.vue
...nents/gva-wfd/components/DetailPanel/StartEventDetail.vue
+8
-0
web/src/components/gva-wfd/components/DetailPanel/TimerEventDetail.vue
...nents/gva-wfd/components/DetailPanel/TimerEventDetail.vue
+8
-0
web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
...ponents/gva-wfd/components/DetailPanel/UserTaskDetail.vue
+14
-6
web/src/view/workflow/workflowCreate/workflowCreate.vue
web/src/view/workflow/workflowCreate/workflowCreate.vue
+13
-3
未找到文件。
server/model/wf_process.go
浏览文件 @
9926e192
...
...
@@ -17,6 +17,7 @@ type WorkflowProcess struct {
Label
string
`json:"label" gorm:"comment:流程标题"`
HideIcon
bool
`json:"hideIcon" gorm:"comment:是否隐藏图标"`
Description
string
`json:"description" gorm:"comment:详细介绍"`
View
string
`json:"view" gorm:"comment:前端视图文件"`
Nodes
[]
WorkflowNode
`json:"nodes"`
// 流程节点数据
Edges
[]
WorkflowEdge
`json:"edges"`
// 流程链接数据
}
...
...
@@ -31,7 +32,8 @@ type WorkflowNode struct {
Label
string
`json:"label" gorm:"comment:节点名称"`
Type
string
`json:"type" gorm:"comment:图标类型"`
Shape
string
`json:"shape" gorm:"comment:形状"`
Description
bool
`json:"description" gorm:"comment:详细介绍"`
Description
string
`json:"description" gorm:"comment:详细介绍"`
View
string
`json:"view" gorm:"comment:前端视图文件"`
X
float64
`json:"y" gorm:"comment:x位置"`
Y
float64
`json:"x" gorm:"comment:y位置"`
WaitState
string
`json:"waitState" gorm:"comment:等待属性"`
...
...
@@ -42,6 +44,9 @@ type WorkflowNode struct {
Cycle
string
`json:"cycle" gorm:"comment:循环时间"`
Duration
string
`json:"duration" gorm:"comment:持续时间"`
HideIcon
bool
`json:"hideIcon" gorm:"comment:是否隐藏图标"`
DueDate
time
.
Time
`json:"dueDate" gorm:"comment:到期时间"`
AssignType
string
`json:"assignType" gorm:"comment:审批类型"`
AssignValue
string
`json:"assignValue" gorm:"comment:审批类型值"`
}
type
WorkflowEdge
struct
{
...
...
@@ -55,6 +60,7 @@ type WorkflowEdge struct {
Target
string
`json:"target" gorm:"comment:目标节点"`
SourceAnchor
int
`json:"sourceAnchor" gorm:"comment:起点"`
TargetAnchor
int
`json:"targetAnchor" gorm:"comment:目标点"`
Description
string
`json:"description" gorm:"comment:详细介绍"`
Shape
string
`json:"shape" gorm:"comment:形状"`
StartPoint
WorkflowStartPoint
`json:"startPoint"`
// 起点信息
EndPoint
WorkflowEndPoint
`json:"endPoint"`
// 终点信息
...
...
web/src/components/gva-wfd/components/DetailPanel/StartEventDetail.vue
浏览文件 @
9926e192
...
...
@@ -4,6 +4,14 @@
<div
class=
"panelBody"
>
<DefaultDetail
:model=
"model"
:onChange=
"onChange"
:readOnly=
"readOnly"
/>
</div>
<div
class=
"panelRow"
>
<div>
视图路径(以view开头)
</div>
<el-input
style=
"width:90%; font-size:12px"
:disabled=
"readOnly"
type=
"view"
:value=
"model.view"
@
input=
"(value) =>
{onChange('view', value)}" />
</div>
</div>
</
template
>
<
script
>
...
...
web/src/components/gva-wfd/components/DetailPanel/TimerEventDetail.vue
浏览文件 @
9926e192
...
...
@@ -21,6 +21,14 @@
:value=
"model.duration"
@
input=
"(value) =>
{onChange('duration', value)}" />
</div>
<div
class=
"panelRow"
>
<div>
视图路径(以view开头)
</div>
<el-input
style=
"width:90%; font-size:12px"
:disabled=
"readOnly"
type=
"view"
:value=
"model.view"
@
input=
"(value) =>
{onChange('view', value)}" />
</div>
</div>
</div>
</
template
>
...
...
web/src/components/gva-wfd/components/DetailPanel/UserTaskDetail.vue
浏览文件 @
9926e192
...
...
@@ -21,7 +21,7 @@
:disabled=
"readOnly"
:value=
"model.assignValue"
clearable
allow-creat
e
multipl
e
:filterable=
"true"
:filter-method=
"filterUsers"
@
change=
"(e) => onChange('assignValue', e)"
>
...
...
@@ -33,11 +33,11 @@
<el-select
style=
"width:90%; font-size:12px"
:placeholder=
"'请选择角色'"
:disabled=
"readOnly"
multiple
:value=
"model.assignValue"
allow-create
clearable
:filterable=
"true"
:filter-method=
"
a
uthorities"
:filter-method=
"
filterA
uthorities"
@
change=
"(e) => onChange('assignValue', e)"
>
<el-option
v-for=
"authority in authoritiesCopy"
:key=
"authority.id"
:label=
"authority.name"
:value=
"authority.id"
/>
</el-select>
...
...
@@ -49,7 +49,6 @@
:placeholder=
"i18n['userTask.dueDate.placeholder']"
:disabled=
"readOnly"
:value=
"model.dueDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
@
input=
"(value) => onChange('dueDate', value)"
/>
</div>
<div
class=
"panelRow"
>
...
...
@@ -57,6 +56,14 @@
:disabled=
"readOnly"
:value=
"!!model.isSequential"
>
{{
i18n
[
'
userTask.counterSign
'
]
}}
</el-checkbox>
</div>
<div
class=
"panelRow"
>
<div>
视图路径(以view开头)
</div>
<el-input
style=
"width:90%; font-size:12px"
:disabled=
"readOnly"
type=
"view"
:value=
"model.view"
@
input=
"(value) =>
{onChange('view', value)}" />
</div>
<div
class=
"panelRow"
>
<div>
详情说明:
</div>
<el-input
style=
"width:90%; font-size:12px"
...
...
@@ -116,7 +123,7 @@
filterUsers
(
input
)
{
if
(
input
)
{
this
.
usersCopy
=
this
.
users
.
filter
((
item
)
=>
{
if
(
!!~
item
.
name
.
indexOf
(
input
)
||
!!~
item
.
name
.
toLowerCase
().
indexOf
(
input
.
toLowerCase
())
)
{
if
(
item
.
name
.
indexOf
(
input
)
>-
1
)
{
return
true
}
})
...
...
@@ -127,7 +134,8 @@
filterAuthorities
(
input
)
{
if
(
input
)
{
this
.
authoritiesCopy
=
this
.
authorities
.
filter
((
item
)
=>
{
if
(
!!~
item
.
name
.
indexOf
(
input
)
||
!!~
item
.
name
.
toLowerCase
().
indexOf
(
input
.
toLowerCase
()))
{
console
.
log
(
item
)
if
(
item
.
name
.
indexOf
(
input
)
>-
1
)
{
return
true
}
})
...
...
web/src/view/workflow/workflowCreate/workflowCreate.vue
浏览文件 @
9926e192
...
...
@@ -98,7 +98,7 @@ export default {
y
:
84
,
id
:
"
userTask1603681299962
"
,
style
:
{},
assignValue
:
1
,
assignValue
:
[
1
]
,
assignType
:
"
user
"
},
{
...
...
@@ -110,7 +110,7 @@ export default {
y
:
321
,
id
:
"
userTask1603681302372
"
,
style
:
{},
assignValue
:
2
,
assignValue
:
[
2
]
,
assignType
:
"
user
"
},
{
...
...
@@ -268,7 +268,12 @@ export default {
const
obj
=
this
.
$refs
[
"
wfd
"
].
graph
.
save
()
const
processModel
=
this
.
$refs
[
"
wfd
"
].
processModel
processModel
.
edges
=
obj
.
edges
processModel
.
nodes
=
obj
.
nodes
processModel
.
nodes
=
JSON
.
parse
(
JSON
.
stringify
(
obj
.
nodes
))
processModel
.
nodes
.
map
(
item
=>
{
if
(
item
.
assignValue
){
item
.
assignValue
=
String
(
item
.
assignValue
)
}
})
if
(
!
processModel
.
id
){
this
.
$message
({
type
:
"
error
"
,
...
...
@@ -321,6 +326,11 @@ export default {
const
res
=
await
findWorkflowProcess
({
id
:
this
.
$route
.
query
.
id
});
this
.
disabled
=
this
.
$route
.
query
.
type
==
"
view
"
if
(
res
.
code
==
0
){
res
.
data
.
reworkflowProcess
.
nodes
.
map
(
item
=>
{
if
(
item
.
assignValue
){
item
.
assignValue
=
item
.
assignValue
.
split
(
"
,
"
)
}
})
this
.
demoData
.
nodes
=
res
.
data
.
reworkflowProcess
.
nodes
delete
res
.
data
.
reworkflowProcess
.
nodes
this
.
demoData
.
edges
=
res
.
data
.
reworkflowProcess
.
edges
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录