fix

package.json

@@ -24,7 +24,7 @@
     "@types/webpack-env": "^1.18.0",
     "ahooks": "2.9.1",
     "ali-oss": "^6.21.0",
-    "antd": "^5.24.7",
+    "antd": "^5.27.4",
     "antd-img-crop": "^4.2.0",
     "array-move": "^4.0.0",
     "axios": "^0.26.1",

src/pages/weComTask/page/alarmGl/index.tsx

@@ -103,7 +103,7 @@ const AlarmGl: React.FC = () => {
                             dataSource={getCorpPhoneMsgAlarmList?.data?.data?.records}
                             loading={getCorpPhoneMsgAlarmList?.loading}
                             columns={TableConfig(handleMsg)}
-                            scroll={{ y: size?.height && ref.current ? size?.height : 300 }}
+                            scroll={{ y: size?.height && ref.current ? size?.height - 30 : 300 }}
                             rowKey={(s) => {
                                 return s.id
                             }}

src/pages/weComTask/page/chatRecordManage/chatRecord/index.tsx

@@ -26,7 +26,7 @@ const ChatRecord: React.FC = () => {
 
     const [queryForm, setQueryForm] = useState<GetChatMessageListProps>({ 
         pageNum: 1, 
-        pageSize: 20, 
+        pageSize: 50, 
         messageTimeStart: moment().format('YYYY-MM-DD'), 
         messageTimeEnd: moment().format('YYYY-MM-DD'),
         ...(chatRecordFilterValue ? JSON.parse(chatRecordFilterValue) : {})

src/pages/weComTask/page/chatRecordManage/riskWord/index.tsx

@@ -174,7 +174,7 @@ const RiskWord: React.FC = () => {
                             dataSource={getKeywordList?.data?.data?.records}
                             loading={getKeywordList?.loading}
                             columns={TableConfig(edit, del, taskPause)}
-                            scroll={{ x: "max-content", y: size?.height && ref.current ? size?.height - 32 : 300 }}
+                            scroll={{ x: 1200, y: size?.height && ref.current ? size?.height - 32 : 300 }}
                             rowKey={'id'}
                             bordered
                             size='small'

src/pages/weComTask/page/chatRecordManage/riskWord/tableConfig.tsx

@@ -1,5 +1,6 @@
-import { Button, Popconfirm, Space, Tag, Badge } from "antd";
+import { Button, Popconfirm, Space, Tag, Badge, Typography } from "antd";
 import { ColumnsType } from "antd/es/table";
+const { Paragraph } = Typography;
 
 export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (value: any) => void, taskPause: (pause: boolean, taskId: number[]) => void): ColumnsType<any> {
 
@@ -9,7 +10,7 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
             dataIndex: 'corpUserVO',
             key: 'corpUserVO',
             align: 'center',
-            width: 100,
+            width: 150,
             ellipsis: true,
             render(value) {
                 return value?.[0]?.corpName
@@ -20,29 +21,25 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
             dataIndex: 'corpId',
             key: 'corpId',
             align: 'center',
-            width: 100,
+            width: 150,
             ellipsis: true
         },
         {
             title: '企微号',
             dataIndex: 'corpUserVO',
             key: 'corpUserVO',
-            align: 'center',
-            width: 100,
-            ellipsis: true,
+            width: 450,
             render(value) {
-                return value?.map((item: { name: any; }) => item.name).toString()
+                return <Paragraph style={{ margin: 0 }} ellipsis={{ rows: 3, tooltip: { mouseEnterDelay: 1, placement: 'bottomLeft', styles: { body: { maxHeight: 450, width: 500, overflow: 'auto' } } } }}>{value?.map((item: { name: any; }) => item.name).toString()}</Paragraph>
             },
         },
         {
             title: '企微号ID',
             dataIndex: 'corpUserId',
             key: 'corpUserId',
-            align: 'center',
-            width: 100,
-            ellipsis: true,
+            width: 450,
             render(value) {
-                return value?.toString()
+                return <Paragraph style={{ margin: 0 }} ellipsis={{ rows: 3, tooltip: { mouseEnterDelay: 1, placement: 'bottomLeft', styles: { body: { maxHeight: 450, width: 500, overflow: 'auto' } } } }}>{value?.toString()}</Paragraph>
             },
         },
         {
@@ -52,7 +49,7 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
             align: 'center',
             width: 100,
             render: (a: any, b: any) => {
-                return a ? ["",<Badge color="#ffccc7" text="低" />,<Badge color="#ff7875" text="中" /> , <Badge color="#cf1322" text="高" /> ][a] : "--"
+                return a ? ["", <Badge color="#ffccc7" text="低" />, <Badge color="#ff7875" text="中" />, <Badge color="#cf1322" text="高" />][a] : "--"
             }
         },
         {
@@ -61,6 +58,7 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
             key: 'keywordJson',
             align: 'center',
             ellipsis: true,
+            width: 450,
             render: (a) => {
                 return <Space size={[0, 0]} wrap>
                     {
@@ -71,7 +69,6 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
                 </Space>
             }
         },
-
         {
             title: '启用状态',
             dataIndex: 'enabled',
@@ -87,7 +84,7 @@ export function TableConfig(edit: (row: any, isCopy?: boolean) => void, del: (va
             dataIndex: 'sysUserRpcVO',
             key: 'sysUserRpcVO',
             align: 'center',
-            width: 140,
+            width: 90,
             ellipsis: true,
             render(a) {
                 return a?.nickName || '--'

yarn.lock

@@ -28,13 +28,20 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
-"@ant-design/colors@^7.0.0", "@ant-design/colors@^7.2.0":
+"@ant-design/colors@^7.0.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.2.0.tgz#80d7325d20463f09c7839d28da630043dd5c263a"
   integrity sha512-bjTObSnZ9C/O8MB/B4OUtd/q9COomuJAR2SYfhxLyHvCKn4EKwCN3e+fWGMo7H5InAyV0wL17jdE9ALrdOW/6A==
   dependencies:
     "@ant-design/fast-color" "^2.0.6"
 
+"@ant-design/colors@^7.2.1":
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.2.1.tgz#3bbc1c6c18550020d1622a0067ff03492318df98"
+  integrity sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==
+  dependencies:
+    "@ant-design/fast-color" "^2.0.6"
+
 "@ant-design/cssinjs-utils@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@ant-design/cssinjs-utils/-/cssinjs-utils-1.1.3.tgz#5dd79126057920a6992d57b38dd84e2c0b707977"
@@ -1800,7 +1807,7 @@
     classnames "^2.3.2"
     rc-util "^5.24.4"
 
-"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1", "@rc-component/trigger@^2.2.6":
+"@rc-component/trigger@^2.0.0", "@rc-component/trigger@^2.1.1":
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.2.6.tgz#bfe6602313b3fadd659687746511f813299d5ea4"
   integrity sha512-/9zuTnWwhQ3S3WT1T8BubuFTT46kvnXgaERR9f4BTKyn61/wpf/BvbImzYBubzJibU707FxwbKszLlHjcLiv1Q==
@@ -1812,6 +1819,18 @@
     rc-resize-observer "^1.3.1"
     rc-util "^5.44.0"
 
+"@rc-component/trigger@^2.3.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@rc-component/trigger/-/trigger-2.3.0.tgz#9499ada078daca9dd99d01f0f0743ee1ab9e398b"
+  integrity sha512-iwaxZyzOuK0D7lS+0AQEtW52zUWxoGqTGkke3dRyb8pYiShmRpCjB/8TzPI4R6YySCH7Vm9BZj/31VPiiQTLBg==
+  dependencies:
+    "@babel/runtime" "^7.23.2"
+    "@rc-component/portal" "^1.1.0"
+    classnames "^2.3.2"
+    rc-motion "^2.0.0"
+    rc-resize-observer "^1.3.1"
+    rc-util "^5.44.0"
+
 "@remix-run/router@1.23.0":
   version "1.23.0"
   resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.23.0.tgz#35390d0e7779626c026b11376da6789eb8389242"
@@ -2962,12 +2981,12 @@ antd-img-crop@^4.2.0:
     react-easy-crop "^5.4.1"
     tslib "^2.8.1"
 
-antd@^5.24.7:
-  version "5.24.9"
-  resolved "https://registry.yarnpkg.com/antd/-/antd-5.24.9.tgz#c5862e02ed770bd95e312961f4f0b7b158a004d9"
-  integrity sha512-liB+Y/JwD5/KSKbK1Z1EVAbWcoWYvWJ1s97AbbT+mOdigpJQuWwH7kG8IXNEljI7onvj0DdD43TXhSRLUu9AMA==
+antd@^5.27.4:
+  version "5.27.4"
+  resolved "https://registry.yarnpkg.com/antd/-/antd-5.27.4.tgz#13c97deb12e6aeb43adecd23f3dbe3139a62e579"
+  integrity sha512-rhArohoAUCxhkPjGI/BXthOrrjaElL4Fb7d4vEHnIR3DpxFXfegd4rN21IgGdiF+Iz4EFuUZu8MdS8NuJHLSVQ==
   dependencies:
-    "@ant-design/colors" "^7.2.0"
+    "@ant-design/colors" "^7.2.1"
     "@ant-design/cssinjs" "^1.23.0"
     "@ant-design/cssinjs-utils" "^1.1.3"
     "@ant-design/fast-color" "^2.0.6"
@@ -2978,15 +2997,15 @@ antd@^5.24.7:
     "@rc-component/mutate-observer" "^1.1.0"
     "@rc-component/qrcode" "~1.0.0"
     "@rc-component/tour" "~1.15.1"
-    "@rc-component/trigger" "^2.2.6"
+    "@rc-component/trigger" "^2.3.0"
     classnames "^2.5.1"
     copy-to-clipboard "^3.3.3"
     dayjs "^1.11.11"
-    rc-cascader "~3.33.1"
+    rc-cascader "~3.34.0"
     rc-checkbox "~3.5.0"
     rc-collapse "~3.9.0"
     rc-dialog "~9.6.0"
-    rc-drawer "~7.2.0"
+    rc-drawer "~7.3.0"
     rc-dropdown "~4.2.1"
     rc-field-form "~2.7.0"
     rc-image "~7.12.0"
@@ -3002,17 +3021,17 @@ antd@^5.24.7:
     rc-rate "~2.13.1"
     rc-resize-observer "^1.4.3"
     rc-segmented "~2.7.0"
-    rc-select "~14.16.6"
-    rc-slider "~11.1.8"
+    rc-select "~14.16.8"
+    rc-slider "~11.1.9"
     rc-steps "~6.0.1"
     rc-switch "~4.1.0"
-    rc-table "~7.50.4"
-    rc-tabs "~15.6.1"
-    rc-textarea "~1.10.0"
+    rc-table "~7.53.0"
+    rc-tabs "~15.7.0"
+    rc-textarea "~1.10.2"
     rc-tooltip "~6.4.0"
     rc-tree "~5.13.1"
     rc-tree-select "~5.27.0"
-    rc-upload "~4.8.1"
+    rc-upload "~4.9.2"
     rc-util "^5.44.4"
     scroll-into-view-if-needed "^3.1.0"
     throttle-debounce "^5.0.2"
@@ -9092,10 +9111,10 @@ raw-body@2.5.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc-cascader@~3.33.1:
-  version "3.33.1"
-  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.33.1.tgz#19e01462ef5ef51b723c1f562c7b9cde4691e7ee"
-  integrity sha512-Kyl4EJ7ZfCBuidmZVieegcbFw0RcU5bHHSbtEdmuLYd0fYHCAiYKZ6zon7fWAVyC6rWWOOib0XKdTSf7ElC9rg==
+rc-cascader@~3.34.0:
+  version "3.34.0"
+  resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.34.0.tgz#56f936ab6b1229bab7d558701ce9b9e96536582c"
+  integrity sha512-KpXypcvju9ptjW9FaN2NFcA2QH9E9LHKq169Y0eWtH4e/wHQ5Wh5qZakAgvb8EKZ736WZ3B0zLLOBsrsja5Dag==
   dependencies:
     "@babel/runtime" "^7.25.7"
     classnames "^2.3.1"
@@ -9133,10 +9152,10 @@ rc-dialog@~9.6.0:
     rc-motion "^2.3.0"
     rc-util "^5.21.0"
 
-rc-drawer@~7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-7.2.0.tgz#8d7de2f1fd52f3ac5a25f54afbb8ac14c62e5663"
-  integrity sha512-9lOQ7kBekEJRdEpScHvtmEtXnAsy+NGDXiRWc2ZVC7QXAazNVbeT4EraQKYwCME8BJLa8Bxqxvs5swwyOepRwg==
+rc-drawer@~7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-7.3.0.tgz#1bb5fe5f9da38b6a2b2a7dffc9fcb647252a328f"
+  integrity sha512-DX6CIgiBWNpJIMGFO8BAISFkxiuKitoizooj4BDyee8/SnBn0zwO2FHrNDpqqepj0E/TFTDpmEBCyFuTgC7MOg==
   dependencies:
     "@babel/runtime" "^7.23.9"
     "@rc-component/portal" "^1.1.1"
@@ -9308,7 +9327,7 @@ rc-segmented@~2.7.0:
     rc-motion "^2.4.4"
     rc-util "^5.17.0"
 
-rc-select@~14.16.2, rc-select@~14.16.6:
+rc-select@~14.16.2:
   version "14.16.6"
   resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.16.6.tgz#1c57a9aa97248b3fd9a830d9bf5df6e9d2ad2c69"
   integrity sha512-YPMtRPqfZWOm2XGTbx5/YVr1HT0vn//8QS77At0Gjb3Lv+Lbut0IORJPKLWu1hQ3u4GsA0SrDzs7nI8JG7Zmyg==
@@ -9321,10 +9340,23 @@ rc-select@~14.16.2, rc-select@~14.16.6:
     rc-util "^5.16.1"
     rc-virtual-list "^3.5.2"
 
-rc-slider@~11.1.8:
-  version "11.1.8"
-  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.8.tgz#cf3b30dacac8f98d44f7685f733f6f7da146fc06"
-  integrity sha512-2gg/72YFSpKP+Ja5AjC5DPL1YnV8DEITDQrcc1eASrUYjl0esptaBVJBh5nLTXCCp15eD8EuGjwezVGSHhs9tQ==
+rc-select@~14.16.8:
+  version "14.16.8"
+  resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.16.8.tgz#78e6782f1ccc1f03d9003bc3effa4ed609d29a97"
+  integrity sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==
+  dependencies:
+    "@babel/runtime" "^7.10.1"
+    "@rc-component/trigger" "^2.1.1"
+    classnames "2.x"
+    rc-motion "^2.0.1"
+    rc-overflow "^1.3.1"
+    rc-util "^5.16.1"
+    rc-virtual-list "^3.5.2"
+
+rc-slider@~11.1.9:
+  version "11.1.9"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.9.tgz#d872130fbf4ec51f28543d62e90451091d6f5208"
+  integrity sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==
   dependencies:
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
@@ -9348,10 +9380,10 @@ rc-switch@~4.1.0:
     classnames "^2.2.1"
     rc-util "^5.30.0"
 
-rc-table@~7.50.4:
-  version "7.50.4"
-  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.50.4.tgz#687b5bf76d1a94168f75481cbc83be9442010432"
-  integrity sha512-Y+YuncnQqoS5e7yHvfvlv8BmCvwDYDX/2VixTBEhkMDk9itS9aBINp4nhzXFKiBP/frG4w0pS9d9Rgisl0T1Bw==
+rc-table@~7.53.0:
+  version "7.53.1"
+  resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.53.1.tgz#b891aa39e9d1d944711f018692d2c52013afc90f"
+  integrity sha512-firAd7Z+liqIDS5TubJ1qqcoBd6YcANLKWQDZhFf3rfoOTt/UNPj4n3O+2vhl+z4QMqwPEUVAil661WHA8H8Aw==
   dependencies:
     "@babel/runtime" "^7.10.1"
     "@rc-component/context" "^1.4.0"
@@ -9360,10 +9392,10 @@ rc-table@~7.50.4:
     rc-util "^5.44.3"
     rc-virtual-list "^3.14.2"
 
-rc-tabs@~15.6.1:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.6.1.tgz#f0b6c65384dfa09a64eb539e86a0667c7a650708"
-  integrity sha512-/HzDV1VqOsUWyuC0c6AkxVYFjvx9+rFPKZ32ejxX0Uc7QCzcEjTA9/xMgv4HemPKwzBNX8KhGVbbumDjnj92aA==
+rc-tabs@~15.7.0:
+  version "15.7.0"
+  resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-15.7.0.tgz#14ca2ee6213d00491a8b67ae26e2d35c256bf19a"
+  integrity sha512-ZepiE+6fmozYdWf/9gVp7k56PKHB1YYoDsKeQA1CBlJ/POIhjkcYiv0AGP0w2Jhzftd3AVvZP/K+V+Lpi2ankA==
   dependencies:
     "@babel/runtime" "^7.11.2"
     classnames "2.x"
@@ -9384,6 +9416,17 @@ rc-textarea@~1.10.0:
     rc-resize-observer "^1.0.0"
     rc-util "^5.27.0"
 
+rc-textarea@~1.10.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-1.10.2.tgz#459e3574a95c32939c6793045a1e4db04cb514cc"
+  integrity sha512-HfaeXiaSlpiSp0I/pvWpecFEHpVysZ9tpDLNkxQbMvMz6gsr7aVZ7FpWP9kt4t7DB+jJXesYS0us1uPZnlRnwQ==
+  dependencies:
+    "@babel/runtime" "^7.10.1"
+    classnames "^2.2.1"
+    rc-input "~1.8.0"
+    rc-resize-observer "^1.0.0"
+    rc-util "^5.27.0"
+
 rc-tooltip@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-6.4.0.tgz#e832ed0392872025e59928cfc1ad9045656467fd"
@@ -9416,10 +9459,10 @@ rc-tree@~5.13.0, rc-tree@~5.13.1:
     rc-util "^5.16.1"
     rc-virtual-list "^3.5.1"
 
-rc-upload@~4.8.1:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.8.1.tgz#ac55f2bc101b95b52a6e47f3c18f0f55b54e16d2"
-  integrity sha512-toEAhwl4hjLAI1u8/CgKWt30BR06ulPa4iGQSMvSXoHzO88gPCslxqV/mnn4gJU7PDoltGIC9Eh+wkeudqgHyw==
+rc-upload@~4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.9.2.tgz#297f52fd1b1c2a4b570c3e42444609b7530531bb"
+  integrity sha512-nHx+9rbd1FKMiMRYsqQ3NkXUv7COHPBo3X1Obwq9SWS6/diF/A0aJ5OHubvwUAIDs+4RMleljV0pcrNUc823GQ==
   dependencies:
     "@babel/runtime" "^7.18.3"
     classnames "^2.2.5"