From c8dec113736cc78c47cd63377d756d364b42a94e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 四月 2025 16:39:15 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
index afb9c56..6dc26e9 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/columnform/index.jsx
@@ -45,10 +45,11 @@
values.limit = ''
}
- this.props.columnChange(values)
- this.props.form.setFieldsValue({
- Column: '',
- Text: ''
+ this.props.columnChange(values, () => {
+ this.props.form.setFieldsValue({
+ Column: '',
+ Text: ''
+ })
})
}
})
@@ -78,6 +79,10 @@
{
required: true,
message: '璇疯緭鍏ュ瓧娈�!'
+ },
+ {
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '鍙厑璁稿寘鍚暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯'
}
]
})(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
@@ -117,6 +122,8 @@
<Select.Option value="Decimal(18,2)"> Decimal(18,2) </Select.Option>
<Select.Option value="Decimal(18,4)"> Decimal(18,4) </Select.Option>
<Select.Option value="Decimal(18,6)"> Decimal(18,6) </Select.Option>
+ <Select.Option value="Decimal(18,8)"> Decimal(18,8) </Select.Option>
+ <Select.Option value="Decimal(18,10)"> Decimal(18,10) </Select.Option>
<Select.Option value="date"> date </Select.Option>
<Select.Option value="datetime"> datetime </Select.Option>
</Select>
@@ -135,7 +142,7 @@
)}
</Form.Item>
</Col>
- <Col span={6}>
+ <Col span={6} style={{clear: 'left'}}>
<Form.Item style={{marginBottom: 0}} label="瀵煎叆">
{getFieldDecorator('import', {
initialValue: 'true'
--
Gitblit v1.8.0