From fc8f947ef1a12f21b524fd97af6b2b589b8b736e Mon Sep 17 00:00:00 2001 From: baiqi Date: Fri, 5 Jul 2024 11:47:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=A0=87=E5=87=86=E6=B7=BB=E5=8A=A0&ms-json-schema?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20enable=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ms-params-input/index.vue | 4 +- .../components/pure/ms-cron-select/index.vue | 19 +++- .../components/pure/ms-form-table/index.vue | 10 +- .../components/pure/ms-json-schema/index.vue | 30 +++--- .../components/pure/ms-table/base-table.vue | 7 ++ .../api-test/components/batchAddKeyVal.vue | 91 +++++++++++++++++-- .../components/requestComposition/body.vue | 1 + .../components/requestComposition/query.vue | 1 + .../components/requestComposition/rest.vue | 1 + .../src/views/api-test/debug/locale/en-US.ts | 4 + .../src/views/api-test/debug/locale/zh-CN.ts | 3 + .../api-test/management/components/import.vue | 29 +----- .../views/api-test/management/locale/en-US.ts | 4 - .../views/api-test/management/locale/zh-CN.ts | 4 - .../taskCenter/component/scheduledTask.vue | 30 +----- 15 files changed, 152 insertions(+), 86 deletions(-) diff --git a/frontend/src/components/business/ms-params-input/index.vue b/frontend/src/components/business/ms-params-input/index.vue index f08145d80b..789b1e7633 100644 --- a/frontend/src/components/business/ms-params-input/index.vue +++ b/frontend/src/components/business/ms-params-input/index.vue @@ -696,13 +696,13 @@ .ms-params-input:not(.arco-input-focus) { @apply bg-transparent; - border-color: transparent; + border-color: transparent !important; &:not(:hover) { .arco-input::placeholder { @apply invisible; } - border-color: transparent; + border-color: transparent !important; } } .ms-params-input, diff --git a/frontend/src/components/pure/ms-cron-select/index.vue b/frontend/src/components/pure/ms-cron-select/index.vue index 3f8e62584a..0eeb435614 100644 --- a/frontend/src/components/pure/ms-cron-select/index.vue +++ b/frontend/src/components/pure/ms-cron-select/index.vue @@ -1,5 +1,11 @@ diff --git a/frontend/src/views/api-test/components/requestComposition/rest.vue b/frontend/src/views/api-test/components/requestComposition/rest.vue index 9427b48daf..6a2940fb23 100644 --- a/frontend/src/views/api-test/components/requestComposition/rest.vue +++ b/frontend/src/views/api-test/components/requestComposition/rest.vue @@ -28,6 +28,7 @@ :params="innerParams" :disabled="props.disabledExceptParam" :default-param-item="defaultRequestParamsItem" + has-standard @apply="handleBatchParamApply" /> diff --git a/frontend/src/views/api-test/debug/locale/en-US.ts b/frontend/src/views/api-test/debug/locale/en-US.ts index c981632e34..73c8c7eeeb 100644 --- a/frontend/src/views/api-test/debug/locale/en-US.ts +++ b/frontend/src/views/api-test/debug/locale/en-US.ts @@ -209,4 +209,8 @@ export default { 'apiTestDebug.actualValue': 'Actual value', 'apiTestDebug.condition': 'condition', 'apiTestDebug.expectedValue': 'Expected value', + 'apiTestDebug.standardAdditions': 'Standard', + 'apiTestDebug.standardAdditionsTip': + 'Writing format: parameter name, type, required, parameter value; multiple records separated by newlines', + 'apiTestDebug.quickAdditions': 'Quick', }; diff --git a/frontend/src/views/api-test/debug/locale/zh-CN.ts b/frontend/src/views/api-test/debug/locale/zh-CN.ts index c7d6bbf1a1..78dcc34841 100644 --- a/frontend/src/views/api-test/debug/locale/zh-CN.ts +++ b/frontend/src/views/api-test/debug/locale/zh-CN.ts @@ -196,4 +196,7 @@ export default { 'apiTestDebug.condition': '匹配条件', 'apiTestDebug.expectedValue': '匹配值', 'apiTestDebug.extractValue': '提取值', + 'apiTestDebug.standardAdditions': '标准添加', + 'apiTestDebug.standardAdditionsTip': '书写格式:参数名,类型,必填,参数值;多条记录换行分隔', + 'apiTestDebug.quickAdditions': '快捷添加', }; diff --git a/frontend/src/views/api-test/management/components/import.vue b/frontend/src/views/api-test/management/components/import.vue index 630084f73f..8c394effa9 100644 --- a/frontend/src/views/api-test/management/components/import.vue +++ b/frontend/src/views/api-test/management/components/import.vue @@ -290,26 +290,7 @@ - - - -
- {{ item.value }} -
{{ item.label }}
-
-
- - -
+
@@ -346,6 +327,7 @@ import dayjs from 'dayjs'; import MsButton from '@/components/pure/ms-button/index.vue'; + import MsCronSelect from '@/components/pure/ms-cron-select/index.vue'; import MsDrawer from '@/components/pure/ms-drawer/index.vue'; import MsIcon from '@/components/pure/ms-icon-font/index.vue'; import MsBaseTable from '@/components/pure/ms-table/base-table.vue'; @@ -437,12 +419,7 @@ } return !importForm.value.name || !importForm.value.swaggerUrl; }); - const syncFrequencyOptions = [ - { label: t('apiTestManagement.timeTaskHour'), value: '0 0 0/1 * * ?' }, - { label: t('apiTestManagement.timeTaskSixHour'), value: '0 0 0/6 * * ?' }, - { label: t('apiTestManagement.timeTaskTwelveHour'), value: '0 0 0/12 * * ?' }, - { label: t('apiTestManagement.timeTaskDay'), value: '0 0 0 * * ?' }, - ]; + const cronValue = ref('0 0 0/1 * * ?'); const importLoading = ref(false); const taskDrawerVisible = ref(false); diff --git a/frontend/src/views/api-test/management/locale/en-US.ts b/frontend/src/views/api-test/management/locale/en-US.ts index de9189c58c..77963fd50c 100644 --- a/frontend/src/views/api-test/management/locale/en-US.ts +++ b/frontend/src/views/api-test/management/locale/en-US.ts @@ -97,10 +97,6 @@ export default { 'apiTestManagement.taskNameRequired': 'Task name cannot be empty', 'apiTestManagement.syncFrequency': 'Sync Frequency', 'apiTestManagement.timeTaskList': 'Time Task List', - 'apiTestManagement.timeTaskHour': '(Every Hour)', - 'apiTestManagement.timeTaskSixHour': '(Every 6 Hours)', - 'apiTestManagement.timeTaskTwelveHour': '(Every 12 Hours)', - 'apiTestManagement.timeTaskDay': '(Every Day)', 'apiTestManagement.customFrequency': 'Custom Frequency', 'apiTestManagement.case': 'Case', 'apiTestManagement.definition': 'Definition', diff --git a/frontend/src/views/api-test/management/locale/zh-CN.ts b/frontend/src/views/api-test/management/locale/zh-CN.ts index 63456aa788..0fe1fb32cd 100644 --- a/frontend/src/views/api-test/management/locale/zh-CN.ts +++ b/frontend/src/views/api-test/management/locale/zh-CN.ts @@ -92,10 +92,6 @@ export default { 'apiTestManagement.taskNameRequired': '任务名称不能为空', 'apiTestManagement.syncFrequency': '同步频率', 'apiTestManagement.timeTaskList': '定时任务列表', - 'apiTestManagement.timeTaskHour': '(每小时)', - 'apiTestManagement.timeTaskSixHour': '(每 6 小时)', - 'apiTestManagement.timeTaskTwelveHour': '(每 12 小时)', - 'apiTestManagement.timeTaskDay': '(每天)', 'apiTestManagement.customFrequency': '自定义频率', 'apiTestManagement.case': '用例', 'apiTestManagement.definition': '定义', diff --git a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue index c3a61d7dfe..574fa7c496 100644 --- a/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue +++ b/frontend/src/views/project-management/taskCenter/component/scheduledTask.vue @@ -82,20 +82,12 @@