From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28

---
 src/menu/datasource/verifycard/customscript/index.jsx |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index 24e92d2..27fb640 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -32,9 +32,7 @@
       if (!item.field) return
 
       if (item.type === 'group') {
-        if (item.transfer === 'true') {
-          _usefulFields.push(item.field)
-        }
+        _usefulFields.push(item.field)
         _usefulFields.push(item.datefield)
         _usefulFields.push(item.datefield + '1')
       } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
@@ -60,9 +58,7 @@
         if (!item.field) return
 
         if (item.type === 'group') {
-          if (item.transfer === 'true') {
-            _usefulFields.push(item.field)
-          }
+          _usefulFields.push(item.field)
           _usefulFields.push(item.datefield)
           _usefulFields.push(item.datefield + '1')
         } else if (['dateweek', 'datemonth', 'daterange'].includes(item.type)) {
@@ -220,7 +216,7 @@
           </Col>
           <Col span={24} className="sqlfield">
             <Form.Item label={'鍙敤瀛楁'}>
-              id, bid, loginuid, sessionuid, userid, username, fullname, login_city, appkey, time_id, orderBy, pageSize, pageIndex{usefulFields ? ', ' + usefulFields : ''}
+              id, bid, loginuid, sessionuid, userid, username, fullname, login_city, appkey, time_id, orderBy, pageSize, pageIndex{usefulFields ? ', ' + usefulFields : ''}{window.GLOB.urlFields && window.GLOB.urlFields.length > 0 ? ', ' + window.GLOB.urlFields.join(', ') : ''}
             </Form.Item>
           </Col>
           <Col span={10} style={{width: '43%'}}>

--
Gitblit v1.8.0