From 010fdcf8abd58bde5c1106db8ed8448effc75b4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 25 二月 2025 16:37:46 +0800
Subject: [PATCH] 2025-02-25

---
 src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
index d050d57..24e658c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
@@ -1,11 +1,10 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { Form, Row, Col, Button, Input, InputNumber, Radio } from 'antd'
-import './index.scss'
+// import './index.scss'
 
 class ExcelOutColumn extends Component {
   static propTpyes = {
-    dict: PropTypes.object,         // 瀛楀吀椤�
     columnChange: PropTypes.func    // 淇敼鍑芥暟
   }
 
@@ -13,18 +12,18 @@
     // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        this.props.columnChange(values)
-        this.props.form.setFieldsValue({
-          Column: '',
-          Text: '',
-          Width: 20
+        this.props.columnChange(values, () => {
+          this.props.form.setFieldsValue({
+            Column: '',
+            Text: '',
+            Width: 20
+          })
         })
       }
     })
   }
 
   render() {
-    const { dict } = this.props
     const { getFieldDecorator } = this.props.form
     const formItemLayout = {
       labelCol: {
@@ -41,57 +40,62 @@
       <Form {...formItemLayout} className="verify-form">
         <Row gutter={24}>
           <Col span={5}>
-            <Form.Item label={dict['model.form.field']}>
+            <Form.Item label="瀛楁">
               {getFieldDecorator('Column', {
                 initialValue: '',
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.input'] + dict['model.form.field'] + '!'
+                    message: '璇疯緭鍏ュ瓧娈�!'
+                  },
+                  {
+                    pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+                    message: '鍙厑璁稿寘鍚暟瀛椼�佸瓧姣嶃�佹眽瀛椾互鍙奯'
                   }
                 ]
-              })(<Input placeholder="" autoComplete="off" />)}
+              })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
             </Form.Item>
           </Col>
           <Col span={5}>
-            <Form.Item label={dict['model.name']}>
+            <Form.Item label="鍚嶇О">
               {getFieldDecorator('Text', {
                 initialValue: '',
                 rules: [
                   {
                     required: true,
-                    message: dict['form.required.input'] + dict['model.name'] + '!'
+                    message: '璇疯緭鍏ュ悕绉�!'
                   }
                 ]
-              })(<Input placeholder="" autoComplete="off" />)}
+              })(<Input placeholder="" autoComplete="off" onPressEnter={this.handleConfirm}/>)}
             </Form.Item>
           </Col>
           <Col span={5}>
-            <Form.Item label={dict['model.form.columnWidth']}>
+            <Form.Item label="鍒楀">
               {getFieldDecorator('Width', {
                 initialValue: 20,
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.input'] + dict['model.form.columnWidth'] + '!'
+                    message: '璇疯緭鍏ュ垪瀹�!'
                   }
                 ]
-              })(<InputNumber min={5} max={200} precision={0} />)}
+              })(<InputNumber min={5} max={200} precision={0} onPressEnter={this.handleConfirm}/>)}
             </Form.Item>
           </Col>
-          <Col span={5}>
+          <Col span={6}>
             <Form.Item label="绫诲瀷">
               {getFieldDecorator('type', {
                 initialValue: 'text'
               })(
-                <Radio.Group>
+                <Radio.Group style={{whiteSpace: 'nowrap'}}>
                   <Radio value="text">鏂囨湰</Radio>
+                  <Radio value="number">鏁板��</Radio>
                   <Radio value="image">鍥剧墖</Radio>
                 </Radio.Group>
               )}
             </Form.Item>
           </Col>
-          <Col span={4} className="add">
+          <Col span={3} className="add">
             <Button onClick={this.handleConfirm} type="primary" className="mk-green">
               娣诲姞
             </Button>

--
Gitblit v1.8.0