增加统计数

src/model/assetmanage.js

@@ -152,3 +152,7 @@ export function* getRelAttrByModel(payload) {
 export function* fillElementValueBeforeCreate(payload) {
   return yield call(service.fillElementValueBeforeCreate, payload);
 }
+
+export function* countResourceState(payload) {
+  return yield call(service.countResourceState, payload);
+}
\ No newline at end of file

src/service/dataassetmanager.js

@@ -159,3 +159,7 @@ export function getRelAttrByModel(payload) {
 export function fillElementValueBeforeCreate(payload) {
   return PostJSON("/dataassetmanager/eleAndAttrApi/fillElementValueBeforeCreate", payload);
 }
+
+export function countResourceState(payload) {
+  return GetJSON("/dataassetmanager/countApi/countResourceState", payload);
+}

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

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Spin, Tooltip, Typography, Dropdown, Menu } from 'antd';
 
 import { dispatch } from '../../../../model';
-import { AssetManageReference } from '../../../../util/constant';
+import { AssetManageReference, ResourceBrowseReference } from '../../../../util/constant';
 import ImportElement from './ImportElement';
 import AttributeRelationModal from "./AttributeRelationModal";
 import FilterElementModal from './FilterElementModal';
@@ -22,6 +22,7 @@ const AssetDirectory = (props) => {
   const [ importElementVisible, setImportElementVisible ] = useState(false);
   const [ attributeRelationModalVisible, setAttributeRelationModalVisible ] = useState(false);
   const [ filterElementVisible, setFilterElementVisible ] = useState(false);
+  const [ resourceState, setResourceState ] = useState(null);
 
   useEffect(() => {
     if ((id||'')!=='') {
@@ -40,6 +41,12 @@ const AssetDirectory = (props) => {
       callback: data => {
         setLoading(false);
         setDir(data);
+
+        if (data.resourceType==='innerSource' || data.resourceType==='outerSource') {
+          getResourceState();
+        } else {
+          setResourceState(null);
+        }
       },
       error: () => {
         setLoading(false);
@@ -47,6 +54,20 @@ const AssetDirectory = (props) => {
     })
   }
 
+  const getResourceState = () => {
+    dispatch({
+      type: 'assetmanage.countResourceState',
+      payload: { 
+        dirId: id
+      },
+      callback: data => {
+        setResourceState(data);
+      },
+      error: () => {
+      }
+    })
+  }
+
   const onImportElementBtnClick = () => {
     setImportElementVisible(true);
   }
@@ -140,7 +161,7 @@ const AssetDirectory = (props) => {
                 </Tooltip>
               </Paragraph>
             </div>
-            <div className={(reference===AssetManageReference)?'mb-common':''}>
+            <div className={(reference===AssetManageReference || reference===ResourceBrowseReference)?'mb-common':''}>
               <Paragraph>
                 <Tooltip title={dir?.desc||''}>
                   <Text className='title-color' ellipsis={true}>
@@ -151,15 +172,51 @@ const AssetDirectory = (props) => {
               </Paragraph>
             </div>
             {
-              (reference === AssetManageReference) && 
-                <Paragraph>
-                  <Tooltip title={dir?.remarks||''}>
-                    <Text className='title-color' ellipsis={true}>
-                      备注：
-                      <Text className='text-color'>{dir?.remarks||''}</Text>
-                    </Text>
-                  </Tooltip>
-                </Paragraph>
+              (reference===AssetManageReference || reference===ResourceBrowseReference) && <div className='flex'>
+              {
+                (reference === AssetManageReference) && <React.Fragment>
+                  <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
+                    <Tooltip title={dir?.remarks||''}>
+                      <Text className='title-color' ellipsis={true}>
+                        备注：
+                        <Text className='text-color'>{dir?.remarks||''}</Text>
+                      </Text>
+                    </Tooltip>
+                  </Paragraph>
+                  <Separate width={10} background='#fff' />
+                </React.Fragment>
+              }
+              {
+                (reference===ResourceBrowseReference) && <React.Fragment>
+                  <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
+                    <Tooltip title={resourceState?.relatedAsset}>
+                      <Text className='title-color' ellipsis={true}>
+                        资产化数量：
+                        <Text className='text-color'>{resourceState?.relatedAsset}</Text>
+                      </Text>
+                    </Tooltip>
+                  </Paragraph>
+                  <Separate width={10} background='#fff' />
+                  <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
+                    <Tooltip title={resourceState?.notRelatedAsset}>
+                      <Text className='title-color' ellipsis={true}>
+                        非资产数量：
+                        <Text className='text-color'>{resourceState?.notRelatedAsset}</Text>
+                      </Text>
+                    </Tooltip>
+                  </Paragraph>
+                  <Separate width={10} background='#fff' />
+                  <Paragraph style={{ flex: 1, overflow: 'hidden' }}>
+                    <Tooltip title={resourceState?.uncombed}>
+                      <Text className='title-color' ellipsis={true}>
+                        待整理数量：
+                        <Text className='text-color'>{resourceState?.uncombed}</Text>
+                      </Text>
+                    </Tooltip>
+                  </Paragraph>
+                </React.Fragment>
+              }
+              </div>
             }
           </div>
         </div>

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

@@ -570,9 +570,9 @@ const AssetTable = (props) => {
   if ((assets||[]).length>0) {
     if (fullScreen) {
       scrollY = 'calc(100vh - 219px - 72px)';
-    } else if (reference===AssetManageReference) {
+    } else if (reference===AssetManageReference||reference===ResourceBrowseReference) {
       scrollY = 'calc(100vh - 219px - 123px - 15px - 72px)';
-    } else if (reference===AssetBrowseReference||reference===ResourceBrowseReference) {
+    } else if (reference===AssetBrowseReference) {
       scrollY = 'calc(100vh - 219px - 94px - 15px - 72px)';
     } else if (reference===AssetRecycleReference) {
       scrollY = 'calc(100vh - 219px - 72px)';
@@ -619,7 +619,7 @@ const AssetTable = (props) => {
             </React.Fragment>
           }
           {
-            (reference!==AssetRecycleReference) && <Checkbox onChange={onRecursiveChange} checked={!recursive}>仅显示当前目录</Checkbox>
+            (reference!==AssetRecycleReference && isSzseEnv) && <Checkbox onChange={onRecursiveChange} checked={!recursive}>仅显示当前目录</Checkbox>
           }
         </Space>
         <Space>