gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-992 fix: 修复 asset 批量修改 label 显示问题

Browse Source
This commit is contained in:
@changcode
2021-09-14 10:52:54 +08:00
parent 42ca43f68e
commit 7a4bbfee4a
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/css/common/rightBoxCommon.scss
View File

@@ -56,7 +56,7 @@
.input-box { .input-box {
.el-textarea { .el-textarea {
.el-textarea__inner { .el-textarea__inner {
width: 530px; width: 522px;
height: 32px; height: 32px;
padding: 5px 70px 4px 10px; padding: 5px 70px 4px 10px;
} }

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -625,6 +625,7 @@ const cn = {
talonPrompt: 'Talon 是一个负责日志收集的客户端程序', talonPrompt: 'Talon 是一个负责日志收集的客户端程序',
alertNum: '告警', alertNum: '告警',
userName: '用户名', userName: '用户名',
username: '用户名',
address: '地址', address: '地址',
assetType: '资产类型', // '资产类型' assetType: '资产类型', // '资产类型'
batchEditAsset: '批量修改资产', batchEditAsset: '批量修改资产',

1
nezha-fronted/src/components/common/language/en.js
View File

@@ -632,6 +632,7 @@ const en = {
asset: 'Asset ', asset: 'Asset ',
talonPrompt: 'Talon is a client program responsible for log collection.', talonPrompt: 'Talon is a client program responsible for log collection.',
userName: 'User name', userName: 'User name',
username: 'Username',
address: 'Address', address: 'Address',
assets: 'Asset', // '资产' assets: 'Asset', // '资产'
editAsset: 'Edit asset', // '编辑资产' editAsset: 'Edit asset', // '编辑资产'

4
nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
View File

@@ -161,7 +161,7 @@
:options="fieldGroupData" :options="fieldGroupData"
:props="labelCascProp" :props="labelCascProp"
class="hide-input" class="hide-input"
popper-class="prevent-clickoutside" popper-class="prevent-clickoutside limit-height"
size="small" size="small"
@change="addLabel" @change="addLabel"
></el-cascader> ></el-cascader>
@@ -471,7 +471,7 @@ export default {
handler (n) { handler (n) {
this.isEdit = true this.isEdit = true
if (n !== assetConstants.editTypeData.account) { if (n !== assetConstants.editTypeData.account) {
this.editData.authProtocol = 0 this.editData.authProtocol = 1
} else { } else {
this.getTableData() this.getTableData()
} }