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

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

Browse Source
This commit is contained in:
zhangyu
2023-06-25 15:28:52 +08:00
parent fbf8550728 acef5e8bee
commit aca7f61d4b
15 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,7 +325,12 @@
margin-top: 0 !important; margin-top: 0 !important;
margin-bottom: 0 !important; margin-bottom: 0 !important;
max-width: 626px !important; max-width: 626px !important;
.hidden-padding {
padding: 0;
> span{
padding: 0 20px;
}
}
} }
.api-select.right-box-select-top.right-public-box-dropdown-top { .api-select.right-box-select-top.right-public-box-dropdown-top {
.el-scrollbar__view.el-select-dropdown__list { .el-scrollbar__view.el-select-dropdown__list {

5
nezha-fronted/src/components/common/elSelect/MyElSelect.vue
View File

@@ -48,6 +48,7 @@
:class="[selectSize ? `is-${ selectSize }` : '']" :class="[selectSize ? `is-${ selectSize }` : '']"
:disabled="selectDisabled" :disabled="selectDisabled"
:autocomplete="autoComplete || autocomplete" :autocomplete="autoComplete || autocomplete"
:maxlength = "maxlength"
@focus="handleFocus" @focus="handleFocus"
@blur="softFocus = false" @blur="softFocus = false"
@click.stop @click.stop
@@ -72,6 +73,7 @@
v-model="selectedLabel" v-model="selectedLabel"
type="text" type="text"
:placeholder="currentPlaceholder" :placeholder="currentPlaceholder"
:maxlength = "maxlength"
:name="name" :name="name"
:id="id" :id="id"
:autocomplete="autoComplete || autocomplete" :autocomplete="autoComplete || autocomplete"
@@ -301,6 +303,9 @@ export default {
popperAppendToBody: { popperAppendToBody: {
type: Boolean, type: Boolean,
default: true default: true
},
maxlength: {
type: Number
} }
}, },

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

@@ -12,7 +12,7 @@
<div class="condition__column"> <div class="condition__column">
<div v-if="meta.nameIsEditing"> <div v-if="meta.nameIsEditing">
<el-select <el-select
allow-create allow-create :maxlength="64"
filterable filterable
size="mini" size="mini"
v-model="meta.name" v-model="meta.name"
@@ -35,7 +35,7 @@
<div class="condition__column"> <div class="condition__column">
<div v-if="meta.operIsEditing"> <div v-if="meta.operIsEditing">
<el-select <el-select
allow-create allow-create :maxlength="64"
filterable filterable
size="mini" size="mini"
v-model="meta.oper" v-model="meta.oper"

6
nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue
View File

@@ -30,13 +30,13 @@
</span> </span>
<el-row class="block-col-2" style="width: 35px;"> <el-row class="block-col-2" style="width: 35px;">
<el-col> <el-col>
<el-dropdown placement="bottom-end" trigger="click"> <el-dropdown placement="bottom-end" trigger="click" v-if="data.id != -1">
<span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span> <span class="el-dropdown-link tree--operation" @click.stop><i class="nz-icon nz-icon-more1"></i></span>
<el-dropdown-menu class="right-box-select-top" slot="dropdown" v-has="['asset_label_delete', 'asset_label_edit']"> <el-dropdown-menu class="right-box-select-top" slot="dropdown" v-has="['asset_label_delete', 'asset_label_edit']">
<el-dropdown-item> <el-dropdown-item class="hidden-padding">
<span @click.stop="edit(data)"><i v-has="'asset_label_edit'" class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</span> <span @click.stop="edit(data)"><i v-has="'asset_label_edit'" class="nz-icon nz-icon-edit"></i>{{$t('overall.edit')}}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item class="hidden-padding">
<span @click.stop="del(data)" v-has="'asset_label_delete'"><i class="nz-icon nz-icon-delete"></i>{{$t('overall.delete')}}</span> <span @click.stop="del(data)" v-has="'asset_label_delete'"><i class="nz-icon nz-icon-delete"></i>{{$t('overall.delete')}}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>

6
nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue
View File

@@ -466,7 +466,7 @@
</el-select> </el-select>
</div> </div>
<div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px"> <div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px">
<el-select v-model="pen.data.textLegend" size="small" filterable allow-create clearable default-first-option> <el-select v-model="pen.data.textLegend" size="small" filterable allow-create :maxlength="64" clearable default-first-option>
<el-option v-for="item in queryValues.filter(query => (query.parent === pen.data.textParent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title="item.name" style="width: 302px"> </el-option> <el-option v-for="item in queryValues.filter(query => (query.parent === pen.data.textParent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title="item.name" style="width: 302px"> </el-option>
</el-select> </el-select>
</div> </div>
@@ -806,7 +806,7 @@
</el-select> </el-select>
</div> </div>
<div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px"> <div style="display: inline-block;width: calc(70% - 13px);margin-left: 10px">
<el-select v-model="pen.data.legend" size="small" filterable allow-create clearable default-first-option> <el-select v-model="pen.data.legend" size="small" filterable allow-create :maxlength="64" clearable default-first-option>
<el-option class="text-ellipsis" v-for="item in queryValues.filter(query => (query.parent === pen.data.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title="item.name" style="width: 302px;"></el-option> <el-option class="text-ellipsis" v-for="item in queryValues.filter(query => (query.parent === pen.data.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title="item.name" style="width: 302px;"></el-option>
</el-select> </el-select>
</div> </div>
@@ -1087,7 +1087,7 @@
:title="legend.legend" :title="legend.legend"
style="width: 100%" style="width: 100%"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
clearable> clearable>
<el-option class="text-ellipsis" v-for="item in queryValues.filter(query => (query.parent === legend.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title='item.name' style="width: 300px"></el-option> <el-option class="text-ellipsis" v-for="item in queryValues.filter(query => (query.parent === legend.parent) && query.type === 'item')" :key="item.id" :value="item.name" :label='item.name' :title='item.name' style="width: 300px"></el-option>

2
nezha-fronted/src/components/common/rightBox/administration/modelBox.vue
View File

@@ -15,7 +15,7 @@
</el-form-item> </el-form-item>
<!--brand--> <!--brand-->
<el-form-item :label='$t("asset.brand")' prop="brandId"> <el-form-item :label='$t("asset.brand")' prop="brandId">
<el-select value-key="id" allow-create class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" :filterable="true" v-model="editModel.brandId" placeholder="" size="small" id="module-box-input-project"> <el-select value-key="id" allow-create :maxlength="64" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" :filterable="true" v-model="editModel.brandId" placeholder="" size="small" id="module-box-input-project">
<el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

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

@@ -75,6 +75,7 @@
popper-class="right-box-select-top right-public-box-dropdown-top" popper-class="right-box-select-top right-public-box-dropdown-top"
placeholder="key" placeholder="key"
size="mini" size="mini"
:maxlength="64"
@select="handleSelect" @select="handleSelect"
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>

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

@@ -40,8 +40,8 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item :label='$t("overall.type")' prop="type"> <el-form-item :label='$t("overall.type")' prop="type">
<el-select v-model="editAssetMeta.type" :popper-append-to-body="false" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" size="small" @change="selectType"> <el-select v-model="editAssetMeta.type" :popper-append-to-body="false" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside right-box-select-width" size="small" @change="selectType">
<el-option v-for="(item, index) in typeData" :key="index" :value="item.value" :disabled="item.disabled"> <el-option v-for="(item, index) in typeData" :key="index" :value="item.value" :disabled="item.disabled" :label="item.name">
<div><i :class="item.icon"></i>&nbsp;&nbsp;<span>{{item.name}}</span></div> <div><i :class="item.icon"></i>&nbsp;&nbsp;<span>{{item.name}}</span></div>
</el-option> </el-option>
</el-select> </el-select>

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

@@ -941,7 +941,7 @@
style="margin-right: 10px" style="margin-right: 10px"
@change="change('valueMapping', index)" @change="change('valueMapping', index)"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option
@@ -1019,7 +1019,7 @@
size="small" size="small"
@change="change" @change="change"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option

2
nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
View File

@@ -195,7 +195,7 @@
size="small" size="small"
@change="change" @change="change"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option

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

@@ -692,7 +692,7 @@
style="margin-right: 10px" style="margin-right: 10px"
@change="change('valueMapping', index)" @change="change('valueMapping', index)"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option
@@ -771,7 +771,7 @@
size="small" size="small"
@change="change" @change="change"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option

2
nezha-fronted/src/components/common/rightBox/issueBox.vue
View File

@@ -33,7 +33,7 @@
:placeholder="editIssue.type" :placeholder="editIssue.type"
style="margin-right: 10px" style="margin-right: 10px"
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
> >
<el-option <el-option

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

@@ -52,6 +52,7 @@
<!-- <el-input placeholder="" v-model=""></el-input>--> <!-- <el-input placeholder="" v-model=""></el-input>-->
<el-autocomplete <el-autocomplete
id="module-box-input-pattern" id="module-box-input-pattern"
:maxlength="64"
v-model="editModule.endpointNameTmpl" v-model="editModule.endpointNameTmpl"
:fetch-suggestions="querySearch" :fetch-suggestions="querySearch"
:placeholder="$t('overall.placeHolder')" :placeholder="$t('overall.placeHolder')"

2
nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue
View File

@@ -16,6 +16,7 @@
id="traffic-setting-asset" id="traffic-setting-asset"
popper-class="no-style-class" popper-class="no-style-class"
size="small" size="small"
:maxlength="64"
v-model="assetSetting.host" v-model="assetSetting.host"
></el-autocomplete> ></el-autocomplete>
<el-popover @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="hover"> <el-popover @hide="popHide" @show="popShow" placement="bottom" popper-class="no-style-class" trigger="hover">
@@ -177,6 +178,7 @@
:trigger-on-focus="true" :trigger-on-focus="true"
popper-class="no-style-class" popper-class="no-style-class"
size="mini" size="mini"
:maxlength="64"
:highlight-first-item="true" :highlight-first-item="true"
@input="ifIndexInputChange(scope.row[item.prop],scope.row,scope.$index)" @input="ifIndexInputChange(scope.row[item.prop],scope.row,scope.$index)"
></el-autocomplete> ></el-autocomplete>

2
nezha-fronted/src/components/common/searchBox/searchBox.vue
View File

@@ -182,7 +182,7 @@
v-model="editDialogObj.realValue" v-model="editDialogObj.realValue"
multiple multiple
filterable filterable
allow-create allow-create :maxlength="64"
default-first-option default-first-option
:filter-method="dialogValueListSet" :filter-method="dialogValueListSet"
v-loadMore="{ v-loadMore="{