From d7a901aae28b8f87162efba8a4992a60a9421184 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 22 Aug 2024 14:30:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Nuclide=20Library=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/NuclideLibraryModal.vue | 120 +++++++++++-------
 .../SelfStationNuclideLibraryModal.vue        | 120 +++++++++++-------
 2 files changed, 142 insertions(+), 98 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue
index d013870..2164f0f 100644
--- a/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue
@@ -78,6 +78,7 @@
               :dataSource="nuclLinesLibs"
               :pagination="false"
               :scroll="{ y: 330 }"
+              @change="handleTableChange"
             >
               <template slot="keyLine" slot-scope="text">
                 <span v-if="text == 1" class="green-check-mark"> </span>
@@ -133,54 +134,6 @@ const daughterColumns = [
   },
 ]
 
-// 主体表格配置
-const mainColumns = [
-  {
-    title: 'Id',
-    width: 80,
-    customRender: (_, __, index) => {
-      return index + 1
-    },
-  },
-  {
-    title: 'Full Name',
-    dataIndex: 'fullName',
-  },
-  {
-    title: 'Energy(keV)',
-    dataIndex: 'energy',
-    width: 100,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'Energy Uncert(%)',
-    dataIndex: 'energyUncert',
-    width: 120,
-    customRender: (text) => Number(text).toFixed(6),
-  },
-  {
-    title: 'Yield',
-    dataIndex: 'yield',
-    width: 80,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'Yield Uncert(%)',
-    dataIndex: 'yieldUncert',
-    width: 120,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'KeyLine',
-    dataIndex: 'keyFlag',
-    width: 100,
-    align: 'center',
-    scopedSlots: {
-      customRender: 'keyLine',
-    },
-  },
-]
-
 export default {
   mixins: [ModalMixin, SampleDataMixin],
   components: {
@@ -188,7 +141,6 @@ export default {
   },
   data() {
     this.daughterColumns = daughterColumns
-    this.mainColumns = mainColumns
     return {
       isLoading: false,
       nuclideList: [],
@@ -200,6 +152,7 @@ export default {
 
       selectedNuclide: {}, // 当前选中的Nuclide
       selectedParent: {}, // 当前选中的Parent
+      sortedInfo: null, // 控制筛选
     }
   },
   methods: {
@@ -253,6 +206,7 @@ export default {
         editEnergy: '',
         nuclideName: '',
       }
+      this.sortedInfo = null
       this.getInfo(true)
       window.addEventListener('keyup', this.handleKeyUp)
     },
@@ -327,6 +281,74 @@ export default {
       this.model.nuclideName = item
       this.getInfo()
     },
+
+    // 主表格变化
+    handleTableChange(_, __, sorter) {
+      this.sortedInfo = sorter
+    },
+  },
+  computed: {
+    // 主体表格配置
+    mainColumns() {
+      const sortedInfo = this.sortedInfo || {}
+
+      const mainColumns = [
+        {
+          title: 'Id',
+          width: 50,
+          customRender: (_, __, index) => {
+            return index + 1
+          },
+        },
+        {
+          title: 'Full Name',
+          dataIndex: 'fullName',
+        },
+        {
+          title: 'Energy(keV)',
+          dataIndex: 'energy',
+          width: 110,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.energy - b.energy,
+          sortOrder: sortedInfo.columnKey === 'energy' && sortedInfo.order,
+        },
+        {
+          title: 'Energy Uncert(%)',
+          dataIndex: 'energyUncert',
+          width: 140,
+          customRender: (text) => Number(text).toFixed(6),
+          sorter: (a, b) => a.energyUncert - b.energyUncert,
+          sortOrder: sortedInfo.columnKey === 'energyUncert' && sortedInfo.order,
+        },
+        {
+          title: 'Yield',
+          dataIndex: 'yield',
+          width: 80,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.yield - b.yield,
+          sortOrder: sortedInfo.columnKey === 'yield' && sortedInfo.order,
+        },
+        {
+          title: 'Yield Uncert(%)',
+          dataIndex: 'yieldUncert',
+          width: 130,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.yieldUncert - b.yieldUncert,
+          sortOrder: sortedInfo.columnKey === 'yieldUncert' && sortedInfo.order,
+        },
+        {
+          title: 'KeyLine',
+          dataIndex: 'keyFlag',
+          width: 100,
+          align: 'center',
+          scopedSlots: {
+            customRender: 'keyLine',
+          },
+        },
+      ]
+
+      return mainColumns
+    },
   },
 }
 </script>
diff --git a/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationNuclideLibraryModal.vue b/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationNuclideLibraryModal.vue
index e5d1352..d24dab1 100644
--- a/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationNuclideLibraryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SelfStation/SelfStationNuclideLibraryModal.vue
@@ -78,6 +78,7 @@
               :dataSource="nuclLinesLibs"
               :pagination="false"
               :scroll="{ y: 330 }"
+              @change="handleTableChange"
             >
               <template slot="keyLine" slot-scope="text">
                 <span v-if="text == 1" class="green-check-mark"> </span>
@@ -132,54 +133,6 @@ const daughterColumns = [
   },
 ]
 
