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

Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.9

Browse Source
This commit is contained in:
zhangyu
2023-10-31 18:26:48 +08:00
parent 690513cd81 83c00039c5
commit b9dc1cf313
8 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -746,3 +746,23 @@ i.nz-icon-override{
input::placeholder{
text-transform:capitalize;
}
.vue-tags-input {
.ti-tag.ti-valid {
max-width: 100%;
.ti-content {
max-width: 90%;
flex-shrink: 0;
.ti-tag-center {
max-width: 100%;
flex-shrink: 0;
> span {
max-width: 100%;
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
}
}
}

6
nezha-fronted/src/components/common/js/constants.js
View File

@@ -363,11 +363,15 @@ export const chart = {
export const intervalList = [
{ value: 0, label: i18n.t('dashboard.dashboard.chartForm.lockList.off') },
{ value: 5, label: '5s' },
{ value: 10, label: '10s' },
{ value: 30, label: '30s' },
{ value: 60, label: '1m' },
{ value: 300, label: '5m' },
{ value: 900, label: '15m' },
{ value: 1800, label: '30m' }
{ value: 1800, label: '30m' },
{ value: 3600, label: '1h' },
{ value: 7200, label: '2h' }
]
export const setting = {

1
nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
View File

@@ -216,7 +216,6 @@
>
<vue-tags-input
v-model="tag"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="chartConfig.param.tags"
@tags-changed="(newTags)=>{tagsChange(newTags)}"

1
nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
View File

@@ -188,7 +188,6 @@
>
<vue-tags-input
v-model="tag"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="chartConfig.param.tags"
@tags-changed="(newTags)=>{tagsChange(newTags)}"

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

@@ -236,7 +236,6 @@
<el-form-item :prop="'paramObj.' + index + '.value'" class="param-box-row-value">
<vue-tags-input
v-model="item.tags"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="item.value"
@tags-changed="(newTags)=>{tagsChange(newTags, index)}"
@@ -296,7 +295,6 @@
]">
<vue-tags-input
v-model="item.tags"
:maxlength="32"
ref="relabelTag"
tabindex="9999"
:placeholder="$t('tagsInput.placeholder')"
@@ -467,7 +465,6 @@
>
<vue-tags-input
v-model="item.namespaces.tags"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="item.namespaces.names"
@tags-changed="(newTags)=>{logsTagsChange(newTags,item)}"
@@ -499,7 +496,6 @@
]">
<vue-tags-input
v-model="subItem.tags"
:maxlength="32"
:ref="'logsRelabelTag'+index+subIndex"
tabindex="9999"
:placeholder="$t('tagsInput.placeholder')"

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

@@ -187,7 +187,6 @@
<el-form-item :prop="'paramObj.' + index + '.value'" class="param-box-row-value">
<vue-tags-input
v-model="item.tags"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="item.value"
@tags-changed="(newTags)=>{tagsChange(newTags, index)}"
@@ -247,7 +246,6 @@
]">
<vue-tags-input
v-model="item.tags"
:maxlength="32"
ref="relabelTag"
tabindex="9999"
:placeholder="$t('tagsInput.placeholder')"
@@ -420,7 +418,6 @@
>
<vue-tags-input
v-model="item.namespaces.tags"
:maxlength="32"
:placeholder="$t('tagsInput.placeholder')"
:tags="item.namespaces.names"
@tags-changed="(newTags)=>{logsTagsChange(newTags,item)}"
@@ -472,7 +469,6 @@
]">
<vue-tags-input
v-model="subItem.tags"
:maxlength="32"
:ref="'logsRelabelTag'+index+subIndex"
tabindex="9999"
:placeholder="$t('tagsInput.placeholder')"

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -15,7 +15,7 @@
<el-select v-model="state" class="margin-r-10" size="small" value-key="value" @change="getTableData" popper-class="right-box-select-top right-public-box-dropdown-top" style="width: 100px">
<el-option v-for="item in stateOptions" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
</el-select>
<pick-time ref="pickTime" v-model="searchTime" sign="message" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="false"></pick-time>
<pick-time ref="pickTime" v-model="searchTime" sign="message" :default-pick="defaultPick" :refresh-data-func="dateChange" :show-empty="true" :use-chart-unit="false" :use-refresh="true"></pick-time>
<button id="roles-add" v-has="'alertMessage_view'" :title="$t('overall.exportExcel')" class="top-tool-btn margin-r-10" type="button" @click="showExportDialog">
<i class="nz-icon-download1 nz-icon"></i>
</button>

1
nezha-fronted/src/components/page/config/monitor.vue
View File

@@ -30,7 +30,6 @@
<el-form-item :label="$t('config.system.monitor.interface_name')" prop="interface_name">
<vue-tags-input
v-model="tag"
:maxlength="32"
:class="monitor.interface_name.length !== 0 ? 'interface-name' : ''"
:placeholder="$t('tagsInput.placeholder')"
:tags="monitor.interface_name"