fix fenye and anquan issues

(cherry picked from commit 9e64cc7f67b00c93f9aaadd9885d768f28205505)
This commit is contained in:
wkl505997900 2023-09-20 15:14:57 +08:00 committed by openeuler-sync-bot
parent 3a0e6e08db
commit 0164d1f02c
2 changed files with 58 additions and 2 deletions

View File

@ -0,0 +1,51 @@
From 05b4972808e22c2a9c2c36aa639e521e1a6d5809 Mon Sep 17 00:00:00 2001
From: wkl505997900 <2313665567@qq.com>
Date: Wed, 20 Sep 2023 14:43:57 +0800
Subject: [PATCH] solve some bug
---
src/vendor/ant-design-pro/utils/request.js | 6 +++++-
src/views/leaks/components/CvesTable.vue | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/vendor/ant-design-pro/utils/request.js b/src/vendor/ant-design-pro/utils/request.js
index 1f0fe84..c3307ce 100644
--- a/src/vendor/ant-design-pro/utils/request.js
+++ b/src/vendor/ant-design-pro/utils/request.js
@@ -83,7 +83,11 @@ request.interceptors.request.use(config => {
const userName = localStorage.getItem('user_name')
userName && localStorage.setItem('user_name', userName);
}
- config.headers['Content-Type'] = 'application/json'
+ if (config.url === '/vulnerability/cve/advisory/upload' || config.url === '/vulnerability/cve/unaffected/upload') {
+ config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+ } else {
+ config.headers['Content-Type'] = 'application/json'
+ }
return config;
}, errorHandler);
diff --git a/src/views/leaks/components/CvesTable.vue b/src/views/leaks/components/CvesTable.vue
index eae6a6b..72b4703 100644
--- a/src/views/leaks/components/CvesTable.vue
+++ b/src/views/leaks/components/CvesTable.vue
@@ -705,7 +705,6 @@ export default {
this.pagination = pagination;
// 翻页时清楚展开状态
this.expandedRowKeys = []
-
this.filters = Object.assign({}, this.filters, filters);
if (this.filters['fixStatus'] != null) {
this.assignFiltersFixStatus(this.filters['fixStatus'])
@@ -1072,6 +1071,8 @@ export default {
pageSize: pagination.pageSize,
total: res.data.total_count || (res.data.total_count === 0 ? 0 : pagination.total)
};
+ // 获取cve列表后清楚展开状态
+ _this.expandedRowKeys = [];
})
.catch(function (err) {
_this.$message.error(err.response.message);
--
Gitee

View File

@ -2,12 +2,13 @@
Name: aops-hermes
Version: v1.3.3
Release: 1
Release: 2
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-Resolve-upload-and-pagination-issues.patch
BuildRequires: nodejs node-gyp nodejs-yarn
@ -19,7 +20,7 @@ Web for an intelligent diagnose frame
%prep
%autosetup -n %{name}-%{version}
%autosetup -n %{name}-%{version} -p1
%setup -T -D -a 1
@ -44,6 +45,10 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
%changelog
* Wed Sep 20 2023 wangkunlong<505997900@qq.com> - v1.3.3-2
- Resolve the issue of abnormal display of paginated data after expanding the rpm list when setting multiple data pagination settings
- Resolve the issue of abnormal upload security announcement parameters
* Tue Sep 19 2023 wangkunlong<505997900@qq.com> - v1.3.3-1
- Fix parameter passing when expanding a secondary list of unselectable items in the CVE list
- Fix the issue of abnormal repo settings during deployment and adjust the parameters for rollback tasks