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

Merge branch 'dev-3.4' of git.mesalab.cn:nezha/nezha-fronted into dev-3.4

Browse Source
This commit is contained in:
zyh
2022-07-01 17:43:17 +08:00
parent db69b71774 349610f178
commit c9c1ccced2
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/assets/css/components/common/rightBox/panelBox.scss
View File

@@ -80,7 +80,8 @@
}
.el-radio-button.is-active{
border: 1px solid #fbb569 !important;
border-radius: 0;
border-radius: 0px !important;
background-color: $--color-primary;
}
.el-radio-button__inner{
border: 0;

6
nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
View File

@@ -32,9 +32,9 @@
<el-form-item :label='$t("overall.value")' prop="value">
<el-input placeholder="" maxlength="128" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>
</el-form-item>
<!-- <el-form-item :label='$t("i18n.remark")' prop="remark">-->
<!-- <el-input placeholder="" maxlength="64" show-word-limit v-model="editGlobalization.value" size="small" id="dc-box-input-value"></el-input>-->
<!-- </el-form-item>-->
<el-form-item :label='$t("overall.remark")' prop="remark">
<el-input placeholder="" maxlength="256" type="textarea" show-word-limit v-model="editGlobalization.remark" size="small" :rows="2" id="dc-box-input-value"></el-input>
</el-form-item>
</el-form>
</div>
</div>

12
nezha-fronted/src/components/common/table/settings/globalizationTable.vue
View File

@@ -112,13 +112,13 @@ export default {
prop: 'value',
minWidth: 150,
show: true
}, {
label: this.$t('overall.remark'),
prop: 'remark',
show: true,
minWidth: 150,
sortable: 'custom'
}
// , {
// label: this.$t('i18n.remark'),
// prop: 'remark',
// show: true,
// sortable: 'custom'
// }
]
}
}