资产挂载

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

@@ -246,7 +246,7 @@ const AssetTable = (props) =>{
               title='资产要素导入'
               visible={importElementVisible} 
               onVisibleChange={onImportElementVisibleChange}
-              trigger="click">
+              trigger="hover">
               <Button type="primary">导入</Button>
             </Popover>
             <Button type="primary" onClick={onExportElementBtnClick}>导出</Button>
@@ -256,7 +256,7 @@ const AssetTable = (props) =>{
               title='资产要素过滤'
               visible={filterElementVisible} 
               onVisibleChange={onFilterElementVisibleChange}
-              trigger="click">
+              trigger="hover">
               <Button type="primary">过滤</Button>
             </Popover>
           </Space>
@@ -270,7 +270,7 @@ const AssetTable = (props) =>{
               title='资产导入'
               visible={importAssetVisible} 
               onVisibleChange={onImportAssetVisibleChange}
-              trigger="click">
+              trigger="hover">
               <Button type="primary">
               导入
               </Button>

src/view/Manage/AssetRecycle/AssetMount.jsx

-import React from "react";
-import { Modal } from "antd";
-
-import LeftTree from '../AssetManage/components/LeftTree';
-
-const AssetMount = (props)=>{
-  
-  const { onCancel,visible, item } = props
-
-  return(
-    <Modal
-      title='挂载详情'
-      visible={visible}
-      width={800}
-      onCancel={()=>{ onCancel && onCancel()}}
-    >
-      <LeftTree readOnly={true} />
-    </Modal>
-  )
-}
-
-export default AssetMount;
\ No newline at end of file

src/view/Manage/AssetRecycle/Components/AssetMount.jsx

+import React, { useState } from "react";
+import { Modal } from "antd";
+
+import { dispatch } from '../../../../model';
+import LeftTree from '../../AssetManage/components/LeftTree';
+import { showMessage } from '../../../../util';
+
+const AssetMount = (props)=>{
+  
+  const { onCancel,visible, item } = props;
+  const [ nodeId, setNodeId ] = useState(null);
+  const [ confirmLoading, setConfirmLoading ] = useState(false);
+
+  const onOk = () => {
+    if (!nodeId) {
+      showMessage('warn', '请先选择资产目录');
+      return;
+    }
+    
+    setConfirmLoading(true);
+    dispatch({
+      type: 'assetmanage.loadDataAssets',
+      payload: {
+        params: {
+          dirId: nodeId,
+        },
+        data: [ item.id||'' ]
+      },
+      callback: data => {
+        setConfirmLoading(false);
+
+        onCancel && onCancel(true);
+      },
+      error: () => {
+        setConfirmLoading(false);
+      }
+    })
+  }
+
+  return(
+    <Modal
+      title='挂载详情'
+      visible={ visible }
+      width={ 500 }
+      confirmLoading={ confirmLoading }
+      onCancel={()=>{ onCancel && onCancel()}}
+      onOk={ onOk }
+    >
+      <LeftTree 
+        readOnly={true} 
+        setNodeId={(data) => { setNodeId(data); }} 
+      />
+    </Modal>
+  )
+}
+
+export default AssetMount;
\ No newline at end of file

src/view/Manage/AssetRecycle/index.jsx

 import React, { useEffect, useState } from 'react';
-import { Table, Pagination, Space, Tooltip, Button } from 'antd';
+import { Table, Pagination, Space, Tooltip, Button, Modal } from 'antd';
 import { ReconciliationOutlined, DeleteOutlined, UndoOutlined  } from '@ant-design/icons';
 
 import { dispatchLatest } from '../../../model';
 import AssetDetail from '../AssetManage/components/AssetDetail';
-import AssetMount from './AssetMount';
+import AssetMount from './Components/AssetMount';
+import { showMessage } from '../../../util';
 
 import './index.less';
 
@@ -20,6 +21,8 @@ const AssetRecycle = (props) => {
 
   const { pageNum, pageSize } = pagination;
 
+  const [modal, contextHolder] = Modal.useModal();
+
   useEffect(() => {
     
     getAssets();
@@ -98,15 +101,31 @@ const AssetRecycle = (props) => {
   }
 
   const deleteItem = (record) => {
-
+    modal.confirm({
+      title: '提示!',
+      content: '您确定要永久删除该资产吗?',
+      onOk: () => {
+        dispatchLatest({
+          type: 'assetmanage.deleteDataAssets',
+          payload: {
+            data: [ record.id ]
+          },
+          callback: () => {
+            showMessage('success', '资产删除成功');
+            getAssets();
+          }
+        })
+      }
+    });
   }
 
   const onAssetDetailCancel = () => {
     setAssetDetailVisible(false);
   }
 
-  const onAssetMountCancel = () => {
+  const onAssetMountCancel = (refresh = false) => {
     setAssetMountVisible(false);
+    refresh && getAssets();
   }
 
   return (
@@ -145,6 +164,7 @@ const AssetRecycle = (props) => {
         item={ currentAsset }
         onCancel={ onAssetMountCancel }
       />
+      {contextHolder}
     </div>
   );
 }