fix: 系统字段无法搜索

backend/src/main/resources/db/migration/V80__v1.9.0_release.sql

@@ -20,26 +20,26 @@ CREATE TABLE IF NOT EXISTS `custom_field` (
 
 -- 用例系统字段
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('45f2de57-9d1d-11eb-b418-0242ac120002','i43sf4_testCaseStatus','TEST_CASE','select','',
+VALUES ('45f2de57-9d1d-11eb-b418-0242ac120002','用例状态','TEST_CASE','select','',
         '[{"value":"Prepare", "text":"test_track.case.status_prepare", "system": true},{"value":"Underway", "text":"test_track.case.status_running","system": true},{"value":"Completed", "text":"test_track.case.status_finished", "system": true}]',
         1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('46065143-9d1d-11eb-b418-0242ac120002','i43sf4_testCaseMaintainer','TEST_CASE','member','',
+VALUES ('46065143-9d1d-11eb-b418-0242ac120002','责任人','TEST_CASE','member','',
         '[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('4619cc23-9d1d-11eb-b418-0242ac120002','i43sf4_testCasePriority','TEST_CASE','select','',
+VALUES ('4619cc23-9d1d-11eb-b418-0242ac120002','用例等级','TEST_CASE','select','',
         '[{"value":"P0", "text":"P0", "system": true},{"value":"P1", "text":"P1","system": true},{"value":"P2", "text":"P2", "system": true},{"value":"P3", "text":"P3", "system": true}]',
         1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 
 -- 缺陷系统字段
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('09642424-7b1b-4004-867e-ff9c798a1933','i43sf4_issueCreator','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('09642424-7b1b-4004-867e-ff9c798a1933','创建人','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('a577bc60-75fe-47ec-8aa6-32dca23bf3d6','i43sf4_issueProcessor','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('a577bc60-75fe-47ec-8aa6-32dca23bf3d6','处理人','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('beb57501-19c8-4ca3-8dfb-2cef7c0ea087','i43sf4_issueStatus','ISSUE','select','','[{"text":"test_track.issue.status_new","value":"new","system": true},{"text":"test_track.issue.status_resolved","value":"resolved","system": true},{"text":"test_track.issue.status_closed","value":"closed","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('beb57501-19c8-4ca3-8dfb-2cef7c0ea087','状态','ISSUE','select','','[{"text":"test_track.issue.status_new","value":"new","system": true},{"text":"test_track.issue.status_resolved","value":"resolved","system": true},{"text":"test_track.issue.status_closed","value":"closed","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('d392af07-fdfe-4475-a459-87d59f0b1626','i43sf4_issueSeverity','ISSUE','select','','[{"text":"P0","value":"P0","system": true},{"text":"P1","value":"P1","system": true},{"text":"P2","value":"P2","system": true},{"text":"P3","value":"P3","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('d392af07-fdfe-4475-a459-87d59f0b1626','严重程度','ISSUE','select','','[{"text":"P0","value":"P0","system": true},{"text":"P1","value":"P1","system": true},{"text":"P2","value":"P2","system": true},{"text":"P3","value":"P3","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 
 -- 用例模板表
 CREATE TABLE IF NOT EXISTS `test_case_template` (

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -591,13 +591,13 @@ export default {
       if (customFieldsStr) {
         let customFields = JSON.parse(customFieldsStr);
         customFields.forEach(item => {
-          if (item.name === 'i43sf4_testCasePriority') {
+          if (item.name === '用例等级') {
             param.priority = item.value;
           }
-          if (item.name === 'i43sf4_testCaseMaintainer') {
+          if (item.name === '责任人') {
             param.maintainer = item.value;
           }
-          if (item.name === 'i43sf4_testCaseStatus') {
+          if (item.name === '用例状态') {
             param.status = item.value;
           }
         });

frontend/src/business/components/track/issue/IssueEditDetail.vue

@@ -242,9 +242,11 @@ export default {
       let customFieldsStr = param.customFields;
       if (customFieldsStr) {
         let customFields = JSON.parse(customFieldsStr);
-        if (customFields['i43sf4_issueStatus']) {
-          param.status = JSON.parse(customFields['i43sf4_issueStatus']);
-        }
+        customFields.forEach(item => {
+          if (item.name === '状态') {
+            param.status = item.value;
+          }
+        });
       }
     },
   }

frontend/src/common/js/custom_field.js

@@ -49,8 +49,8 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
 
     // 将保存的值赋值给template
     if (data.customFields instanceof Array) {
-      for (const index in data.customFields) {
-        let customField = data.customFields[index];
+      for (let i = 0; i < data.customFields.length; i++) {
+        let customField = data.customFields[i];
         if (customField.id === item.id) {
           item.defaultValue = customField.value;
           break;
@@ -124,8 +124,8 @@ export function getTemplate(baseUrl, vueObj) {
 // 兼容旧字段
 export function buildTestCaseOldFields(testCase) {
   let oldFields = new Map();
-  oldFields.set('i43sf4_testCaseStatus', testCase.status);
-  oldFields.set('i43sf4_testCaseMaintainer', testCase.maintainer);
-  oldFields.set('i43sf4_testCasePriority', testCase.priority);
+  oldFields.set('用例状态', testCase.status);
+  oldFields.set('责任人', testCase.maintainer);
+  oldFields.set('用例等级', testCase.priority);
   return oldFields;
 }

frontend/src/common/js/table-constants.js

@@ -50,14 +50,14 @@ export const SCENE_MAP = {
 
 export const SYSTEM_FIELD_NAME_MAP = {
   //用例字段
-  i43sf4_testCaseStatus: 'custom_field.case_status',
-  i43sf4_testCaseMaintainer: 'custom_field.case_maintainer',
-  i43sf4_testCasePriority: 'custom_field.case_priority',
+  用例状态: 'custom_field.case_status',
+  责任人: 'custom_field.case_maintainer',
+  用例等级: 'custom_field.case_priority',
   //缺陷字段
-  i43sf4_issueCreator: 'custom_field.issue_creator',
-  i43sf4_issueProcessor: 'custom_field.issue_processor',
-  i43sf4_issueStatus: 'custom_field.issue_status',
-  i43sf4_issueSeverity: 'custom_field.issue_severity',
+  创建人: 'custom_field.issue_creator',
+  处理人: 'custom_field.issue_processor',
+  状态: 'custom_field.issue_status',
+  严重程度: 'custom_field.issue_severity',
 }
 
 

frontend/src/i18n/en-US.js

@@ -263,6 +263,15 @@ export default {
       host_is_null: 'Prometheus Host cannot be empty'
     }
   },
+  custom_field: {
+    case_status: 'Case Status',
+    case_maintainer: 'Maintainer',
+    case_priority: 'Case Priority',
+    issue_creator: 'Creator',
+    issue_processor: 'Processor',
+    issue_status: 'Status',
+    issue_severity: 'Severity'
+  },
   workspace: {
     create: 'Create Workspace',
     update: 'Update Workspace',