Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/components/RightContent/AvatarDropdown.tsx

@@ -85,25 +85,12 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
     return loading
   }
 
+  const menuItems = [
+    { icon: <SettingOutlined />, label: '个人设置', key: 'settings' },
+    { icon: <LogoutOutlined />, label: '退出登录', key: 'logout' }
+  ]
   const menuHeaderDropdown = (
-    <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick}>
-      <Menu.Item key="settings">
-        <SettingOutlined />
-        个人设置
-      </Menu.Item>
-      {/* {menu && (
-        <Menu.Item key="settings">
-          <SettingOutlined />
-          个人设置
-        </Menu.Item>
-      )}
-      {menu && <Menu.Divider />} */}
-
-      <Menu.Item key="logout">
-        <LogoutOutlined />
-        退出登录
-      </Menu.Item>
-    </Menu>
+    <Menu className={styles.menu} selectedKeys={[]} onClick={onMenuClick} items={menuItems} />
   )
 
   return (

src/pages/Customer/Business/components/BusinessDetail/Step/index.jsx

@@ -70,9 +70,9 @@ const Step = ({ id, statusId, groupStatus = [], isOwner }) => {
             tryChangeStatus({ id, businessStatusId: e.key })
           }
         })
-      }}>
-      {op.otherItems.map(item => (
-        <Menu.Item key={item.id}>
+      }}
+      items={op.otherItems.map(item => ({
+        label: (
           <div className="flex justify-between items-center">
             <span className={stateMap[item.key]?.fontColor}>
               {stateMap[item.key]?.icon}
@@ -80,9 +80,10 @@ const Step = ({ id, statusId, groupStatus = [], isOwner }) => {
             </span>
             <span>{item.percentage}%</span>
           </div>
-        </Menu.Item>
-      ))}
-    </Menu>
+        ),
+        key: item.id
+      }))}
+    />
   )
   return (
     <div className={['busi-state', 'mb-4', styles.businessStep].join(' ')}>

src/pages/Customer/Company/components/CompanyDetail/TabList.jsx

@@ -58,13 +58,15 @@ const CompanyTabList = ({ initData, customerId, client, software, customer, busi
         if (key !== defaultSelectedKey) {
           changePriority(key, id)
         }
-      }}>
-      <Menu.Item key="1">1</Menu.Item>
-      <Menu.Item key="2">2</Menu.Item>
-      <Menu.Item key="3">3</Menu.Item>
-      <Menu.Item key="4">4</Menu.Item>
-      <Menu.Item key="5">5</Menu.Item>
-    </Menu>
+      }}
+      items={[
+        { label: '1', key: '1' },
+        { label: '2', key: '2' },
+        { label: '3', key: '3' },
+        { label: '4', key: '4' },
+        { label: '5', key: '5' }
+      ]}
+    />
   )
 
   const columns = [