From d49124329b0119ba0ce7c69afbe2b864209e2495 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 11:58:11 +0800
Subject: [PATCH] 2023-10-25

---
 src/menu/components/share/markcomponent/markform/index.jsx |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/menu/components/share/markcomponent/markform/index.jsx b/src/menu/components/share/markcomponent/markform/index.jsx
index c027d4b..0fb88dc 100644
--- a/src/menu/components/share/markcomponent/markform/index.jsx
+++ b/src/menu/components/share/markcomponent/markform/index.jsx
@@ -1,13 +1,14 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
-import { Form, Row, Col, Select, Button, Input, Icon, Cascader, Tooltip } from 'antd'
+import { Form, Row, Col, Select, Button, Input, Cascader, Tooltip } from 'antd'
+import { QuestionCircleOutlined } from '@ant-design/icons'
 
 import ColorSketch from '@/mob/colorsketch'
 import './index.scss'
 
 class UniqueForm extends Component {
   static propTpyes = {
-    dict: PropTypes.object,         // 瀛楀吀椤�
+    field: PropTypes.any,
     columns: PropTypes.array,       // 鍒楀悕闆嗗悎
     signs: PropTypes.array,         // 鏍囪绫诲瀷
     markChange: PropTypes.func      // 淇敼鍑芥暟
@@ -17,13 +18,16 @@
     // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
+        if (values.contrastValue) {
+          values.contrastValue = values.contrastValue.replace(/\t+|\v+|\s+/g, '')
+        }
         this.props.markChange(values)
       }
     })
   }
 
   render() {
-    const { columns, signs } = this.props
+    const { columns, signs, field } = this.props
     const { getFieldDecorator } = this.props.form
     const formItemLayout = {
       labelCol: {
@@ -36,21 +40,35 @@
       }
     }
 
+    let initVal = []
+    if (field) {
+      initVal = [field, 'static']
+    }
+
     return (
       <Form {...formItemLayout} className="normal-table-mark-form">
         <Row gutter={24}>
           <Col span={6}>
             <Form.Item label={'瀵规瘮瀛楁'}>
               {getFieldDecorator('field', {
-                initialValue: [],
+                initialValue: initVal,
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.select'] + '瀵规瘮瀛楁!'
+                    message: '璇烽�夋嫨瀵规瘮瀛楁!'
+                  },
+                  {
+                    validator: (rule, value, callback) => {
+                      if (value[1] === 'dynamic' && value[0] === value[2]) {
+                        callback('瀵规瘮瀛楁涓嶅彲鐩稿悓锛�')
+                      } else {
+                        callback()
+                      }
+                    }
                   }
                 ]
               })(
-                <Cascader options={columns} placeholder=""/>
+                <Cascader className="mark-type" options={columns} placeholder=""/>
               )}
             </Form.Item>
           </Col>
@@ -61,7 +79,7 @@
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.select'] + '瀵规瘮鏂瑰紡!'
+                    message: '璇烽�夋嫨瀵规瘮鏂瑰紡!'
                   }
                 ]
               })(
@@ -77,7 +95,7 @@
           </Col>
           <Col span={6}>
             <Form.Item label={<Tooltip placement="topLeft" title="瀵规瘮闈欐�佸�兼椂锛岄渶瑕佸～鍐欏姣斿�硷紝榛樿涓虹┖銆�">
-                <Icon type="question-circle" />
+              <QuestionCircleOutlined className="mk-form-tip" />
                 {'瀵规瘮鍊�'}
               </Tooltip>
             }>
@@ -93,7 +111,7 @@
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.select'] + '棰滆壊!'
+                    message: '璇烽�夋嫨棰滆壊!'
                   }
                 ]
               })(
@@ -108,11 +126,11 @@
                 rules: [
                   {
                     required: true,
-                    message: this.props.dict['form.required.select'] + '鏍囪鏂瑰紡!'
+                    message: '璇烽�夋嫨鏍囪鏂瑰紡!'
                   }
                 ]
               })(
-                <Cascader options={signs} placeholder=""/>
+                <Cascader popupClassName="mark-type" options={signs} placeholder=""/>
               )}
             </Form.Item>
           </Col> : null}

--
Gitblit v1.8.0