From 14b6d196d85da48d9e988832b7f5209b8fa092a4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 29 七月 2023 15:03:10 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/datasource/verifycard/utils.jsx |   46 ++++-------
 src/utils/utils-datamanage.js            |  135 +++++++++++++++------------------
 2 files changed, 81 insertions(+), 100 deletions(-)

diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index d4d1a6c..e1efa0b 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -127,37 +127,27 @@
       }
     })
 
+    _regoptions.push({
+      reg: new RegExp('@orderBy@', 'ig'),
+    }, {
+      reg: new RegExp('@UserName@', 'ig'),
+    }, {
+      reg: new RegExp('@FullName@', 'ig'),
+    }, {
+      reg: new RegExp('@pageSize@', 'ig'),
+    }, {
+      reg: new RegExp('@pageIndex@', 'ig'),
+    })
+
+    _regoptions.forEach(item => {
+      _dataresource = _dataresource.replace(item.reg, '0')
+      _customScript = _customScript.replace(item.reg, '0')
+    })
+
     let _search = defSearch
 
-    if (_dataresource) {
-      _regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, '0')
-      })
-
+    if (setting.queryType === 'statistics') {
       _search = ''
-    }
-
-    let originscript = _customScript
-
-    if (_customScript) {
-      _regoptions.push({
-        reg: new RegExp('@orderBy@', 'ig'),
-      }, {
-        reg: new RegExp('@UserName@', 'ig'),
-      }, {
-        reg: new RegExp('@FullName@', 'ig'),
-      })
-      if (setting.laypage === 'true') {
-        _regoptions.push({
-          reg: new RegExp('@pageSize@', 'ig'),
-        }, {
-          reg: new RegExp('@pageIndex@', 'ig'),
-        })
-      }
-      _regoptions.forEach(item => {
-        _customScript = _customScript.replace(item.reg, '0')
-        originscript = originscript.replace(item.reg, '0')
-      })
     }
 
     let sumSql = ''
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index f3ed7f4..50ccbeb 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -167,34 +167,33 @@
       _customScript = _customScript.replace(/@mk_year@/ig, year)
     }
 
-    let regoptions = null
-    if (setting.queryType === 'statistics' || _customScript) {
-      let allSearch = Utils.getAllSearchOptions(search)
-      regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-      regoptions.push({
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: setting.laypage ? pageSize : '9999'
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: pageIndex
-      })
-    }
+    let allSearch = Utils.getAllSearchOptions(search)
+    let regoptions = allSearch.map(item => {
+      return {
+        reg: new RegExp('@' + item.key + '@', 'ig'),
+        value: `'${item.value}'`
+      }
+    })
+    regoptions.push({
+      reg: new RegExp('@orderBy@', 'ig'),
+      value: orderBy
+    }, {
+      reg: new RegExp('@pageSize@', 'ig'),
+      value: setting.laypage ? pageSize : '9999'
+    }, {
+      reg: new RegExp('@pageIndex@', 'ig'),
+      value: pageIndex
+    })
+
+    regoptions.forEach(item => {
+      _dataresource = _dataresource.replace(item.reg, item.value)
+      _customScript = _customScript.replace(item.reg, item.value)
+    })
 
     let _search = ''
     
     if (_dataresource) {
       if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-        regoptions.forEach(item => {
-          _dataresource = _dataresource.replace(item.reg, item.value)
-        })
         if (id) {
           _dataresource = _dataresource + ` where ${setting.primaryKey || 'ID'}='${id}'`
         }
@@ -210,9 +209,7 @@
     }
 
     if (_customScript) {
-      regoptions.forEach(item => {
-        _customScript = _customScript.replace(item.reg, item.value)
-      })
+      
       if (window.GLOB.breakpoint) {
         _customScript = _customScript.replace(/\$breakpoint_proc@/ig, window.GLOB.breakpoint)
         param.func = 'sPC_Get_TableData_debug'
@@ -372,44 +369,42 @@
     _dataresource = _dataresource.replace(/@typename@/ig, `'admin'`)
     _customScript = _customScript.replace(/@typename@/ig, `'admin'`)
 
-    let regoptions = null
-    if (setting.queryType === 'statistics' || _customScript) {
-      let allSearch = Utils.getAllSearchOptions(search)
+    let allSearch = Utils.getAllSearchOptions(search)
+    let regoptions = allSearch.map(item => {
+      return {
+        reg: new RegExp('@' + item.key + '@', 'ig'),
+        value: `'${item.value}'`
+      }
+    })
 
-      regoptions = allSearch.map(item => {
-        return {
-          reg: new RegExp('@' + item.key + '@', 'ig'),
-          value: `'${item.value}'`
-        }
-      })
-      regoptions.push({
-        reg: new RegExp('@orderBy@', 'ig'),
-        value: orderBy
-      }, {
-        reg: new RegExp('@pageSize@', 'ig'),
-        value: 999999
-      }, {
-        reg: new RegExp('@pageIndex@', 'ig'),
-        value: 1
-      })
-    }
+    regoptions.push({
+      reg: new RegExp('@orderBy@', 'ig'),
+      value: orderBy
+    }, {
+      reg: new RegExp('@pageSize@', 'ig'),
+      value: 999999
+    }, {
+      reg: new RegExp('@pageIndex@', 'ig'),
+      value: 1
+    })
 
-    let _search = Utils.joinMainSearchkey(search)
-    if (_search) {
-      _search = 'where ' + _search
-    }
-    
-    if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
-      regoptions.forEach(item => {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      })
-      _search = ''
-    }
+    regoptions.forEach(item => {
+      _dataresource = _dataresource.replace(item.reg, item.value)
+    })
 
     if (_customScript) {
       regoptions.forEach(item => {
         _customScript = _customScript.replace(item.reg, item.value)
       })
+    }
+
+    let _search = ''
+    
+    if (setting.queryType !== 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+      _search = Utils.joinMainSearchkey(search)
+      if (_search) {
+        _search = 'where ' + _search
+      }
     }
 
     let LText = ` /*system_query*/select ${statFields.map(col => `isnull(sum(${col.field}),0) as ${col.field}`).join(',')} from ${_dataresource} ${_search} `
@@ -471,22 +466,18 @@
   let _dataresource = setting.dataresource
   let _customScript = setting.customScript
   
-  if (setting.queryType === 'statistics' || _customScript) {
-    let allSearch = Utils.getAllSearchOptions(searchlist)
-    let regoptions = allSearch.map(item => {
-      return {
-        reg: new RegExp('@' + item.key + '@', 'ig'),
-        value: `'${item.value}'`
-      }
-    })
+  let allSearch = Utils.getAllSearchOptions(searchlist)
+  let regoptions = allSearch.map(item => {
+    return {
+      reg: new RegExp('@' + item.key + '@', 'ig'),
+      value: `'${item.value}'`
+    }
+  })
 
-    regoptions.forEach(item => {
-      if (_dataresource && setting.queryType === 'statistics') {
-        _dataresource = _dataresource.replace(item.reg, item.value)
-      }
-      _customScript = _customScript.replace(item.reg, item.value)
-    })
-  }
+  regoptions.forEach(item => {
+    _dataresource = _dataresource.replace(item.reg, item.value)
+    _customScript = _customScript.replace(item.reg, item.value)
+  })
 
   _dataresource = _dataresource.replace(/@select\$|\$select@/ig, '')
   _customScript = _customScript.replace(/@select\$|\$select@/ig, '')

--
Gitblit v1.8.0