From 66cc7818cf5e13c44f4372e7d47fb72df7d2f752 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 10:30:14 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/index.jsx |   66 ++-------------------------------
 1 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index abe3ac2..ceea329 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -86,7 +86,9 @@
       let shortcuts = []
 
       try { // 閰嶇疆淇℃伅瑙f瀽
-        config = JSON.parse(window.decodeURIComponent(window.atob(result.LongParam)))
+        config = window.decodeURIComponent(window.atob(result.LongParam))
+        config = config.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+        config = JSON.parse(config)
       } catch (e) {
         console.warn('Parse Failure')
         config = ''
@@ -608,18 +610,6 @@
                       cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
                     }
                   }
-                } else if (cell.eleType === 'icon') {
-                  let fontSize = 14
-                  let lineHeight = 1.5
-            
-                  if (cell.style.fontSize) {
-                    fontSize = parseInt(cell.style.fontSize)
-                  }
-                  if (cell.style.lineHeight) {
-                    lineHeight = parseFloat(cell.style.lineHeight)
-                  }
-            
-                  cell.innerHeight = fontSize * lineHeight
                 }
                 return cell
               })
@@ -728,18 +718,6 @@
                   cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
                 }
               }
-            } else if (cell.eleType === 'icon') {
-              let fontSize = 14
-              let lineHeight = 1.5
-        
-              if (cell.style.fontSize) {
-                fontSize = parseInt(cell.style.fontSize)
-              }
-              if (cell.style.lineHeight) {
-                lineHeight = parseFloat(cell.style.lineHeight)
-              }
-        
-              cell.innerHeight = fontSize * lineHeight
             }
 
             return cell.eleType !== 'button' || skip || permAction[cell.uuid]
@@ -778,20 +756,8 @@
                   cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
                 }
               }
-            } else if (cell.eleType === 'icon') {
-              let fontSize = 14
-              let lineHeight = 1.5
-        
-              if (cell.style.fontSize) {
-                fontSize = parseInt(cell.style.fontSize)
-              }
-              if (cell.style.lineHeight) {
-                lineHeight = parseFloat(cell.style.lineHeight)
-              }
-        
-              cell.innerHeight = fontSize * lineHeight
             }
-            
+
             return cell.eleType !== 'button' || skip || permAction[cell.uuid]
           })
         })
@@ -832,18 +798,6 @@
                 cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
               }
             }
-          } else if (cell.eleType === 'icon') {
-            let fontSize = 14
-            let lineHeight = 1.5
-      
-            if (cell.style.fontSize) {
-              fontSize = parseInt(cell.style.fontSize)
-            }
-            if (cell.style.lineHeight) {
-              lineHeight = parseFloat(cell.style.lineHeight)
-            }
-      
-            cell.innerHeight = fontSize * lineHeight
           }
 
           return cell.eleType !== 'button' || skip || permAction[cell.uuid]
@@ -884,18 +838,6 @@
                   cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
                 }
               }
-            } else if (cell.eleType === 'icon') {
-              let fontSize = 14
-              let lineHeight = 1.5
-        
-              if (cell.style.fontSize) {
-                fontSize = parseInt(cell.style.fontSize)
-              }
-              if (cell.style.lineHeight) {
-                lineHeight = parseFloat(cell.style.lineHeight)
-              }
-        
-              cell.innerHeight = fontSize * lineHeight
             }
             return cell.eleType !== 'button' || skip || permAction[cell.uuid]
           })

--
Gitblit v1.8.0