From 99e24df9ee20077ea8da3285368627ab84034db3 Mon Sep 17 00:00:00 2001 From: "nathan.liu" Date: Mon, 25 Jul 2022 18:05:50 +0800 Subject: [PATCH] =?UTF-8?q?fix(UI=E8=87=AA=E5=8A=A8=E5=8C=96):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8E=E5=88=97=E8=A1=A8=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1015130 --user=刘瑶 【UI测试】各页面高级搜索状态字段下拉选项和各页面列表状态字段下拉选项不一致 https://www.tapd.cn/55049933/s/1210824 --- backend/src/main/java/io/metersphere/xpack | 2 +- .../common/components/search/search-components.js | 7 ++++--- frontend/src/business/components/xpack | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 4a0c2d7ab2..3e34e4f699 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 4a0c2d7ab2106f8ab20761461b082f80658e3484 +Subproject commit 3e34e4f69968987e9d8020421d16e9fb5cdb7075 diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js index 564f19715d..95291f4d43 100644 --- a/frontend/src/business/components/common/components/search/search-components.js +++ b/frontend/src/business/components/common/components/search/search-components.js @@ -166,11 +166,12 @@ export const UI_REPORT_STATUS = { options: [OPERATORS.IN, OPERATORS.NOT_IN] }, options: [ - {label: "Saved", value: "Saved"}, {label: "Running", value: "Running"}, - {label: 'Stopped', value: 'stop'}, {label: "Error", value: "Error"}, - {label: "Success", value: "Success"} + {label: "Success", value: "Success"}, + {label: 'Stopped', value: 'stop'}, + {label: "NotExecute", value: "unexecute"}, + // {label: "Saved", value: "Saved"}, ], props: { // 尾部控件的props,一般为element ui控件的props multiple: true diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 4dc70b23e6..298d8ad3fa 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 4dc70b23e64fcb66a11419268e6af9e6ae2bc2c4 +Subproject commit 298d8ad3fa5f305cb8c70dd01bc26aea01d2f099