样式调整

src/view/Manage/AssetManage/Component/AssetTable.jsx

@@ -27,6 +27,7 @@ import WorkbookDrawer from "./WorkbookDrawer";
 import TagCell, { TagSelectPopup } from './tag-help'
 import HistoryAndVersionDrawer from "./HistoryAndVersionDrawer";
 import PermissionButton from '../../../../util/Component/PermissionButton'
+import PermissionMenuItem from '../../../../util/Component/PermissionMenuItem'
 
 import "./AssetTable.less";
 import 'react-contexify/dist/ReactContexify.css';
@@ -1110,24 +1111,60 @@ const AssetTable = (props) => {
     setWorkbookDrawerVisible(true);
   }
 
-  const moreMenu = (
-    <Menu>
-    {
-      reportTypes?.map(item => 
-        <React.Fragment key={item.code}>
-          <Menu.Item disabled={(checkedKeys||[]).length===0}>
-            <div className='text-center' onClick={() => { onReportAnalyseClick(item) }}>
-              {`${item.name}自助分析`}
-            </div>
-          </Menu.Item>
-          <Menu.Item>
-            <div className='text-center' onClick={() => { onReportWorkbookClick(item)}}>
-            {`${item.name}工作簿`}
-            </div>
-          </Menu.Item>
-        </React.Fragment>
-      )
+  const onMenuClick = ({ key }) => {
+    if (key === 'offline') {
+      offlineAssets()
+    } else if (key === 'addTag') {
+      onBatchAddTagClick()
+    } else if (key === 'visibleColSetting') {
+      onFilterElementClick()
     }
+  }
+
+  const moreMenu = (
+    <Menu onClick={onMenuClick}>
+      <PermissionMenuItem 
+        key='offline' 
+        defaultPermission={offlineAble}
+        disabled={(checkedKeys??[]).length===0}
+        tip={(checkedKeys??[]).length===0?'请先选择资产':''}
+      >
+        <div className='text-center'>
+          停用
+        </div>
+      </PermissionMenuItem>
+      <PermissionMenuItem 
+        key='addTag' 
+        defaultPermission={addTagAble}
+        disabled={(checkedKeys??[]).length===0}
+        tip={(checkedKeys??[]).length===0?'请先选择资产':''}
+      >
+        <div className='text-center'>
+          添加标签
+        </div>
+      </PermissionMenuItem>
+      <Menu.Item key='visibleColSetting' 
+      >
+        <div className='text-center'>
+          可见列设置
+        </div>
+      </Menu.Item>
+      {
+        template?.structedStateEnum==='structured' && reportTypes?.map(item => 
+          <React.Fragment key={item.code}>
+            <Menu.Item disabled={(checkedKeys||[]).length===0}>
+              <div className='text-center' onClick={() => { onReportAnalyseClick(item) }}>
+                {`${item.name}自助分析`}
+              </div>
+            </Menu.Item>
+            <Menu.Item>
+              <div className='text-center' onClick={() => { onReportWorkbookClick(item)}}>
+              {`${item.name}工作簿`}
+              </div>
+            </Menu.Item>
+          </React.Fragment>
+        )
+      }
     </Menu>
   )
 
@@ -1225,28 +1262,10 @@ const AssetTable = (props) => {
             </PermissionButton>
           }
           {
-            reference===AssetManageReference && <PermissionButton 
-              defaultPermission={offlineAble} 
-              tip={(checkedKeys||[]).length===0?'请先选择资产':''}
-              onClick={offlineAssets} 
-              disabled={(checkedKeys||[]).length===0}
-            >
-              停用
-            </PermissionButton>
-          }
-          {
-            reference===AssetManageReference && <PermissionButton 
-              defaultPermission={addTagAble} 
-              tip={(checkedKeys||[]).length===0?'请先选择资产':''}
-              onClick={onBatchAddTagClick} 
-              disabled={(checkedKeys||[]).length===0}
-            >
-              添加标签
-            </PermissionButton>
+            reference===AssetBrowseReference && <Button onClick={onFilterElementClick}>可见列设置</Button>
           }
-          <Button onClick={onFilterElementClick}>可见列设置</Button>
           {
-            reference===AssetManageReference && template?.structedStateEnum==='structured' && (reportTypes??[]).length > 0 && <Dropdown overlay={moreMenu} placement="bottomCenter"> 
+            reference===AssetManageReference && <Dropdown overlay={moreMenu} placement="bottomCenter"> 
               <Button>其他操作</Button>
             </Dropdown>
           }