From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09

---
 src/templates/sharecomponent/columncomponent/colspanform/index.jsx |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
index 2729c01..0c9be7e 100644
--- a/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
+++ b/src/templates/sharecomponent/columncomponent/colspanform/index.jsx
@@ -1,9 +1,11 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Input, InputNumber, Select, Radio, Tooltip, Icon } from 'antd'
+import { Form, Row, Col, Input, InputNumber, Select, Radio, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
+
 import { formRule } from '@/utils/option.js'
 import TransferForm from '@/templates/zshare/transferform'
-import './index.scss'
+// import './index.scss'
 
 class MainSearch extends Component {
   static propTpyes = {
@@ -75,7 +77,7 @@
       }
     }
     return (
-      <Form {...formItemLayout} className="commontable-cospan-column-form" id="columncolspan">
+      <Form {...formItemLayout} style={{minHeight: '190px'}} id="columncolspan">
         <Row gutter={24}>
           <Col span={12}>
             <Form.Item label={this.props.dict['model.name']}>
@@ -144,7 +146,7 @@
           <Col span={12}>
             <Form.Item label={
               <Tooltip placement="topLeft" title="閫夋嫨鏄剧ず鍒嗙粍锛岃〃鏍间細灞曞紑娣诲姞鍒嗙粍鐨勫瓙鍒楋紝姝ゆ椂鎺掑垪鏂瑰紡浼氬け鏁堛��">
-                <Icon type="question-circle" />
+                <QuestionCircleOutlined className="mk-form-tip" />
                 鏄剧ず鍒嗙粍
               </Tooltip>
             }>
@@ -177,22 +179,22 @@
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item label={this.props.dict['header.form.order']}>
+            <Form.Item label="鎺掑垪">
               {getFieldDecorator('order', {
                 initialValue: card.order,
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.select'] + this.props.dict['header.form.order'] + '!'
+                    message: this.props.dict['form.required.select'] + '鎺掑垪!'
                   }
                 ]
               })(
                 <Select getPopupContainer={() => document.getElementById('columncolspan')} >
-                  <Select.Option value="vertical">{this.props.dict['header.form.vertical']}</Select.Option>
-                  <Select.Option value="horizontal">{this.props.dict['header.form.horizontal']}</Select.Option>
-                  <Select.Option value="vertical2">{this.props.dict['header.form.vertical2']}</Select.Option>
-                  <Select.Option value="topPicBottomText">{this.props.dict['header.form.topPicBottomText']}</Select.Option>
-                  <Select.Option value="leftPicRightText">{this.props.dict['header.form.leftPicRightText']}</Select.Option>
+                  <Select.Option value="vertical">绾靛悜</Select.Option>
+                  <Select.Option value="horizontal">妯悜</Select.Option>
+                  <Select.Option value="vertical2">绾靛悜(2鍒�)</Select.Option>
+                  <Select.Option value="topPicBottomText">涓婂浘涓嬫枃</Select.Option>
+                  <Select.Option value="leftPicRightText">宸﹀浘鍙虫枃</Select.Option>
                 </Select>
               )}
             </Form.Item>

--
Gitblit v1.8.0