From d333453578190ff8fc689cb9b4b5ec20f4cf3dd5 Mon Sep 17 00:00:00 2001
From: chiayin <chiayin.kuo@dsp.im>
Date: Tue, 5 Mar 2024 16:07:22 +0800
Subject: [PATCH] fix: Issues #242 done.

---
 src/views/Upload/index.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/Upload/index.vue b/src/views/Upload/index.vue
index f6bad16..96deb0b 100644
--- a/src/views/Upload/index.vue
+++ b/src/views/Upload/index.vue
@@ -202,7 +202,9 @@ export default {
      */
     updateValidationData(data) {
       const nameOccurrences = {};
+      const noSortedRepeatedData = []; // 未排序的重複選擇的 data
       let selectedData = [] // 已經選擇的 data
+
       this.informData = []; // 尚未選擇的 data
       this.repeatedData = []; // 重複選擇的 data
 
@@ -213,7 +215,10 @@ export default {
           // 'Not Assigned'、'Case Attribute' 不列入驗證
           if(!code || code === 'case_attributes') return;
           nameOccurrences[name]++;
-          this.repeatedData.push(item);
+          // 重複的選項只出現一次
+          nameOccurrences[name] === 2 ? noSortedRepeatedData.push(item) : false;
+          // 要按照選單的順序排序
+          this.repeatedData = this.columnType.filter(column => noSortedRepeatedData.includes(column));
         }else {
           nameOccurrences[name] = 1;
           selectedData.push(name);