From 09022377f8c902469793e59f502903b48e1cb605 Mon Sep 17 00:00:00 2001
From: JINGYJ <1458671527@qq.com>
Date: Mon, 18 Dec 2023 17:58:52 +0800
Subject: [PATCH] =?UTF-8?q?feact:=20=E8=81=94=E7=B3=BB=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=BB=BA=E5=BC=B9=E6=A1=86=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/zh-CN/contact.ts                  |  7 +-
 .../ContactList/components/CreateForm.tsx     | 59 +++++++++++++++--
 .../ContactList/components/UpdateForm.tsx     | 65 ++++++++++++-------
 src/pages/Contact/ContactList/index.tsx       |  2 +-
 4 files changed, 97 insertions(+), 36 deletions(-)

diff --git a/src/locales/zh-CN/contact.ts b/src/locales/zh-CN/contact.ts
index 6496572..758fc9b 100644
--- a/src/locales/zh-CN/contact.ts
+++ b/src/locales/zh-CN/contact.ts
@@ -8,9 +8,10 @@ export const contact_list: { [key: string]: string } = {
     'contact.contact.table.list.remark': '备注',
     'contact.contact.table.list.createTime': '创建时间',
     'contact.contact.table.list.updateTime': '更新时间',
-    'contact.contact.table.rule.required.name': '项目名称为必填项',
+    'contact.contact.table.rule.required.name': '姓名为必填项',
     'contact.contact.table.rule.required.code': '项目代码为必填项',
     'contact.contact.table.rule.required.info': '项目简介为必填项',
-    'contact.contact.table.list.add': '新建项目',
-    'contact.contact.table.list.update': '更新项目',
+    'contact.contact.table.list.add': '新建联系人',
+    'contact.contact.table.list.update': '编辑联系人',
+    'contact.contact.table.list.editor': '编辑',
 };
\ No newline at end of file
diff --git a/src/pages/Contact/ContactList/components/CreateForm.tsx b/src/pages/Contact/ContactList/components/CreateForm.tsx
index abf8d84..f668bdf 100644
--- a/src/pages/Contact/ContactList/components/CreateForm.tsx
+++ b/src/pages/Contact/ContactList/components/CreateForm.tsx
@@ -30,7 +30,7 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
     <ModalForm<API.DeviceCategory>
       width={proFormSmallModelWidth}
       title={intl.formatMessage({
-        id: 'device.device_category.table.list.add',
+        id: 'contact.contact.table.list.add',
         defaultMessage: '$$$',
       })}
       open={props.createModalOpen}
@@ -59,13 +59,13 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
           width={proFormSmallItemStyleProps.width}
           name="name"
           label={
-            <FormattedMessage id="device.device_category.table.list.name" defaultMessage="$$$" />
+            <FormattedMessage id="contact.contact.table.list.name" defaultMessage="$$$" />
           }
           placeholder={`${intl.formatMessage({
             id: 'common.please_input',
             defaultMessage: '$$$',
           })}${intl.formatMessage({
-            id: 'device.device_category.table.list.name',
+            id: 'contact.contact.table.list.name',
             defaultMessage: '$$$',
           })}`}
           required={true}
@@ -74,14 +74,14 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
               required: true,
               message: (
                 <FormattedMessage
-                  id="device.device_category.table.rule.required.name"
+                  id="contact.contact.table.rule.required.name"
                   defaultMessage="name is required"
                 />
               ),
             },
           ]}
         />
-        <ProFormText
+        {/* <ProFormText
           width="lg"
           name="code"
           label={
@@ -120,18 +120,63 @@ const CreateForm: React.FC<CreateFormProps> = (props) => {
               onChange={setIsAuto}
             />
           }
+        /> */}
+        <ProFormText
+          width={proFormSmallItemStyleProps.width}
+          name="phone"
+          label={
+            <FormattedMessage id="contact.contact.table.list.phone" defaultMessage="$$$" />
+          }
+          placeholder={`${intl.formatMessage({
+            id: 'common.please_input',
+            defaultMessage: '$$$',
+          })}${intl.formatMessage({
+            id: 'contact.contact.table.list.phone',
+            defaultMessage: '$$$',
+          })}`}
+          required={true}
+        />
+        <ProFormText
+          width={proFormSmallItemStyleProps.width}
+          name="mail"
+          label={
+            <FormattedMessage id="contact.contact.table.list.mail" defaultMessage="$$$" />
+          }
+          placeholder={`${intl.formatMessage({
+            id: 'common.please_input',
+            defaultMessage: '$$$',
+          })}${intl.formatMessage({
+            id: 'contact.contact.table.list.mail',
+            defaultMessage: '$$$',
+          })}`}
+          required={true}
+        />
+        <ProFormText
+          width={proFormSmallItemStyleProps.width}
+          name="WeChatID"
+          label={
+            <FormattedMessage id="contact.contact.table.list.WeChatID" defaultMessage="$$$" />
+          }
+          placeholder={`${intl.formatMessage({
+            id: 'common.please_input',
+            defaultMessage: '$$$',
+          })}${intl.formatMessage({
+            id: 'contact.contact.table.list.WeChatID',
+            defaultMessage: '$$$',
+          })}`}
+          required={false}
         />
         <ProFormText
           width={proFormSmallItemStyleProps.width}
           name="remark"
           label={
-            <FormattedMessage id="device.device_category.table.list.remark" defaultMessage="$$$" />
+            <FormattedMessage id="contact.contact.table.list.remark" defaultMessage="$$$" />
           }
           placeholder={`${intl.formatMessage({
             id: 'common.please_input',
             defaultMessage: '$$$',
           })}${intl.formatMessage({
-            id: 'device.device_category.table.list.remark',
+            id: 'contact.contact.table.list.remark',
             defaultMessage: '$$$',
           })}`}
           required={false}
diff --git a/src/pages/Contact/ContactList/components/UpdateForm.tsx b/src/pages/Contact/ContactList/components/UpdateForm.tsx
index 741077c..9dc1796 100644
--- a/src/pages/Contact/ContactList/components/UpdateForm.tsx
+++ b/src/pages/Contact/ContactList/components/UpdateForm.tsx
@@ -9,7 +9,7 @@ import {
 } from '@ant-design/pro-components';
 import { FormattedMessage, useIntl } from '@umijs/max';
 import { Form, message } from 'antd';
-import { proFormItemStyleProps, proFormModelWidth } from '../../../../../config/defaultForm';
+import { proFormSmallItemStyleProps, proFormSmallModelWidth } from '../../../../../config/defaultForm';
 import React from 'react';
 export type FormValueType = {
   target?: string;
@@ -34,9 +34,9 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
 
   return (
     <ModalForm<API.Project>
-      width={proFormModelWidth}
+      width={proFormSmallModelWidth}
       title={intl.formatMessage({
-        id: 'project.project.table.list.update',
+        id: 'contact.contact.table.list.update',
         defaultMessage: '$$$',
       })}
       open={props.updateModalOpen}
@@ -62,22 +62,22 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
       }}
     >
       <ProForm.Group>
-        <ProFormText
-          width={proFormItemStyleProps.column2Width}
+        {/* <ProFormText
+          width={proFormSmallItemStyleProps.width}
           name="id"
           label="id"
           disabled={true}
           initialValue={props.values.id}
-        />
+        /> */}
         <ProFormText
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
           name="name"
-          label={<FormattedMessage id="project.project.table.list.name" defaultMessage="$$$" />}
+          label={<FormattedMessage id="contact.contact.table.list.name" defaultMessage="$$$" />}
           placeholder={`${intl.formatMessage({
             id: 'common.please_input',
             defaultMessage: '$$$',
           })}${intl.formatMessage({
-            id: 'project.project.table.list.name',
+            id: 'contact.contact.table.list.name',
             defaultMessage: '$$$',
           })}`}
           required={true}
@@ -88,7 +88,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
               required: true,
               message: (
                 <FormattedMessage
-                  id="project.project.table.rule.required.name"
+                  id="contact.contact.table.rule.required.name"
                   defaultMessage="name is required"
                 />
               ),
@@ -96,14 +96,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           ]}
         />
         <ProFormText
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
           name="code"
-          label={<FormattedMessage id="project.project.table.list.code" defaultMessage="$$$" />}
+          label={<FormattedMessage id="contact.contact.table.list.phone" defaultMessage="$$$" />}
           placeholder={`${intl.formatMessage({
             id: 'common.please_input',
             defaultMessage: '$$$',
           })}${intl.formatMessage({
-            id: 'project.project.table.list.code',
+            id: 'contact.contact.table.list.phone',
             defaultMessage: '$$$',
           })}`}
           required={true}
@@ -122,14 +122,14 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           ]}
         />
         <ProFormText
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
           name="info"
-          label={<FormattedMessage id="project.project.table.list.info" defaultMessage="$$$" />}
+          label={<FormattedMessage id="contact.contact.table.list.mail" defaultMessage="$$$" />}
           placeholder={`${intl.formatMessage({
             id: 'common.please_input',
             defaultMessage: '$$$',
           })}${intl.formatMessage({
-            id: 'project.project.table.list.info',
+            id: 'contact.contact.table.list.mail',
             defaultMessage: '$$$',
           })}`}
           required={true}
@@ -149,7 +149,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
         />
 
         {/* <ProFormCheckbox.Group
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
           name="isEnable"
           layout="vertical"
           label={<FormattedMessage id="project.project.table.list.isEnable" defaultMessage="$$$" />}
@@ -163,7 +163,22 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           启用此项目
         </div> */}
         <ProFormText
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
+          name="remark"
+          label={<FormattedMessage id="contact.contact.table.list.WeChatID" defaultMessage="$$$" />}
+          placeholder={`${intl.formatMessage({
+            id: 'common.please_input',
+            defaultMessage: '$$$',
+          })}${intl.formatMessage({
+            id: 'contact.contact.table.list.WeChatID',
+            defaultMessage: '$$$',
+          })}`}
+          required={false}
+          initialValue={props.values.remark}
+          disabled={false}
+        />
+        <ProFormText
+          width={proFormSmallItemStyleProps.width}
           name="remark"
           label={<FormattedMessage id="project.project.table.list.remark" defaultMessage="$$$" />}
           placeholder={`${intl.formatMessage({
@@ -177,15 +192,15 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           initialValue={props.values.remark}
           disabled={false}
         />
-                <ProFormSwitch
-          width={proFormItemStyleProps.column2Width}
+                {/* <ProFormSwitch
+          width={proFormSmallItemStyleProps.width}
           name="isEnable"
           label={<FormattedMessage id="project.project.table.list.isEnable" defaultMessage="$$$" />}
           initialValue={props.values.isEnable}
           disabled={false}
-        />
-        <ProFormDateTimePicker
-          width={proFormItemStyleProps.column2Width}
+        /> */}
+        {/* <ProFormDateTimePicker
+          width={proFormSmallItemStyleProps.width}
           name="createTime"
           label={
             <FormattedMessage id="project.project.table.list.createTime" defaultMessage="$$$" />
@@ -202,7 +217,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           disabled={true}
         />
         <ProFormDateTimePicker
-          width={proFormItemStyleProps.column2Width}
+          width={proFormSmallItemStyleProps.width}
           name="updateTime"
           label={
             <FormattedMessage id="project.project.table.list.updateTime" defaultMessage="$$$" />
@@ -217,7 +232,7 @@ const UpdateForm: React.FC<UpdateFormProps> = (props) => {
           required={false}
           initialValue={props.values.updateTime}
           disabled={true}
-        />
+        /> */}
       </ProForm.Group>
     </ModalForm>
   );
diff --git a/src/pages/Contact/ContactList/index.tsx b/src/pages/Contact/ContactList/index.tsx
index efb3d6f..71bd617 100644
--- a/src/pages/Contact/ContactList/index.tsx
+++ b/src/pages/Contact/ContactList/index.tsx
@@ -180,7 +180,7 @@ const ProjectList: React.FC = () => {
                     setCurrentRow(record);
                   }}
                 >
-                  <FormattedMessage id="pages.searchTable.update" defaultMessage="Update" />
+                  <FormattedMessage id="contact.contact.table.list.editor" defaultMessage="editor" />
                 </Button>
               ),
             },