From f18eef383f288e453b7b6d0a34237ddf6e6620e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:50:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 7df803d..c64b0ef 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
@@ -15,9 +15,9 @@
let arr_field = []
verify.columns.forEach(item => {
- if (item.Column !== '$Index') {
- arr_field.push(item.Column)
- }
+ if (item.output === 'false' || item.Column === '$Index') return
+
+ arr_field.push(item.Column)
})
arr_field = arr_field.join(',')
@@ -46,11 +46,17 @@
_dataresource = ''
}
+ let custompage = false
+
+ if (/order\s+by\s+sort_id\s*$/i.test(_dataresource)) {
+ custompage = true
+ } else if (/@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)) {
+ custompage = true
+ }
+
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
-
- let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
// 姝ｅ垯鏇挎崲
regoptions.push({
@@ -73,6 +79,10 @@
value: ''
})
+ if (window.GLOB.process) {
+ regoptions.push({reg: /@works_flow_code@/ig, value: `'mk_flow_code'`})
+ }
+
regoptions.forEach(item => {
_dataresource = _dataresource.replace(item.reg, item.value)
_customScript = _customScript.replace(item.reg, item.value)
--
Gitblit v1.8.0