From 3497df836f7dca585237d901523d3675c14caf5f Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Sat, 14 Sep 2024 14:25:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=A8=A1=E6=9D=BF=E5=A4=9A=E9=80=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1046409 --user=宋昌昌 【项目管理】编辑缺陷模版-多值输入类型字段-编辑后保存无效 https://www.tapd.cn/55049933/s/1578713
---
 frontend/src/views/bug-management/edit.vue    |  3 +-
 .../template/components/addTemplate.vue       |  2 +-
 .../template/components/fieldSetting.ts       | 45 ++++++++++---------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/frontend/src/views/bug-management/edit.vue b/frontend/src/views/bug-management/edit.vue
index 711d13e931..06a98fda7c 100644
--- a/frontend/src/views/bug-management/edit.vue
+++ b/frontend/src/views/bug-management/edit.vue
@@ -184,7 +184,6 @@
 </template>
 
 <script setup lang="ts">
-  import { useRoute } from 'vue-router';
   import { Message } from '@arco-design/web-vue';
 
   import MsButton from '@/components/pure/ms-button/index.vue';
@@ -387,7 +386,7 @@
     formRules.value = [];
     if (Array.isArray(arr) && arr.length) {
       formRules.value = arr.map((item: any) => {
-        const initOptions = item.options || JSON.parse(item.platformOptionJson || '{}');
+        const initOptions = item.options || JSON.parse(item.platformOptionJson || '[]');
         const initValue = getInitValue(item, initOptions);
         return {
           type: item.type,
diff --git a/frontend/src/views/setting/organization/template/components/addTemplate.vue b/frontend/src/views/setting/organization/template/components/addTemplate.vue
index 708e9431eb..5f8710f0d5 100644
--- a/frontend/src/views/setting/organization/template/components/addTemplate.vue
+++ b/frontend/src/views/setting/organization/template/components/addTemplate.vue
@@ -601,7 +601,7 @@
     return customFields.map((item: any) => {
       const currentFormRules = FieldTypeFormRules[item.type];
       let selectOptions: any = [];
-      const multipleType = ['MULTIPLE_SELECT', 'CHECKBOX', 'MULTIPLE_MEMBER', 'MULTIPLE_INPUT'];
+      const multipleType = ['MULTIPLE_SELECT', 'CHECKBOX', 'MULTIPLE_MEMBER'];
       if (item.options && item.options.length) {
         selectOptions = item.options.map((optionItem: any) => {
           return {
diff --git a/frontend/src/views/setting/organization/template/components/fieldSetting.ts b/frontend/src/views/setting/organization/template/components/fieldSetting.ts
index e3d6a48f46..58af25a076 100644
--- a/frontend/src/views/setting/organization/template/components/fieldSetting.ts
+++ b/frontend/src/views/setting/organization/template/components/fieldSetting.ts
@@ -306,27 +306,30 @@ export const getTotalFieldOptionList = (totalData: DefinedFieldItem[]) => {
  */
 export const getCustomDetailFields = (totalData: DefinedFieldItem[], customFields: CustomField[]) => {
   const customFieldsIds = customFields.map((index: any) => index.fieldId);
-  return totalData.filter((item) => {
-    const currentCustomFieldIndex = customFieldsIds.findIndex((it: any) => it === item.id);
-    if (customFieldsIds.indexOf(item.id) > -1) {
-      const currentForm = item.formRules?.map((it: any) => {
-        it.props.modelValue = customFields[currentCustomFieldIndex].defaultValue;
-        return {
-          ...it,
-          value: customFields[currentCustomFieldIndex].defaultValue,
-          effect: {
-            required: item.required,
-          },
-        };
-      });
-      const formItem = item;
-      formItem.formRules = cloneDeep(currentForm);
-      formItem.apiFieldId = customFields[currentCustomFieldIndex].apiFieldId;
-      formItem.required = customFields[currentCustomFieldIndex].required;
-      return true;
-    }
-    return false;
-  });
+  return totalData
+    .filter((item) => {
+      const index = customFieldsIds.findIndex((it: any) => it === item.id);
+      if (customFieldsIds.indexOf(item.id) > -1) {
+        const currentForm = item.formRules?.map((it: any) => {
+          it.props.modelValue = customFields[index].defaultValue;
+          return {
+            ...it,
+            value: customFields[index].defaultValue,
+            effect: {
+              required: item.required,
+            },
+          };
+        });
+        const formItem = item;
+        formItem.formRules = cloneDeep(currentForm);
+        formItem.apiFieldId = customFields[index].apiFieldId;
+        formItem.required = customFields[index].required;
+        formItem.index = index;
+        return true;
+      }
+      return false;
+    })
+    .sort((f1, f2) => f1.index - f2.index);
 };
 
 export default {};