Просмотр исходного кода

fix: 备忘录回车触发表达

lanjianrong 5 лет назад
Родитель
Сommit
445734b43c

+ 5 - 8
src/pages/Customer/Client/components/ClientDetail/AddRecord.jsx

@@ -1,13 +1,13 @@
 import React, { useRef, useState } from 'react'
-import { Form, Button, Input, Radio, DatePicker, Switch } from 'antd'
+import { Form, Button, Radio, DatePicker, Switch } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
 import { Plus } from '@icon-park/react'
 import dayjs from 'dayjs'
 import ModalDragForm from '@/components/Modal/src/components/ModalDragForm'
+import { ProFormTextArea } from '@ant-design/pro-form'
 
 const AddRecord = props => {
   const formRef = useRef(null)
-  const { TextArea } = Input
   const { onConfirm } = props
   const [showExtraItem, setShowExtraItem] = useState(false)
 
@@ -56,9 +56,8 @@ const AddRecord = props => {
       <Form.Item name="date" label="服务日期" initialValue={dayjs(new Date())}>
         <DatePicker style={{ width: '100%' }} disabledDate={disabledDate} />
       </Form.Item>
-      <Form.Item name="mark" label="内容">
-        <TextArea rows={3} />
-      </Form.Item>
+      <ProFormTextArea name="mark" label="内容" />
+
       <div className="pb-5">
         <Switch onChange={onChange} />
         <span className="ml-2">添加备忘录</span>
@@ -68,9 +67,7 @@ const AddRecord = props => {
           <Form.Item name="remindTime" label="备忘日期">
             <DatePicker style={{ width: '100%' }} disabledDate={disabledDate} />
           </Form.Item>
-          <Form.Item name="memoContent" label="备忘内容">
-            <TextArea rows={2} />
-          </Form.Item>
+          <ProFormTextArea name="memoContent" label="备忘内容" />
         </>
       ) : null}
     </ModalDragForm>

+ 2 - 2
src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect } from 'react'
 import { Form, Row, Col, Button } from 'antd'
 import LazyCascader from '@/components/LazyCascader'
-import { ProFormText, ProFormCheckbox } from '@ant-design/pro-form'
+import { ProFormText, ProFormCheckbox, ProFormTextArea } from '@ant-design/pro-form'
 import { Plus } from '@icon-park/react'
 import { connect } from 'dva'
 import { ChangeCompMap } from '../ChangeCompany'
@@ -92,7 +92,7 @@ const AddCompanyModal = ({ dataId, dataType, onConfirm, dispatch, natures }) =>
         <Col span={12}>
           <ProFormText name="webservice" label="网址" placeholder="" />
           <ProFormText name="landmarks" label="地标建筑" placeholder="" />
-          <ProFormText name="remarks" label="备注" placeholder="" />
+          <ProFormTextArea name="remarks" label="备注" placeholder="" />
         </Col>
       </Row>
     </ModalDragForm>

+ 2 - 3
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -10,6 +10,7 @@ import { apiSoftwareAddLonglelog } from '@/services/lock'
 import { useDispatch, connect } from 'umi'
 import { createUid } from '@/utils/utils'
 import DragIniter from '@/components/Modal/src/components/DragIniter'
+import { ProFormTextArea } from '@ant-design/pro-form'
 
 export const lockTypeEnum = {
   RECEIVE: 2,
@@ -281,9 +282,7 @@ const LockModal = props => {
 
         {type === lockTypeEnum.REMARK ? (
           <>
-            <Form.Item name="mark" label="备注">
-              <Input.TextArea />
-            </Form.Item>
+            <ProFormTextArea name="mark" label="备注" />
           </>
         ) : null}