From 9a10123bc4e8bc8b5b78ec3318b85b5a100d127e Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 22 Sep 2020 21:14:02 +0800 Subject: [PATCH 1/8] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E8=AF=84?= =?UTF-8?q?=E5=AE=A1):=20=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/track/review/components/TestCaseReviewEdit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue index 9c411e16e0..af42109d43 100644 --- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue +++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue @@ -210,7 +210,7 @@ export default { }); }, editTestReview(param) { - this.$post('/test/case/review/' + this.operationType, param, () => { + this.result = this.$post('/test/case/review/' + this.operationType, param, () => { this.$success(this.$t('commons.save_success')); this.dialogFormVisible = false; this.$emit("refresh"); From 5ad828ec057712a5e25fc8ed1b254ef3c90246c6 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 23 Sep 2020 09:59:33 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(XPack):=20=E4=BF=AE=E5=A4=8D=E8=A2=AB?= =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=A2=E5=A4=B1=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=BC=95=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/APITestController.java | 1 - .../api/service/APITestService.java | 1 - .../controller/LoginController.java | 1 - .../java/io/metersphere/dto/LicenseDTO.java | 14 ------------- .../io/metersphere/dto/LicenseInfoDTO.java | 21 ------------------- .../metersphere/service/LicenseService.java | 10 --------- .../io/metersphere/service/UserService.java | 2 -- 7 files changed, 50 deletions(-) delete mode 100644 backend/src/main/java/io/metersphere/dto/LicenseDTO.java delete mode 100644 backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java delete mode 100644 backend/src/main/java/io/metersphere/service/LicenseService.java diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java index 28cbd6e764..ad3940ac7a 100644 --- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java +++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java @@ -12,7 +12,6 @@ import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.commons.utils.SessionUtils; import io.metersphere.controller.request.QueryScheduleRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.dto.ScheduleDao; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java index bedba60a9d..44dd35677b 100644 --- a/backend/src/main/java/io/metersphere/api/service/APITestService.java +++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java @@ -20,7 +20,6 @@ import io.metersphere.commons.constants.ScheduleType; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.utils.*; import io.metersphere.controller.request.QueryScheduleRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.dto.ScheduleDao; import io.metersphere.i18n.Translator; import io.metersphere.job.sechedule.ApiTestJob; diff --git a/backend/src/main/java/io/metersphere/controller/LoginController.java b/backend/src/main/java/io/metersphere/controller/LoginController.java index 015c0fa641..f1473d15fc 100644 --- a/backend/src/main/java/io/metersphere/controller/LoginController.java +++ b/backend/src/main/java/io/metersphere/controller/LoginController.java @@ -5,7 +5,6 @@ import io.metersphere.commons.constants.UserSource; import io.metersphere.commons.user.SessionUser; import io.metersphere.commons.utils.SessionUtils; import io.metersphere.controller.request.LoginRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.service.UserService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; diff --git a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseDTO.java deleted file mode 100644 index 245f875979..0000000000 --- a/backend/src/main/java/io/metersphere/dto/LicenseDTO.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.metersphere.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class LicenseDTO implements Serializable { - - private String status; - - private LicenseInfoDTO license; - -} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java b/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java deleted file mode 100644 index 682ebe564e..0000000000 --- a/backend/src/main/java/io/metersphere/dto/LicenseInfoDTO.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.metersphere.dto; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class LicenseInfoDTO implements Serializable { - // 客户名称 - private String corporation; - // 授权截止时间 - private String expired; - //产品名称 - private String product; - //产品版本 - private String edition; - //icense版本 - private String licenseVersion; - //授权数量 - private int licenseCount; -} diff --git a/backend/src/main/java/io/metersphere/service/LicenseService.java b/backend/src/main/java/io/metersphere/service/LicenseService.java deleted file mode 100644 index 25e46b3d18..0000000000 --- a/backend/src/main/java/io/metersphere/service/LicenseService.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.metersphere.service; - -import io.metersphere.dto.LicenseDTO; - -public interface LicenseService { - - public LicenseDTO valid(); - - public LicenseDTO addValidLicense(String reqLicenseCode); -} diff --git a/backend/src/main/java/io/metersphere/service/UserService.java b/backend/src/main/java/io/metersphere/service/UserService.java index d88864f060..fe2b0b8dfc 100644 --- a/backend/src/main/java/io/metersphere/service/UserService.java +++ b/backend/src/main/java/io/metersphere/service/UserService.java @@ -10,7 +10,6 @@ import io.metersphere.commons.constants.UserStatus; import io.metersphere.commons.exception.MSException; import io.metersphere.commons.user.SessionUser; import io.metersphere.commons.utils.CodingUtil; -import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.SessionUtils; import io.metersphere.controller.ResultHolder; import io.metersphere.controller.request.LoginRequest; @@ -20,7 +19,6 @@ import io.metersphere.controller.request.member.QueryMemberRequest; import io.metersphere.controller.request.member.UserRequest; import io.metersphere.controller.request.organization.AddOrgMemberRequest; import io.metersphere.controller.request.organization.QueryOrgMemberRequest; -import io.metersphere.dto.LicenseDTO; import io.metersphere.dto.UserDTO; import io.metersphere.dto.UserRoleDTO; import io.metersphere.i18n.Translator; From 3dfab4b13ff298089e96eaff40b4d5fc3d9d5606 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 23 Sep 2020 10:11:06 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix(XPack):=20=E6=B7=BB=E5=8A=A0=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/business/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index 19a4248b6b..c226861e51 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -32,7 +32,7 @@ import {saveLocalStorage} from "../common/js/utils"; const requireComponent = require.context('@/business/components/xpack/', true, /\.vue$/); - const header = requireComponent("./license/LicenseMessage.vue"); + const header = requireComponent.keys().length > 0 ? requireComponent("./license/LicenseMessage.vue") : {}; export default { name: 'app', From 4b1c6a4a8ae0dec0da8f32ea58ad3b005cfe5caf Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 23 Sep 2020 11:02:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dfirefox=E4=B8=8B=E8=BD=BD=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/common/js/ajax.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js index 0e500b68e9..3b07a7d3b4 100644 --- a/frontend/src/common/js/ajax.js +++ b/frontend/src/common/js/ajax.js @@ -136,7 +136,8 @@ export default { .then(response => { let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]); let link = document.createElement("a"); - link.href = window.URL.createObjectURL(new Blob([response.data], {type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"})); + console.log(response.data); + link.href = window.URL.createObjectURL(new Blob([response.data])); link.download = fileName; link.click(); }); From 5afdfac40c8635f3bce73bfb936cf572e32ec79d Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 23 Sep 2020 11:03:52 +0800 Subject: [PATCH 5/8] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA)?= =?UTF-8?q?:=20=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/common/js/ajax.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/common/js/ajax.js b/frontend/src/common/js/ajax.js index 3b07a7d3b4..3dd6792e3e 100644 --- a/frontend/src/common/js/ajax.js +++ b/frontend/src/common/js/ajax.js @@ -136,7 +136,6 @@ export default { .then(response => { let fileName = window.decodeURI(response.headers['content-disposition'].split('=')[1]); let link = document.createElement("a"); - console.log(response.data); link.href = window.URL.createObjectURL(new Blob([response.data])); link.download = fileName; link.click(); From 7f6fd6d0138cdefc626df325dc78efafdd8d275c Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Wed, 23 Sep 2020 11:15:11 +0800 Subject: [PATCH 6/8] =?UTF-8?q?refactor(=E7=94=A8=E4=BE=8B=E8=AF=84?= =?UTF-8?q?=E5=AE=A1):=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/metersphere/xpack | 2 +- .../track/review/view/components/TestReviewTestCaseEdit.vue | 4 ++-- frontend/src/business/components/xpack | 2 +- frontend/src/i18n/en-US.js | 2 +- frontend/src/i18n/zh-CN.js | 2 +- frontend/src/i18n/zh-TW.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index e51e5704f9..141ee64787 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit e51e5704f9d7fbfb030a8a7d67d0094a9f36c23d +Subproject commit 141ee64787b4a28ef108c5fa4dde90446de01887 diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue index 80d8603082..8c49aa1e55 100644 --- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue +++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue @@ -166,7 +166,7 @@ type="textarea" :autosize="{ minRows: 2, maxRows: 4}" :rows="2" - :disabled="isReadOnly" + :disabled="true" v-model="scope.row.actualResult" :placeholder="$t('commons.input_content')" clearable/> @@ -175,7 +175,7 @@