From e543372cc70a19ff2630c79d8421c2c593e54e5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 02 六月 2021 17:15:21 +0800
Subject: [PATCH] 2021-06-02

---
 src/menu/datasource/verifycard/utils.jsx |   63 ++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index bb94a8f..9858c7d 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -23,27 +23,43 @@
     }
 
     if (setting.interType === 'system' && setting.execute !== 'false') {
-      _dataresource = setting.dataresource
+      _dataresource = setting.dataresource || ''
     }
     
-    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, '')
 
     if (_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),@login_city nvarchar(50) select @ErrorCode='',@retmsg =''
         ${_customScript}
       `
     }
+
+    // 澶栬仈鏁版嵁搴撴浛鎹�
+    if (window.GLOB.externalDatabase !== null) {
+      _dataresource = _dataresource.replace(/@db@/ig, window.GLOB.externalDatabase)
+      _customScript = _customScript.replace(/@db@/ig, window.GLOB.externalDatabase)
+    }
+
+    if (window.GLOB.urlFields) {
+      window.GLOB.urlFields.forEach(field => {
+        let reg = new RegExp('@' + field + '@', 'ig')
+        _dataresource = _dataresource.replace(reg, '0')
+        _customScript = _customScript.replace(reg, '0')
+      })
+    }
+    
     
     // 姝ｅ垯鏇挎崲
     let _regoptions = []
     let _fields = []
 
     searches.forEach(item => {
+      if (!item.field) return
       if (item.datefield) {
         _regoptions.push({
           var: new RegExp('@' + item.datefield, 'ig'),
@@ -76,6 +92,13 @@
             reg: new RegExp('@' + item.field + '@', 'ig')
           })
         }
+      } else if (item.type === 'text' || item.type === 'select') {
+        item.field.split(',').forEach(field => {
+          _regoptions.push({
+            var: new RegExp('@' + field, 'ig'),
+            reg: new RegExp('@' + field + '@', 'ig')
+          })
+        })
       } else {
         _regoptions.push({
           var: new RegExp('@' + item.field, 'ig'),
@@ -98,27 +121,32 @@
 
     if (_customScript) {
       _regoptions.push({
-        var: new RegExp('@orderBy', 'ig'),
+        reg: new RegExp('@login_city@', 'ig'),
+      }, {
         reg: new RegExp('@orderBy@', 'ig'),
+      }, {
+        reg: new RegExp('@UserName@', 'ig'),
+      }, {
+        reg: new RegExp('@FullName@', 'ig'),
       })
       if (setting.laypage !== 'false') {
         _regoptions.push({
-          var: new RegExp('@pageSize', 'ig'),
           reg: new RegExp('@pageSize@', 'ig'),
         }, {
-          var: new RegExp('@pageIndex', 'ig'),
           reg: new RegExp('@pageIndex@', 'ig'),
         })
       }
       _regoptions.forEach(item => {
         _customScript = _customScript.replace(item.reg, '0')
         originscript = originscript.replace(item.reg, '0')
-        originscript = originscript.replace(item.var, '0')
       })
 
       if (setting.varMark) {
         originscript = originscript.replace(/@ErrorCode/ig, '')
         originscript = originscript.replace(/@retmsg/ig, '')
+        originscript = originscript.replace(/@UserName@/ig, '').replace(/@UserName/ig, '')
+        originscript = originscript.replace(/@FullName@/ig, '').replace(/@FullName/ig, '')
+        originscript = originscript.replace(/@login_city@/ig, '').replace(/@login_city/ig, '')
         originscript = originscript.replace(/@id@/ig, '').replace(/@id/ig, '')
         originscript = originscript.replace(/@bid@/ig, '').replace(/@bid/ig, '')
         originscript = originscript.replace(/@loginuid@/ig, '').replace(/@loginuid/ig, '')
@@ -141,19 +169,24 @@
         _dataresource = '(' + _dataresource + ') tb'
       }
 
-      _dataresource = `select ${setting.laypage !== 'false' ?  'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ?  'where rows > 0' : ''} order by tmptable.rows`
+      _dataresource = `select${setting.laypage !== 'false' ?  ' top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ?  'where rows > 0' : ''} order by tmptable.rows`
     }
 
     if (_customScript) {
-      sql = `${_customScript}
+      sql = `/* sql 楠岃瘉 */
+        ${_customScript}
         ${_dataresource}
         aaa:
         if @ErrorCode!=''
           insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
       `
     } else {
-      sql = _dataresource
+      sql = `/* sql 楠岃瘉 */
+        ${_dataresource}`
     }
+    sql = sql.replace(/\n\s{8}/ig, '\n')
+
+    console.info(sql)
     
     return { error, sql }
   }

--
Gitblit v1.8.0