From 1aa5654a0b51bb82948fff8bed77b166f25f11ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 19 二月 2025 20:14:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/utils.jsx
index 7df803d..4949841 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(',')
@@ -50,7 +50,7 @@
_dataresource = '(' + _dataresource + ') tb'
}
- let custompage = /@pageSize@|@orderBy@/i.test(_dataresource + _customScript)
+ let custompage = /@pageSize@|@orderBy@|@mk_total/i.test(_dataresource + _customScript)
// 姝ｅ垯鏇挎崲
regoptions.push({
@@ -73,6 +73,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