fix: 大司空2.0定额不存在的不显示

src/pages/Product/Road/Enterprise/index.jsx

@@ -57,8 +57,7 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
               dataId: record.ID
             })
           }
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-hex-967bbd">
           {text}
         </span>
       )
@@ -102,7 +101,7 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
       key: 'usedCptList',
       width: 110,
       render: (_, record) => (
-        <div className="children:m-2px">
+        <div className="!children:m-2px">
           {record.usedCptList
             .filter(u => compilationv2.findIndex(i => i.ID === u.compilationID) !== -1)
             .map(item => {
@@ -159,8 +158,7 @@ const Enterprise = ({ compilationv2, shouldUpdate }) => {
                 },
                 reload: () => tRef.current?.reload()
               })
-            }
-          >
+            }>
             创建企业
           </Button>
         ]

src/pages/Product/Road/Personal/index.jsx

@@ -46,8 +46,7 @@ const Personal = props => {
               projectType: 1
             })
           }
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-hex-967bbd">
           {text}
         </span>
       )
@@ -127,8 +126,8 @@ const Personal = props => {
       dataIndex: 'usedCptList',
       key: 'usedCptList',
       width: 120,
-      filters: true,
-      filterMultiple: false,
+      // filters: true,
+      // filterMultiple: false,
       // valueEnum: compilationv2.reduce((prev, curr) => {
       //   const obj = { ...prev }
       //   if (curr.ID) {
@@ -139,7 +138,7 @@ const Personal = props => {
       //   return obj
       // }, {}),
       renderText: (_, record) => (
-        <div className="children:m-2px">
+        <div className="!children:m-2px">
           {record.usedCptList
             .filter(u => compilationv2.findIndex(i => i.ID === u.compilationID) !== -1)
             .map(item => {
@@ -156,7 +155,7 @@ const Personal = props => {
       title: '注册时间',
       dataIndex: 'createTime',
       key: 'createTime',
-      sorter: true,
+      // sorter: true,
       ellipsis: true,
       width: 150,
       renderText: text => dayjsFormat(text, 'YYYY-MM-DD HH:mm')
@@ -166,8 +165,8 @@ const Personal = props => {
       dataIndex: 'proCptList',
       key: 'proCptList',
       width: 150,
-      filters: true,
-      filterMultiple: false,
+      // filters: true,
+      // filterMultiple: false,
       // valueEnum: compilationv2.reduce((prev, curr) => {
       //   const obj = { ...prev }
       //   if (curr.ID) {
@@ -178,9 +177,9 @@ const Personal = props => {
       //   return obj
       // }, {}),
       renderText: (_, record) => (
-        <div className="children:m-2px">
+        <div className="!children:m-2px">
           {record.proCptList
-            .filter(item => item.activated)
+            .filter(item => item.activated && compilationv2.findIndex(c => c.id === item.ID) !== -1)
             .map(item => {
               return (
                 <Tag color="purple" key={item.ID}>
@@ -191,36 +190,6 @@ const Personal = props => {
         </div>
       )
     }
-    // {
-    //   title: '是否升级到专业版',
-    //   dataIndex: 'upGrade',
-    //   key: 'upGrade',
-    //   width: 150,
-    //   filters: true,
-    //   filterMultiple: false,
-    //   valueEnum: compilationv2.reduce((prev, curr) => {
-    //     const obj = { ...prev }
-    //     if (curr._id) {
-    //       obj[curr._id] = {
-    //         text: curr.name
-    //       }
-    //     }
-    //     return obj
-    //   }, {}),
-    //   renderText: (_, record) => (
-    //     <div className="children:m-2px">
-    //       {record.upgrade_list
-    //         .filter(item => item.isUpgrade)
-    //         .map(item => {
-    //           return (
-    //             <Tag color="purple" key={item.compilationID}>
-    //               {compilationv2?.find(i => i._id === item.compilationID)?.name}
-    //             </Tag>
-    //           )
-    //         })}
-    //     </div>
-    //   )
-    // }
   ]
   const handleSearch = value => {
     tRef.current?.reloadAndRest()