资产打标签

src/App.js

@@ -82,6 +82,19 @@ export class App extends React.Component {
       );
     }
 
+    if (message === 'showDatasource') {
+      return (
+        <AppContext.Provider value={{
+          env: params?.env,
+          user: params?.user,
+          setGlobalState,
+          onGlobalStateChange
+        }}>
+          <DatasourceManage />
+        </AppContext.Provider>
+      );
+    }
+
     return (
       <AppContext.Provider value={{
         env: params?.env,

src/model/assetmanage.js

@@ -49,6 +49,10 @@ export function* addOrUpdateDataAsset(payload) {
   return yield call(service.addOrUpdateDataAsset, payload);
 }
 
+export function* addDataAssetByDirIds(payload) {
+  return yield call(service.addDataAssetByDirIds, payload);
+}
+
 export function* deleteDataAssets(payload) {
   return yield call(service.deleteDataAssets, payload);
 }
@@ -109,6 +113,10 @@ export function* upDownDirectory(payload) {
   return yield call(service.upDownDirectory, payload);
 }
 
+export function* listDirectoryByName(payload) {
+  return yield call(service.listDirectoryByName, payload);
+}
+
 export function* loadDataAssets(payload) {
   return yield call(service.loadDataAssets, payload);
 }

src/service/dataassetmanager.js

@@ -48,6 +48,10 @@ export function addOrUpdateDataAsset(payload) {
   return PostJSON("/dataassetmanager/dataAssetApi/addOrUpdateDataAsset", payload);
 }
 
+export function addDataAssetByDirIds(payload) {
+  return PostJSON("/dataassetmanager/dataAssetApi/addDataAssetByDirIds", payload);
+}
+
 export function deleteDataAssets(payload) {
   return PostJSON("/dataassetmanager/dataAssetApi/deleteDataAssets", payload);
 }
@@ -136,6 +140,10 @@ export function upDownDirectory(payload) {
   return PostJSON("/dataassetmanager/directoryApi/upDownDirectory", payload);
 }
 
+export function listDirectoryByName(payload) {
+  return GetJSON("/dataassetmanager/directoryApi/listDirectoryByName", payload);
+}
+
 export function getMetadataModelTree() {
   return GetJSON("/metadatarepo/rest/model/tree");
 }

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

@@ -232,6 +232,10 @@ const AssetAction = (props) => {
     })
   }
 
+  const onAssetTag = (keyword) => {
+
+  }
+
   const formItemLayout = {
     labelCol: {
       xs: { span: 24 },
@@ -317,7 +321,7 @@ const AssetAction = (props) => {
                 <AppContext.Consumer>
                 {
                   value => {
-                    return (currentAction==='add'||currentAction==='edit')?<Tag styleType='complex' id={id} creator={value?.user?.userName||''} />:<Tag id={id} creator={value?.user?.userName||''} />
+                    return (currentAction==='add'||currentAction==='edit')?<Tag styleType='complex' id={id} creator={value?.user?.userName||''} onAssetTag={onAssetTag} />:<Tag id={id} creator={value?.user?.userName||''} />
                   } 
                 }
                 </AppContext.Consumer>

src/view/Manage/DatasourceManage/index.jsx

@@ -20,9 +20,9 @@ const DatasourceManage = (props) => {
 
   const { env } = useContext(AppContext);
 
-  const domainId = getQueryParam('domainId', props.location.search);
-  const catalogId = getQueryParam('catalogId', props.location.search);
-  const scopeId = getQueryParam('scopeId', props.location.search);
+  const domainId = getQueryParam('domainId', props?.location?.search);
+  const catalogId = getQueryParam('catalogId', props?.location?.search);
+  const scopeId = getQueryParam('scopeId', props?.location?.search);
 
   const [ treeData, setTreeData ] = useState([]);
   const [ treeValue, setTreeValue ] = useState('');

src/view/Manage/Model/Component/VersionCompare.less

 .model-version-compare {
-  .delete {
-    color: red;
-    text-decoration: line-through;
+  .yy-typography .delete, .delete {
+    color: red !important;
+    text-decoration: line-through !important;
   }
 
-  .add {
-    color: #0069ac;
+  .yy-typography .add, .add {
+    color: #0069ac !important;
   }
 }
\ No newline at end of file

src/view/Manage/Tag/Component/AddTagModal.jsx

@@ -34,7 +34,7 @@ const ClassifySelect = ({ value = '', data = [], onChange, ...restProps }) => {
 }
 
 const AddTagModal = (props) => {
-  const { visible, onCancel, id, type, creator } = props;
+  const { visible, onCancel, id, type, creator, onAssetTag } = props;
 
   const [ step, setStep ] = useState(0);
   const [ keyword, setKeyword ] = useState('');
@@ -135,29 +135,48 @@ const AddTagModal = (props) => {
       return;
     }
 
-    if (selectTag) {
-      setConfirmLoading(true);
-      dispatch({
-        type: 'tag.batchAddTagResource',
-        payload: {
-          params: {
-            tagId: selectTag.tagId,
-            resourceIds: id,
-            type,
-            creator
+    setConfirmLoading(true);
+    dispatch({
+      type: 'assetmanage.listDirectoryByName',
+      payload: {
+        name: keyword
+      },
+      callback: data => {
+        setConfirmLoading(false);
+
+        if ((data||[]).length===0) {
+          if (selectTag) {
+            setConfirmLoading(true);
+            dispatch({
+              type: 'tag.batchAddTagResource',
+              payload: {
+                params: {
+                  tagId: selectTag.tagId,
+                  resourceIds: id,
+                  type,
+                  creator
+                }
+              },
+              callback: () => {
+                reset();
+                onCancel && onCancel(true);
+              },
+              error: () => {
+                setConfirmLoading(false);
+              }
+            })
+          } else {
+            setStep(1);
           }
-        },
-        callback: () => {
+        } else {
           reset();
-          onCancel && onCancel(true);
-        },
-        error: () => {
-          setConfirmLoading(false);
+          onAssetTag && onAssetTag(keyword);
         }
-      })
-    } else {
-      setStep(1);
-    }
+      },
+      error: () => {
+        setConfirmLoading(false);
+      }
+    })
   }
 
   const cancel = () => {

src/view/Manage/Tag/index.jsx

@@ -6,7 +6,7 @@ import AddTagModal from './Component/AddTagModal';
 import { dispatch } from '../../../model';
 
 const TagColumn = (props) => {
-  const { id, type = 'dataAsset', creator = '', styleType = 'simple' } = props;
+  const { id, type = 'dataAsset', creator = '', styleType = 'simple', onAssetTag } = props;
 
   const [ ownTags, setOwnTags ] = useState([]);
   const [ addTagModalVisible, setAddTagModalVisible ] = useState(false);
@@ -50,6 +50,11 @@ const TagColumn = (props) => {
     refresh && getTags();
   }
 
+  const onAssetTagCancel = (keyword) => {
+    setAddTagModalVisible(false);
+    onAssetTag && onAssetTag(keyword);
+  }
+
   const handleClose = (index) => {
     const _tag = ownTags[index];
 
@@ -147,7 +152,8 @@ const TagColumn = (props) => {
       id={id}
       type={type}
       creator={creator}
-      onCancel={onAddTagModalCancel}  
+      onCancel={onAddTagModalCancel}
+      onAssetTag={onAssetTagCancel}  
     />
     {contextHolder}  
     </React.Fragment>