Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
5b779ede
Commit
5b779ede
authored
Aug 12, 2020
by
张俊
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://cloud.wodcloud.com/git/apaas/apaas-v3-ui
into dev
parents
7b34afe5
c138751e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
45 additions
and
13 deletions
+45
-13
src/components/apass-table.vue
src/components/apass-table.vue
+17
-9
src/pages/workbench/component-center/process-management/designer/index.vue
...ch/component-center/process-management/designer/index.vue
+27
-3
src/pages/workbench/yygl/yyglList.vue
src/pages/workbench/yygl/yyglList.vue
+1
-1
No files found.
src/components/apass-table.vue
View file @
5b779ede
...
...
@@ -338,7 +338,15 @@ export default {
_self
.
moreActionList
=
[];
_self
.
showMoreActionList
=
true
;
_self
.
moreActionList
=
moreActionList
.
map
((
item
)
=>
({
_self
.
moreActionList
=
moreActionList
.
filter
((
item
)
=>
{
if
(
item
.
showRule
)
{
return
item
.
showRule
(
row
);
}
else
{
return
true
;
}
})
.
map
((
item
)
=>
({
id
:
row
.
id
,
label
:
item
.
label
,
callback
()
{
...
...
src/pages/workbench/component-center/process-management/designer/index.vue
View file @
5b779ede
...
...
@@ -124,9 +124,18 @@ export default {
methods
:
{
init
(
filter
)
{
let
params
=
{
sectors
:
(
filter
.
service_domains
&&
filter
.
service_domains
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
workareas
:
(
filter
.
workareas
&&
filter
.
workareas
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
states
:
(
filter
.
states
&&
filter
.
states
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
sectors
:
(
filter
.
service_domains
&&
filter
.
service_domains
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
workareas
:
(
filter
.
workareas
&&
filter
.
workareas
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
states
:
(
filter
.
states
&&
filter
.
states
.
map
((
item
)
=>
item
.
value
).
join
(
"
,
"
))
||
""
,
page
:
filter
.
page
,
page_size
:
filter
.
size
,
};
...
...
@@ -235,22 +244,37 @@ export default {
{
label
:
"
取消发布
"
,
callback
:
this
.
cancelPublishItem
,
showRule
(
item
)
{
return
item
.
state
===
2
;
},
},
{
label
:
"
部署
"
,
callback
:
this
.
deployItem
,
showRule
(
item
)
{
return
item
.
state
===
0
;
},
},
{
label
:
"
取消部署
"
,
callback
:
this
.
cancelDeployItem
,
showRule
(
item
)
{
return
item
.
state
===
1
;
},
},
{
label
:
"
复制
"
,
callback
:
this
.
copyItem
,
showRule
(
item
)
{
return
true
;
},
},
{
label
:
"
删除
"
,
callback
:
this
.
deleteItem
,
showRule
(
item
)
{
return
item
.
state
!==
2
;
},
},
],
},
...
...
src/pages/workbench/yygl/yyglList.vue
View file @
5b779ede
...
...
@@ -1341,7 +1341,7 @@ export default {
this
.
showDialog
();
},
editItem
(
item
)
{
this
.
$router
.
push
(
`/yygl/
${
this
.
level
}
/
${
this
.
type
}
/edit/
${
item
.
id
}
`
);
this
.
$router
.
push
(
`/yygl/
${
this
.
level
}
/
${
this
.
type
}
/edit/
${
item
.
app_
id
}
`
);
},
onLine
(
item
)
{
this
.
dialogInfo
.
title
=
"
提示
"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment