From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/utils.jsx | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 67b552d..6714e81 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -1,4 +1,5 @@
+import md5 from 'md5'
import { getSearchRegs, joinMainSearchkey } from '@/utils/utils-custom.js'
export default class SettingUtils {
@@ -49,34 +50,24 @@
})
}
- let getuuid = () => {
- let uuid = []
- let timestamp = new Date().getTime()
- let _options = '0123456789abcdefghigklmnopqrstuv'
- for (let i = 0; i < 19; i++) {
- uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- }
- uuid = timestamp + uuid.join('')
- return uuid
- }
-
let regs = [
- {reg: /@time_id@/ig, value: `'${getuuid()}'`},
- {reg: /@BID@/ig, value: `'${getuuid()}'`},
- {reg: /@upid@/ig, value: `'${getuuid()}'`},
+ // {reg: /@time_id@/ig, value: `'${getuuid()}'`}, // 璁＄畻md5鍚庢浛鎹�
+ // {reg: /@BID@/ig, value: `'${getuuid()}'`},
+ // {reg: /@upid@/ig, value: `'${getuuid()}'`},
{reg: /@typename@/ig, value: `'debug'`},
{reg: /@datam@/ig, value: `''`},
{reg: /@LoginUID@/ig, value: `'${sessionStorage.getItem('LoginUID')}'`},
{reg: /@SessionUid@/ig, value: `'${localStorage.getItem('SessionUid')}'`},
{reg: /@UserID@/ig, value: `'${sessionStorage.getItem('UserID')}'`},
{reg: /@Appkey@/ig, value: `'${window.GLOB.appkey}'`},
+ {reg: /@lang@/ig, value: `'${sessionStorage.getItem('lang')}'`},
{reg: /@\$|\$@/ig, value: ''},
{reg: /@select\$|\$select@/ig, value: ''},
{reg: /@sum\$|\$sum@/ig, value: ''},
]
if (window.GLOB.process && type !== 'invoice') {
- regs.push({reg: /@works_flow_code@/ig, value: `'${getuuid()}'`})
+ regs.push({reg: /@works_flow_code@/ig, value: `'mk_flow_code'`})
}
if (hasExtend) {
@@ -114,7 +105,7 @@
}
// 姝ｅ垯鏇挎崲
- let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
+ let custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)
let _regoptions = getSearchRegs(searches)
let _search = joinMainSearchkey(searches)
@@ -182,6 +173,29 @@
${_dataresource}`
}
+ let debugId = md5(sql + window.GLOB.appkey)
+
+ let getuuid = () => {
+ let uuid = []
+ let timestamp = new Date().getTime()
+ let _options = '0123456789abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ uuid = timestamp + uuid.join('')
+ return uuid
+ }
+
+ let _regs = [
+ {reg: /@time_id@/ig, value: `'${getuuid()}'`},
+ {reg: /@BID@/ig, value: `'${getuuid()}'`},
+ {reg: /@upid@/ig, value: `'${getuuid()}'`},
+ ]
+
+ _regs.forEach(item => {
+ sql = sql.replace(item.reg, item.value)
+ })
+
let errors = []
if (/@[0-9a-zA-Z_]+@/ig.test(sql)) {
@@ -214,8 +228,6 @@
})
arr.forEach(item => {
- if (/@time_id@/ig.test(item)) return
-
let reg = new RegExp(item, 'i')
if (reg.test(_dataresource)) {
errors.push(`鏁版嵁婧愪腑瀛樺湪鏈浛鎹㈠��${item}`)
@@ -232,6 +244,6 @@
})
}
- return { error, sql, errors: errors.join('锛�'), custompage }
+ return { error, sql, errors: errors.join('锛�'), custompage, debugId }
}
}
\ No newline at end of file
--
Gitblit v1.8.0