File tree Expand file tree Collapse file tree 2 files changed +29
-3
lines changed
Expand file tree Collapse file tree 2 files changed +29
-3
lines changed Original file line number Diff line number Diff line change 459459 :value =" securitygroupids"
460460 :loading =" loading.networks"
461461 :preFillContent =" dataPreFill"
462+ :domainId =" owner.domainid"
463+ :account =" owner.account"
464+ :projectId =" owner.projectid"
462465 @select-security-group-item =" ($event) => updateSecurityGroups($event)" ></security-group-selection >
463466 </template >
464467 </a-step >
@@ -1501,6 +1504,9 @@ export default {
15011504 return tabList
15021505 },
15031506 showSecurityGroupSection () {
1507+ if (this .zone && this .zone .networktype === ' Basic' ) {
1508+ return true
1509+ }
15041510 if (this .networks .length < 1 ) {
15051511 return false
15061512 }
Original file line number Diff line number Diff line change @@ -75,6 +75,18 @@ export default {
7575 preFillContent: {
7676 type: Object ,
7777 default : () => {}
78+ },
79+ domainId: {
80+ type: String ,
81+ default : () => ' '
82+ },
83+ account: {
84+ type: String ,
85+ default : () => ' '
86+ },
87+ projectId: {
88+ type: String ,
89+ default : () => ' '
7890 }
7991 },
8092 data () {
@@ -102,6 +114,9 @@ export default {
102114 }
103115 },
104116 computed: {
117+ ownerParams () {
118+ return ` ${ this .domainId } -${ this .account } -${ this .projectId } `
119+ },
105120 rowSelection () {
106121 return {
107122 type: ' checkbox' ,
@@ -121,6 +136,11 @@ export default {
121136 this .selectedRowKeys = newValue
122137 }
123138 },
139+ ownerParams () {
140+ this .selectedRowKeys = []
141+ this .$emit (' select-security-group-item' , null )
142+ this .fetchData ()
143+ },
124144 loading () {
125145 if (! this .loading ) {
126146 if (this .preFillContent .securitygroupids ) {
@@ -140,9 +160,9 @@ export default {
140160 methods: {
141161 fetchData () {
142162 const params = {
143- projectid: this .$store .getters .project ? this .$store .getters .project .id : null ,
144- domainid: this .$store .getters .project && this .$store .getters .project .id ? null : this .$store .getters .userInfo .domainid ,
145- account: this .$store .getters .project && this .$store .getters .project .id ? null : this .$store .getters .userInfo .account ,
163+ projectid: this .projectId || ( this . $store .getters .project ? this .$store .getters .project .id : null ) ,
164+ domainid: this .projectId || ( this . $store .getters .project && this .$store .getters .project .id ) ? null : ( this .domainId || this . $store .getters .userInfo .domainid ) ,
165+ account: this .projectId || ( this . $store .getters .project && this .$store .getters .project .id ) ? null : ( this .account || this . $store .getters .userInfo .account ) ,
146166 page: this .page ,
147167 pageSize: this .pageSize
148168 }
You can’t perform that action at this time.
0 commit comments