From e62bed4f742dd29820499cfe745eb381d9f39f87 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 30 六月 2020 17:23:01 +0800
Subject: [PATCH] 2020-06-30

---
 src/tabviews/zshare/actionList/normalbutton/index.jsx |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 8b22246..f56f4e5 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -223,7 +223,12 @@
               param.LText = param.LText.replace(/@\$|\$@/ig, '')
             }
 
-            param.LText = Utils.formatOptions(param.LText)
+            let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+            param.LText2 = LText2
+            param.LText1 = LText1
+            param.LText = LText
+
             param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
             param.secretkey = Utils.encrypt(param.LText, param.timestamp)
           }
@@ -259,7 +264,12 @@
               param.LText = param.LText.replace(/@\$|\$@/ig, '')
             }
 
-            param.LText = Utils.formatOptions(param.LText)
+            let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+            param.LText2 = LText2
+            param.LText1 = LText1
+            param.LText = LText
+
             param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
             param.secretkey = Utils.encrypt(param.LText, param.timestamp)
           } else if (btn.sql) {
@@ -272,8 +282,13 @@
             } else {
               param.LText = param.LText.replace(/@\$|\$@/ig, '')
             }
+
+            let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+            param.LText2 = LText2
+            param.LText1 = LText1
+            param.LText = LText
             
-            param.LText = Utils.formatOptions(param.LText)
             param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
             param.secretkey = Utils.encrypt(param.LText, param.timestamp)
           }
@@ -336,7 +351,11 @@
                 param.LText = param.LText.replace(/@\$|\$@/ig, '')
               }
 
-              param.LText = Utils.formatOptions(param.LText)
+              let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+              param.LText2 = LText2
+              param.LText1 = LText1
+              param.LText = LText
               param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
               param.secretkey = Utils.encrypt(param.LText, param.timestamp)
             }
@@ -371,7 +390,12 @@
                 param.LText = param.LText.replace(/@\$|\$@/ig, '')
               }
 
-              param.LText = Utils.formatOptions(param.LText)
+              let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+              param.LText2 = LText2
+              param.LText1 = LText1
+              param.LText = LText
+
               param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
               param.secretkey = Utils.encrypt(param.LText, param.timestamp)
             } else if (btn.sql) {
@@ -385,7 +409,12 @@
                 param.LText = param.LText.replace(/@\$|\$@/ig, '')
               }
 
-              param.LText = Utils.formatOptions(param.LText)
+              let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
+
+              param.LText2 = LText2
+              param.LText1 = LText1
+              param.LText = LText
+
               param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
               param.secretkey = Utils.encrypt(param.LText, param.timestamp)
             }

--
Gitblit v1.8.0