From d3f2fa2767b949b17cd9bca3ea8f6def1ba7a715 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Sun, 25 Jun 2023 14:00:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?NEZ-2914=20fix=EF=BC=9A=E4=B8=AD=E6=96=87?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/rightBox/assetMetaBox.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index 63df0c5ad..a49cb11b3 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -40,8 +40,8 @@ - - + +
  {{item.name}}
 From 0328db0491c8ec1453b8c6fefc5cefe17f619803 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Sun, 25 Jun 2023 14:52:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=20el-seleect=20=E5=8F=AF?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=9D=A1=E7=9B=AE=20=E4=BB=A5=E5=8F=8A=20el-?= =?UTF-8?q?autocomplete=20=E6=B7=BB=E5=8A=A0=E6=9C=80=E5=A4=A7=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E4=B8=BA64=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/elSelect/MyElSelect.vue | 8 ++++++++ .../src/components/common/filterSearch/filterSearch.vue | 4 ++-- .../components/common/project/meta2d/meta2dElement.vue | 6 +++--- .../common/rightBox/administration/modelBox.vue | 2 +- .../src/components/common/rightBox/alertSilenceBox.vue | 1 + .../src/components/common/rightBox/chart/chartConfig.vue | 4 ++-- .../components/common/rightBox/chart/otherChartConfig.vue | 2 +- .../common/rightBox/chart/systemChartConfig.vue | 4 ++-- nezha-fronted/src/components/common/rightBox/issueBox.vue | 2 +- .../src/components/common/rightBox/moduleBox.vue | 1 + .../common/rightBox/trafficSetting/trafficSettingTab.vue | 2 ++ .../src/components/common/searchBox/searchBox.vue | 2 +- 12 files changed, 25 insertions(+), 13 deletions(-) diff --git a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue index 0b5eb7cf2..f4f1ec53f 100644 --- a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue +++ b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue @@ -48,6 +48,7 @@ :class="[selectSize ? `is-${ selectSize }` : '']" :disabled="selectDisabled" :autocomplete="autoComplete || autocomplete" + :maxlength = "maxlength" @focus="handleFocus" @blur="softFocus = false" @click.stop @@ -72,6 +73,7 @@ v-model="selectedLabel" type="text" :placeholder="currentPlaceholder" + :maxlength = "maxlength" :name="name" :id="id" :autocomplete="autoComplete || autocomplete" @@ -301,6 +303,9 @@ export default { popperAppendToBody: { type: Boolean, default: true + }, + maxlength: { + type: Number } }, @@ -332,6 +337,9 @@ export default { }, watch: { + maxlength (n) { + console.log(n) + }, selectDisabled () { this.$nextTick(() => { this.resetInputHeight() diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue index 0b2d8f76e..8f3f4343e 100644 --- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue +++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue @@ -12,7 +12,7 @@
- +
@@ -806,7 +806,7 @@
- +
@@ -1087,7 +1087,7 @@ :title="legend.legend" style="width: 100%" filterable - allow-create + allow-create :maxlength="64" default-first-option clearable> diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue index 596db3b05..b4cfe6e31 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue @@ -15,7 +15,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index f3ca52d5a..6a7a880db 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -75,6 +75,7 @@ popper-class="right-box-select-top right-public-box-dropdown-top" placeholder="key" size="mini" + :maxlength="64" @select="handleSelect" > diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 68b789548..7a11db015 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -940,7 +940,7 @@ style="margin-right: 10px" @change="change('valueMapping', index)" filterable - allow-create + allow-create :maxlength="64" default-first-option > --> @@ -177,6 +178,7 @@ :trigger-on-focus="true" popper-class="no-style-class" size="mini" + :maxlength="64" :highlight-first-item="true" @input="ifIndexInputChange(scope.row[item.prop],scope.row,scope.$index)" > diff --git a/nezha-fronted/src/components/common/searchBox/searchBox.vue b/nezha-fronted/src/components/common/searchBox/searchBox.vue index a780527ad..46ac98c95 100644 --- a/nezha-fronted/src/components/common/searchBox/searchBox.vue +++ b/nezha-fronted/src/components/common/searchBox/searchBox.vue @@ -78,7 +78,7 @@ v-model="editDialogObj.value" multiple filterable - allow-create + allow-create :maxlength="64" default-first-option > Date: Sun, 25 Jun 2023 15:14:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?NEZ-2915=20fix=EF=BC=9AAsset=20attributes?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8CAll=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B8=8D=E6=98=BE=E7=A4=BAEdit=E5=92=8CDelec?= =?UTF-8?q?t=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/elSelect/MyElSelect.vue | 3 --- .../src/components/common/popBox/selectAssetMetaGroup.vue | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue index f4f1ec53f..149820ea2 100644 --- a/nezha-fronted/src/components/common/elSelect/MyElSelect.vue +++ b/nezha-fronted/src/components/common/elSelect/MyElSelect.vue @@ -337,9 +337,6 @@ export default { }, watch: { - maxlength (n) { - console.log(n) - }, selectDisabled () { this.$nextTick(() => { this.resetInputHeight() diff --git a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue index eab47081d..4ebcd15d5 100644 --- a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue +++ b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue @@ -30,13 +30,13 @@ - + - + {{$t('overall.edit')}} - + {{$t('overall.delete')}} From acef5e8bee848823077f6a1757c7aabc096b6cfa Mon Sep 17 00:00:00 2001 From: zhangyu Date: Sun, 25 Jun 2023 15:26:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?NEZ-2916=20fix=EF=BC=9AAsset=20attributes?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8CGroup=20=E9=80=89=E4=B8=ADEdit?= =?UTF-8?q?=E5=92=8CDelete=E6=8C=89=E9=92=AE=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A9=BA=E7=99=BD=E5=A4=84=E6=97=A0=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common/rightBoxCommon.scss | 7 ++++++- .../src/components/common/popBox/selectAssetMetaGroup.vue | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index f00d91b40..57a1973d0 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -325,7 +325,12 @@ margin-top: 0 !important; margin-bottom: 0 !important; max-width: 626px !important; - + .hidden-padding { + padding: 0; + > span{ + padding: 0 20px; + } + } } .api-select.right-box-select-top.right-public-box-dropdown-top { .el-scrollbar__view.el-select-dropdown__list { diff --git a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue index 4ebcd15d5..d6c3fd759 100644 --- a/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue +++ b/nezha-fronted/src/components/common/popBox/selectAssetMetaGroup.vue @@ -33,10 +33,10 @@ - + {{$t('overall.edit')}} - + {{$t('overall.delete')}}