fix(all): 修复严重 bug

2024-04-10 11:55:50 +08:00 · 2024-04-10 11:55:50 +08:00 · 8af35fe57c
parent d3bf4cc11c
commit 8af35fe57c
7 changed files with 64 additions and 46 deletions
--- a/frontend/src/api/modules/api-test/scenario.ts
+++ b/frontend/src/api/modules/api-test/scenario.ts
@ -284,5 +284,5 @@ export function updateScenarioPro(id: string | number, priority: CaseLevel | und

 // 获取跨项目信息
 export function getStepProjectInfo(id: string, type: ScenarioStepType) {
-  return MSR.get<ScenarioStepResourceInfo>({ url: GetStepProjectInfoUrl, params: id, data: { resourceType: type } });
+  return MSR.get<ScenarioStepResourceInfo>({ url: `${GetStepProjectInfoUrl}/${id}`, params: { resourceType: type } });
 }
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@ -197,21 +197,6 @@
    init(true);
  });

-  const filterTreeData = ref<MsTreeNodeData[]>([]); // 初始化时全量的树数据或在非搜索情况下更新后的全量树数据
-
-  watch(
-    () => data.value,
-    (val) => {
-      if (!props.keyword) {
-        filterTreeData.value = cloneDeep(val);
-      }
-    },
-    {
-      deep: true,
-      immediate: true,
-    }
-  );
-
  /**
   * 根据关键字过滤树节点
   * @param keyword 搜索关键字
@ -240,6 +225,8 @@
    return search(data.value);
  }

+  const filterTreeData = ref<MsTreeNodeData[]>([]); // 初始化时全量的树数据或在非搜索情况下更新后的全量树数据
+
  // 防抖搜索
  const updateDebouncedSearch = debounce(() => {
    if (props.keyword) {
@ -251,11 +238,26 @@
    }
  }, props.searchDebounce);

+  watch(
+    () => data.value,
+    (val) => {
+      if (!props.keyword) {
+        filterTreeData.value = val;
+      } else {
+        updateDebouncedSearch();
+      }
+    },
+    {
+      deep: true,
+      immediate: true,
+    }
+  );
+
  watch(
    () => props.keyword,
    (val) => {
      if (!val) {
-        filterTreeData.value = cloneDeep(data.value);
+        filterTreeData.value = data.value;
      } else {
        updateDebouncedSearch();
      }
--- a/frontend/src/store/modules/user/index.ts
+++ b/frontend/src/store/modules/user/index.ts
@ -107,6 +107,7 @@ const useUserStore = defineStore('user', {
        appStore.setCurrentOrgId(res.lastOrganizationId || '');
        appStore.setCurrentProjectId(res.lastProjectId || '');
        this.setInfo(res);
+        this.initLocalConfig(); // 获取本地执行配置
      } catch (err) {
        clearToken();
        throw err;
--- a/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue
+++ b/frontend/src/views/api-test/scenario/components/common/customApiDrawer.vue
@ -6,6 +6,7 @@
    :show-continue="true"
    :footer="requestVModel.isNew === true"
    :ok-disabled="requestVModel.executeLoading || (isHttpProtocol && !requestVModel.url)"
+    show-full-screen
    @confirm="handleSave"
    @continue="handleContinue"
    @close="handleClose"
@ -23,21 +24,21 @@
        </a-tooltip>
      </div>
      <div
-        v-if="
-          props.step &&
-          !props.step.isQuoteScenarioStep &&
-          props.step.resourceId &&
-          props.step?.stepType !== ScenarioStepType.CUSTOM_REQUEST
-        "
-        class="ml-auto"
+        v-if="props.step && !props.step.isQuoteScenarioStep"
+        class="right-operation-button-icon ml-auto flex items-center"
      >
        <replaceButton
+          v-if="props.step.resourceId && props.step?.stepType !== ScenarioStepType.CUSTOM_REQUEST"
          :steps="props.steps"
          :step="props.step"
          :resource-id="props.step.resourceId"
          :scenario-id="scenarioId"
          @replace="handleReplace"
        />
+        <MsButton class="mr-4" type="icon" status="secondary" @click="emit('deleteStep')">
+          <MsIcon type="icon-icon_delete-trash_outlined" />
+          {{ t('common.delete') }}
+        </MsButton>
      </div>
      <div
        v-if="!props.step || props.step?.stepType === ScenarioStepType.CUSTOM_REQUEST"
@ -330,6 +331,7 @@
  import { Message, SelectOptionData } from '@arco-design/web-vue';
  import { cloneDeep, debounce } from 'lodash-es';

+  import MsButton from '@/components/pure/ms-button/index.vue';
  import MsDrawer from '@/components/pure/ms-drawer/index.vue';
  import MsFormCreate from '@/components/pure/ms-form-create/formCreate.vue';
  import MsIcon from '@/components/pure/ms-icon-font/index.vue';
@ -437,6 +439,7 @@
    (e: 'applyStep', request: RequestParam): void;
    (e: 'execute', request: RequestParam, executeType?: 'localExec' | 'serverExec'): void;
    (e: 'stopDebug'): void;
+    (e: 'deleteStep'): void;
    (e: 'replace', newStep: ScenarioStepItem): void;
  }>();

@ -446,7 +449,7 @@
  // 注入祖先组件提供的属性
  const scenarioId = inject<string | number>('scenarioId');
  const currentEnvConfig = inject<Ref<EnvConfig>>('currentEnvConfig');
-  const hasLocalExec = inject<Ref<boolean>>('isPriorityLocalExec');
+  const hasLocalExec = inject<Ref<boolean>>('hasLocalExec');
  const isPriorityLocalExec = inject<Ref<boolean>>('isPriorityLocalExec');

  const visible = defineModel<boolean>('visible', { required: true });
--- a/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
+++ b/frontend/src/views/api-test/scenario/components/common/customCaseDrawer.vue
@ -29,13 +29,13 @@
          <MsIcon type="icon-icon_edit_outlined" class="edit-script-name-icon" @click="showEditScriptNameInput" />
        </div>
        <div
-          v-if="activeStep && !activeStep.isQuoteScenarioStep && requestVModel.resourceId"
+          v-if="activeStep && !activeStep.isQuoteScenarioStep && activeStep.resourceId"
          class="right-operation-button-icon flex items-center"
        >
          <replaceButton
            :steps="props.steps"
            :step="activeStep"
-            :resource-id="requestVModel.resourceId"
+            :resource-id="activeStep.resourceId"
            :scenario-id="scenarioId"
            @replace="handleReplace"
          />
@ -350,6 +350,7 @@
  // 注入祖先组件提供的属性
  const scenarioId = inject<string | number>('scenarioId');
  const isPriorityLocalExec = inject<Ref<boolean>>('isPriorityLocalExec');
+  const hasLocalExec = inject<Ref<boolean>>('hasLocalExec');

  const defaultApiParams: RequestParam = {
    name: '',
@ -620,8 +621,6 @@
    }
  }

-  const hasLocalExec = ref(false); // 是否配置了api本地执行
-
  const pluginScriptMap = ref<Record<string, PluginConfig>>({}); // 存储初始化过后的插件配置
  const temporaryPluginFormMap: Record<string, any> = {}; // 缓存插件表单，避免切换传入的 API 数据导致动态表单数据丢失
  const pluginLoading = ref(false);
--- a/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/quoteContent.vue
+++ b/frontend/src/views/api-test/scenario/components/step/stepNodeComposition/quoteContent.vue
@ -13,6 +13,7 @@
    >
      <MsIcon type="icon-icon-draft" class="text-[var(--color-text-4)] hover:text-[rgb(var(--primary-5))]" />
      <template #content>
+        <a-spin class="h-full w-full" :loading="loading">
          <div class="flex flex-col gap-[16px]">
            <div>
              <div class="mb-[2px] text-[var(--color-text-4)]">{{ t('apiScenario.belongProject') }}</div>
@ -27,6 +28,7 @@
              </div>
            </div>
          </div>
+        </a-spin>
      </template>
    </a-popover>
    <MsTag
@ -68,11 +70,19 @@
  const { openNewPage } = useOpenNewPage();

  const originProjectInfo = ref<ScenarioStepResourceInfo>();
-
+  const loading = ref(false);
  async function handleVisibleChange(val: boolean) {
+    try {
+      loading.value = true;
      if (val && props.data.originProjectId) {
        originProjectInfo.value = await getStepProjectInfo(props.data.resourceId || '', props.data.stepType);
      }
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.log(error);
+    } finally {
+      loading.value = false;
+    }
  }

  function goDetail() {
--- a/frontend/src/views/api-test/scenario/components/step/stepTree.vue
+++ b/frontend/src/views/api-test/scenario/components/step/stepTree.vue
@ -220,6 +220,7 @@
      :permission-map="permissionMap"
      :steps="steps"
      @add-step="addCustomApiStep"
+      @delete-step="deleteStep(activeStep)"
      @apply-step="applyApiStep"
      @stop-debug="handleStopExecute(activeStep)"
      @execute="handleApiExecute"
@ -235,7 +236,7 @@
      :step-responses="scenario.stepResponses"
      :permission-map="permissionMap"
      @apply-step="applyApiStep"
-      @delete-step="deleteCaseStep(activeStep)"
+      @delete-step="deleteStep(activeStep)"
      @stop-debug="handleStopExecute(activeStep)"
      @execute="(request, executeType) => handleApiExecute((request as unknown as RequestParam), executeType)"
      @replace="handleReplaceStep"
@ -1525,12 +1526,14 @@
  /**
   * 删除
   */
-  function deleteCaseStep(step?: ScenarioStepItem) {
+  function deleteStep(step?: ScenarioStepItem) {
    if (step) {
      customCaseDrawerVisible.value = false;
+      customApiDrawerVisible.value = false;
      deleteNode(steps.value, step.uniqueId, 'uniqueId');
      activeStep.value = undefined;
      scenario.value.unSaved = true;
+      Message.success(t('common.deleteSuccess'));
    }
  }