From 214620dbe5de8b42ab3879d702d4acd12ed931a9 Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Wed, 10 Apr 2024 20:49:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(all):=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-params-input/locale/en-US.ts  |  1 +
 .../business/ms-params-input/locale/zh-CN.ts  |  1 +
 .../api-test/components/condition/content.vue | 17 +++++++-------
 .../views/api-test/components/paramTable.vue  |  7 +-----
 .../components/requestComposition/header.vue  |  2 --
 .../components/common/customCaseDrawer.vue    |  2 +-
 .../api-test/scenario/components/setting.vue  | 11 ++++++++--
 .../stepNodeComposition/waitTimeContent.vue   |  3 +--
 .../api-test/scenario/components/utils.ts     |  4 +++-
 .../environmental/components/EnvGroupBox.vue  | 16 ++++++++++----
 .../components/allParams/index.vue            | 14 +++++-------
 .../components/envParams/EnvParamsTab.vue     | 22 +++++--------------
 12 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/business/ms-params-input/locale/en-US.ts b/frontend/src/components/business/ms-params-input/locale/en-US.ts
index 173501a8d0..09e94c48c9 100644
--- a/frontend/src/components/business/ms-params-input/locale/en-US.ts
+++ b/frontend/src/components/business/ms-params-input/locale/en-US.ts
@@ -26,6 +26,7 @@ export default {
   'ms.paramsInput.floatIntegerMin': 'Minimum value of integer part',
   'ms.paramsInput.floatIntegerMax': 'Maximum value of integer part',
   'ms.paramsInput.commonPlaceholder': 'Please input',
+  'ms.paramsInput.commonDescPlaceholder': 'Please input description',
   'ms.paramsInput.commonSelectPlaceholder': 'Please select',
   'ms.paramsInput.bool': 'Boolean',
   'ms.paramsInput.boolDesc': 'Generate a random boolean value',
diff --git a/frontend/src/components/business/ms-params-input/locale/zh-CN.ts b/frontend/src/components/business/ms-params-input/locale/zh-CN.ts
index 90456d367c..246b11c3d0 100644
--- a/frontend/src/components/business/ms-params-input/locale/zh-CN.ts
+++ b/frontend/src/components/business/ms-params-input/locale/zh-CN.ts
@@ -24,6 +24,7 @@ export default {
   'ms.paramsInput.floatIntegerMin': '整数部分最小值',
   'ms.paramsInput.floatIntegerMax': '整数部分最大值',
   'ms.paramsInput.commonPlaceholder': '请输入',
+  'ms.paramsInput.commonDescPlaceholder': '请输入描述',
   'ms.paramsInput.commonSelectPlaceholder': '请选择',
   'ms.paramsInput.bool': '布尔值',
   'ms.paramsInput.boolDesc': '随机生成一个布尔值',
diff --git a/frontend/src/views/api-test/components/condition/content.vue b/frontend/src/views/api-test/components/condition/content.vue
index 814fa06e45..d399a726a6 100644
--- a/frontend/src/views/api-test/components/condition/content.vue
+++ b/frontend/src/views/api-test/components/condition/content.vue
@@ -199,7 +199,7 @@
         </div>
       </div>
       <div v-else class="flex h-[calc(100%-47px)] flex-col">
-        <div class="mb-[16px] flex w-full items-center bg-[var(--color-text-n9)] p-[12px]">
+        <div class="mb-[8px] flex w-full items-center bg-[var(--color-text-n9)] p-[12px]">
           <div class="break-word max-w-[70%] break-all text-[var(--color-text-2)]">
             {{ condition.commonScriptInfo?.name || '-' }}
           </div>
@@ -247,17 +247,16 @@
     </template>
     <!-- SQL操作 -->
     <template v-else-if="condition.processorType === RequestConditionProcessor.SQL">
-      <div class="mb-[16px]">
-        <div class="mb-[8px] text-[var(--color-text-1)]">{{ t('common.desc') }}</div>
+      <div class="mb-[8px]">
         <a-input
           v-model:model-value="condition.name"
           :disabled="props.disabled"
-          :placeholder="t('apiTestDebug.commonPlaceholder')"
+          :placeholder="t('ms.paramsInput.commonDescPlaceholder')"
           :max-length="255"
           @input="() => emit('change')"
         />
       </div>
-      <div class="mb-[16px] flex w-full items-center bg-[var(--color-text-n9)] p-[12px]">
+      <div class="mb-[8px] flex w-full items-center bg-[var(--color-text-n9)] p-[12px]">
         <div class="max-w-[70%] break-words text-[var(--color-text-2)]">
           {{ condition.dataSourceName || '-' }}
         </div>
@@ -272,12 +271,12 @@
         </MsButton>
       </div>
       <div class="mb-[8px] text-[var(--color-text-1)]">{{ t('apiTestDebug.sqlScript') }}</div>
-      <div class="mb-[16px] h-[300px]">
+      <div class="mb-[8px] h-[300px]">
         <MsCodeEditor
           v-model:model-value="condition.script"
           :read-only="props.disabled"
           theme="vs"
-          height="276px"
+          height="120px"
           :language="LanguageEnum.SQL"
           :show-full-screen="false"
           :show-theme-change="false"
@@ -285,7 +284,7 @@
         >
         </MsCodeEditor>
       </div>
-      <div class="mb-[16px]">
+      <div class="mb-[8px]">
         <div class="mb-[8px] flex items-center text-[var(--color-text-1)]">
           {{ t('apiTestDebug.storageByCol') }}
           <a-tooltip position="right" :content="t('apiTestDebug.storageColTip')">
@@ -318,7 +317,7 @@
           @change="handleSqlSourceParamTableChange"
         />
       </div>
-      <div class="mt-[16px]">
+      <div class="mt-[8px]">
         <div class="mb-[8px] flex items-center text-[var(--color-text-1)]">
           {{ t('apiTestDebug.storageByResult') }}
           <a-tooltip position="right" :content="t('apiTestDebug.storageResultTip')">
diff --git a/frontend/src/views/api-test/components/paramTable.vue b/frontend/src/views/api-test/components/paramTable.vue
index 70a505327f..621731b155 100644
--- a/frontend/src/views/api-test/components/paramTable.vue
+++ b/frontend/src/views/api-test/components/paramTable.vue
@@ -87,7 +87,7 @@
           v-if="columnConfig.inputType === 'autoComplete'"
           v-model:model-value="record[columnConfig.dataIndex as string]"
           :disabled="props.disabledExceptParam || columnConfig.disabledColumn"
-          :data="columnConfig.autoCompleteParams?.filter((e) => e.isShow === true)"
+          :data="record[columnConfig.dataIndex as string] !== '' ? columnConfig.autoCompleteParams?.filter((e) => e.isShow === true) : columnConfig.autoCompleteParams"
           class="ms-form-table-input"
           :trigger-props="{ contentClass: 'ms-form-table-input-trigger' }"
           :filter-option="false"
@@ -99,11 +99,6 @@
           <template #option="{ data: opt }">
             <div class="w-[350px]">
               {{ t(opt.raw.label) }}
-              <!-- <a-tooltip :content="t(opt.raw.label)" position="bl" :mouse-enter-delay="300">
-                <div class="one-line-text max-w-full">
-                  {{ t(opt.raw.label) }}
-                </div>
-              </a-tooltip> -->
             </div>
           </template>
         </a-auto-complete>
diff --git a/frontend/src/views/api-test/components/requestComposition/header.vue b/frontend/src/views/api-test/components/requestComposition/header.vue
index 4f2a839305..615d58182b 100644
--- a/frontend/src/views/api-test/components/requestComposition/header.vue
+++ b/frontend/src/views/api-test/components/requestComposition/header.vue
@@ -30,14 +30,12 @@
   import paramTable, { ParamTableColumn } from '@/views/api-test/components/paramTable.vue';
 
   import { responseHeaderOption } from '@/config/apiTest';
-  import { useI18n } from '@/hooks/useI18n';
 
   import { EnableKeyValueParam } from '@/models/apiTest/common';
 
   import { filterKeyValParams } from '../utils';
   import { defaultHeaderParamsItem } from '@/views/api-test/components/config';
 
-  const { t } = useI18n();
   const props = defineProps<{
     params: EnableKeyValueParam[];
     layout: 'horizontal' | 'vertical';
diff --git a/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue b/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
index 9d476ec4fa..7b04fb70d4 100644
--- a/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
+++ b/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
@@ -76,7 +76,7 @@
           <template v-if="hasLocalExec">
             <a-dropdown-button
               v-if="!requestVModel.executeLoading"
-              :disabled="requestVModel.executeLoading || (isHttpProtocol && !requestVModel.url)"
+              :disabled="requestVModel.executeLoading || (isHttpProtocol && !requestVModel.path)"
               class="exec-btn"
               @click="() => execute(isPriorityLocalExec ? 'localExec' : 'serverExec')"
               @select="execute"
diff --git a/frontend/src/views/api-test/scenario/components/setting.vue b/frontend/src/views/api-test/scenario/components/setting.vue
index c0f9cd7343..b21185652c 100644
--- a/frontend/src/views/api-test/scenario/components/setting.vue
+++ b/frontend/src/views/api-test/scenario/components/setting.vue
@@ -43,7 +43,7 @@
       </a-tooltip>
     </div>
 
-    <a-form-item v-if="form.stepWaitTime" class="flex-1">
+    <a-form-item v-if="form.stepWaitTime !== null || form.stepWaitTime !== undefined" class="flex-1">
       <template #label>
         <div class="flex items-center">
           {{ t('apiScenario.setting.waitTime') }}
@@ -56,8 +56,9 @@
         :step="100"
         :min="0"
         :max="600000"
+        model-event="input"
         class="w-[160px]"
-        @change="emit('change')"
+        @blur="handleInputChange"
       />
     </a-form-item>
 
@@ -90,6 +91,12 @@
   const form = defineModel<OtherConfig>('otherConfig', {
     required: true,
   });
+
+  function handleInputChange() {
+    if (!form.value.stepWaitTime) {
+      form.value.stepWaitTime = 1000;
+    }
+  }
 </script>
 
 <style lang="less" scoped></style>
diff --git a/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/waitTimeContent.vue b/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/waitTimeContent.vue
index afa74e2a06..a20f176cf3 100644
--- a/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/waitTimeContent.vue
+++ b/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/waitTimeContent.vue
@@ -46,9 +46,8 @@
   });
 
   function handleInputChange() {
-    console.log('innerData.value.delay', innerData.value.delay);
     if (!innerData.value.delay) {
-      innerData.value.delay = 1;
+      innerData.value.delay = 1000;
     }
     nextTick(() => {
       emit('change', innerData.value);
diff --git a/frontend/src/views/api-test/scenario/components/utils.ts b/frontend/src/views/api-test/scenario/components/utils.ts
index 61d69e55dc..1750f67f56 100644
--- a/frontend/src/views/api-test/scenario/components/utils.ts
+++ b/frontend/src/views/api-test/scenario/components/utils.ts
@@ -67,7 +67,9 @@ export default function updateStepStatus(
           }
         }
       } else if (node.stepType === ScenarioStepType.CONSTANT_TIMER) {
-        node.executeStatus = ScenarioExecuteStatus.SUCCESS;
+        node.executeStatus = stepResponses[node.uniqueId]
+          ? ScenarioExecuteStatus.SUCCESS
+          : ScenarioExecuteStatus.UN_EXECUTE;
       } else if (node.executeStatus === ScenarioExecuteStatus.EXECUTING) {
         // 非逻辑控制器直接更改本身状态
         if (stepResponses[node.uniqueId] && stepResponses[node.uniqueId].length > 0) {
diff --git a/frontend/src/views/project-management/environmental/components/EnvGroupBox.vue b/frontend/src/views/project-management/environmental/components/EnvGroupBox.vue
index 25fba24551..ed9fdb1673 100644
--- a/frontend/src/views/project-management/environmental/components/EnvGroupBox.vue
+++ b/frontend/src/views/project-management/environmental/components/EnvGroupBox.vue
@@ -38,18 +38,19 @@
           </a-form-item>
         </a-form>
         <paramsTable
-          v-model:params="innerParams"
+          :params="innerParams"
           :show-setting="false"
           :columns="columns"
           :selectable="false"
+          :default-param-item="defaultParamItem"
           @change="handleParamTableChange"
         />
       </div>
       <div v-permission="['PROJECT_ENVIRONMENT:READ+UPDATE']" class="footer" :style="{ width: '100%' }">
         <a-button :disabled="!canSave" @click="handleReset">{{ t('common.cancel') }}</a-button>
-        <a-button :disabled="!canSave" :loading="loading" type="primary" @click="handleSave">{{
-          t('common.save')
-        }}</a-button>
+        <a-button :disabled="!canSave" :loading="loading" type="primary" @click="handleSave">
+          {{ t('common.save') }}
+        </a-button>
       </div>
     </template>
     <template v-else>
@@ -86,6 +87,13 @@
   });
   const store = useProjectEnvStore();
 
+  const defaultParamItem = {
+    projectId: '',
+    environmentId: '',
+    host: '',
+    description: '',
+    enable: true,
+  };
   const columns = computed<ParamTableColumn[]>(() => [
     {
       title: 'project.environmental.project',
diff --git a/frontend/src/views/project-management/environmental/components/allParams/index.vue b/frontend/src/views/project-management/environmental/components/allParams/index.vue
index 027767efb6..48dd033e6f 100644
--- a/frontend/src/views/project-management/environmental/components/allParams/index.vue
+++ b/frontend/src/views/project-management/environmental/components/allParams/index.vue
@@ -22,7 +22,7 @@
     />
   </div>
   <paramsTable
-    v-model:params="innerParams"
+    :params="innerParams"
     :table-key="props.tableKey"
     :columns="columns"
     :draggable="true"
@@ -34,8 +34,6 @@
 </template>
 
 <script setup lang="ts">
-  import { useVModel } from '@vueuse/core';
-
   import batchAddKeyVal from '@/views/api-test/components/batchAddKeyVal.vue';
   import paramsTable, { type ParamTableColumn } from '@/views/api-test/components/paramTable.vue';
 
@@ -47,7 +45,6 @@
 
   const props = withDefaults(
     defineProps<{
-      params: any[];
       tableKey: TableKeyEnum;
     }>(),
     {
@@ -55,7 +52,6 @@
     }
   );
   const emit = defineEmits<{
-    (e: 'update:params', value: any[]): void;
     (e: 'change'): void; //  数据发生变化
   }>();
 
@@ -63,13 +59,15 @@
 
   const { t } = useI18n();
 
-  const innerParams = useVModel(props, 'params', emit);
-  const backupParams = ref(props.params);
+  const innerParams = defineModel<any[]>('params', {
+    required: true,
+  });
+  const backupParams = ref(innerParams.value);
   const firstSearch = ref(true);
 
   const defaultParamItem = {
     key: '',
-    type: '',
+    paramType: '',
     value: '',
     description: '',
     tags: [],
diff --git a/frontend/src/views/project-management/environmental/components/envParams/EnvParamsTab.vue b/frontend/src/views/project-management/environmental/components/envParams/EnvParamsTab.vue
index 3c309d6a0a..43cdf263a6 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/EnvParamsTab.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/EnvParamsTab.vue
@@ -1,5 +1,8 @@
 <template>
-  <AllPrams v-model:params="allParams" :table-key="TableKeyEnum.PROJECT_MANAGEMENT_ENV_ENV_PARAM" />
+  <AllPrams
+    v-model:params="projectEnvStore.currentEnvDetailInfo.config.commonVariables"
+    :table-key="TableKeyEnum.PROJECT_MANAGEMENT_ENV_ENV_PARAM"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -9,22 +12,7 @@
 
   import { TableKeyEnum } from '@/enums/tableEnum';
 
-  const store = useProjectEnvStore();
-
-  const allParams = computed({
-    set: (value: any) => {
-      store.currentEnvDetailInfo.config.commonVariables = value;
-    },
-    get: () => {
-      return store.currentEnvDetailInfo.config?.commonVariables.map((e: any) => {
-        return {
-          ...e,
-          tags: e.tags || [],
-          description: e.description || '',
-        };
-      });
-    },
-  });
+  const projectEnvStore = useProjectEnvStore();
 </script>
 
 <style lang="less" scoped></style>