恢复

src/util/constant.js

@@ -28,9 +28,4 @@ export const AssetBrowseReference = 'asset-browse';
 export const ResourceBrowseReference = 'resource-browse';
 export const AssetRecycleReference = 'asset-recycle';
 export const AssetMountReference = 'asset-mount';
-export const MyAssetReference = 'my-asset';
-
-//数据服务
-export const DataServiceRoleAdmin = 'admin';
-export const DataServiceRoleUser = 'user';
-export const DataServiceRoleReader = 'reader';
\ No newline at end of file
+export const MyAssetReference = 'my-asset';
\ No newline at end of file

src/util/index.js

@@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
 import { dispatchLatest, action } from '../model';
 import { set_sess_state } from "../model/reducer";
 
-import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader,DataServiceRoleAdmin,DataServiceRoleUser,DataServiceRoleReader } from './constant';
+import { DataModelerRoleAdmin, DataModelerRoleUser, DataModelerRoleReader } from './constant';
 
 //内网深交所环境 isSzseEnv true
 //元曜公网环境 isSzseEnv false
@@ -388,7 +388,6 @@ export function getTextWidth(text, font='14px tabular-nums') {
 }
 
 export function getDataModelerRole(user) {
-  console.log(user?.roles)
   if ((user?.roles||[]).indexOf('ROLE_dataModeler_admin') !== -1) {
     return DataModelerRoleAdmin;
   } else if ((user?.roles||[]).indexOf('ROLE_dataModeler_user') !== -1) {
@@ -399,16 +398,3 @@ export function getDataModelerRole(user) {
   
   return DataModelerRoleAdmin;
 }
-// hjj 数据服务权限
-export function getDataServiceRole(user) {
-  console.log(user?.roles)
-  if ((user?.roles||[]).indexOf('ROLE_dataService_admin') !== -1) {
-    return DataServiceRoleAdmin;
-  } else if ((user?.roles||[]).indexOf('ROLE_dataService_user') !== -1) {
-    return DataServiceRoleUser;
-  } else if ((user?.roles||[]).indexOf('ROLE_dataService_reader') !== -1) {
-    return DataServiceRoleReader;
-  }
-  
-  return DataServiceRoleAdmin;
-}

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

@@ -6,8 +6,8 @@ import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify"
 
 import UpdateTreeItemModal from './UpdateTreeItemModal';
 import { dispatch } from '../../../../model'; 
-import { showMessage, getQueryParam, highlightSearchContentByTerms,  getDataServiceRole } from '../../../../util';
-import { AnchorDirId, AnchorId, AnchorTimestamp, DataServiceRoleAdmin } from '../../../../util/constant';
+import { showMessage, getQueryParam, highlightSearchContentByTerms, getDataModelerRole } from '../../../../util';
+import { AnchorDirId, AnchorId, AnchorTimestamp, DataModelerRoleAdmin } from '../../../../util/constant';
 import { AppContext } from "../../../../App";
 
 import './ModelTree.less';
@@ -545,7 +545,7 @@ const ModelTree = (props) => {
           borderBottom: "1px solid #EFEFEF",
           height: 57,
           alignItems: 'center',
-          // justifyContent: (viewSelectedKey==='dir' &&  getDataServiceRole(user)===DataServiceRoleAdmin)?'space-between':'',
+          // justifyContent: (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin)?'space-between':'',
         }}
       >
         <Dropdown overlay={exportMenu} placement="bottomLeft">
@@ -555,14 +555,14 @@ const ModelTree = (props) => {
         </Dropdown>
 
         {
-          // (viewSelectedKey==='dir' &&  getDataServiceRole(user)===DataServiceRoleAdmin && !isOnlyEnding) && ( 
+          // (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin && !isOnlyEnding) && ( 
           //   <Tooltip title="新增目录" className='ml-6'>
           //     <PlusOutlined className='default' onClick={add} style={{ fontSize:16,cursor:'pointer' }} />
           //   </Tooltip>
           // )
         }     
         {/* {
-          (viewSelectedKey==='dir' &&  getDataServiceRole(user)===DataServiceRoleAdmin) && ( 
+          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && ( 
             <Tooltip title="存量模型导入" className='ml-2'>
               <ImportOutlined className='default' onClick={() => { importStockModel && importStockModel() }} style={{ fontSize:16,cursor:'pointer' }} />
             </Tooltip>
@@ -574,7 +574,7 @@ const ModelTree = (props) => {
         </Tooltip>
 
         {/* {
-          (viewSelectedKey==='dir' &&  getDataServiceRole(user)===DataServiceRoleAdmin) && !isSetRootId && (
+          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && !isSetRootId && (
             <Dropdown overlay={syncMenu} placement="bottomLeft"> 
               <Tooltip title="同步目录">
                 <SwapOutlined className='default ml-2' style={{ fontSize:16,cursor:'pointer', transform: 'rotate(90deg)', }} />
@@ -584,7 +584,7 @@ const ModelTree = (props) => {
         }  */}
 
         {
-          (viewSelectedKey==='dir' &&  getDataServiceRole(user)===DataServiceRoleAdmin) && isSetRootId && (
+          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && isSetRootId && (
               <Tooltip title="同步目录" className='ml-6'>
                 <Button type='text' icon={<SwapOutlined className='default' style={{ transform: 'rotate(90deg)' }} />} size='small' onClick={sync} />
               </Tooltip>

src/view/Manage/Model/index.jsx

@@ -15,9 +15,9 @@ import RecatalogModal from './Component/RecatalogModal';
 import HistoryAndVersionDrawer from './Component/HistoryAndVersionDrawer';
 import StartFlowModal from './Component/StartFlowModal';
 import JDBCInformation from './Component/JDBCInformation';
-import { showMessage, showNotifaction, inputWidth, DeleteTipModal, getDataModelerRole,getDataServiceRole } from '../../../util';
+import { showMessage, showNotifaction, inputWidth, DeleteTipModal, getDataModelerRole } from '../../../util';
 import { dispatch, dispatchLatestHomepage } from '../../../model'; 
-import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder, DDL, DataServiceRoleReader, ReadOnly } from '../../../util/constant';
+import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder, DDL, DataModelerRoleReader, ReadOnly } from '../../../util/constant';
 import { AppContext } from '../../../App';
 import DebounceInput from './Component/DebounceInput';
 import ColSettingModal from './Component/ColSettingModal';
@@ -683,7 +683,7 @@ class Model extends React.Component {
           > 
             <Space>
             {
-              currentView==='dir' && (getDataServiceRole(app?.user)!==DataServiceRoleReader) && !isOnlyEnding && <React.Fragment>
+              currentView==='dir' && (getDataModelerRole(app?.user)!==DataModelerRoleReader) && !isOnlyEnding && <React.Fragment>
                 <Space>
                   <Dropdown 
                     overlay={
@@ -732,11 +732,11 @@ class Model extends React.Component {
                   </Tooltip>
                 </Space> */}
 
-                <Space>
+                {/* <Space>
                   <Tooltip title={(selectModelerIds||[]).length===0?'请先选择服务':''}>
                     <Button onClick={this.onReleaseBtnClick} disabled={(selectModelerIds||[]).length===0}>发布</Button>
                   </Tooltip>
-                </Space>
+                </Space> */}
               
                 {/* <Space>
                   <Tooltip title={(selectModelerIds||[]).length===0?'请先选择服务':''}>
@@ -755,22 +755,22 @@ class Model extends React.Component {
               <Button onClick={() => { this.setState({jdbcInformationVisible: true}); }}>JDBC信息</Button>
             </Space>
             {
-              (getDataModelerRole(app?.user)!==DataServiceRoleReader) && !isOnlyEnding && <Button onClick={this.onImportClick}>导入</Button>
+              (getDataModelerRole(app?.user)!==DataModelerRoleReader) && !isOnlyEnding && <Button onClick={this.onImportClick}>导入</Button>
             }
             {
-              (getDataModelerRole(app?.user)!==DataServiceRoleReader) && !isOnlyEnding && (currentView==='dir') && 
+              (getDataModelerRole(app?.user)!==DataModelerRoleReader) && !isOnlyEnding && (currentView==='dir') && 
                 <Tooltip title={this.state.isRoot?'请先选择目录':''}>
                   <Button onClick={this.onExportClick} disabled={this.state.isRoot}>导出</Button>
                 </Tooltip>
             }
             {
-              (getDataModelerRole(app?.user)!==DataServiceRoleReader) && isOnlyEnding && 
+              (getDataModelerRole(app?.user)!==DataModelerRoleReader) && isOnlyEnding && 
                   <Tooltip title={(selectModelerIds||[]).length===0?'请先选择服务':''}>
                     <Button onClick={this.onSubscribeBtnClick} disabled={(selectModelerIds||[]).length===0}>收藏</Button>
                   </Tooltip>
             }
             {
-              (getDataModelerRole(app?.user)!==DataServiceRoleReader) && isOnlyEnding && 
+              (getDataModelerRole(app?.user)!==DataModelerRoleReader) && isOnlyEnding && 
                   <Tooltip title={(selectModelerIds||[]).length===0?'请先选择服务':''}>
                     <Button onClick={this.onOfflineBtnClick} disabled={(selectModelerIds||[]).length===0}>停用</Button>
                   </Tooltip>