From 040e8b707ae4be84757825c5bbaf88345b942c68 Mon Sep 17 00:00:00 2001
From: chiayin <chiayin.kuo@dsp.im>
Date: Thu, 21 Sep 2023 15:10:29 +0800
Subject: [PATCH] Issue #133: Done.

---
 .../Conformance/ConformanceSidebar/ActList.vue     | 13 ++++++++++++-
 .../Conformance/ConformanceSidebar/ActRadio.vue    | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue
index d1a5ee0..b46bf17 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ActList.vue
@@ -4,7 +4,7 @@
     <div class="h-[calc(100%_-_48px)]">
       <p class="h2 pl-2 border-b mb-3">Sort</p>
       <div class="flex flex-wrap justify-start content-start gap-4 px-2 overflow-y-auto scrollbar h-[calc(100%_-_52px)]">
-          <div class="flex items-center w-[166px]" v-for="(act, index) in data" :key="index">
+          <div class="flex items-center w-[166px]" v-for="(act, index) in sortData" :key="index">
               <Checkbox v-model="actList" :inputId="index.toString()" name="actList" :value="act" @change="actListData"/>
               <label :for="index" class="ml-2 p-2 whitespace-nowrap break-keep text-ellipsis overflow-hidden">{{ act }}</label>
           </div>
@@ -13,13 +13,24 @@
   </div>
 </template>
 <script>
+import sortNumEngZhtw from '@/module/sortNumEngZhtw.js';
+
 export default {
   props: ['data', 'select'],
   data() {
     return {
+      sortData: [],
       actList: this.select,
     }
   },
+  watch: {
+    data: {
+      handler: function(newValue) {
+        this.sortData = sortNumEngZhtw(newValue)
+      },
+      immediate: true, // 立即執行一次排序
+    },
+  },
   methods: {
     actListData() {
       this.$emitter.emit('actListData', this.actList);
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue b/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue
index d635a8b..eaa2622 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ActRadio.vue
@@ -4,7 +4,7 @@
     <div class="h-[calc(100%_-_48px)]">
       <p class="h2 pl-2 border-b mb-3">Sort</p>
       <div class="flex flex-wrap justify-start content-start gap-4 px-2 overflow-y-auto scrollbar h-[calc(100%_-_52px)]">
-          <div class="flex items-center w-[166px]" v-for="(act, index) in data" :key="index">
+          <div class="flex items-center w-[166px]" v-for="(act, index) in sortData" :key="index">
               <RadioButton v-model="selectedRadio" :inputId="index + act" :name="select" :value="act" @change="actRadioData" />
               <label :for="index + act" class="ml-2 p-2 whitespace-nowrap break-keep text-ellipsis overflow-hidden">{{ act }}</label>
           </div>
@@ -13,18 +13,27 @@
   </div>
 </template>
 <script>
+import sortNumEngZhtw from '@/module/sortNumEngZhtw.js';
+
 export default {
   props: ['title', 'select', 'data', 'category', 'task', 'isSubmit'],
   data() {
     return {
+      sortData: [],
       localSelect: null,
       selectedRadio: null,
     }
   },
   watch: {
+    data: {
+      handler: function(newValue) {
+        this.sortData = sortNumEngZhtw(newValue)
+      },
+      immediate: true, // 立即執行一次排序
+    },
     task: function(newValue) {
       this.selectedRadio = newValue;
-    }
+    },
   },
   methods: {
     actRadioData() {
@@ -37,6 +46,7 @@ export default {
     }
   },
   created() {
+    sortNumEngZhtw(this.sortData);
     this.localSelect = this.isSubmit ? this.select : null;
     this.selectedRadio = this.localSelect;
     this.$emitter.on('reset', (data) => {