From 4b467effbc0e3a9199146573c0ceedf404bd07c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 九月 2023 17:16:01 +0800
Subject: [PATCH] 2023-09-07
---
src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx | 96 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
index c4df36d..6d1b718 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/datasource/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, Radio, Tooltip, notification } from 'antd'
+import { Form, Row, Col, Input, Radio, Tooltip, notification, InputNumber } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import Utils from '@/utils/utils.js'
@@ -76,6 +76,14 @@
})
reject()
return
+ } else if (/,,/ig.test(values.dataresource)) {
+ notification.warning({
+ top: 92,
+ message: '鏁版嵁婧愪腑锛屼笉鍙嚭鐜拌繛缁殑鑻辨枃閫楀彿锛�,,锛�',
+ duration: 5
+ })
+ reject()
+ return
}
let error = Utils.verifySql(values.dataresource)
@@ -100,8 +108,18 @@
}
updateDataType = (e) => {
- this.setState({dataType: e.target.value})
this.props.updateDataType(e.target.value)
+
+ if (e.target.value === 'custom') {
+ setTimeout(() => {
+ this.setState({
+ dataType: e.target.value,
+ defaultSql: this.props.setting.defaultSql || 'true'
+ })
+ }, 10)
+ } else {
+ this.setState({dataType: e.target.value})
+ }
}
render() {
@@ -198,15 +216,25 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
- {dataType === 'custom' && defaultSql === 'true' ? <Col className="short-label" span={8}>
- <Form.Item label="涓婚敭">
+ {btnType !== 'print' && dataType === 'custom' && defaultSql === 'true' ? <Col className="short-label" span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="鍙嚜瀹氫箟涓婚敭锛岀┖鏃堕粯璁や负鏁版嵁婧愪富閿�傛敞锛氶�夎瀵煎嚭鏃朵娇鐢ㄣ��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 涓婚敭
+ </Tooltip>
+ }>
{getFieldDecorator('primaryKey', {
- initialValue: setting.primaryKey || 'ID',
+ initialValue: setting.primaryKey || '',
})(<Input placeholder={''} autoComplete="off" />)}
</Form.Item>
</Col> : null}
{dataType === 'custom' && defaultSql === 'true' ? <Col className="short-label" span={8}>
- <Form.Item label="鎺掑簭鏂瑰紡">
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="濡傛灉鍦ㄨ嚜瀹氫箟鑴氭湰涓娇鐢ㄤ簡@pageSize@鎴朄orderBy@锛岃鍦ㄦ暟鎹簮涓崟鐙啓鎺掑簭璇彞銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鎺掑簭鏂瑰紡
+ </Tooltip>
+ }>
{getFieldDecorator('order', {
initialValue: setting.order || '',
rules: [
@@ -234,6 +262,62 @@
</Radio.Group>)}
</Form.Item>
</Col> : null}
+ {btnType !== 'print' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="瀵煎嚭excel涓伐浣滆〃鍚嶇О锛岄粯璁や负Sheet1銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 宸ヤ綔琛�
+ </Tooltip>
+ }>
+ {getFieldDecorator('sheet', {
+ initialValue: setting.sheet || ''
+ })(<Input placeholder="" autoComplete="off" />)}
+ </Form.Item>
+ </Col> : null}
+ {btnType !== 'print' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="瀵煎嚭excel涓殑琛岄珮銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 琛岄珮
+ </Tooltip>
+ }>
+ {getFieldDecorator('rowHeight', {
+ initialValue: setting.rowHeight || ''
+ })(<InputNumber min={10} max={200} precision={0} />)}
+ </Form.Item>
+ </Col> : null}
+ {btnType !== 'print' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="璇峰皢闇�瑕佸悎骞剁殑琛ㄥご浣跨敤涓í绾垮垎闅旓紙濡傦細鍟嗗搧-鏁伴噺銆佸晢鍝�-鍗曚环锛夛紝鍓嶉儴鍒嗗皢浣滀负涓昏〃澶达紝鍚庨儴鍒嗗皢浣滀负瀛愯〃澶淬��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 琛ㄥご鍚堝苟
+ </Tooltip>
+ }>
+ {getFieldDecorator('merge', {
+ initialValue: setting.merge || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="false">鍚�</Radio>
+ <Radio value="true">鏄�</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col> : null}
+ {btnType !== 'print' ? <Col span={8}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="Excel鍐呭鍖烘槸鍚﹁嚜鍔ㄦ崲琛屻��">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 鑷姩鎹㈣
+ </Tooltip>
+ }>
+ {getFieldDecorator('wrapText', {
+ initialValue: setting.wrapText || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="false">鍚�</Radio>
+ <Radio value="true">鏄�</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col> : null}
</Row>
</Form>
</div>
--
Gitblit v1.8.0