From 0190c7ec012c28a154983b5f78f052a9a350bf73 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 四月 2025 14:31:13 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/index.jsx | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index d10bf53..58eef7d 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,
@@ -1113,7 +1115,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 +1247,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 +1265,7 @@
subColumns={subColumns}
setting={setting}
scripts={scripts}
+ hasMainSearch={hasMainSearch}
updateStatus={this.updateStatus}
updateColumns={this.updateColumns}
addProcess={this.addProcess}
--
Gitblit v1.8.0