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/templates/zshare/customscript/index.jsx | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index a69270f..e2db585 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -19,6 +19,7 @@
setting: PropTypes.object, // 璁剧疆
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
searches: PropTypes.array, // 鎼滅储鏉′欢
+ urlFields: PropTypes.any, // url鍙橀噺
defaultSql: PropTypes.string, // 榛樿sql
scriptsChange: PropTypes.func, // 鑷畾涔夎剼鏈垏鎹㈡椂楠岃瘉
scriptsUpdate: PropTypes.func // 琛ㄥ崟
@@ -87,15 +88,13 @@
}
UNSAFE_componentWillMount() {
- const { searches, scripts } = this.props
+ const { searches, scripts, urlFields } = this.props
let _usefulFields = []
searches.forEach(item => {
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)) {
@@ -108,6 +107,10 @@
}
})
+ if (urlFields) {
+ _usefulFields.push(...urlFields)
+ }
+
this.setState({
usefulFields: _usefulFields.join(', '),
scripts: fromJS(scripts).toJS()
--
Gitblit v1.8.0