Skip to content

S
szse
Commit e75bdf58 by zhaochengxiang
Options

bug fix

parent ae779580
Showing with 27 additions and 100 deletions
src/App.js
...@@ -21,12 +21,7 @@ import AssetDetail from './view/Manage/AssetManage/Component/AssetDetail'; ...@@ -21,12 +21,7 @@ import AssetDetail from './view/Manage/AssetManage/Component/AssetDetail';
import ImportAction from './view/Manage/Model/Component/ImportAction'; import ImportAction from './view/Manage/Model/Component/ImportAction';
import EditModel from './view/Manage/Model/Component/EditModel'; import EditModel from './view/Manage/Model/Component/EditModel';
import EditTemplate from './view/Manage/ModelConfig/Component/EditTemplate'; import EditTemplate from './view/Manage/ModelConfig/Component/EditTemplate';
import AssetTree from './view/Manage/AssetManage/Component/AssetTree'; import AssetTree from './view/Manage/AssetManage/Component/AssetManageTree';
import Asset1104Manage from './view/Manage/Asset1104Manage';
import AssetTask from './view/Manage/AssetTask';
import DataService from './view/Manage/Pdata';
import DataServiceDetail from './view/Manage/Pdata/Component/ServiceDetail';
import GrantedDataServiceList from './view/Manage/Pdata/Component/GrantedList';
import { AssetMountReference } from './util/constant'; import { AssetMountReference } from './util/constant';
...@@ -137,57 +132,6 @@ export class App extends React.Component { ...@@ -137,57 +132,6 @@ export class App extends React.Component {
); );
} }
if (message === 'showDataService' || message === 'showDataServiceManage') {
return (
<AppContext.Provider value={{
env: hostParams?.env,
user: hostParams?.user,
openAdmit: hostParams?.openAdmit,
openDetail: hostParams?.openDetail,
editServer: hostParams?.editServer,
applyServer: hostParams?.applyServer,
setGlobalState,
onGlobalStateChange
}}>
<DataService
isOnlyEnding={message==='showDataServiceManage'}
location={this.props.location}
/>
</AppContext.Provider>
);
}
if (message === 'showDataServiceDetail') {
return (
<AppContext.Provider value={{
setGlobalState,
onGlobalStateChange
}}>
<DataServiceDetail
id={id}
terms={terms}
/>
</AppContext.Provider>
);
}
if (message === 'showGrantedDataService') {
return (
<AppContext.Provider value={{
env: hostParams?.env,
user: hostParams?.user,
openAdmit: hostParams?.openAdmit,
openDetail: hostParams?.openDetail,
editServer: hostParams?.editServer,
applyServer: hostParams?.applyServer,
setGlobalState,
onGlobalStateChange
}}>
<GrantedDataServiceList/>
</AppContext.Provider>
);
}
return ( return (
<AppContext.Provider value={{ <AppContext.Provider value={{
env: hostParams?.env, env: hostParams?.env,
...@@ -204,30 +148,13 @@ export class App extends React.Component { ...@@ -204,30 +148,13 @@ export class App extends React.Component {
<Route path={`${ContextPath}/model-template-action`} component={EditTemplate} exact /> <Route path={`${ContextPath}/model-template-action`} component={EditTemplate} exact />
<Route path={`${ContextPath}/asset-detail`} component={AssetDetailPage} exact /> <Route path={`${ContextPath}/asset-detail`} component={AssetDetailPage} exact />
<Route path={'/center-home/view/datasource-manage'} component={DatasourceManage} exact />
<Route path={'/center-home/view/data-model'} component={Model} exact />
<Route path={'/center-home/view/model-config'} component={ModelConfig} exact />
<Route path={'/center-home/view/asset-map'} component={Map} exact />
<Route path={'/center-home/view/asset-manage'} component={AssetManage} exact />
<Route path={'/center-home/view/asset-resource-browse'} component={AssetResourceBrowse} exact />
<Route path={'/center-home/view/asset-browse'} component={AssetBrowse} exact />
<Route path={'/center-home/view/asset-recycle'} component={AssetRecycle} exact />
<Route path={'/center-home/view/asset-task'} component={AssetTask} exact />
<Route path={'/center-home/view/asset-1104-manage'} component={Asset1104Manage} exact />
<Route path={'/center-home/menu/datasource-manage'} component={DatasourceManage} exact /> <Route path={'/center-home/menu/datasource-manage'} component={DatasourceManage} exact />
<Route path={'/center-home/menu/data-model'} component={Model} exact /> <Route path={'/center-home/menu/data-model'} component={Model} exact />
<Route path={'/center-home/menu/model-config'} component={ModelConfig} exact /> <Route path={'/center-home/menu/model-config'} component={ModelConfig} exact />
<Route path={'/center-home/menu/asset-map'} component={Map} exact />
<Route path={'/center-home/menu/asset-manage'} component={AssetManage} exact /> <Route path={'/center-home/menu/asset-manage'} component={AssetManage} exact />
<Route path={'/center-home/menu/asset-resource-browse'} component={AssetResourceBrowse} exact /> <Route path={'/center-home/menu/asset-resource-browse'} component={AssetResourceBrowse} exact />
<Route path={'/center-home/menu/asset-browse'} component={AssetBrowse} exact /> <Route path={'/center-home/menu/asset-browse'} component={AssetBrowse} exact />
<Route path={'/center-home/menu/asset-recycle'} component={AssetRecycle} exact /> <Route path={'/center-home/menu/asset-recycle'} component={AssetRecycle} exact />
<Route path={'/center-home/menu/asset-task'} component={AssetTask} exact />
<Route path={'/center-home/menu/asset-1104-manage'} component={Asset1104Manage} exact />
<Route path={'/center-home/menu/data-service'} component={DataService} exact />
<Route path={'/center-home/data-model-action'} component={EditModel} exact /> <Route path={'/center-home/data-model-action'} component={EditModel} exact />
<Route path={'/center-home/asset-detail'} component={AssetDetailPage} exact /> <Route path={'/center-home/asset-detail'} component={AssetDetailPage} exact />
<Route path={'/center-home/session/asset-detail'} component={AssetDetailPage} exact /> <Route path={'/center-home/session/asset-detail'} component={AssetDetailPage} exact />
......
src/view/Manage/AssetManage/Component/AssetAction.jsx
...@@ -12,12 +12,12 @@ import Separate from './Separate'; ...@@ -12,12 +12,12 @@ import Separate from './Separate';
import AssetTagModal from './AssetTagModal'; import AssetTagModal from './AssetTagModal';
import { AnchorId, AnchorDirId, AssetManageReference } from '../../../../util/constant'; import { AnchorId, AnchorDirId, AssetManageReference } from '../../../../util/constant';
import IndexCode from './IndexCode'; import IndexCode from './IndexCode';
import Upload from './Upload'; // import Upload from './Upload';
import Table from '../../ResizeableTable'; import Table from '../../ResizeableTable';
import { CancelSvg, EditSvg, SaveSvg, FullScreenSvg, CancelFullScreenSvg } from './AssetSvg'; import { CancelSvg, EditSvg, SaveSvg, FullScreenSvg, CancelFullScreenSvg } from './AssetSvg';
import SelectUser from '../../Model/Component/SelectUsers'; // import SelectUser from '../../Model/Component/SelectUsers';
import SelectFilter from '../../Model/Component/SelectFilter'; // import SelectFilter from '../../Model/Component/SelectFilter';
import { checkDataAssetEditable } from '../../../../service/dataassetmanager'; import { checkDataAssetEditable } from '../../../../service/dataassetmanager';
import download from '../../../../util/download'; import download from '../../../../util/download';
import SelectStandard from './SelectStandard'; import SelectStandard from './SelectStandard';
...@@ -757,22 +757,22 @@ const AssetAction = (props) => { ...@@ -757,22 +757,22 @@ const AssetAction = (props) => {
) )
} }
if (element.name==='数据关键用户' || element.name?.toLowerCase()==='业务数据owner' || element.name?.toLowerCase()==='it责任人') { // if (element.name==='数据关键用户' || element.name?.toLowerCase()==='业务数据owner' || element.name?.toLowerCase()==='it责任人') {
return <SelectUser // return <SelectUser
type='edit' // type='edit'
loading={loadingUsers} // loading={loadingUsers}
users={users} // users={users}
disabled={element.manualMaintain==='否'} // disabled={element.manualMaintain==='否'}
/> // />
} // }
if (element.name==='业务责任部门' || element.name?.toLowerCase()==='it责任部门') { // if (element.name==='业务责任部门' || element.name?.toLowerCase()==='it责任部门') {
return <SelectFilter // return <SelectFilter
loading={loadingDepartments} // loading={loadingDepartments}
data={departments} // data={departments}
disabled={element.manualMaintain==='否'} // disabled={element.manualMaintain==='否'}
/> // />
} // }
if (element.name === '主题域分组') { if (element.name === '主题域分组') {
return ( return (
...@@ -856,14 +856,14 @@ const AssetAction = (props) => { ...@@ -856,14 +856,14 @@ const AssetAction = (props) => {
return <IndexCode value={item.value||''} terms={terms} />; return <IndexCode value={item.value||''} terms={terms} />;
} }
if (item.name==='数据关键用户' || item.name?.toLowerCase()==='业务数据owner' || item.name?.toLowerCase()==='it责任人' || item.name==='创建人' || item.name==='更新人') { // if (item.name==='数据关键用户' || item.name?.toLowerCase()==='业务数据owner' || item.name?.toLowerCase()==='it责任人' || item.name==='创建人' || item.name==='更新人') {
return <SelectUser // return <SelectUser
type='detail' // type='detail'
users={users} // users={users}
terms={terms} // terms={terms}
value={item.value||''} // value={item.value||''}
/> // />
} // }
return <span className='text-color'>{highlightSearchContentByTerms(item.value||'', terms)}</span>; return <span className='text-color'>{highlightSearchContentByTerms(item.value||'', terms)}</span>;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment