From c7aece35a62b6e91fd98a625bf0e53f64bfbd18d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 17 八月 2023 16:22:15 +0800
Subject: [PATCH] 2023-08-17
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx | 262 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 192 insertions(+), 70 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
index 6fe2b7c..99a32d2 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/index.jsx
@@ -4,6 +4,7 @@
import { Form, Tabs, Row, Col, Button, notification, Modal, message, InputNumber, Radio, Spin, Typography, Popconfirm } from 'antd'
import { EditOutlined, StopOutlined, CheckCircleOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
+import md5 from 'md5'
import Api from '@/api'
import Utils from '@/utils/utils.js'
@@ -28,6 +29,7 @@
state = {
verify: {},
+ debugId: '',
activeKey: 'setting',
defaultscript: '', // 鑷畾涔夎剼鏈�
excelColumns: [
@@ -37,7 +39,7 @@
inputType: 'input',
editable: true,
unique: true,
- width: '17%'
+ width: '16%'
},
{
title: '鍚嶇О',
@@ -45,7 +47,7 @@
inputType: 'input',
editable: true,
unique: true,
- width: '17%'
+ width: '16%'
},
{
title: '鍒楀',
@@ -54,7 +56,7 @@
min: 5,
max: 200,
editable: true,
- width: '12%',
+ width: '10%',
render: (text) => text || 20
},
{
@@ -63,7 +65,7 @@
inputType: 'select',
editable: true,
required: false,
- width: '14%',
+ width: '12%',
render: (text) => {
if (text === 'image') {
return '鍥剧墖'
@@ -85,7 +87,7 @@
inputType: 'radio',
editable: true,
required: false,
- width: '14%',
+ width: '12%',
render: (text) => {
if (text === 'true') {
return '鏄�'
@@ -114,7 +116,7 @@
inputType: 'radio',
editable: true,
required: false,
- width: '14%',
+ width: '12%',
render: (text) => {
if (text !== 'false') {
return '鏄�'
@@ -126,7 +128,19 @@
{value: 'true', text: '鏄�'},
{value: 'false', text: '鍚�'}
]
- }
+ },
+ {
+ title: '绾㈣壊鏍囬',
+ dataIndex: 'required',
+ width: '10%',
+ editable: true,
+ inputType: 'radio',
+ render: (text, record) => record.required === 'true' ? <span style={{color: 'red'}}>鏄�</span> : '鍚�',
+ options: [
+ {value: 'true', text: '鏄�'},
+ {value: 'false', text: '鍚�'}
+ ]
+ },
],
scriptsColumns: [
{
@@ -146,20 +160,20 @@
)
}
},
- {
- title: '鎵ц浣嶇疆',
- dataIndex: 'position',
- width: '10%',
- render: (text, record) => {
- if (record.position === 'init') {
- return <span style={{color: 'orange'}}>鍒濆鍖�</span>
- } else if (record.position === 'front') {
- return <span style={{color: '#26C281'}}>sql鍓�</span>
- } else {
- return <span style={{color: '#1890ff'}}>sql鍚�</span>
- }
- }
- },
+ // {
+ // title: '鎵ц浣嶇疆',
+ // dataIndex: 'position',
+ // width: '10%',
+ // render: (text, record) => {
+ // if (record.position === 'init') {
+ // return <span style={{color: 'orange'}}>鍒濆鍖�</span>
+ // } else if (record.position === 'front') {
+ // return <span style={{color: '#26C281'}}>sql鍓�</span>
+ // } else {
+ // return <span style={{color: '#1890ff'}}>sql鍚�</span>
+ // }
+ // }
+ // },
{
title: '鐘舵��',
dataIndex: 'status',
@@ -215,13 +229,21 @@
if (card.intertype !== 'system') {
_verify.enable = 'false'
}
- if (_verify.columns[0] && (!_verify.columns[0].type || !_verify.columns[0].output)) {
- _verify.columns = _verify.columns.map(col => {
- col.type = col.type || 'text'
- col.output = col.output || 'true'
- return col
- })
- }
+ _verify.columns = _verify.columns.map(col => {
+ col.type = col.type || 'text'
+ col.output = col.output || 'true'
+ col.required = col.required || 'false'
+
+ if (!['text', 'image', 'number'].includes(col.type)) {
+ if (/^Decimal/ig.test(col.type)) {
+ col.type = 'number'
+ } else {
+ col.type = 'text'
+ }
+ }
+
+ return col
+ })
let defaultscript = ''
if (!_verify.script && card.intertype === 'system') {
@@ -459,6 +481,7 @@
values.uuid = Utils.getuuid()
values.abs = 'false'
values.output = 'true'
+ values.required = 'false'
verify.columns.push(values)
this.setState({
@@ -564,6 +587,17 @@
} else if (activeKey === 'setting') {
this.settingForm.handleConfirm().then(res => {
let _verify = {...verify, ...res}
+
+ if (res.dataType !== 'custom') {
+ delete _verify.tableName
+ delete _verify.dataresource
+ delete _verify.queryType
+ delete _verify.defaultSql
+ delete _verify.order
+
+ _verify.scripts = []
+ }
+
this.setState({
verify: _verify
}, () => {
@@ -670,6 +704,13 @@
duration: 5
})
return
+ } else if (/,,/ig.test(values.sql)) {
+ notification.warning({
+ top: 92,
+ message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇杩炵画鐨勮嫳鏂囬�楀彿锛�,,锛�',
+ duration: 5
+ })
+ return
}
let error = Utils.verifySql(values.sql, 'customscript')
@@ -690,7 +731,7 @@
}
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`)
+ param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id|datam)@/ig, `'${param.timestamp}'`)
param.LText = param.LText.replace(/\n/g, ' ')
param.LText = Utils.formatOptions(param.LText)
@@ -751,6 +792,7 @@
Width: 20,
abs: 'false',
output: 'true',
+ required: 'false',
type: 'text',
uuid: Utils.getuuid()
}
@@ -762,6 +804,31 @@
columns.push(cell)
})
+
+ if (config.subtype === 'dualdatacard') {
+ config.subColumns.forEach(item => {
+ if (fields.includes(item.field) || !item.field) return
+ fields.push(item.field)
+
+ let cell = {
+ Column: item.field,
+ Text: item.label,
+ Width: 20,
+ abs: 'false',
+ output: 'true',
+ required: 'false',
+ type: 'text',
+ uuid: Utils.getuuid()
+ }
+
+ if (item.type === 'number') {
+ cell.type = 'number'
+ cell.decimal = item.decimal
+ }
+
+ columns.push(cell)
+ })
+ }
this.setState({
verify: {...verify, columns: columns}
@@ -789,21 +856,37 @@
changeColumns = (columns) => {
const { verify } = this.state
- if (columns[0] && !['image', 'text', 'number'].includes(columns[0].type)) {
- columns = columns.map(col => {
- let _cell = {
- uuid: Utils.getuuid(),
- Column: col.Column,
- Text: col.Text,
- Width: 20,
- abs: 'false',
- output: col.output || 'true',
- type: 'text',
- }
+ columns = columns.map(col => {
+ col.type = col.type || 'text'
+ col.output = col.output || 'true'
+ col.required = col.required || 'false'
- return _cell
- })
- }
+ if (!['text', 'image', 'number'].includes(col.type)) {
+ if (/^Decimal/ig.test(col.type)) {
+ col.type = 'number'
+ } else {
+ col.type = 'text'
+ }
+ }
+
+ return col
+ })
+ // if (columns[0] && !['image', 'text', 'number'].includes(columns[0].type)) {
+ // columns = columns.map(col => {
+ // let _cell = {
+ // uuid: Utils.getuuid(),
+ // Column: col.Column,
+ // Text: col.Text,
+ // Width: 20,
+ // abs: 'false',
+ // output: col.output || 'true',
+ // required: col.required || 'false',
+ // type: 'text',
+ // }
+
+ // return _cell
+ // })
+ // }
this.setState({verify: {...verify, columns}})
}
@@ -892,7 +975,7 @@
}
}
- scriptsChange = (values, callback) => {
+ scriptsChange = (values, callback, skip) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
if (values.uuid) {
@@ -908,24 +991,31 @@
verify.scripts.push(values)
}
- this.setState({loading: true})
-
- this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ if (skip) {
this.setState({
- loading: false,
verify: verify
})
callback(true)
- }, () => { // 楠岃瘉澶辫触
- this.setState({
- loading: false
- })
- callback(false)
- }, verify.scripts)
+ } else {
+ this.setState({loading: true})
+
+ this.sqlverify(() => { // 楠岃瘉鎴愬姛
+ this.setState({
+ loading: false,
+ verify: verify
+ })
+ callback(true)
+ }, () => { // 楠岃瘉澶辫触
+ this.setState({
+ loading: false
+ })
+ callback(false)
+ }, verify.scripts)
+ }
}
sqlverify = (_resolve, _reject, scripts) => {
- const { searches, verify } = this.state
+ const { searches, verify, debugId } = this.state
if (verify.dataType !== 'custom') {
_resolve()
@@ -933,7 +1023,15 @@
}
let timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils, timestamp)
+ let sql = SettingUtils.getDebugSql(verify, scripts, (verify.useSearch === 'true' ? searches : []), Utils, '2023-04-20 15:29:37')
+
+ let _debugId = md5(sql)
+
+ if (debugId === _debugId) {
+ _resolve()
+ return
+ }
+
let param = {
func: 's_debug_sql',
exec_type: 'y',
@@ -945,6 +1043,7 @@
Api.genericInterface(param).then(result => {
if (result.status) {
+ this.setState({debugId: _debugId})
_resolve()
} else {
_reject()
@@ -956,7 +1055,22 @@
}
updateDataType = (val) => {
- this.setState({verify: {...this.state.verify, dataType: val}})
+ const { config } = this.props
+
+ let verify = {...this.state.verify, dataType: val}
+ if (val === 'custom' && config.setting) {
+ verify.tableName = verify.tableName || config.setting.tableName || ''
+ verify.dataresource = verify.dataresource || config.setting.dataresource || ''
+ verify.queryType = verify.queryType || config.setting.queryType || ''
+ verify.defaultSql = verify.defaultSql || config.setting.execute || ''
+ verify.order = verify.order || config.setting.order || ''
+
+ if (verify.scripts.length === 0 && config.scripts && config.scripts.length > 0) {
+ verify.scripts = fromJS(config.scripts).toJS()
+ }
+ }
+
+ this.setState({verify: verify})
}
render() {
@@ -995,7 +1109,7 @@
<Button className="excel-col-add mk-red" title="娓呯┖Excel鍒�" onClick={this.clearField}>
娓呯┖Excel鍒�
</Button>
- <div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index锛涙暟鍊肩被鍨嬪鍑烘椂鍙繘琛屾暟鎹鐞嗭紙鍙栫粷瀵瑰�笺�佷繚鐣欏皬鏁颁綅锛夈��</div>
+ <div style={{color: '#959595', fontSize: '13px', paddingLeft: '10px'}}>濡傞渶瀵煎嚭搴忓彿锛岃浣跨敤瀛楁 $Index锛涙暟鍊肩被鍨嬪鍑烘椂鍙繘琛屾暟鎹鐞嗭紙鍙栫粷瀵瑰�笺�佷繚鐣欏皬鏁颁綅锛夛紱绾㈣壊鏍囬瀵煎嚭鏃跺垪澶存枃瀛椾负绾㈣壊銆�</div>
<EditTable actions={['edit', 'move', 'copy', 'del']} type="excelcolumn" wrappedComponentRef={(inst) => this.columnRef = inst} data={verify.columns} columns={excelColumns} onChange={this.changeColumns}/>
</TabPane>
{card.intertype === 'system' ? <TabPane tab={
@@ -1050,7 +1164,7 @@
<Form {...formItemLayout}>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> S </span>
<Button onClick={() => {this.showError('S')}} type="primary" size="small">
鏌ョ湅
@@ -1058,14 +1172,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.stime || 2} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'stime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> Y </span>
<Button onClick={() => {this.showError('Y')}} type="primary" size="small">
鏌ョ湅
@@ -1075,7 +1189,15 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -1 </span>
+ 鎵ц鎴愬姛鏃犳彁绀恒��
+ </Form.Item>
+ </Col>
+ </Row>
+ <Row gutter={24}>
+ <Col offset={6} span={6}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> N </span>
<Button onClick={() => {this.showError('N')}} type="primary" size="small">
鏌ョ湅
@@ -1083,14 +1205,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> F </span>
<Button onClick={() => {this.showError('F')}} type="primary" size="small">
鏌ョ湅
@@ -1098,14 +1220,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> E </span>
<Button onClick={() => {this.showError('E')}} type="primary" size="small">
鏌ョ湅
@@ -1115,7 +1237,7 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> NM </span>
<Button onClick={() => {this.showError('NM')}} type="primary" size="small">
鏌ョ湅
@@ -1125,9 +1247,9 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
- <span className="errorval"> -1 </span>
- 涓嶆彁绀�
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -2 </span>
+ 鎵ц澶辫触鏃犳彁绀�
</Form.Item>
</Col>
</Row>
--
Gitblit v1.8.0