From d0764c7facff9abf00af6f3ff06a26260d1d8770 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:34:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/index.jsx | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index d10bf53..b83a387 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -55,6 +55,7 @@
oriConfig: null,
scriptValue: '',
cols: null,
+ hasMainSearch: false,
colColumns: [
{
title: '鍚嶇О',
@@ -269,6 +270,7 @@
searches: formatSearch(search),
searchKey: '',
debugId: _setting.debugId || '',
+ hasMainSearch: mainSearch && mainSearch.length > 0,
oriConfig: fromJS({
scripts,
columns: columns,
@@ -721,6 +723,16 @@
return
}
+ if (type === 'submit' && config.subtype === 'dualdatacard' && setting.subdata === 'sub_data_string' && !columns.find(col => col.field === 'sub_data_string')) {
+ notification.warning({
+ top: 92,
+ message: '涓昏〃瀛楁闆嗕腑闇�娣诲姞 sub_data_string 瀛楁锛�',
+ duration: 5
+ })
+ reject()
+ return
+ }
+
if (type === 'change' && columns.length === 0) {
reject()
return
@@ -728,7 +740,7 @@
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let _columns = columns
- if (config.subtype === 'dualdatacard') {
+ if (config.subtype === 'dualdatacard' && setting.subdata !== 'sub_data_string') {
_columns = [...columns, ...subColumns]
}
@@ -1113,7 +1125,9 @@
if @pageIndex_top > 0
delete #${setting.tableName || 'tb'} where sort_id <= @pageIndex_top
- drop table #${setting.tableName || 'tb'}${extend}`
+ drop table #${setting.tableName || 'tb'}${extend}
+
+ select top 99999 @mk_total as mk_total, * from #${setting.tableName || 'tb'} order by sort_id`
document.body.appendChild(oInput)
oInput.select()
@@ -1243,7 +1257,7 @@
render() {
const { config } = this.props
- const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId } = this.state
+ const { columns, subColumns, median, skip, setting, scripts, colColumns, scriptsColumns, activeKey, loading, searches, defaultsql, visible, pvisible, reload, script, scriptValue, searchKey, editLineId, hasMainSearch } = this.state
return (
<div className="model-data-source-wrap">
@@ -1261,6 +1275,7 @@
subColumns={subColumns}
setting={setting}
scripts={scripts}
+ hasMainSearch={hasMainSearch}
updateStatus={this.updateStatus}
updateColumns={this.updateColumns}
addProcess={this.addProcess}
--
Gitblit v1.8.0