From dabcd53b6a8941c9d6b942c615cb6766b34b673e Mon Sep 17 00:00:00 2001
From: limin-fit2 <min.li@fit2cloud.com>
Date: Thu, 24 Feb 2022 17:13:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B):?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=9C=AA=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1008919 --user=李敏 【测试跟踪】测试用例-自定义模板，字段没对齐 https://www.tapd.cn/55049933/s/1109564
---
 .../components/form/CustomFiledFormItem.vue       | 15 ++++++++++++++-
 .../workspace/template/CustomFiledComponent.vue   | 12 ++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
index 5f144eec3d..da07a6da76 100644
--- a/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
+++ b/frontend/src/business/components/common/components/form/CustomFiledFormItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row v-for="(i) in (customFieldRowNums)" :key="i">
-    <span class="custom-item" v-for="(item, j) in issueTemplate.customFields" :key="j">
+    <span class="custom-item" v-for="(item, j) in sortCustomFields" :key="j">
       <span v-if="j >= (i - 1)*3 && j < (i - 1)*3+3">
         <el-col :span="8" v-if="item.type !== 'richText'">
           <el-form-item :label="item.system ? $t(systemNameMap[item.name]) : item.name" :prop="item.name"
@@ -55,6 +55,19 @@ export default {
     systemNameMap() {
       return SYSTEM_FIELD_NAME_MAP;
     },
+    sortCustomFields() {
+      let total = 0;//定义total用于控制循环结束
+      let customFields = this.issueTemplate.customFields;
+      for (let i = 0; total < customFields.length; total++) {
+        if (customFields[i].type === 'richText') {
+          //循环到是0的位置就删除该元素0并且在arr末尾push进这个元素0，由于splice删除了该位置元素，所以i不用+1，下次循环仍然检查i位置的元素
+          customFields.push(customFields.splice(i, 1)[0]);
+        } else {
+          i++;//循环到不是0的位置就继续往后循环
+        }
+      }
+      return customFields;
+    },
   }
 }
 </script>
diff --git a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
index 7febad269f..befe0c4dde 100644
--- a/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
+++ b/frontend/src/business/components/settings/workspace/template/CustomFiledComponent.vue
@@ -148,4 +148,16 @@ export default {
 </script>
 
 <style scoped>
+.el-select {
+  width: 100%;
+}
+.el-date-editor.el-input {
+  width: 100%;
+}
+.custom-with >>> .el-input__inner{
+  height: 32px;
+}
+>>> .el-input--suffix .el-input__inner{
+  height: 32px;
+}
 </style>