-// 主体表格配置
-const mainColumns = [
-  {
-    title: 'Id',
-    width: 80,
-    customRender: (_, __, index) => {
-      return index + 1
-    },
-  },
-  {
-    title: 'Full Name',
-    dataIndex: 'fullName',
-  },
-  {
-    title: 'Energy(keV)',
-    dataIndex: 'energy',
-    width: 100,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'Energy Uncert(%)',
-    dataIndex: 'energyUncert',
-    width: 120,
-    customRender: (text) => Number(text).toFixed(6),
-  },
-  {
-    title: 'Yield',
-    dataIndex: 'yield',
-    width: 80,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'Yield Uncert(%)',
-    dataIndex: 'yieldUncert',
-    width: 120,
-    customRender: (text) => Number(text).toFixed(3),
-  },
-  {
-    title: 'KeyLine',
-    dataIndex: 'keyFlag',
-    width: 100,
-    align: 'center',
-    scopedSlots: {
-      customRender: 'keyLine',
-    },
-  },
-]
-
 export default {
   mixins: [SampleDataMixin],
   components: {
@@ -187,7 +140,6 @@ export default {
   },
   data() {
     this.daughterColumns = daughterColumns
-    this.mainColumns = mainColumns
     return {
       visible: false,
       isLoading: false,
@@ -200,6 +152,7 @@ export default {
 
       selectedNuclide: {}, // 当前选中的Nuclide
       selectedParent: {}, // 当前选中的Parent
+      sortedInfo: null, // 控制筛选
     }
   },
   methods: {
@@ -253,6 +206,7 @@ export default {
         editEnergy: '',
         nuclideName: '',
       }
+      this.sortedInfo = null
       this.getInfo(true)
       this.visible = true
       window.addEventListener('keyup', this.handleKeyUp)
@@ -328,6 +282,74 @@ export default {
       this.model.nuclideName = item
       this.getInfo()
     },
+
+    // 主表格变化
+    handleTableChange(_, __, sorter) {
+      this.sortedInfo = sorter
+    },
+  },
+  computed: {
+    // 主体表格配置
+    mainColumns() {
+      const sortedInfo = this.sortedInfo || {}
+
+      const mainColumns = [
+        {
+          title: 'Id',
+          width: 50,
+          customRender: (_, __, index) => {
+            return index + 1
+          },
+        },
+        {
+          title: 'Full Name',
+          dataIndex: 'fullName',
+        },
+        {
+          title: 'Energy(keV)',
+          dataIndex: 'energy',
+          width: 110,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.energy - b.energy,
+          sortOrder: sortedInfo.columnKey === 'energy' && sortedInfo.order,
+        },
+        {
+          title: 'Energy Uncert(%)',
+          dataIndex: 'energyUncert',
+          width: 140,
+          customRender: (text) => Number(text).toFixed(6),
+          sorter: (a, b) => a.energyUncert - b.energyUncert,
+          sortOrder: sortedInfo.columnKey === 'energyUncert' && sortedInfo.order,
+        },
+        {
+          title: 'Yield',
+          dataIndex: 'yield',
+          width: 80,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.yield - b.yield,
+          sortOrder: sortedInfo.columnKey === 'yield' && sortedInfo.order,
+        },
+        {
+          title: 'Yield Uncert(%)',
+          dataIndex: 'yieldUncert',
+          width: 130,
+          customRender: (text) => Number(text).toFixed(3),
+          sorter: (a, b) => a.yieldUncert - b.yieldUncert,
+          sortOrder: sortedInfo.columnKey === 'yieldUncert' && sortedInfo.order,
+        },
+        {
+          title: 'KeyLine',
+          dataIndex: 'keyFlag',
+          width: 100,
+          align: 'center',
+          scopedSlots: {
+            customRender: 'keyLine',
+          },
+        },
+      ]
+
+      return mainColumns
+    },
   },
 }
 </script>