Merge remote-tracking branch 'origin/warningNew' into clienetAdd

PurelzMgnead
2 parents d5a14e93 6a6bf420
Showing 8 changed files with 49 additions and 6 deletions
src/pages/Client/Client/Components/CommunicationHistoryModal.tsx
src/pages/Client/Client/Components/InformationHistoryModal.tsx
src/pages/Client/Client/index.css
src/pages/Client/Client/index.less
src/pages/Client/Client/index.tsx
src/pages/Client/FollowRecord/Components/CommunicationHistoryModal.tsx
src/pages/Client/FollowRecord/index.less
src/pages/Client/FollowRecord/index.tsx
@@ -15,6 +15,7 @@ import {
 } from '@ant-design/pro-components';
 import { Descriptions, Popconfirm, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
+import '../index.less';
 import ClientModal from './ClientModal';
 import InformationHistoryModal from './InformationHistoryModal';
 export default ({ record }) => {
@@ -258,6 +259,7 @@ export default ({ record }) =&gt; {
   ];
   return (
     <ModalForm
+      className="client-index"
       title="客户详情"
       trigger={<a type="primary">查看</a>}
       modalProps={{
@@ -267,9 +269,10 @@ export default ({ record }) =&gt; {
         return true;
       }}
     >
-      <Descriptions items={items} column={2} />
+      <Descriptions className="client-index" items={items} column={2} />
       <ClientModal
         key={'add'}
+        className="client-index"
         data={recordSave}
         reloadTable={() => {
           actionRef.current?.reload();
@@ -278,6 +281,7 @@ export default ({ record }) =&gt; {
       />
       <EditableProTable
         rowKey="tid"
+        className="client-index"
         formRef={ref}
         actionRef={actionRef}
         recordCreatorProps={false}
@@ -8,6 +8,7 @@ import {
 import { ModalForm } from '@ant-design/pro-components';
 import { Button, Descriptions, Space } from 'antd';
 import { useEffect, useRef, useState } from 'react';
+import '../index.less';
 export default ({ data, reloadTable }) => {
   // const [isModalVisible, setIsModalVisible] = useState(false); // 控制 ClientModal 的显示
@@ -153,6 +154,7 @@ export default ({ data, reloadTable }) =&gt; {
   return (
     <Space>
       <ModalForm
+        className="client-index"
         title="跟进记录"
         trigger={<Button type="link">查看</Button>}
         submitter={{
@@ -171,6 +173,7 @@ export default ({ data, reloadTable }) =&gt; {
               ...defaultDoms,
               <>
                 <ClientInformationModal
+                  className="client-index"
                   key={'modify'}
                   data={data} // 将表单数据传递给 ClientModal
                   reloadTable={() => {
+.client-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 13px;
+  word-wrap: break-word;
+
+  /* 优先使用 */
+  word-break: break-word;
+
+  /* 强制断行，适用于长单词 */
+  white-space: normal;
+
+  /* 允许内容换行 */
+}
+.client-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 13px;
+  word-wrap: break-word; /* 优先使用 */
+  word-break: break-word; /* 强制断行，适用于长单词 */
+  white-space: normal; /* 允许内容换行 */
+}
@@ -17,7 +17,7 @@ import type { ActionType } from &#39;@ant-design/pro-components&#39;;
 import { ProTable } from '@ant-design/pro-components';
 import { Badge, Button, Radio, Space, message } from 'antd';
 import { useEffect, useRef, useState } from 'react';
-
+import './index.less';
 const columns = [
   {
     dataIndex: 'index',
@@ -415,7 +415,7 @@ export default () =&gt; {
     actionRef.current?.reload();
   }, [groupFilter]);
   return (
-    <>
+    <div className="client-index">
       <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
         <div key={'groupFilter'}>
           <Radio.Group
@@ -527,6 +527,6 @@ export default () =&gt; {
         />
       </Space>
       {contextHolder}
-    </>
+    </div>
   );
 };
@@ -6,6 +6,7 @@ import {
 import { ModalForm } from '@ant-design/pro-components';
 import { Button, Descriptions, Space } from 'antd';
 import { useEffect, useRef, useState } from 'react';
+import '../index.less';
 export default ({ data, reloadTable }) => {
   // const [isModalVisible, setIsModalVisible] = useState(false); // 控制 ClientModal 的显示
@@ -180,6 +181,7 @@ export default ({ data, reloadTable }) =&gt; {
   return (
     <Space>
       <ModalForm
+        className="client-index"
         title="跟进记录"
         trigger={<Button type="primary">查看</Button>}
         submitter={{
+.client-index td {
+  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+    'WenQuanYi Micro Hei', sans-serif;
+  font-size: 13px;
+  word-wrap: break-word; /* 优先使用 */
+  word-break: break-word; /* 强制断行，适用于长单词 */
+  white-space: normal; /* 允许内容换行 */
+}
@@ -12,6 +12,7 @@ import type { ActionType } from &#39;@ant-design/pro-components&#39;;
 import { ProTable } from '@ant-design/pro-components';
 import { Button, Popconfirm, Space, message } from 'antd';
 import { useRef, useState } from 'react';
+import './index.less';
 export default () => {
   const actionRef = useRef<ActionType>();
@@ -328,7 +329,7 @@ export default () =&gt; {
   //   actionRef.current?.reload();
   // }, [groupFilter]);
   return (
-    <>
+    <div className="client-index">
       <Space direction="vertical" size="middle" style={{ display: 'flex' }}>
         <ProTable
           columns={columns}
@@ -410,6 +411,6 @@ export default () =&gt; {
         />
       </Space>
       {/* {contextHolder} */}
-    </>
+    </div>
   );
 };