From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09

---
 src/templates/sharecomponent/settingcomponent/settingform/utils.jsx |   79 ++++++++++++++++++++++++++++++++++-----
 1 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
index 4298827..7d9b017 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/utils.jsx
@@ -18,7 +18,7 @@
     })
 
     if (_customScript) {
-      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
+      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
         ${_customScript}
       `
     }
@@ -26,13 +26,25 @@
     if (setting.default === 'false') {
       _dataresource = ''
     }
+
+    if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+      window.GLOB.funcs.forEach(item => {
+        let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
+        _dataresource = _dataresource.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+        _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+      })
+    }
     
-    if (_dataresource) {
-      _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
-    }
-    if (_customScript) {
-      _customScript = _customScript.replace(/@\$|\$@/ig, '')
-    }
+    _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
+    _customScript = _customScript.replace(/@\$|\$@/ig, '')
+    _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
+    _customScript = _customScript.replace(/@select\$|\$select@/ig, '')
+    // _dataresource = _dataresource.replace(/@sum\$|\$sum@/ig, '')
+    _customScript = _customScript.replace(/@sum\$|\$sum@/ig, '')
+
+    _dataresource = _dataresource.replace(/\$sum@/ig, '/*$sum@')
+    _dataresource = _dataresource.replace(/@sum\$/ig, '@sum$*/')
+
     // 澶栬仈鏁版嵁搴撴浛鎹�
     if (window.GLOB.externalDatabase !== null) {
       _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
@@ -43,11 +55,21 @@
     let _regoptions = regoptions.map(item => {
       return {
         reg: new RegExp('@' + item.key + '@', 'ig'),
-        value: `'0'`
+        value: `'0'`,
+        type: item.type || ''
       }
     })
 
     _regoptions.push({
+      reg: new RegExp('@login_city@', 'ig'),
+      value: `''`
+    }, {
+      reg: new RegExp('@userName@', 'ig'),
+      value: `''`
+    }, {
+      reg: new RegExp('@fullName@', 'ig'),
+      value: `''`
+    }, {
       reg: new RegExp('@orderBy@', 'ig'),
       value: setting.order
     }, {
@@ -65,12 +87,36 @@
         _dataresource = _dataresource.replace(item.reg, item.value)
       })
       _search = ''
+    } else if (_dataresource) {
+      _regoptions.forEach(item => {
+        if (item.type !== 'url') return
+        _dataresource = _dataresource.replace(item.reg, item.value)
+      })
     }
 
     if (_customScript) {
       _regoptions.forEach(item => {
         _customScript = _customScript.replace(item.reg, item.value)
       })
+    }
+
+    let sumSql = ''
+
+    if (arr_field && _dataresource && /\/\*\$sum@/ig.test(_dataresource)) {
+      let _sql = _dataresource.replace(/\/\*\$sum@|@sum\$\*\//ig, '')
+      _sql = `${_sql} ${_search}`
+      if (_customScript) {
+        sumSql = `/* sql sum楠岃瘉 */
+          ${_customScript}
+          ${_sql}
+          aaa:
+          if @ErrorCode!=''
+            insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
+        `
+      } else {
+        sumSql = `/* sql sum楠岃瘉 */
+          ${_sql}`
+      }
     }
 
     // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂 
@@ -97,7 +143,12 @@
     sql = sql.replace(/\n\s{8}/ig, '\n')
     console.info(sql)
 
-    return sql
+    if (sumSql) {
+      sumSql = sumSql.replace(/\n\s{10}/ig, '\n')
+      console.info(sumSql)
+    }
+
+    return { sql, sumSql }
   }
 
   /**
@@ -118,12 +169,20 @@
     })
 
     if (_customScript) {
-      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50) select @ErrorCode='',@retmsg =''
+      _customScript = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000),@UserName nvarchar(50),@FullName nvarchar(50),@RoleID nvarchar(512),@mk_departmentcode nvarchar(50),@mk_organization nvarchar(50),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
         ${_customScript}
       `
     }
 
+    if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
+      window.GLOB.funcs.forEach(item => {
+        let reg = new RegExp('\\$ex@' + item.func_code + '@ex\\$', 'ig')
+        _customScript = _customScript.replace(reg, `/*$ex@${item.func_code}-begin*/\n${item.key_sql}\n/*@ex$-end*/`)
+      })
+    }
+
     _customScript = _customScript.replace(/@\$|\$@/ig, '')
+    _customScript = _customScript.replace(/@userName@|@fullName@|@login_city@/ig, `''`)
     // 澶栬仈鏁版嵁搴撴浛鎹�
     if (window.GLOB.externalDatabase !== null) {
       _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)

--
Gitblit v1.8.0