bug fix

src/util/Component/PermissionButton.jsx

@@ -7,7 +7,7 @@ const FC = (props) => {
   const havePermission = useMemo(() => {
     let _havePermission = true;
 
-    if (defaultPermission===false) {
+    if (defaultPermission!==undefined && defaultPermission!==null) {
       _havePermission = defaultPermission;
     } else if (permissionKey) {
       const index = (permissions||[]).findIndex(item => item === permissionKey);

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

@@ -345,7 +345,7 @@ const EditModel = (props) => {
   }
 
   const onCopy = () => {
-    window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId}&${ModelerId}=${modelerId}`)
+    window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId??''}&${ModelerId}=${modelerId}`)
   }
 
   const onExport = () => {
@@ -513,7 +513,7 @@ const EditModel = (props) => {
           导出
         </PermissionButton>
         {
-          !modelerData?.fork && <PermissionButton 
+          !branchId && <PermissionButton 
             type='primary' 
             onClick={onChangeCatalog} 
             ghost 
@@ -537,7 +537,7 @@ const EditModel = (props) => {
         {
           readOnly!=='true' && <Space>
               {
-                !modelerData?.inheritedFromEasyDataModelerDataModel && !modelerData?.fork && <PermissionButton 
+                !modelerData?.inheritedFromEasyDataModelerDataModel && !branchId && <PermissionButton 
                   type='primary' 
                   onClick={() => {
                     if (importActionRef.current && importActionRef.current.isLoading()) {

src/view/Manage/Model/index.jsx

@@ -352,9 +352,15 @@ class Model extends React.Component {
 
   onTableItemAction = (record, action, readOnly=false) => {
     this.setState({ importModalAction: action, modelerId: record.id }, () => {
-      const { catalogId, importModalAction, modelerId } = this.state;
+      const { catalogId, importModalAction, modelerId, currentView } = this.state;
 
-      window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${catalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${Holder}=${record.holder||''}&${ReadOnly}=${readOnly}`);
+      let currentBranchId = '', currentCatalogId = catalogId
+      if (currentView === 'branch') {
+        currentCatalogId = ''
+        currentBranchId = catalogId
+      }
+
+      window.open(`/data-govern/data-model-action?${Action}=${importModalAction}&${CatalogId}=${currentCatalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${Holder}=${record.holder||''}&${ReadOnly}=${readOnly}&${BranchId}=${currentBranchId}`);
     });
   }