diff --git a/src/dashboard-front/src/components/resource-detail/index.vue b/src/dashboard-front/src/components/resource-detail/index.vue
index 1f01ab1f8..9e81b2b21 100644
--- a/src/dashboard-front/src/components/resource-detail/index.vue
+++ b/src/dashboard-front/src/components/resource-detail/index.vue
@@ -185,7 +185,7 @@
class="title mt15"
:class="{
'ag-diff':
- checkDiff('localData.proxy') ||
+ checkDiff('localData.proxy.backend_name') ||
checkDiff('localData.proxy.config.method') ||
checkDiff('localData.proxy.config.timeout') ||
checkDiff('localData.proxy.config.path'),
@@ -218,14 +218,14 @@
-->
- {{ localData?.proxy?.backend_name || "--" }}
+ {{ localData.proxy.backend_name || "--" }}
diff --git a/src/dashboard-front/src/components/version-diff/index.vue b/src/dashboard-front/src/components/version-diff/index.vue
index 0a5d08ef1..200315efc 100644
--- a/src/dashboard-front/src/components/version-diff/index.vue
+++ b/src/dashboard-front/src/components/version-diff/index.vue
@@ -657,6 +657,20 @@ const getDiffData = async () => {
});
res.update.forEach((item: any) => {
item.isExpanded = false;
+
+ if (item?.source?.diff?.proxy?.backend_id) {
+ const curBackend: any = backendsList.value?.find((backend: any) => {
+ return backend.id === item.source.diff.proxy.backend_id;
+ });
+ item.source.diff.proxy.backend_name = curBackend?.name || '';
+ }
+
+ if (item?.target?.diff?.proxy?.backend_id) {
+ const curBackend: any = backendsList.value?.find((backend: any) => {
+ return backend.id === item.target.diff.proxy.backend_id;
+ });
+ item.target.diff.proxy.backend_name = curBackend?.name || '';
+ }
});
diffData.add = res.add;
diff --git a/src/dashboard-front/src/http/access-log.ts b/src/dashboard-front/src/http/access-log.ts
index a99cc8be5..2d137f831 100644
--- a/src/dashboard-front/src/http/access-log.ts
+++ b/src/dashboard-front/src/http/access-log.ts
@@ -8,7 +8,7 @@ const { BK_DASHBOARD_URL } = window;
* 获取流程日志列表
* @param apigwId 网关id
*/
-export const fetchApigwAccessLogList = (apigwId: number, params: ChartInterface) => fetch.get(`${BK_DASHBOARD_URL}/gateways/${apigwId}/logs/?${json2Query(params)}`);
+export const fetchApigwAccessLogList = (apigwId: number, params: ChartInterface, extraStr?: string) => fetch.get(`${BK_DASHBOARD_URL}/gateways/${apigwId}/logs/?${json2Query(params)}${extraStr}`);
/**
* 获取流程日志chart
diff --git a/src/dashboard-front/src/language/lang.ts b/src/dashboard-front/src/language/lang.ts
index 946d516b2..e271809b8 100644
--- a/src/dashboard-front/src/language/lang.ts
+++ b/src/dashboard-front/src/language/lang.ts
@@ -1422,6 +1422,10 @@ const lang: ILANG = {
'版本列表': ['VersionList'],
'请输入网关名称': ['Please enter gateway name'],
'': [''],
+ '切换插件': ['Switching plug-in'],
+ '确认{optType}插件({name})到 {stage} 环境?': ['Confirm the {optType} plug-in ({name}) to the {stage} environment?'],
+ '插件配置变更后,将立即影响线上环境,请确认。': ['The plug-in configuration change will affect the online environment immediately. Please confirm.'],
+ 'allow_origins 与 allow_origins_by_regex 不能同时为空': ['allow_origins and allow_origins_by_regex cannot be empty at the same time'],
'条': ['line'],
'共': ['total'],
'日志详情': ['Log details'],
diff --git a/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue b/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
index 08bdd29f1..6ad705b93 100644
--- a/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
+++ b/src/dashboard-front/src/views/components/plugin-manage/plugin-info.vue
@@ -33,7 +33,7 @@
- 切换插件
+ {{ t('切换插件') }}
@@ -87,15 +87,17 @@
:schema="formConfig.schema"
:layout="formConfig.layout"
:rules="formConfig.rules"
- :label-width="180"
ref="formRef">
-
+
@@ -270,6 +270,8 @@ const table = ref({
fields: [],
headers: [],
});
+const includeObj = ref([]);
+const excludeObj = ref([]);
// const searchUsage = ref({
// showed: false,
// });
@@ -476,7 +478,16 @@ const getApigwAccessLogList = async () => {
offset: (pagination.value.current - 1) * pagination.value.limit,
limit: pagination.value.limit,
};
- return await fetchApigwAccessLogList(apigwId.value, params);
+
+ let includeStr = '';
+ includeObj.value?.forEach((item: string) => {
+ includeStr += `&include=${item}`;
+ });
+ let excludeStr = '';
+ excludeObj.value?.forEach((item: string) => {
+ excludeStr += `&exclude=${item}`;
+ });
+ return await fetchApigwAccessLogList(apigwId.value, params, includeStr + excludeStr);
};
const getApigwAccessLogChart = async () => {
@@ -525,13 +536,30 @@ const handleRowCopy = (field: string, row: any) => {
const handleKeySearch = (row: any) => {
const { request_id } = row;
- keyword.value = `request_id: ${request_id}`;
- handleSearch(keyword.value);
+
+ includeObj.value?.push(`request_id:${request_id}`);
+ includeObj.value = Array.from(new Set(includeObj.value));
+
+ const index = excludeObj.value?.indexOf(`request_id:${request_id}`);
+ if (index !== -1) {
+ excludeObj.value?.splice(index, 1);
+ }
+
+ getSearchData();
};
-const handleRemoveKey = () => {
- keyword.value = '';
- handleSearch(keyword.value);
+const handleRemoveKey = (row: any) => {
+ const { request_id } = row;
+
+ excludeObj.value?.push(`request_id:${request_id}`);
+ excludeObj.value = Array.from(new Set(excludeObj.value));
+
+ const index = includeObj.value?.indexOf(`request_id:${request_id}`);
+ if (index !== -1) {
+ includeObj.value?.splice(index, 1);
+ }
+
+ getSearchData();
};
// const handleClickCopyLink = async ({ request_id }: any) => {
diff --git a/src/dashboard-front/src/views/resource/setting/detail.vue b/src/dashboard-front/src/views/resource/setting/detail.vue
index 0c34f72f5..4991e1d74 100644
--- a/src/dashboard-front/src/views/resource/setting/detail.vue
+++ b/src/dashboard-front/src/views/resource/setting/detail.vue
@@ -937,11 +937,12 @@ watch(
color: #313238;
font-weight: 700;
font-size: 14px;
- margin-bottom: 18px;
+ margin-bottom: 12px;
}
.form-cls {
font-size: 12px;
flex-flow: wrap;
+ margin-bottom: 30px;
:deep(.form-item-cls){
flex: 0 0 50%;
margin-bottom: 6px;
diff --git a/src/dashboard-front/src/views/resource/version/edition/index.vue b/src/dashboard-front/src/views/resource/version/edition/index.vue
index f987043a0..96d66812a 100644
--- a/src/dashboard-front/src/views/resource/version/edition/index.vue
+++ b/src/dashboard-front/src/views/resource/version/edition/index.vue
@@ -74,6 +74,8 @@
+
+