From cb52ff0fd9fdf3ebfbde2314539998f3fedd9854 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 九月 2024 10:16:46 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/basetable/index.jsx |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 3ef6c7c..d066c57 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -2,6 +2,7 @@
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
 import { notification, Spin, Row, Col } from 'antd'
+import md5 from 'md5'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
@@ -174,19 +175,20 @@
 
       window.GLOB.CacheData.set(MenuID, urlparam)
 
-      // if (window.backend && config.allSqls) {
-      //   let keys = Object.keys(urlparam)
-      //   config.allSqls.forEach(item => {
-      //     if (item.type === 'datasource') {
-      //       item.urlkeys = keys
-      //       item.urlparam = urlparam
-      //       if (config.flow_code) {
-      //         item.works_flow_code = config.flow_code
-      //       }
-      //     }
-      //     window.GLOB.CacheData.set('sql_' + item.uuid, item)
-      //   })
-      // }
+      if (window.backend && config.allSqls) {
+        let keys = Object.keys(urlparam)
+        config.allSqls.forEach(item => {
+          item.id = md5(window.GLOB.appkey + item.v_id)
+          if (item.type === 'datasource' || item.type === 'excelOut') {
+            item.urlkeys = keys
+            item.urlparam = urlparam
+            if (config.flow_code) {
+              item.works_flow_code = config.flow_code
+            }
+          }
+          window.GLOB.CacheData.set('sql_' + item.uuid, item)
+        })
+      }
 
       let userName = sessionStorage.getItem('User_Name') || ''
       let fullName = sessionStorage.getItem('Full_Name') || ''

--
Gitblit v1.8.0