From d1657e9835a6b3350dee76956deae3029cfe4b11 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 四月 2021 15:54:06 +0800
Subject: [PATCH] 2021-04-20
---
src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index 1096b9c..a310f50 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -20,6 +20,7 @@
setting: PropTypes.object, // 璁剧疆
scripts: PropTypes.array, // 鑷畾涔夎剼鏈垪琛�
searches: PropTypes.array, // 鎼滅储鏉′欢
+ urlFields: PropTypes.any, // url鍙橀噺
regoptions: PropTypes.any, // 姝ｅ垯鏇挎崲
scriptsChange: PropTypes.func, // 鑷畾涔夎剼鏈垏鎹㈡椂楠岃瘉
scriptsUpdate: PropTypes.func // 琛ㄥ崟
@@ -100,7 +101,7 @@
}
UNSAFE_componentWillMount() {
- const { searches, scripts } = this.props
+ const { searches, scripts, urlFields } = this.props
let _usefulFields = []
let scriptsColumns = fromJS(this.state.scriptsColumns).toJS()
@@ -123,6 +124,11 @@
_usefulFields.push(item.field)
}
})
+
+ if (urlFields) {
+ _usefulFields.push(...urlFields)
+ }
+
_usefulFields = _usefulFields.join(', ')
scriptsColumns = scriptsColumns.filter(item => {
if (item.dataIndex === 'sql') {
--
Gitblit v1.8.0