From 3f9a26e65ac4e1095e15ec96ef35aeeed83a4294 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 29 Jan 2021 10:31:07 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=97=A7=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=BC=E5=AE=B9=E5=A4=8D=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/api/service/HistoricalDataUpgradeService.java | 2 ++ .../src/main/resources/db/migration/V71__modify_scenario.sql | 1 + 2 files changed, 3 insertions(+) create mode 100644 backend/src/main/resources/db/migration/V71__modify_scenario.sql diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java index a36b4ff3d7..6277311471 100644 --- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java +++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java @@ -377,6 +377,8 @@ public class HistoricalDataUpgradeService { if (CollectionUtils.isNotEmpty(scenarios)) { // 批量处理 for (Scenario scenario : scenarios) { + scenario.setId(test.getId() + "=" + scenario.getId()); + scenario.setName(test.getName() + "_" + scenario.getName()); MsScenario scenario1 = createScenario(scenario); String scenarioDefinition = JSON.toJSONString(scenario1); num++; diff --git a/backend/src/main/resources/db/migration/V71__modify_scenario.sql b/backend/src/main/resources/db/migration/V71__modify_scenario.sql new file mode 100644 index 0000000000..6edc321985 --- /dev/null +++ b/backend/src/main/resources/db/migration/V71__modify_scenario.sql @@ -0,0 +1 @@ +ALTER TABLE api_scenario MODIFY COLUMN id VARCHAR (120); \ No newline at end of file From da83beefb033cdac2b6c6839000e907c3c21b696 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 29 Jan 2021 10:41:22 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=97=A7=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=20body=20form-data=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HistoricalDataUpgradeService.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java index 6277311471..2beaf836c8 100644 --- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java +++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java @@ -136,21 +136,21 @@ public class HistoricalDataUpgradeService { if ("json".equals(request1.getBody().getFormat())) { if ("Raw".equals(request1.getBody().getType())) { request1.getBody().setType(Body.JSON); - } - if (CollectionUtils.isEmpty(request1.getHeaders())) { - List headers = new LinkedList<>(); - headers.add(new KeyValue("Content-Type", "application/json")); - request1.setHeaders(headers); - } else { - boolean isJsonType = false; - for (KeyValue keyValue : request1.getHeaders()) { - if ("Content-Type".equals(keyValue.getName())) { - isJsonType = true; - break; + if (CollectionUtils.isEmpty(request1.getHeaders())) { + List headers = new LinkedList<>(); + headers.add(new KeyValue("Content-Type", "application/json")); + request1.setHeaders(headers); + } else { + boolean isJsonType = false; + for (KeyValue keyValue : request1.getHeaders()) { + if ("Content-Type".equals(keyValue.getName())) { + isJsonType = true; + break; + } + } + if (!isJsonType) { + request1.getHeaders().set(request1.getHeaders().size() - 1, new KeyValue("Content-Type", "application/json")); } - } - if (!isJsonType) { - request1.getHeaders().set(request1.getHeaders().size() - 1, new KeyValue("Content-Type", "application/json")); } } } @@ -318,9 +318,6 @@ public class HistoricalDataUpgradeService { } private void createApiScenarioWithBLOBs(SaveHistoricalDataUpgrade saveHistoricalDataUpgrade, String id, String name, int total, String scenarioDefinition, ApiScenarioMapper mapper, int num) { - if (StringUtils.isEmpty(name)) { - name = "默认名称-" + DateUtils.getTimeStr(System.currentTimeMillis()); - } ApiScenarioWithBLOBs scenario = getScenario(id, mapper); if (scenario != null) { scenario.setName(name); @@ -377,6 +374,9 @@ public class HistoricalDataUpgradeService { if (CollectionUtils.isNotEmpty(scenarios)) { // 批量处理 for (Scenario scenario : scenarios) { + if (StringUtils.isEmpty(scenario.getName())) { + scenario.setName("默认名称-" + DateUtils.getTimeStr(System.currentTimeMillis())); + } scenario.setId(test.getId() + "=" + scenario.getId()); scenario.setName(test.getName() + "_" + scenario.getName()); MsScenario scenario1 = createScenario(scenario); From 1674cd44a7832893fac1a47facd88baeac748ca0 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Fri, 29 Jan 2021 10:42:18 +0800 Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=E9=80=9A=E7=9F=A5=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8C=89=E9=92=AE=E9=97=B4=E8=B7=9D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/components/DefectTaskNotification.vue | 3 +++ .../settings/organization/components/JenkinsNotification.vue | 4 ++++ .../organization/components/TestPlanTaskNotification.vue | 3 +++ .../organization/components/TestReviewNotification.vue | 3 +++ 4 files changed, 13 insertions(+) diff --git a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue index 1375d4ab42..4d82e7ad15 100644 --- a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue @@ -274,4 +274,7 @@ export default { .el-row { margin-bottom: 10px; } +.el-button { + margin-left: 10px; +} diff --git a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue index 14f8bb6109..2d0915dbfe 100644 --- a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue @@ -295,4 +295,8 @@ export default { .el-row { margin-bottom: 10px; } + +.el-button { + margin-left: 10px; +} diff --git a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue index 2708c60379..f5ba6d642b 100644 --- a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue @@ -308,4 +308,7 @@ export default { .el-row { margin-bottom: 10px; } +.el-button { + margin-left: 10px; +} diff --git a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue index ed89473882..125ccf379f 100644 --- a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue @@ -313,4 +313,7 @@ export default { .el-row { margin-bottom: 10px; } +.el-button { + margin-left: 10px; +} From 31d870ec5712c72270b451fdbe0e5b9c36158635 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 29 Jan 2021 10:55:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=97=A7=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=20path=20=E5=92=8C=20url=20=E5=88=86?= =?UTF-8?q?=E5=BC=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HistoricalDataUpgradeService.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java index 2beaf836c8..0e0d55f483 100644 --- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java +++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java @@ -28,7 +28,6 @@ import io.metersphere.base.mapper.ApiTestMapper; import io.metersphere.base.mapper.ext.ExtApiScenarioMapper; import io.metersphere.commons.utils.BeanUtils; import io.metersphere.commons.utils.DateUtils; -import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.SessionUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -42,7 +41,6 @@ import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.net.URL; import java.nio.channels.FileChannel; import java.util.*; @@ -116,18 +114,6 @@ public class HistoricalDataUpgradeService { if (request instanceof HttpRequest) { element = new MsHTTPSamplerProxy(); HttpRequest request1 = (HttpRequest) request; - if (StringUtils.isEmpty(request1.getPath()) && StringUtils.isNotEmpty(request1.getUrl())) { - try { - URL urlObject = new URL(request1.getUrl()); - String envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getPath(); - request1.setPath(envPath); - request1.setUrl(null); - } catch (Exception ex) { - LogUtil.error(ex.getMessage()); - } - } else { - request1.setUrl(null); - } if (request1.getBody() != null) { request1.getBody().setBinary(new ArrayList<>()); if (request1.getBody().isOldKV()) { @@ -161,6 +147,13 @@ public class HistoricalDataUpgradeService { BeanUtils.copyBean(element, request1); ((MsHTTPSamplerProxy) element).setProtocol(RequestType.HTTP); ((MsHTTPSamplerProxy) element).setArguments(request1.getParameters()); + if (StringUtils.isNotEmpty(request1.getPath()) && request1.isUseEnvironment()) { + ((MsHTTPSamplerProxy) element).setPath(request1.getPath()); + ((MsHTTPSamplerProxy) element).setUrl(null); + } else { + ((MsHTTPSamplerProxy) element).setPath(null); + ((MsHTTPSamplerProxy) element).setUrl(request1.getUrl()); + } List keyValues = new LinkedList<>(); keyValues.add(new KeyValue("", "")); ((MsHTTPSamplerProxy) element).setRest(keyValues); From 86c079c62a99f9ac572be1306f9292c5bb612de1 Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Fri, 29 Jan 2021 11:08:52 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20swagger=E5=AE=9A=E6=97=B6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V72__modify_swagger_url_project.sql | 6 ++++++ .../api/definition/components/import/ApiImport.vue | 6 +++--- frontend/src/i18n/en-US.js | 2 ++ frontend/src/i18n/zh-CN.js | 2 ++ frontend/src/i18n/zh-TW.js | 2 ++ 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql diff --git a/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql b/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql new file mode 100644 index 0000000000..bba509bd4a --- /dev/null +++ b/backend/src/main/resources/db/migration/V72__modify_swagger_url_project.sql @@ -0,0 +1,6 @@ +ALTER TABLE swagger_url_project + MODIFY COLUMN id VARCHAR(120); +ALTER TABLE swagger_url_project + MODIFY COLUMN project_id VARCHAR(120); +ALTER TABLE swagger_url_project + MODIFY COLUMN mode_id VARCHAR(120); diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue index a7bb46b646..0998fb2b28 100644 --- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue +++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue @@ -113,11 +113,11 @@ export default { showEnvironmentSelect: true, modeOptions: [{ id: 'fullCoverage', - name: '全量覆盖' + name: this.$t('commons.cover') }, { id: 'incrementalMerge', - name: '增量合并' + name: this.$t('commons.not.cover') }], protocol: "", platforms: [ @@ -153,7 +153,7 @@ export default { file: undefined, swaggerUrl: '', modeId: '', - moduleId: '' + moduleId: this.$t('commons.not.cover') }, rules: {}, currentModule: {}, diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 3d7b54e1d1..b57556fa94 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1,5 +1,7 @@ export default { commons: { + cover:'Cover', + not_cover:'Not Cover', import_mode: 'Import mode', import_module: 'Import module', please_fill_in_the_template: 'Please fill in the template', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 9c9f5ef10f..01c88a49b7 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1,5 +1,7 @@ export default { commons: { + cover:'覆盖', + not_cover:'不覆盖', import_mode: '导入模式', import_module: '导入模块', please_fill_in_the_template: '请填写模版内容', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index ef1230efc6..6d81c01325 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -1,5 +1,7 @@ export default { commons: { + cover:'覆蓋', + not_cover:'不覆蓋', import_mode: '導入模式', import_module: '導入模塊', please_fill_in_the_template: '請填寫模版內容', From 0b1a1e0135dc95790e25daebee9be4da3f9f998a Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Fri, 29 Jan 2021 11:12:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/definition/components/import/ApiImport.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue index 0998fb2b28..005ad19883 100644 --- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue +++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue @@ -152,8 +152,8 @@ export default { formData: { file: undefined, swaggerUrl: '', - modeId: '', - moduleId: this.$t('commons.not.cover') + modeId: this.$t('commons.not.cover'), + moduleId: '', }, rules: {}, currentModule: {}, From 37d12eea49018685b7625f022931e69d5b96a9df Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 29 Jan 2021 11:28:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=8A=A5=E5=91=8A=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/definition/request/MsTestElement.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java index 01bcb6121e..b328123763 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java @@ -256,25 +256,21 @@ public abstract class MsTestElement { return getRootParent(element.getParent()); } - protected String getParentName(MsTestElement element, ParameterConfig config) { - if (element != null) { - MsTestElement parent = this.getRootParent(element); - if (parent != null) { - if (MsTestElementConstants.LoopController.name().equals(parent.getType())) { - MsLoopController loopController = (MsLoopController) parent; - if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) { - return "While 循环-" + "${LoopCounterConfigXXX}"; - } - if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) { - return "ForEach 循环-" + "${LoopCounterConfigXXX}"; - } - if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) { - return "次数循环-" + "${LoopCounterConfigXXX}"; - } + protected String getParentName(MsTestElement parent, ParameterConfig config) { + if (parent != null) { + if (MsTestElementConstants.LoopController.name().equals(parent.getType())) { + MsLoopController loopController = (MsLoopController) parent; + if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) { + return "While 循环-" + "${LoopCounterConfigXXX}"; + } + if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) { + return "ForEach 循环-" + "${LoopCounterConfigXXX}"; + } + if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) { + return "次数循环-" + "${LoopCounterConfigXXX}"; } - return parent.getName(); } - return element.getName(); + return parent.getName(); } else if (config != null && StringUtils.isNotEmpty(config.getStep())) { if (MsTestElementConstants.SCENARIO.name().equals(config.getStepType())) { return config.getStep(); From 5ad5d1c702a27fe97a968ab6b74e680bee8a411f Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Fri, 29 Jan 2021 11:50:41 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/api/service/ApiDefinitionService.java | 5 ++++- .../api/definition/components/import/ApiImport.vue | 4 ++-- .../src/business/components/settings/system/Organization.vue | 3 --- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java index 022a7f36d3..6160fa7f57 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java @@ -661,7 +661,10 @@ public class ApiDefinitionService { public String getResourceId(SwaggerUrlRequest swaggerUrlRequest) { SwaggerUrlProjectExample swaggerUrlProjectExample = new SwaggerUrlProjectExample(); SwaggerUrlProjectExample.Criteria criteria = swaggerUrlProjectExample.createCriteria(); - criteria.andProjectIdEqualTo(swaggerUrlRequest.getProjectId()).andSwaggerUrlEqualTo(swaggerUrlRequest.getSwaggerUrl()).andModuleIdEqualTo(swaggerUrlRequest.getModuleId()); + criteria.andProjectIdEqualTo(swaggerUrlRequest.getProjectId()).andSwaggerUrlEqualTo(swaggerUrlRequest.getSwaggerUrl()); + if (StringUtils.isNotBlank(swaggerUrlRequest.getModuleId())) { + criteria.andModuleIdEqualTo(swaggerUrlRequest.getModuleId()); + } List list = swaggerUrlProjectMapper.selectByExample(swaggerUrlProjectExample); String resourceId = ""; if (list.size() == 1) { diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue index 005ad19883..82fb716e25 100644 --- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue +++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue @@ -117,7 +117,7 @@ export default { }, { id: 'incrementalMerge', - name: this.$t('commons.not.cover') + name: this.$t('commons.not_cover') }], protocol: "", platforms: [ @@ -152,7 +152,7 @@ export default { formData: { file: undefined, swaggerUrl: '', - modeId: this.$t('commons.not.cover'), + modeId: this.$t('commons.not_cover'), moduleId: '', }, rules: {}, diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue index 8fc66f3284..888236af0f 100644 --- a/frontend/src/business/components/settings/system/Organization.vue +++ b/frontend/src/business/components/settings/system/Organization.vue @@ -252,9 +252,6 @@ export default { activated() { this.initTableData(); }, - created() { - this.list() - }, methods: { create() { this.dialogOrgAddVisible = true;