From 115a6ae906c22af00efa6734a129ca6500be001c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 一月 2021 19:00:51 +0800
Subject: [PATCH] 2021-01-21

---
 src/utils/utils-datamanage.js |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 38b6f12..a30cbeb 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -89,11 +89,20 @@
       default_sql: setting.execute ? 'true' : 'false'
     }
 
+    let userName = sessionStorage.getItem('User_Name') || ''
+    let fullName = sessionStorage.getItem('Full_Name') || ''
+
+    if (sessionStorage.getItem('isEditState') === 'true') {
+      userName = sessionStorage.getItem('CloudUserName') || ''
+      fullName = sessionStorage.getItem('CloudFullName') || ''
+    }
+
     let _dataresource = setting.dataresource
     let _customScript = ''
     
     if (setting.customScript) {
-      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
+      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50)
+        Select @ErrorCode='',@retmsg ='',@UserName='${userName}', @FullName='${fullName}'
         ${setting.customScript}
       `
     }
@@ -126,7 +135,7 @@
         value: orderBy
       }, {
         reg: new RegExp('@pageSize@', 'ig'),
-        value: pageSize
+        value: setting.laypage ? pageSize : '9999'
       }, {
         reg: new RegExp('@pageIndex@', 'ig'),
         value: pageIndex

--
Gitblit v1.8.0