From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index a8733e8..3bba3de 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -521,7 +521,7 @@
})
}
- columnChange = (values) => {
+ columnChange = (values, callback) => {
let verify = JSON.parse(JSON.stringify(this.state.verify))
let fields = verify.columns.map(item => item.Column)
@@ -532,6 +532,8 @@
duration: 5
})
return
+ } else {
+ callback()
}
values.uuid = Utils.getuuid()
@@ -902,19 +904,6 @@
</Radio.Group>)}
</Form.Item>
</Col>
- {verify.excelHandle === 'true' ? <Col span={24} style={{paddingLeft: '30px'}}>
- <Form.Item wrapperCol={ {xs: { span: 24 }, sm: { span: 24 }} } label="">
- {getFieldDecorator('excel_func', {
- initialValue: verify.excel_func || '',
- rules: [
- {
- required: true,
- message: '璇峰～鍐欒嚜瀹氫箟閫昏緫!'
- }
- ]
- })(<CodeMirror mode="text/javascript" theme="cobalt" />)}
- </Form.Item>
- </Col> : null}
{verify.excelHandle !== 'true' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title="瀵煎叆鏃跺伐浣滆〃鍚嶄笌excel涓繀椤讳竴鑷达紝娉細宸ヤ綔琛ㄥ悕涓篠heet1涓攅xcel涓粎鏈変竴涓伐浣滆〃鏃朵笉杩涜琛ㄥ悕楠岃瘉銆�">
@@ -933,7 +922,7 @@
})(<Input placeholder="" autoComplete="off" />)}
</Form.Item>
</Col> : null}
- {verify.excelHandle !== 'true' ? <Col span={8}>
+ <Col span={8}>
<Form.Item label={
<Tooltip placement="bottomLeft" title="蹇界暐棣栬鏃讹紝浼氭牎楠宔xcel涓〃澶村悕绉颁笌excel鍒楄缃槸鍚︿竴鑷淬��">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -944,6 +933,19 @@
initialValue: verify.range || 0
})(<InputNumber min={0} max={100} precision={0} />)}
</Form.Item>
+ </Col>
+ {verify.excelHandle === 'true' ? <Col span={24} style={{paddingLeft: '30px'}}>
+ <Form.Item wrapperCol={ {xs: { span: 24 }, sm: { span: 24 }} } label="">
+ {getFieldDecorator('excel_func', {
+ initialValue: verify.excel_func || '',
+ rules: [
+ {
+ required: true,
+ message: '璇峰～鍐欒嚜瀹氫箟閫昏緫!'
+ }
+ ]
+ })(<CodeMirror mode="text/javascript" theme="cobalt" />)}
+ </Form.Item>
</Col> : null}
</Row>
</Form>
--
Gitblit v1.8.0