Commit bb00d951 by fanyj

tijiao

parent 0cca2a3c
...@@ -94,7 +94,8 @@ const config = { ...@@ -94,7 +94,8 @@ const config = {
pdataservice:`${Api}/pdataservice`, pdataservice:`${Api}/pdataservice`,
dbmanager: `${Api}/dbmanager`, dbmanager: `${Api}/dbmanager`,
datasource:`${Api}/metadataharvester/datasource`, datasource:`${Api}/metadataharvester/datasource`,
classifier:`${Api}/classifier` classifier:`${Api}/classifier`,
syncdata:`${Api}/syncdata`,
} }
} }
......
...@@ -2,10 +2,12 @@ import metaManageService from "./metaManageService" ...@@ -2,10 +2,12 @@ import metaManageService from "./metaManageService"
import metaAdminManageService from "./metaAdminManageService" import metaAdminManageService from "./metaAdminManageService"
import metaUserManageService from "./metaUserManageService" import metaUserManageService from "./metaUserManageService"
import assetsActionManageService from "./assetsActionManageService" import assetsActionManageService from "./assetsActionManageService"
import usersService from "./usersService"
export { export {
metaManageService, metaManageService,
metaAdminManageService, metaAdminManageService,
metaUserManageService, metaUserManageService,
assetsActionManageService assetsActionManageService,
usersService
} }
\ No newline at end of file
...@@ -18,7 +18,7 @@ import Table from '../../ResizeableTable'; ...@@ -18,7 +18,7 @@ import Table from '../../ResizeableTable';
import SubsribeButton from './subscribe-button'; import SubsribeButton from './subscribe-button';
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 '../Component/SelectUser';
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';
...@@ -789,6 +789,7 @@ const getResourceTag = () => { ...@@ -789,6 +789,7 @@ const getResourceTag = () => {
// }; // };
const elementEditComponent = (element) => { const elementEditComponent = (element) => {
console.log(element)
if (element.selectMode==='单选') { if (element.selectMode==='单选') {
return ( return (
<Select <Select
...@@ -806,18 +807,26 @@ const getResourceTag = () => { ...@@ -806,18 +807,26 @@ const getResourceTag = () => {
) )
} }
if(element.name==='数据负责人'||element.name==='数据管家'){
return <SelectUser item={element} />
}
if (element.selectMode==='多选') return <MultipleSelect element={element}/>; if (element.selectMode==='多选') return <MultipleSelect element={element}/>;
return <Input disabled={element.manualMaintain==='否'} />; return <Input disabled={element.manualMaintain==='否'} />;
} }
const elementDetailComponent = (item, publishedItem) => { const elementDetailComponent = (item, publishedItem) => {
return <span> if(item.name==='数据负责人'||item.name==='数据管家'){
return <SelectUser value={item.value} item={item} readOnly={true} terms={terms} />
}else{
return <span>
<Typography.Text>{highlightSearchContentByTerms(item.value||'', terms)}</Typography.Text> <Typography.Text>{highlightSearchContentByTerms(item.value||'', terms)}</Typography.Text>
{ {
publishedItem?.value && publishedItem?.value!==item.value && <Typography.Text className='ml-2' type='danger'><del>{publishedItem?.value}</del></Typography.Text> publishedItem?.value && publishedItem?.value!==item.value && <Typography.Text className='ml-2' type='danger'><del>{publishedItem?.value}</del></Typography.Text>
} }
</span>; </span>;
}
} }
const onExportClick = () => { const onExportClick = () => {
...@@ -1037,7 +1046,7 @@ const getResourceTag = () => { ...@@ -1037,7 +1046,7 @@ const getResourceTag = () => {
<Divider orientation='left'>字段级资源目录信息</Divider> <Divider orientation='left'>字段级资源目录信息</Divider>
</div> </div>
<Button size='small' onClick={()=>{comparemodal.openModal()}}>对比</Button> {action!=='add'&&<Button size='small' onClick={()=>{comparemodal.openModal()}}>对比</Button>}
</div> </div>
{ {
......
import { useSetState } from "ahooks"
import React, { useEffect } from "react"
import {Select} from "antd"
import { usersService } from "@/services"
import { httpUtil } from "@/utils"
import { highlightSearchContentByTerms } from '../../../../util';
const SelectUser:React.FC<any>=(props)=>{
const {value,onChange,item,readOnly=false,terms=[]} = props
const [state,setState] = useSetState({
usermap:{},
userlist:[],
loading:false,
})
useEffect(()=>{
if(item.name){
getusers()
}
},[item])
const getusers=async()=>{
const id = 1
setState({loading:true})
const result:any = await usersService.getUserInRoles({params:{dataRoleId:id}})
if(httpUtil.checkSuccess(result,1)){
let obj = {};
let list = [];
result.data.forEach((item)=>{
const label = `${item.name}(${item.dname})`;
obj[item.name] = label;
list.push({value:item.name,label})
})
setState({loading:false,userlist:list,usermap:obj})
}else{
setState({loading:false,userlist:[],usermap:{}})
}
}
if(readOnly){
return <span>{highlightSearchContentByTerms(state.usermap[value],terms)}</span>
}else{
return(
<Select
options={state.userlist}
loading={state.loading}
value={value}
onChange={onChange}
style={{width:'100%'}}
showSearch
filterOption={(input, option) =>
(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
}
/>
)
}
}
export default SelectUser
\ No newline at end of file
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