From d1e443953eae3c5bdb0b443b4f5c3b7ced9236d7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:38:44 +0800
Subject: [PATCH] Merge branch 'positec' into bms
---
src/menu/datasource/verifycard/index.jsx | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 1ef5833..ea27445 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -659,6 +659,17 @@
let _debugId = md5(r.sql)
+ if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) {
+ Modal.warning({
+ title: `鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤鑷畾涔夊垎椤垫帓搴忔椂锛岃鍦ㄥ瓧娈甸泦涓坊鍔� mk_total銆俙,
+ okText: '鐭ラ亾浜�',
+ onOk: () => {
+ reject()
+ }
+ })
+ return
+ }
+
if (debugId === _debugId) {
resolve()
return
@@ -681,17 +692,19 @@
if (/鍒楀悕\s*'[a-zA-Z0-9_-]+'\s*鏃犳晥/.test(result.message)) {
let tail = ''
let type = ''
- searches.forEach(item => {
- if (item.forbid) return
- item.key.split(',').forEach(field => {
- if (new RegExp(`'${field}'`).test(result.message)) {
- tail = field
- type = '鎼滅储鏉′欢'
- }
+ if (setting.execute !== 'false' && setting.queryType !== 'statistics') {
+ searches.forEach(item => {
+ if (item.forbid) return
+ item.key.split(',').forEach(field => {
+ if (new RegExp(`'${field}'`).test(result.message)) {
+ tail = field
+ type = '鎼滅储鏉′欢'
+ }
+ })
})
- })
+ }
- if (!tail) {
+ if (!tail && setting.order) {
let keys = setting.order.replace(/\s+(asc|desc)/ig, '').replace(/\s+/g, '')
keys.split(',').forEach(field => {
if (new RegExp(`'${field}'`).test(result.message)) {
--
Gitblit v1.8.0