From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01

---
 src/mob/colorsketch/index.jsx |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/mob/colorsketch/index.jsx b/src/mob/colorsketch/index.jsx
index 6070b13..afa975a 100644
--- a/src/mob/colorsketch/index.jsx
+++ b/src/mob/colorsketch/index.jsx
@@ -36,19 +36,25 @@
       initVal = value
     }
 
-    let _colors = sessionStorage.getItem('app_colors') || []
-    try {
-      _colors = JSON.parse(_colors)
-    } catch {
-      _colors = []
-    }
-    
-    let colors = presetColors.map((item, i) => {
-      if (_colors[i] && _colors[i].linkurl && !presetColors.includes(_colors[i].linkurl)) {
-        return _colors[i].linkurl
+    let _colors = sessionStorage.getItem('app_colors')
+    let colors = presetColors
+
+    if (_colors && _colors !== '[]') {
+      try {
+        _colors = JSON.parse(_colors)
+      } catch (e) {
+        _colors = null
       }
-      return item
-    })
+      
+      if (_colors) {
+        colors = presetColors.map((item, i) => {
+          if (_colors[i] && _colors[i].linkurl && !presetColors.includes(_colors[i].linkurl)) {
+            return _colors[i].linkurl
+          }
+          return item
+        })
+      }
+    }
     
     this.setState({color: initVal, allowClear: allowClear === true, colors})
   }

--
Gitblit v1.8.0