From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/menu/datasource/verifycard/customscript/index.jsx | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index 9a9acce..efddfaf 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -9,13 +9,10 @@
class CustomForm extends Component {
static propTpyes = {
- type: PropTypes.string, // 鑿滃崟绫诲瀷
dict: PropTypes.object, // 瀛楀吀椤�
+ defaultsql: PropTypes.string, // 榛樿sql
setting: PropTypes.object, // 璁剧疆
searches: PropTypes.array, // 鎼滅储鏉′欢
- swhere: PropTypes.string, // where鏉′欢
- arr_field: PropTypes.string, // 鍒楀瓧娈�
- regoptions: PropTypes.array, // 姝ｅ垯鏇挎崲
systemScripts: PropTypes.array, // 绯荤粺鑴氭湰
scriptSubmit: PropTypes.func, // 鑴氭湰楠岃瘉鍚庢彁浜�
scriptsChange: PropTypes.func // 鑴氭湰楠岃瘉
@@ -35,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)) {
@@ -63,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)) {
@@ -178,6 +171,10 @@
`
}
+ if (value === 'defaultsql') {
+ value = this.props.defaultsql
+ }
+
_sql = _sql.replace(/\s{6}$/, '')
_sql = _sql + `/*${option.props.children}*/
`
@@ -219,7 +216,7 @@
</Col>
<Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, appkey, time_id{usefulFields ? ', ' + usefulFields : ''}
+ id, bid, loginuid, sessionuid, userid, username, fullname, RoleID, departmentcode, organization, 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%'}}>
@@ -227,8 +224,9 @@
<Select
showSearch
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
- onChange={this.selectScript}
+ onSelect={this.selectScript}
>
+ <Select.Option style={{whiteSpace: 'normal'}} key="default" value="defaultsql">榛樿sql</Select.Option>
{systemScripts.map((option, i) =>
<Select.Option style={{whiteSpace: 'normal'}} key={i} value={option.value}>{option.name}</Select.Option>
)}
--
Gitblit v1.8.0