feat(测试跟踪): 缺陷自定义字段下拉框选项支持远程搜索

2023-02-19 17:23:39 +08:00 · 2023-02-19 17:23:39 +08:00 · 7c533de7a2
parent ca287cb175
commit 7c533de7a2
8 changed files with 110 additions and 6 deletions
--- a/framework/sdk-parent/frontend/src/components/form/CustomFiledFormItem.vue
+++ b/framework/sdk-parent/frontend/src/components/form/CustomFiledFormItem.vue
@ -11,7 +11,10 @@
              :data="item"
              :form="form"
              :default-open="defaultOpen"
-              :disabled="isPublic"/>
+              :disabled="isPublic"
+              @inputSearch="handleInputSearch"
+              ref="customFiled"
+            />
          </el-form-item>
        </el-col>
        <div v-else>
@ -21,7 +24,12 @@
              :prop="item.name"
              :default-open="defaultOpen"
              :label-width="formLabelWidth">
-               <custom-filed-component :data="item" :form="form" prop="defaultValue"/>
+               <custom-filed-component
+                 :data="item"
+                 :form="form"
+                 prop="defaultValue"
+                 @inputSearch="handleInputSearch"
+                 ref="customFiled"/>
            </el-form-item>
          </el-col>
        </div>
@ -81,6 +89,16 @@ export default {
        }
      }
      return customFields;
+    }
+  },
+  methods: {
+    handleInputSearch(data, query) {
+      this.$emit('inputSearch', data, query);
+    },
+    stopLoading() {
+      this.$refs.customFiled.forEach(item => {
+        item.stopLoading();
+      });
    },
  }
 }
--- a/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue
+++ b/framework/sdk-parent/frontend/src/components/template/CustomFiledComponent.vue
@ -1,11 +1,17 @@
 <template>
  <span>
     <el-select v-if="data.type === 'select' || data.type === 'multipleSelect'"
+                :loading="loading"
                :disabled="disabled"
                :multiple="data.type === 'multipleSelect'"
                @change="handleChange"
+                @clear="handleClear"
                clearable
-                filterable v-model="data[prop]" :placeholder="$t('commons.default')">
+                filterable
+                v-model="data[prop]"
+                :filter-method="data.inputSearch ? handleSelectInput : null"
+                :remote="data.inputSearch"
+                :placeholder="$t('commons.default')">
      <el-option
        v-for="(item,index) in data.options ? data.options : []"
        :key="index"
@ -86,7 +92,9 @@
               @change="handleChange"
               clearable
               :disabled="disabled"
-               filterable v-model="data[prop]" :placeholder="$t('commons.default')">
+               filterable
+               v-model="data[prop]"
+               :placeholder="$t('commons.default')">
       <el-option
         v-for="(item) in memberOptions"
         :key="item.id"
