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/formtab/actionList/index.jsx |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/formtab/actionList/index.jsx b/src/tabviews/formtab/actionList/index.jsx
index 51443a1..117d15a 100644
--- a/src/tabviews/formtab/actionList/index.jsx
+++ b/src/tabviews/formtab/actionList/index.jsx
@@ -110,21 +110,42 @@
 
       } else if (btn.sql && btn.sqlType === 'insert') { // 绯荤粺鍑芥暟娣诲姞鏃讹紝鐢熸垚uuid
         param.ID = Utils.getguid()
-        param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns)) // 鏁版嵁婧�
+        param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns) // 鏁版嵁婧�
+        
+        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)
 
         _primaryId = param.ID
       } else if (btn.sql && btn.sqlType === 'insertOrUpdate') { // 绯荤粺鍑芥暟娣诲姞鎴栦慨鏀规椂
         param.ID = primaryId || Utils.getguid()
-        param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns)) // 鏁版嵁婧�
+        param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns) // 鏁版嵁婧�
+
+        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)
 
         _primaryId = param.ID
       } else if (btn.sql) {
         param.ID = primaryId
-        param.LText = Utils.formatOptions(Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns)) // 鏁版嵁婧�
+        param.LText = Utils.getSysDefaultSql(btn, setting, formdata, param, data, logcolumns) // 鏁版嵁婧�
+
+        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