From f6a2246aab317bd3d4b6722cd38cf51a6653e79f Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 13 Aug 2023 14:58:11 +0800
Subject: [PATCH] code refactor

---
 src/components/desktop/ColorSelect.vue        | 13 ++-----------
 src/components/desktop/IconSelect.vue         | 13 ++-----------
 src/components/mobile/ColorSelectionSheet.vue | 13 ++-----------
 src/components/mobile/IconSelectionSheet.vue  | 13 ++-----------
 src/lib/common.js                             | 14 ++++++++++++++
 5 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/src/components/desktop/ColorSelect.vue b/src/components/desktop/ColorSelect.vue
index 3462469b..69f81a1e 100644
--- a/src/components/desktop/ColorSelect.vue
+++ b/src/components/desktop/ColorSelect.vue
@@ -39,6 +39,7 @@
 </template>
 
 <script>
+import { arrayContainsFieldvalue } from '@/lib/common.js';
 import { scrollToSelectedItem } from '@/lib/ui.desktop.js';
 
 import {
@@ -96,17 +97,7 @@ export default {
     },
     methods: {
         hasSelectedIcon(row) {
-            if (!this.modelValue || !row || !row.length) {
-                return false;
-            }
-
-            for (let i = 0; i < row.length; i++) {
-                if (row[i].id === this.modelValue) {
-                    return true;
-                }
-            }
-
-            return false;
+            return arrayContainsFieldvalue(row, 'id', this.modelValue);
         },
         onMenuStateChanged(state) {
             const self = this;
diff --git a/src/components/desktop/IconSelect.vue b/src/components/desktop/IconSelect.vue
index 0a74eba5..34dff259 100644
--- a/src/components/desktop/IconSelect.vue
+++ b/src/components/desktop/IconSelect.vue
@@ -37,6 +37,7 @@
 </template>
 
 <script>
+import { arrayContainsFieldvalue } from '@/lib/common.js';
 import { scrollToSelectedItem } from '@/lib/ui.desktop.js';
 
 import {
@@ -104,17 +105,7 @@ export default {
     },
     methods: {
         hasSelectedIcon(row) {
-            if (!this.modelValue || !row || !row.length) {
-                return false;
-            }
-
-            for (let i = 0; i < row.length; i++) {
-                if (row[i].id === this.modelValue) {
-                    return true;
-                }
-            }
-
-            return false;
+            return arrayContainsFieldvalue(row, 'id', this.modelValue);
         },
         onMenuStateChanged(state) {
             const self = this;
diff --git a/src/components/mobile/ColorSelectionSheet.vue b/src/components/mobile/ColorSelectionSheet.vue
index 57b1126e..5389a885 100644
--- a/src/components/mobile/ColorSelectionSheet.vue
+++ b/src/components/mobile/ColorSelectionSheet.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+import { arrayContainsFieldvalue } from '@/lib/common.js';
 import { scrollToSelectedItem } from '@/lib/ui.mobile.js';
 
 export default {
@@ -81,17 +82,7 @@ export default {
             this.$emit('update:show', false);
         },
         hasSelectedIcon(row) {
-            if (!this.currentValue || !row || !row.length) {
-                return false;
-            }
-
-            for (let i = 0; i < row.length; i++) {
-                if (row[i].id === this.currentValue) {
-                    return true;
-                }
-            }
-
-            return false;
+            return arrayContainsFieldvalue(row, 'id', this.currentValue);
         }
     }
 }
diff --git a/src/components/mobile/IconSelectionSheet.vue b/src/components/mobile/IconSelectionSheet.vue
index 5618850b..300492d9 100644
--- a/src/components/mobile/IconSelectionSheet.vue
+++ b/src/components/mobile/IconSelectionSheet.vue
@@ -29,6 +29,7 @@
 </template>
 
 <script>
+import { arrayContainsFieldvalue } from '@/lib/common.js';
 import { scrollToSelectedItem } from '@/lib/ui.mobile.js';
 
 export default {
@@ -101,17 +102,7 @@ export default {
             this.$emit('update:show', false);
         },
         hasSelectedIcon(row) {
-            if (!this.currentValue || !row || !row.length) {
-                return false;
-            }
-
-            for (let i = 0; i < row.length; i++) {
-                if (row[i].id === this.currentValue) {
-                    return true;
-                }
-            }
-
-            return false;
+            return arrayContainsFieldvalue(row, 'id', this.currentValue);
         }
     }
 }
diff --git a/src/lib/common.js b/src/lib/common.js
index 3cdc71fe..c162e195 100644
--- a/src/lib/common.js
+++ b/src/lib/common.js
@@ -331,6 +331,20 @@ export function copyArrayTo(fromArray, toArray) {
     return toArray;
 }
 
+export function arrayContainsFieldvalue(array, fieldName, value) {
+    if (!value || !array || !array.length) {
+        return false;
+    }
+
+    for (let i = 0; i < array.length; i++) {
+        if (array[i][fieldName] === value) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 export function categoriedArrayToPlainArray(object) {
     const ret = [];