@ -145,6 +153,8 @@ export default {
  data() {
    return {
      memberOptions: [],
+      originOptions: null,
+      loading: false
    };
  },
  mounted() {
@ -197,6 +207,26 @@ export default {
      this.$emit('change', this.data.name);
      this.$forceUpdate();
    },
+    handleSelectInput(val) {
+      this.loading = true;
+      if (!this.originOptions) {
+        this.originOptions = this.data.options;
+      }
+      if (!val) {
+        // 置空搜索时，恢复回原始选项
+        this.data.options = this.originOptions;
+      }
+      this.$emit('inputSearch', this.data, val);
+    },
+    handleClear() {
+      if (this.originOptions && this.data.inputSearch) {
+        // 置空搜索时，恢复回原始选项
+        this.data.options = this.originOptions;
+      }
+    },
+    stopLoading() {
+      this.loading = false;
+    },
    setFormData() {
      if (this.form && this.data && this.data[this.prop]) {
        this.$set(this.form, this.data.name, this.data[this.prop]);
--- a/framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/CustomFieldDao.java
+++ b/framework/sdk-parent/sdk/src/main/java/io/metersphere/dto/CustomFieldDao.java
@ -20,4 +20,8 @@ public class CustomFieldDao extends CustomField {
    private String originGlobalId;

    private String key;
+
+    private Boolean inputSearch;
+
+    private String optionMethod;
 }
--- a/test-track/backend/src/main/java/io/metersphere/controller/IssuesController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/IssuesController.java
@ -17,6 +17,7 @@ import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.log.annotation.MsAuditLog;
 import io.metersphere.notice.annotation.SendNotice;
 import io.metersphere.platform.domain.SelectOption;
+import io.metersphere.request.PlatformOptionRequest;
 import io.metersphere.request.issues.IssueExportRequest;
 import io.metersphere.request.issues.IssueImportRequest;
 import io.metersphere.request.issues.PlatformIssueTypeRequest;
@ -220,6 +221,11 @@ public class IssuesController {
        return platformPluginService.getPlatformOptions();
    }

+    @PostMapping("/platform/form/option")
+    public List<SelectOption> getPlatformOptions(@RequestBody PlatformOptionRequest request) {
+        return platformPluginService.getFormOption(request);
+    }
+
    @PostMapping("/check/third/project")
    public void checkThirdProjectExist(@RequestBody Project project) {
        issuesService.checkThirdProjectExist(project);
--- a/test-track/backend/src/main/java/io/metersphere/request/PlatformOptionRequest.java
+++ b/test-track/backend/src/main/java/io/metersphere/request/PlatformOptionRequest.java
@ -0,0 +1,12 @@
+package io.metersphere.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PlatformOptionRequest extends IntegrationRequest {
+    private String optionMethod;
+    private String projectConfig;
+    private String query;
+}
--- a/test-track/backend/src/main/java/io/metersphere/service/PlatformPluginService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/PlatformPluginService.java
@ -11,11 +11,13 @@ import io.metersphere.base.domain.Project;
 import io.metersphere.base.domain.ServiceIntegration;
 import io.metersphere.commons.constants.PluginScenario;
 import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.platform.domain.GetOptionRequest;
 import io.metersphere.platform.domain.PlatformRequest;
 import io.metersphere.platform.domain.SelectOption;

 import io.metersphere.platform.loader.PlatformPluginManager;
 import io.metersphere.request.IntegrationRequest;
+import io.metersphere.request.PlatformOptionRequest;
 import io.metersphere.utils.PluginManagerUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@ -23,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@ -148,4 +151,17 @@ public class PlatformPluginService {
                .distinct()
                .collect(Collectors.toList());
    }
+
+    public List<SelectOption> getFormOption(PlatformOptionRequest request) {
+        Platform platform = getPlatform(request.getPlatform(), request.getWorkspaceId());
+        GetOptionRequest getOptionRequest = new GetOptionRequest();
+        getOptionRequest.setOptionMethod(request.getOptionMethod());
+        getOptionRequest.setProjectConfig(request.getProjectConfig());
+        getOptionRequest.setQuery(request.getQuery());
+        try {
+            return platform.getFormOptions(getOptionRequest);
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
 }
--- a/test-track/frontend/src/api/issue.js
+++ b/test-track/frontend/src/api/issue.js
@ -265,3 +265,7 @@ export function getIssuePartTemplateWithProject(callback) {
 export function getPlatformOption() {
  return get(BASE_URL + 'platform/option');
 }
+
+export function getPlatformFormOption(param) {
+  return post(BASE_URL + 'platform/form/option', param);
+}
--- a/test-track/frontend/src/business/issue/IssueEditDetail.vue
+++ b/test-track/frontend/src/business/issue/IssueEditDetail.vue
@ -42,7 +42,10 @@
            :form="customFieldForm"
            :default-open="richTextDefaultOpen"
            :form-label-width="formLabelWidth"
-            :issue-template="issueTemplate"/>
+            :issue-template="issueTemplate"
+            @inputSearch="handleInputSearch"
+            ref="customFieldItem"
+          />
        </el-form>

        <el-row v-if="platformTransitions">
@ -204,7 +207,7 @@ import {
  saveFollow,
  getFollow,
  getComments,
-  getTapdUser, getPlatformTransitions
+  getTapdUser, getPlatformTransitions, getPlatformFormOption
 } from "@/api/issue";
 import {
  uploadIssueAttachment,
@ -726,6 +729,17 @@ export default {
        this.getFileMetaData(this.issueId);
      }
    },
+    handleInputSearch(data, query) {
+      getPlatformFormOption({
+        optionMethod: data.optionMethod,
+        workspaceId: getCurrentWorkspaceId(),
+        platform: this.issueTemplate.platform,
+        query
+      }).then((r) => {
+        data.options = r.data;
+        this.$refs.customFieldItem.stopLoading();
+      });
+    },
    handleDelete(file, index) {
      this.$alert((this.cancelFileToken.length > 0 ? this.$t('load_test.delete_file_when_uploading') + '<br/>' : "") + this.$t('load_test.delete_file_confirm') + file.name + "?", '', {
        confirmButtonText: this.$t('commons.confirm'),