资产列表

src/model/assetmanage.js

@@ -70,6 +70,10 @@ export function* listDataAssetsByPage(payload) {
   return yield call(service.listDataAssetsByPage, payload);
 }
 
+export function* getAssetPublishStatus() {
+  return yield call(service.getAssetPublishStatus)
+}
+
 export function* listDataResourcesByPage(payload) {
   return yield call(service.listDataResourcesByPage, payload);
 }

src/service/dataassetmanager.js

@@ -65,7 +65,11 @@ export function getDataAssetDetail(payload) {
 }
 
 export function listDataAssetsByPage(payload) {
-  return GetJSON("/dataassetmanager/dataAssetApi/listDataAssetsByPage", payload);
+  return PostJSON("/dataassetmanager/dataAssetApi/listDataAssetsByPage", payload);
+}
+
+export function getAssetPublishStatus() {
+  return GetJSON("/dataassetmanager/dataAssetApi/listPublishStatus");
 }
 
 export function listDataResourcesByPage(payload) {

src/view/Manage/AssetManage/table.jsx

@@ -40,7 +40,7 @@ const FC = (props) => {
       size: defaultPage.pageSize,
       catalogType: 'currentRecursive',
       keyword: undefined,
-      resourceStatus: undefined,
+      publishStatus: undefined,
       elementValueFilters: []
     },
   }))
@@ -56,6 +56,8 @@ const FC = (props) => {
   const [row, setRow] = React.useState()
   const [rightRow, setRightRow] = React.useState()
   const [permissions, setPermissions] = React.useState([])
+  const [loadingPublishStatus, setLoadingPublishStatus] = React.useState(false)
+  const [publishStatus, setPublishStatus] = React.useState()
   const [loadingRelatedMetadataStatus, setLoadingRelatedMetadataStatus] = React.useState(false)
   const [relatedMetadataStatus, setRelatedMetadataStatus] = React.useState()
   const $keyword = React.useMemo(() => new Subject(), [])
@@ -136,6 +138,7 @@ const FC = (props) => {
 
   React.useEffect(() => {
     getElements()
+    getPublishStatus()
     getResourceRelatedMetadataStatus()
 
     const $$keyword = $keyword.pipe(debounceTime(1000)).subscribe((keyword) => {
@@ -387,6 +390,20 @@ const FC = (props) => {
     })
   }
 
+  const getPublishStatus = () => {
+    setLoadingPublishStatus(true)
+    dispatch({
+      type: 'assetmanage.getAssetPublishStatus',
+      callback: data => {
+        setLoadingPublishStatus(false)
+        setPublishStatus(data)
+      },
+      error: () => {
+        setLoadingPublishStatus(false)
+      }
+    })
+  }
+
   const getResourceRelatedMetadataStatus = () => {
     setLoadingRelatedMetadataStatus(true)
     dispatch({
@@ -431,7 +448,7 @@ const FC = (props) => {
     }
 
     dispatch({
-      type: 'assetmanage.listDataResourcesByPage',
+      type: 'assetmanage.listDataAssetsByPage',
       payload: {
         data: args.params.elementValueFilters??[],
         params: {
@@ -440,10 +457,8 @@ const FC = (props) => {
           pageSize: args.params.size,
           keyword: args.params.keyword,
           range: getAssetRange(AssetManageReference),
-          resourceStatus: args.params.resourceStatus,
-          sortingStatus: args.params.sortingStatus,
+          publishStatus: args.params.publishStatus,
           recursive,
-          filterTodo: args.params.onlyPending,
         }
       },
       callback: data => {
@@ -777,13 +792,13 @@ const FC = (props) => {
             <Select
               placeholder='资产状态'
               onChange={(value) => {
-                setArgsAndPage({ resourceStatus: value })
+                setArgsAndPage({ publishStatus: value })
               }}
               style={{ width: 100 }}
               allowClear
             >
             {
-              (relatedMetadataStatus??[]).map((item, index) => {
+              (publishStatus??[]).map((item, index) => {
                 return <Select.Option key={index} value={item.type}>
                   {item.desc}
                 </Select.Option>

src/view/Manage/AssetOperation/index.jsx

@@ -18,7 +18,6 @@ const mockStatisticInfo = [
 const FC = (props) => {
   return (
     <div className='asset-operation p-3'>
-      <Header title='资产数据概览' />
       <Summary data={mockStatisticInfo} />
       <div className='my-3'>
         <Row gutter={10}>
@@ -55,6 +54,8 @@ export const Header = ({ title }) => (
 
 const Summary = ({ data }) => {
   return (
+    <Card>
+      <Header title='资产数据概览' />
       <Row gutter={10} >
         {
           data?.map((item, index) => {
@@ -77,6 +78,7 @@ const Summary = ({ data }) => {
           })
         }  
       </Row>
+    </Card>
   )
 }
 

src/view/Manage/AssetOperation/index.less

 .asset-operation {
   height: 100%;
-  background-color: white;
+  // background-color: white;
   overflow: auto;
 }
\ No newline at end of file