From 17e0433eb3919da86e757cc93dac3f2ed9fca9d6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 四月 2025 15:37:51 +0800
Subject: [PATCH] 2025-04-27
---
src/utils/utils-custom.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 62635f2..be55f36 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -5012,7 +5012,7 @@
let sFields = getSearches(searches)
let _columns = []
- if (item.subtype === 'dualdatacard') {
+ if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
_columns = [...item.columns, ...item.subColumns]
} else if (item.columns) {
_columns = [...item.columns]
@@ -5128,7 +5128,7 @@
} else if (item.setting.laypage === 'true' && item.setting.order) {
LText = `select top @pageSize@ ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable where rows > @pageSize@ * (@pageIndex@ - 1) order by tmptable.rows `
reps.push('pageSize', 'orderBy', 'pageIndex')
- if (item.subtype === 'dualdatacard') {
+ if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
DateCount = `select count(1) as total from (select distinct ${item.setting.primaryKey || 'ID'} from ${_dataresource} ${_search})a`
} else {
DateCount = `select count(1) as total from ${_dataresource} ${_search}`
@@ -5155,7 +5155,7 @@
let parid = ''
let sub_field = ''
- if (item.subtype === 'dualdatacard') {
+ if (item.subtype === 'dualdatacard' && item.setting.subdata !== 'sub_data_string') {
arr_field = item.columns.map(col => col.field).join(',')
sub_name = item.setting.subdata
tabid = item.setting.primaryKey || ''
--
Gitblit v1.8.0