gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.实体详情tab（相关实体、开放端口）没超过100条的话，more按钮隐藏;2.i18n的新增，后端校验失败时没弹提示。用户、角色新增的name重复校验失败时没弹提示；3.下拉框背景色调为白色；4.修改密码增加at least five的校验；

Browse Source
This commit is contained in:
hyx
2023-07-15 12:50:03 +08:00
parent ee338b247d
commit 14125d549d
10 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/css/components/views/charts2/panel.scss
View File

@@ -71,7 +71,7 @@
.el-input__inner {
font-size: 14px;
color: #353636;
background-color: #F5F8FA;
background-color: #FFFFFF;
}
.common-select {
top: 32px !important;

13
src/components/layout/Header.vue
View File

@@ -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'

4
src/components/rightBox/settings/ChartBox.vue
View File

@@ -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)
}
})
}

4
src/components/rightBox/settings/I18nBox.vue
View File

@@ -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)
}
})
}

4
src/components/rightBox/settings/RoleBox.vue
View File

@@ -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)
}
})
}

18
src/components/rightBox/settings/UserBox.vue
View File

@@ -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)
}
})
}

4
src/mixins/right-box.js
View File

@@ -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)
}
})
}

3
src/views/charts2/chart-mixin.js
View File

@@ -10,7 +10,8 @@ export default {
return {
isNoData: false,
showError: false,
errorMsg: ''
errorMsg: '',
entityDetailRelatedEntitiesShowSize: entityDetailRelatedEntitiesShowSize
}
},
emits: ['toggleLoading'],

6
src/views/charts2/charts/entityDetail/tabs/DomainNameResolution.vue
View File

@@ -14,7 +14,7 @@
{{ entity.appName ? entity.appName : entity }}
</div>
</div>
<div class="more" v-if="relatedAppList.length > 0">
<div class="more" v-if="relatedAppList.length > entityDetailRelatedEntitiesShowSize">
<span class="button" :style="{'opacity': relatedAppList.length > showRelatedAppListInfo.num ? 1 : 0.6}" @click="showMore(showRelatedAppListInfo,relatedAppList)">{{ $t('overall.more') }} > </span>
</div>
</template>
@@ -34,7 +34,7 @@
{{ entity.ip ? entity.ip : entity }}
</div>
</div>
<div class="more" v-if="relatedIpList.length > 0">
<div class="more" v-if="relatedIpList.length > entityDetailRelatedEntitiesShowSize">
<span class="button" :style="{'opacity': relatedIpList.length > showRelatedIpListInfo.num ? 1 : 0.6}" @click="showMore(showRelatedIpListInfo,relatedIpList)">{{ $t('overall.more') }} > </span>
</div>
</template>
@@ -54,7 +54,7 @@
{{ entity.domain ? entity.domain : entity }}
</div>
</div>
<div class="more" v-if="relatedDomainList.length > 0">
<div class="more" v-if="relatedDomainList.length > entityDetailRelatedEntitiesShowSize">
<span class="button" :style="{'opacity': relatedDomainList.length > showRelatedDomainListInfo.num ? 1 : 0.6}" @click="showMore(showRelatedDomainListInfo,relatedDomainList)">{{ $t('overall.more') }} > </span>
</div>
</template>

9
src/views/charts2/charts/entityDetail/tabs/OpenPort.vue
View File

@@ -10,10 +10,13 @@
<span class="type-title-word">{{ $t('entities.tab.currentDevelopmentPortsAndServices') }}</span>({{ openPortList.length }})
</div>
<div class="type-content">
<div v-for="(openPort, index) in openPortList" :key="index" class="data-item">
<div v-for="(openPort, index) in openPortList.slice(0,showOpenPortListInfo.num)" :key="index" class="data-item">
{{ openPort.port }}/{{ openPort.l7Protocol }}
</div>
</div>
<div class="more" v-if="openPortList.length > entityDetailRelatedEntitiesShowSize">
<span class="button" :style="{'opacity': openPortList.length > showOpenPortListInfo.num ? 1 : 0.6}" @click="showMore(showOpenPortListInfo,openPortList)">{{ $t('overall.more') }} > </span>
</div>
</div>
</div>
</div>
@@ -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)