!7 修复主机列表中选择主机后点击漏洞扫描的传参错误、cve fix等数据添加时长度限制

From: @gongzt 
Reviewed-by: @Lostwayzxc 
Signed-off-by: @Lostwayzxc
This commit is contained in:
openeuler-ci-bot 2022-11-28 01:51:00 +00:00 committed by Gitee
commit cc0c50584c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 84 additions and 2 deletions

View File

@ -0,0 +1,79 @@
From e31bf46b107308ba222011f15665ff2393638ba3 Mon Sep 17 00:00:00 2001
From: gongzt <gong_zhengtang@163.com>
Date: Sat, 26 Nov 2022 17:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E6=9C=BA=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E4=B8=AD=E9=80=89=E6=8B=A9=E4=B8=BB=E6=9C=BA=E5=90=8E?=
=?UTF-8?q?=E7=82=B9=E5=87=BB=E6=BC=8F=E6=B4=9E=E6=89=AB=E6=8F=8F=E7=9A=84?=
=?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E3=80=81cve=20fix=E7=AD=89?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=95=BF=E5=BA=A6?=
=?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/leaks/components/AddRepoModal.vue | 5 +++--
src/views/leaks/components/CreateRepairTaskDrawer.vue | 4 ++--
src/views/leaks/components/HostTable.vue | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/leaks/components/AddRepoModal.vue b/src/views/leaks/components/AddRepoModal.vue
index 1d90a35..4cedcfb 100644
--- a/src/views/leaks/components/AddRepoModal.vue
+++ b/src/views/leaks/components/AddRepoModal.vue
@@ -13,7 +13,7 @@
<a-form-item label="REPO源名称">
<a-input
:maxLength="19"
- placeholder="请输入REPO源名称19个字符以内"
+ placeholder="请输入REPO源名称20个字符以内"
v-decorator="['repoName', {rules: [{required: true, message: '请输入REPO名称'}]}]"
>
</a-input>
@@ -23,7 +23,8 @@
<a-textarea
v-decorator="['repoData', {rules: [{required: true, message: '请输入REPO描述'}]}]"
:rows="16"
- placeholder="请输入REPO内容"
+ :maxLength="512"
+ placeholder="请输入REPO内容512个字符以内"
/>
<a-button class="download-template" @click="handleGetTemplate">下载模板</a-button>
</div>
diff --git a/src/views/leaks/components/CreateRepairTaskDrawer.vue b/src/views/leaks/components/CreateRepairTaskDrawer.vue
index 574a6d8..6d372c7 100644
--- a/src/views/leaks/components/CreateRepairTaskDrawer.vue
+++ b/src/views/leaks/components/CreateRepairTaskDrawer.vue
@@ -27,13 +27,13 @@
</a-form-item>
<a-form-item label="任务描述">
<a-textarea
- :maxLength="60"
+ :maxLength="50"
v-decorator="[
'task_desc',
{rules: [{required: true, message: '请输入任务描述'}], initialValue: taskDescDefault}
]"
:rows="4"
- placeholder="请输入任务描述60个字符以内"
+ placeholder="请输入任务描述50个字符以内"
/>
</a-form-item>
<a-form-item label="自动重启" v-if="taskType === 'cve fix'">
diff --git a/src/views/leaks/components/HostTable.vue b/src/views/leaks/components/HostTable.vue
index 77aacf6..3bef8e0 100644
--- a/src/views/leaks/components/HostTable.vue
+++ b/src/views/leaks/components/HostTable.vue
@@ -366,7 +366,8 @@ export default {
_this.scanloading = true;
const requestIds = _this.selectedRowKeys;
return scanHost({
- hostList: requestIds
+ hostList: requestIds,
+ filter: null
})
.then(function(res) {
_this.$message.success(res.msg);
--
Gitee

View File

@ -2,14 +2,14 @@
Name: aops-hermes
Version: v1.1.0
Release: 2
Release: 3
Summary: Web for an intelligent diagnose frame
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
Source1: node-modules.tar.gz
Patch0001: 0001-adjust-code-style.patch
Patch0002: 0002-fix-param-error-and-limit-of-length.patch
BuildRequires: nodejs node-gyp nodejs-yarn
Requires: nginx
@ -44,6 +44,9 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog
* Sat Nov 26 2022 gongzhengtang<gong_zhengtang@163.com> - v1.1.0-3
- Fix param error and input limit of length
* Fri Nov 25 2022 wenxin<shusheng.wen@outlook.com> - v1.1.0-2
- Adjust the code style