bug fix

src/view/Manage/Model/Component/ImportModal.jsx

@@ -27,7 +27,8 @@ const ImportModal = (props) => {
   const [ ddl, setDDL ] = useState('');
   const [ confirmLoading, setConfirmLoading ] = useState(false);
   const [selectAssetParams, setSelectAssetParams] = useState({
-    visible: false
+    visible: false,
+    catalogId: undefined,
   })
 
   const [ form ] = Form.useForm();
@@ -90,7 +91,7 @@ const ImportModal = (props) => {
         reset();
         onCancelByDDL && onCancelByDDL(true, ddl);
       } else if (modeKey === 'asset-import') {
-        setSelectAssetParams({ visible: true })
+        setSelectAssetParams({ visible: true, catalogId })
       }
 
     } catch (errInfo) {
@@ -211,7 +212,7 @@ const ImportModal = (props) => {
     <SelectAsset 
       {...selectAssetParams}
       onCancel={() => {
-        setSelectAssetParams({ visible: false })
+        setSelectAssetParams({ visible: false, catalogId: undefined })
       }}
     />
     </>

src/view/Manage/Model/Component/select-asset.jsx

@@ -8,10 +8,10 @@ import Table from '../../ResizeableTable'
 import { dispatch } from '../../../../model'
 import { AssetItem } from "../../AssetManage/Component/AssetTable"
 import IframeDrawer from '../../ModelConfig/Component/IframeDrawer';
-import { Action, MetadataId } from "../../../../util/constant"
+import { Action, CatalogId, MetadataId } from "../../../../util/constant"
 import { showMessage } from "../../../../util"
 
-const FC = ({ visible, onCancel }) => {
+const FC = ({ visible, catalogId, onCancel }) => {
   const [animated, setAnimated] = React.useState(true)
   const [waiting, setWaiting] = React.useState(false)
   const [iframeDrawerParams, setIframeDrawerParams] = React.useState({
@@ -47,7 +47,7 @@ const FC = ({ visible, onCancel }) => {
         setIframeDrawerParams({
           visible: true,
           title: '新增模型',
-          url: `/data-govern/data-model-action?${Action}=add&${MetadataId}=${metadataTableId}`,
+          url: `/data-govern/data-model-action?${Action}=add&${MetadataId}=${metadataTableId}&${CatalogId}=${catalogId??''}`,
         })
       } else {
         showMessage('warn', '选中资产没有关联元数据')
@@ -81,7 +81,7 @@ const FC = ({ visible, onCancel }) => {
         !animated && <Basic ref={basicRef} />
       }
     </Modal>
-    <IframeDrawer
+    { iframeDrawerParams.visible && <IframeDrawer
       {...iframeDrawerParams}
       onCancel={() => {
         setIframeDrawerParams({
@@ -90,7 +90,7 @@ const FC = ({ visible, onCancel }) => {
           url: undefined,
         })
       }}
-    />
+    /> }
     </>
   )
 }