From 14125d549d486e0835531d4b6e56ec233e7dfdf4 Mon Sep 17 00:00:00 2001 From: hyx Date: Sat, 15 Jul 2023 12:50:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E4=BD=93=E8=AF=A6=E6=83=85tab?= =?UTF-8?q?=EF=BC=88=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E3=80=81=E5=BC=80?= =?UTF-8?q?=E6=94=BE=E7=AB=AF=E5=8F=A3=EF=BC=89=E6=B2=A1=E8=B6=85=E8=BF=87?= =?UTF-8?q?100=E6=9D=A1=E7=9A=84=E8=AF=9D=EF=BC=8Cmore=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=9A=90=E8=97=8F;2.i18n=E7=9A=84=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E5=BC=B9=E6=8F=90=E7=A4=BA=E3=80=82=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E6=96=B0=E5=A2=9E=E7=9A=84name?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E6=97=B6?= =?UTF-8?q?=E6=B2=A1=E5=BC=B9=E6=8F=90=E7=A4=BA=EF=BC=9B3.=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86=E8=83=8C=E6=99=AF=E8=89=B2=E8=B0=83=E4=B8=BA?= =?UTF-8?q?=E7=99=BD=E8=89=B2=EF=BC=9B4.=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E5=A2=9E=E5=8A=A0at=20least=20five=E7=9A=84=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/views/charts2/panel.scss | 2 +- src/components/layout/Header.vue | 13 +++++++++++++ src/components/rightBox/settings/ChartBox.vue | 4 ++-- src/components/rightBox/settings/I18nBox.vue | 4 ++-- src/components/rightBox/settings/RoleBox.vue | 4 ++-- src/components/rightBox/settings/UserBox.vue | 18 +++++++++++++++--- src/mixins/right-box.js | 4 ++-- src/views/charts2/chart-mixin.js | 3 ++- .../entityDetail/tabs/DomainNameResolution.vue | 6 +++--- .../charts/entityDetail/tabs/OpenPort.vue | 9 ++++++++- 10 files changed, 50 insertions(+), 17 deletions(-) diff --git a/src/assets/css/components/views/charts2/panel.scss b/src/assets/css/components/views/charts2/panel.scss index 52c63372..4bd3a1af 100644 --- a/src/assets/css/components/views/charts2/panel.scss +++ b/src/assets/css/components/views/charts2/panel.scss @@ -71,7 +71,7 @@ .el-input__inner { font-size: 14px; color: #353636; - background-color: #F5F8FA; + background-color: #FFFFFF; } .common-select { top: 32px !important; diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index 5ac62c3c..d6489a9d 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -224,6 +224,13 @@ export default { callback() } } + const validateFiveLength = (rule, value, callback) => { + if (value.length < 5) { + callback(new Error(this.$t('validate.atLeastFive'))) + } else { + callback() + } + } return { username: localStorage.getItem(storageKey.username), language: localStorage.getItem(storageKey.language) ? localStorage.getItem(storageKey.language) : 'en', @@ -244,11 +251,17 @@ export default { required: true, message: this.$t('validate.required'), trigger: 'blur' + }, { + validator: validateFiveLength, + trigger: 'change' }], newPwd2: [{ required: true, message: this.$t('validate.required'), trigger: 'blur' + }, { + validator: validateFiveLength, + trigger: 'change' }, { validator: passwordComparison, trigger: 'blur' diff --git a/src/components/rightBox/settings/ChartBox.vue b/src/components/rightBox/settings/ChartBox.vue index 6f560d45..e4b7b0b1 100644 --- a/src/components/rightBox/settings/ChartBox.vue +++ b/src/components/rightBox/settings/ChartBox.vue @@ -376,7 +376,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } else { @@ -386,7 +386,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } diff --git a/src/components/rightBox/settings/I18nBox.vue b/src/components/rightBox/settings/I18nBox.vue index bdddba4f..407b0db8 100644 --- a/src/components/rightBox/settings/I18nBox.vue +++ b/src/components/rightBox/settings/I18nBox.vue @@ -112,7 +112,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } else { @@ -122,7 +122,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } diff --git a/src/components/rightBox/settings/RoleBox.vue b/src/components/rightBox/settings/RoleBox.vue index 83e92e64..2db63516 100644 --- a/src/components/rightBox/settings/RoleBox.vue +++ b/src/components/rightBox/settings/RoleBox.vue @@ -186,7 +186,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } else { @@ -196,7 +196,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue index 66f55798..91cf6c4d 100644 --- a/src/components/rightBox/settings/UserBox.vue +++ b/src/components/rightBox/settings/UserBox.vue @@ -144,6 +144,18 @@ export default { callback() } } + const validateUserName = (rule, value, callback) => { + let validate = true + const reg = /^[a-zA-Z0-9_]{2,64}$/ + validate = reg.test(value) + if (value.length < 2) { + callback(new Error(this.$t('validate.atLeastTwo'))) + } else if (!validate) { + callback(new Error(this.$t('validate.userName'))) + } else { + callback() + } + } return { url: api.user, loginName: localStorage.getItem(storageKey.username), @@ -154,7 +166,7 @@ export default { ], username: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' }, - { pattern: /^[a-zA-Z0-9_]{2,64}$/, message: this.$t('validate.atLeastTwo') } + { validator: validateUserName, trigger: 'change' } ], pin: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' }, @@ -229,7 +241,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } else { @@ -239,7 +251,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } diff --git a/src/mixins/right-box.js b/src/mixins/right-box.js index 9adc76bc..0a6ff2bc 100644 --- a/src/mixins/right-box.js +++ b/src/mixins/right-box.js @@ -33,7 +33,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } else { @@ -43,7 +43,7 @@ export default { this.$message({ duration: 2000, type: 'success', message: this.$t('tip.saveSuccess') }) this.esc(true) } else { - this.$message.error(res.msg) + this.$message.error(res.msg || res.message) } }) } diff --git a/src/views/charts2/chart-mixin.js b/src/views/charts2/chart-mixin.js index dde4fd15..d3687a96 100644 --- a/src/views/charts2/chart-mixin.js +++ b/src/views/charts2/chart-mixin.js @@ -10,7 +10,8 @@ export default { return { isNoData: false, showError: false, - errorMsg: '' + errorMsg: '', + entityDetailRelatedEntitiesShowSize: entityDetailRelatedEntitiesShowSize } }, emits: ['toggleLoading'], diff --git a/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue b/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue index fc88e53d..a0b6879d 100644 --- a/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue +++ b/src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue @@ -14,7 +14,7 @@ {{ entity.appName ? entity.appName : entity }} -
+
{{ $t('overall.more') }} >
@@ -34,7 +34,7 @@ {{ entity.ip ? entity.ip : entity }}
-
+
{{ $t('overall.more') }} >
@@ -54,7 +54,7 @@ {{ entity.domain ? entity.domain : entity }}
-
+
{{ $t('overall.more') }} >
diff --git a/src/views/charts2/charts/entityDetail/tabs/OpenPort.vue b/src/views/charts2/charts/entityDetail/tabs/OpenPort.vue index 83e74ef7..8eaadc7a 100644 --- a/src/views/charts2/charts/entityDetail/tabs/OpenPort.vue +++ b/src/views/charts2/charts/entityDetail/tabs/OpenPort.vue @@ -10,10 +10,13 @@ {{ $t('entities.tab.currentDevelopmentPortsAndServices') }}({{ openPortList.length }})
-
+
{{ openPort.port }}/{{ openPort.l7Protocol }}
+
+ {{ $t('overall.more') }} > +
@@ -34,6 +37,9 @@ export default { data () { return { openPortList: [], + showOpenPortListInfo: { + num: 0 + }, showError: false, errorMsg: '', initFlag: false // 初始化标识，请求接口之后再显示，避免标题初始化会闪一下 @@ -65,6 +71,7 @@ export default { this.showError = false if (!this.isNoData) { this.openPortList = res.data.result + this.handleShowDataNum(this.showOpenPortListInfo, this.openPortList) } } else { this.httpError(res)