Skip to content

Commit

Permalink
Merge pull request #283 from TencentBlueKing/develop
Browse files Browse the repository at this point in the history 
v1.5.8
  • Loading branch information
@zhu327
zhu327 authored Oct 20, 2021
2 parents 5112805 + 1313f96 commit 127bb99
Show file tree
Hide file tree
Showing 113 changed files with 821 additions and 271 deletions.
4 changes: 3 additions & 1 deletion frontend/src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
}
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/attach-action-preview/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.isLoading = false
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/choose-ip/grade.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -1006,7 +1008,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
node.loadingMore = false
Expand Down
12 changes: 9 additions & 3 deletions frontend/src/components/choose-ip/grade/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.isLoading = false
Expand Down Expand Up @@ -1278,7 +1280,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -1416,7 +1420,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
node.loadingMore = false
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/choose-ip/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -1011,7 +1013,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
node.loadingMore = false
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/choose-ip/sideslider.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.loading = false
Expand Down Expand Up @@ -281,7 +283,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.listLoading = false
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/components/header/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -547,7 +549,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/render-perm-template-dialog/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.requestQueue.shift()
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/render-user-group-dialog/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.requestQueue.shift()
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/apply/components/apply-create-rate-manager-detail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.initRequestQueue.shift()
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/apply/components/apply-detail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.initRequestQueue.shift()
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/apply/components/apply-group-detail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.initRequestQueue.shift()
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/apply/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.isApplyLoading = false
Expand Down Expand Up @@ -164,7 +166,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.cancelLoading = false
Expand Down
12 changes: 9 additions & 3 deletions frontend/src/views/approval-process/components/custom-perm-process.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.requestQueue.shift()
Expand Down Expand Up @@ -243,7 +245,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.requestQueue.shift()
Expand Down Expand Up @@ -331,7 +335,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down
8 changes: 6 additions & 2 deletions frontend/src/views/approval-process/components/join-group-process.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.tableLoading = false
Expand All @@ -263,7 +265,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down
12 changes: 9 additions & 3 deletions frontend/src/views/approval-process/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -179,7 +181,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down Expand Up @@ -219,7 +223,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
}
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/audit/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.tableLoading = false
Expand Down
12 changes: 9 additions & 3 deletions frontend/src/views/grading-admin/components/add-action-sideslider.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.initRequestQueue.shift()
Expand Down Expand Up @@ -469,7 +471,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.initRequestQueue.shift()
Expand All @@ -496,7 +500,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.isRightLoading = false
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/grading-admin/components/member-edit.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
}
},
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/grading-admin/components/render-instance-table.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.sliderLoading = false
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/views/grading-admin/components/render-instance.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@
this.bkMessageInstance = this.$bkMessage({
limit: 1,
theme: 'error',
message: e.message || e.data.msg || e.statusText
message: e.message || e.data.msg || e.statusText,
ellipsisLine: 2,
ellipsisCopy: true
})
} finally {
this.isLoading = false
Expand Down
Loading

0 comments on commit 127bb99

Please sign in to comment.