From 047dbd742341e268ca772eda8d2ff0b6ba09cb44 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 六月 2025 16:57:36 +0800
Subject: [PATCH] 2025-06-05

---
 src/utils/utils-datamanage.js |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 84c388f..9507763 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -12,7 +12,7 @@
   if (setting.dataresource) {
     searchKeys = []
 
-    if (search.length) {
+    if (search.length && setting.queryType !== 'statistics') {
       searchKeys = Utils.getSearchkeys(search)
     }
 
@@ -73,6 +73,8 @@
   }
 
   item.urlkeys && item.urlkeys.forEach(key => {
+    if (values.hasOwnProperty(key.toLowerCase())) return
+    
     values[key] = item.urlparam[key]
   })
 
@@ -109,8 +111,8 @@
 
   let cell = {
     id: item.id,
-    exps: exps,
     menuname: setting.$name || '',
+    exps: exps,
     md5_id: md5_id
   }
 
@@ -122,6 +124,7 @@
 
   let param = {
     $backend: true,
+    $type: 's_Get_TableData',
     data: [cell]
   }
 
@@ -634,6 +637,11 @@
   const { columns, setting, dataName, format, uuid } = component
 
   if (window.backend && window.GLOB.CacheData.has('sql_' + uuid)) {
+    if (first) {
+      let item = window.GLOB.CacheData.get('sql_' + uuid)
+      window.GLOB.CacheData.set('first_' + item.id, uuid)
+    }
+
     return getBackendQueryParam(setting, searchlist, setting.order, 1, 1000, '', BID, '', dataName)
   }
 
@@ -712,6 +720,7 @@
   if (window.backend && params[0].exps) {
     let param = {
       $backend: true,
+      $type: 's_Get_structured_data',
       data: params.map(item => {
         let cell = {...item}
 

--
Gitblit v1.8.0