Skip to content

S
szse
Commit be3f3004 by fanyj
Options

修改字眼

parent df078d53
Showing with 119 additions and 119 deletions
src/layout/FullSearch.js
......@@ -34,7 +34,7 @@ const modes = [
key: 'data-model',
},
{
title: '数据资产',
title: '数据资源',
shortTitle: '资',
key: 'data-asset',
},
......
src/routes.js
......@@ -29,23 +29,23 @@ export const routes = [
},
{
name: 'asset-draft',
text: '资产草稿',
text: '资源草稿',
},
{
name: 'asset-manage',
text: '资产管理',
text: '资源管理',
},
{
name: 'asset-browse',
text: '资产浏览'
text: '资源浏览'
},
{
name: 'asset-task',
text: '资产盘点任务',
text: '资源盘点任务',
},
{
name: 'asset-evaluate',
text: '资产评估',
text: '资源评估',
},
]
}
......
src/util/constant.js
......@@ -25,7 +25,7 @@ export const DataModelerRoleAdmin = 'admin';
export const DataModelerRoleUser = 'user';
export const DataModelerRoleReader = 'reader';
//资产
//资源
export const ResourceManageReference = 'resource-manage';
export const AssetManageReference = 'asset-manage';
export const AssetBrowseReference = 'asset-browse';
......
src/view/Manage/AssetBrowse/Component/RelationContainer.jsx
......@@ -133,7 +133,7 @@ const RelationContainer = (props) => {
// const _index = (dirs||[]).findIndex(dir => dir.nodeId === rootNode.id);
// if (_index !== -1) {
// if (reference === AssetBrowseReference) {
// newRelationData = {text: '资产', show: true, simple: false, virtual: true, children: [newRelationData]};
// newRelationData = {text: '资源', show: true, simple: false, virtual: true, children: [newRelationData]};
// } else if (reference === ResourceBrowseReference) {
// newRelationData = {text: '资源', show: true, simple: false, virtual: true, children: [newRelationData]};
// }
......
src/view/Manage/AssetDraft/draft.jsx
......@@ -237,7 +237,7 @@ const FC = (props) => {
column.width = isSzseEnv ? 230 : 160
} else if (name === '英文名称' || name === '岗位英文名') {
column.width = isSzseEnv ? 224 : 160
} else if (name === '资产项') {
} else if (name === '资源项') {
column.width = isSzseEnv ? 250 : 120
column.render = (text) => {
let metadata = null
......@@ -424,7 +424,7 @@ const FC = (props) => {
const onPublishClick = () => {
if (isAdmin) {
modal.confirm({
title: '是否确认发布选中的资产',
title: '是否确认发布选中的资源',
onOk: () => {
dispatch({
type: 'assetmanage.publishDrafts',
......@@ -449,7 +449,7 @@ const FC = (props) => {
const onDeletesClick = () => {
modal.confirm({
title: '是否确认删除选中的资产目录',
title: '是否确认删除选中的资源目录',
onOk: () => {
dispatch({
type: 'assetmanage.deleteDrafts',
......@@ -507,7 +507,7 @@ const FC = (props) => {
const onRightSubmitClick = () => {
modal.confirm({
title: '提示',
content: '是否确认提交选中的资产?',
content: '是否确认提交选中的资源?',
onOk: () => {
dispatch({
type: 'assetmanage.submitDraft',
......@@ -526,7 +526,7 @@ const FC = (props) => {
const onRightChangeToPendingSubmitClick = () => {
modal.confirm({
title: '提示',
content: '是否确认转为待提交选中的资产?',
content: '是否确认转为待提交选中的资源?',
onOk: () => {
dispatch({
type: 'assetmanage.changeToPendingSubmitDraft',
......@@ -580,7 +580,7 @@ const FC = (props) => {
<PermissionButton
defaultPermission={canExport}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onExportClick}
disabled={(selectedRows||[]).length===0}
>
......@@ -589,7 +589,7 @@ const FC = (props) => {
<PermissionButton
defaultPermission={canFlow}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onFlowClick}
disabled={(selectedRows||[]).length===0}
>
......@@ -598,7 +598,7 @@ const FC = (props) => {
<PermissionButton
defaultPermission={canPublish}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onPublishClick}
disabled={(selectedRows||[]).length===0}
>
......@@ -607,7 +607,7 @@ const FC = (props) => {
<PermissionButton
defaultPermission={canDelete}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onDeletesClick}
disabled={(selectedRows||[]).length===0}
>
......
src/view/Manage/AssetDraft/import.jsx
......@@ -179,7 +179,7 @@ const FC = (props) => {
<Drawer
forceRender
visible={ visible }
title='资产目录草稿批量修改'
title='资源目录草稿批量修改'
width={900}
placement="right"
closable={ true }
......
src/view/Manage/AssetDraft/recycle.jsx
......@@ -94,7 +94,7 @@ const FC = (props) => {
column.width = isSzseEnv ? 230 : 160
} else if (name === '英文名称' || name === '岗位英文名') {
column.width = isSzseEnv ? 224 : 160
} else if (name === '资产项') {
} else if (name === '资源项') {
column.width = isSzseEnv ? 250 : 120
column.render = (text) => {
let metadata = null
......@@ -175,7 +175,7 @@ const FC = (props) => {
type: 'assetmanage.getTemplates',
callback: data => {
setLoadingTemplates(false)
//未挂载资产屏蔽岗位
//未挂载资源屏蔽岗位
setTemplates((data??[]).filter(item=>item.type!=='post'))
if ((data??[]).length > 0) {
LocalStorage.set(`templateType-${appId}`, data[0].type)
......@@ -241,7 +241,7 @@ const FC = (props) => {
const onRecoverClick = () => {
modal.confirm({
title: '提示',
content: '是否恢复选中的资产?',
content: '是否恢复选中的资源?',
onOk: () => {
dispatch({
type: 'assetmanage.recoverDataAssetsFromRecycleBin',
......@@ -261,7 +261,7 @@ const FC = (props) => {
const onDeleteClick = () => {
modal.confirm({
title: '提示',
content: '是否删除选中的资产?',
content: '是否删除选中的资源?',
onOk: () => {
dispatch({
type: 'assetmanage.deleteDataAssets',
......@@ -312,7 +312,7 @@ const FC = (props) => {
</Select>
<PermissionButton
defaultPermission={canExport}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onExportClick}
disabled={(selectedRows||[]).length===0}
>
......@@ -320,7 +320,7 @@ const FC = (props) => {
</PermissionButton>
<PermissionButton
defaultPermission={canRecover}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onRecoverClick}
disabled={(selectedRows||[]).length===0}
>
......@@ -328,7 +328,7 @@ const FC = (props) => {
</PermissionButton>
<PermissionButton
defaultPermission={canDelete}
tip={(selectedRows||[]).length===0?'请先选择资产':''}
tip={(selectedRows||[]).length===0?'请先选择资源':''}
onClick={onDeleteClick}
disabled={(selectedRows||[]).length===0}
>
......
src/view/Manage/AssetDraft/review.jsx
......@@ -90,7 +90,7 @@ const FC = (props) => {
}
<div>
<div className='flex my-3' style={{ justifyContent: 'center' }}>
<h3>资产评审流程</h3>
<h3>资源评审流程</h3>
</div>
<Descriptions bordered size='small' column={2}>
<Descriptions.Item label="流程名称">{data?.applyUser?.userName?`${data?.applyUser?.userDisplayName}(${data?.applyUser?.userName})发起的物理模型评审流程`:''}</Descriptions.Item>
......@@ -170,7 +170,7 @@ const List = React.forwardRef(function ({data}, ref) {
render:(_, __, index)=> (index+1)
},
{
title: '资产名称',
title: '资源名称',
dataIndex: 'enName',
width: 160,
ellipsis: false,
......
src/view/Manage/AssetDraft/start-flow.jsx
......@@ -232,7 +232,7 @@ const List = React.forwardRef(function ({ items }, ref) {
render:(_, __, index)=> (index+1)
},
{
title: '资产名称',
title: '资源名称',
dataIndex: 'enName',
width: 160,
render: (text, record) => (
......
src/view/Manage/AssetEvaluate/add.jsx
......@@ -119,8 +119,8 @@ const Basic = React.forwardRef(function ({ item, elements }, ref) {
</Form.Item>
<Form.Item
name='dirs'
label='资产目录'
rules={[{ required: true, message: '请选择资产目录!' }]}
label='资源目录'
rules={[{ required: true, message: '请选择资源目录!' }]}
>
<AssetCatalogItem />
</Form.Item>
......@@ -210,7 +210,7 @@ const AssetCatalogItem = ({ value, onChange }) => {
loading={loadingTreeData}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={treeData1}
placeholder="请选择资产目录"
placeholder="请选择资源目录"
treeDefaultExpandAll
treeCheckable={true}
treeCheckStrictly={true}
......
src/view/Manage/AssetEvaluate/index.jsx
......@@ -119,7 +119,7 @@ const FC = (props) => {
ellipsis: true,
},
{
title: '资产总数',
title: '资源总数',
dataIndex: 'dataAssetTotalNum',
ellipsis: true,
},
......
src/view/Manage/AssetManage/Component/AddAssetModel.jsx
......@@ -77,7 +77,7 @@ const AddAssetModel = (props) => {
<Modal
destroyOnClose
className='asset-add'
title='新增资产目录信息'
title='新增资源目录信息'
visible={ visible }
centered
width='80%'
......
src/view/Manage/AssetManage/Component/AssetAction.jsx
......@@ -508,13 +508,13 @@ const AssetAction = React.forwardRef(function (props, ref) {
callback: data => {
setLoading(false);
//资产草稿版本比对
//资源草稿版本比对
if (reference === AssetDraftReference && data?.dataAssetId && (data?.dirIds??[]).length > 0) {
getPublishedAssetPaths(data?.dataAssetId)
getPublishedAsset(data?.dataAssetId, data?.dirIds[0])
}
const metadataIndex = data?.elements?.findIndex(item => item.name === '资产项');
const metadataIndex = data?.elements?.findIndex(item => item.name === '资源项');
setElements(data?.elements||[]);
......@@ -596,7 +596,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
} else if (item.resourceType==='dataAsset') {
window.open(`/center-home/menu/asset-browse?${AnchorId}=${item?.dataAssetId??''}&${AnchorDirId}=${item?.dirId??''}&templateType=${assets?.templateType}&timestamp=${timestamp}`);
} else {
showMessage('warn', '资产目录类型不是资源也不是资产!');
showMessage('warn', '资源目录类型不是资源也不是资源!');
}
}
......@@ -670,7 +670,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
}
} catch (errInfo) {
console.log('Validate Failed:', errInfo);
showMessage('warn', '请完成资产必填项')
showMessage('warn', '请完成资源必填项')
}
}
......@@ -781,7 +781,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
<div className='mb-3'>
<Row gutter={10}>
<Col flex='1 1 0' style={{ overflow: 'hidden' }}>
<span>资产目录路径: </span>
<span>资源目录路径: </span>
<span>
{
(assetPaths??[]).length > 0 && (
......@@ -820,7 +820,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
{
(!readonly && (reference===AssetManageReference||canEdit)) && <React.Fragment>
{
currentAction==='detail' ? <Tooltip title={(assets?.existDraft)?'资产存在草稿箱中，不允许编辑':''}>
currentAction==='detail' ? <Tooltip title={(assets?.existDraft)?'资源存在草稿箱中，不允许编辑':''}>
<Button onClick={onActionButtonClick} disabled={assets?.existDraft}>编辑</Button>
</Tooltip> : <React.Fragment>
<Button onClick={onCancelButtonClick}>取消</Button>
......@@ -845,7 +845,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
data: { id: metadata?.metadataTableId, type: key }
})
} else {
showMessage("warn","该资产目录没有关联元数据信息");
showMessage("warn","该资源目录没有关联元数据信息");
}
}}>
<Menu.Item key="lineage">血缘分析</Menu.Item>
......@@ -870,7 +870,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
<Descriptions column={1} bordered>
{
elements?.map((element, index) => {
if (element.type!==attribute || element.name === '资产项') return null;
if (element.type!==attribute || element.name === '资源项') return null;
const _index = (publishedAsset?.elements??[]).findIndex(item => item.name===element.name)
let publishedElement = null;
......@@ -942,7 +942,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
</Spin>
<div>
<Divider orientation='left'>字段级资产目录信息</Divider>
<Divider orientation='left'>字段级资源目录信息</Divider>
{
isStructured ? <Table
className='mt-3'
......@@ -1007,7 +1007,7 @@ const AssetAction = React.forwardRef(function (props, ref) {
</Form>
<div>
<Divider orientation='left'>关联资产</Divider>
<Divider orientation='left'>关联资源</Divider>
<RelationAssets
ref={relationAssetsRef}
reference={reference}
......
src/view/Manage/AssetManage/Component/AssetDeleteModal.jsx
......@@ -13,7 +13,7 @@ const AssetDeleteModal = (props) => {
return (
<Modal
title="删除资产目录"
title="删除资源目录"
visible={visible}
width={530}
onCancel={
......@@ -33,12 +33,12 @@ const AssetDeleteModal = (props) => {
>
<Radio.Group onChange={onChange} value={value}>
<Radio value={1}>
<span>删除本目录下的资产目录</span>
<span>删除本目录下的资源目录</span>
&nbsp;
<Popover content={
<span>
当要删除的资产目录,只存在一个目录时,删除该资产目录并且设置为未分类资产目录;<br/>
存在多个目录时,只删除该目录下的这项资产目录,不会设置为未分类资产目录
当要删除的资源目录,只存在一个目录时,删除该资源目录并且设置为未分类资源目录;<br/>
存在多个目录时,只删除该目录下的这项资源目录,不会设置为未分类资源目录
</span>
}
>
......@@ -46,9 +46,9 @@ const AssetDeleteModal = (props) => {
</Popover>
</Radio>
<Radio value={2}>
<span>删除该资产目录(所有目录下的资产目录均删除)</span>
<span>删除该资源目录(所有目录下的资源目录均删除)</span>
&nbsp;
<Popover content='该资产目录所在的目录内,均删除该项资产目录,并设置为未分类资产目录' >
<Popover content='该资源目录所在的目录内,均删除该项资源目录,并设置为未分类资源目录' >
<QuestionCircleOutlined className='pointer' />
</Popover>
</Radio>
......
src/view/Manage/AssetManage/Component/AssetDetailDrawer.jsx
......@@ -23,10 +23,10 @@ const AssetDetailDrawer = (props) => {
}, [visible])
const title = React.useMemo(() => {
if (draftAsset?.state === 'draft') return '资产目录详情(待提交)'
if (draftAsset?.state === 'auditing') return '资产目录详情(审批中)'
if (draftAsset?.state === 'draft') return '资源目录详情(待提交)'
if (draftAsset?.state === 'auditing') return '资源目录详情(审批中)'
return '资产目录详情'
return '资源目录详情'
}, [draftAsset])
const getDraft = () => {
......
src/view/Manage/AssetManage/Component/AssetDetailPage.jsx
......@@ -34,10 +34,10 @@ const AssetDetailPage = (props)=>{
}, [])
const title = React.useMemo(() => {
if (draftAsset?.state === 'draft') return '资产目录详情(待提交)'
if (draftAsset?.state === 'auditing') return '资产目录详情(审批中)'
if (draftAsset?.state === 'draft') return '资源目录详情(待提交)'
if (draftAsset?.state === 'auditing') return '资源目录详情(审批中)'
return '资产目录详情'
return '资源目录详情'
}, [draftAsset])
const getDataAssetDetail = () => {
......
src/view/Manage/AssetManage/Component/AssetDirectory.jsx
......@@ -133,22 +133,22 @@ const AssetDirectory = (props) => {
<Menu>
<Menu.Item>
<div className='text-center' onClick={onImportElementBtnClick}>
导入资产目录属性
导入资源目录属性
</div>
</Menu.Item>
<Menu.Item>
<div className='text-center' onClick={onExportElementBtnClick}>
导出资产目录属性
导出资源目录属性
</div>
</Menu.Item>
<Menu.Item>
<div className='text-center' onClick={onFilterElementClick}>
资产目录浏览管理
资源目录浏览管理
</div>
</Menu.Item>
<Menu.Item>
<div className='text-center' onClick={onAttributeRelationBtnClick}>
资产目录属性关联
资源目录属性关联
</div>
</Menu.Item>
</Menu>
......@@ -212,7 +212,7 @@ const AssetDirectory = (props) => {
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Tooltip title={resourceState?.relatedAsset}>
<Text className='title-color' ellipsis={true}>
资产化数量：
资源化数量：
<Text className='text-color'>{resourceState?.relatedAsset}</Text>
</Text>
</Tooltip>
......@@ -221,7 +221,7 @@ const AssetDirectory = (props) => {
<Paragraph style={{ flex: 1, overflow: 'hidden' }}>
<Tooltip title={resourceState?.notRelatedAsset}>
<Text className='title-color' ellipsis={true}>
非资产数量：
非资源数量：
<Text className='text-color'>{resourceState?.notRelatedAsset}</Text>
</Text>
</Tooltip>
......
src/view/Manage/AssetManage/Component/AssetItem.jsx
......@@ -27,7 +27,7 @@ const AssetItem = (props) => {
<Col className='mb-3' key={_index} md={8}>
<Typography.Paragraph title={ `${element.name||''}: ${element.value||''}` } style={{ color: '#464646' }} ellipsis>
{ `${element.name||''}: `}
{ element.name==='资产项'?<MetadataInfo config={false} value={element.value||''} />:`${element.value||''}` }
{ element.name==='资源项'?<MetadataInfo config={false} value={element.value||''} />:`${element.value||''}` }
</Typography.Paragraph>
</Col>
);
......
src/view/Manage/AssetManage/Component/AssetManageTree.jsx
......@@ -542,7 +542,7 @@ const AssetManageTree = (props) => {
}
})
} else {
showMessage("warn","目录下有资产目录信息,不允许删除!");
showMessage("warn","目录下有资源目录信息,不允许删除!");
}
}
})
......
src/view/Manage/AssetManage/Component/AssetTable.jsx
......@@ -41,7 +41,7 @@ const operationMap = {
historyVersion: '历史版本',
}
//资产项
//资源项
export const AssetItem = (props) => {
const { metadata, terms } = props;
......@@ -594,7 +594,7 @@ const AssetTable = (props) => {
// </Tooltip>
// );
// }
} else if (name === '资产项') {
} else if (name === '资源项') {
params.width = isSzseEnv?250:120;
params.render = (metadata, _) => {
......@@ -604,7 +604,7 @@ const AssetTable = (props) => {
}
_metadataIndex = `element${index}`;
} else if (name === '资产目录路径') {
} else if (name === '资源目录路径') {
params.render = (text, record) => {
return (
<Tooltip title={text||''}>
......@@ -657,7 +657,7 @@ const AssetTable = (props) => {
if (reference !== AssetRecycleReference) {
params.recursive = recursive;
//全局搜索资产
//全局搜索资源
if (fullSearch) {
params.dirId = '';
}
......@@ -814,7 +814,7 @@ const AssetTable = (props) => {
if ((checkedKeys||[]).length === 0) {
modal.confirm({
title: '提示',
content: '是否导出所有资产目录?',
content: '是否导出所有资源目录?',
onOk: () => {
window.open(`/api/dataassetmanager/dataAssetApi/exportByDataAssetIds?exportAll=true&templateType=${getTemplateType()}&queryElementId=${currentElementId??''}&keyword=${encodeURIComponent(keyword??'')}`);
}
......@@ -829,7 +829,7 @@ const AssetTable = (props) => {
modal.confirm({
title: '提示',
content: '是否确认收藏选中的资产目录?',
content: '是否确认收藏选中的资源目录?',
onOk: () => {
dispatch({
type: 'assetmanage.addSubscribe',
......@@ -862,7 +862,7 @@ const AssetTable = (props) => {
modal.confirm({
title: '提示',
content: '是否删除选中的资产目录?',
content: '是否删除选中的资源目录?',
onOk: () => {
let payload = {
data: checkedKeys
......@@ -889,7 +889,7 @@ const AssetTable = (props) => {
modal.confirm({
title: '提示',
content: '是否停用选中的资产目录?',
content: '是否停用选中的资源目录?',
onOk: () => {
let payload = {
data: checkedKeys
......@@ -996,7 +996,7 @@ const AssetTable = (props) => {
if ((checkedKeys||[]).length > 0) {
modal.confirm({
title: '提示',
content: '您确定要恢复这些资产目录吗?',
content: '您确定要恢复这些资源目录吗?',
onOk: () => {
let payload = {
data: checkedKeys
......@@ -1015,7 +1015,7 @@ const AssetTable = (props) => {
}
})
}else{
showMessage("warn","请选择资产目录");
showMessage("warn","请选择资源目录");
}
}
......@@ -1095,7 +1095,7 @@ const AssetTable = (props) => {
const onReportAnalyseClick = (val) => {
if ((checkedKeys||[]).length === 0) {
showMessage('warn', '请先选择资产');
showMessage('warn', '请先选择资源');
} else {
setReport(val);
setWorksheetModalVisible(true);
......@@ -1123,7 +1123,7 @@ const AssetTable = (props) => {
key='offline'
defaultPermission={offlineAble}
disabled={(checkedKeys??[]).length===0}
tip={(checkedKeys??[]).length===0?'请先选择资产':''}
tip={(checkedKeys??[]).length===0?'请先选择资源':''}
>
<div className='text-center'>
停用
......@@ -1133,7 +1133,7 @@ const AssetTable = (props) => {
key='addTag'
defaultPermission={addTagAble}
disabled={(checkedKeys??[]).length===0}
tip={(checkedKeys??[]).length===0?'请先选择资产':''}
tip={(checkedKeys??[]).length===0?'请先选择资源':''}
>
<div className='text-center'>
添加标签
......@@ -1232,7 +1232,7 @@ const AssetTable = (props) => {
<PermissionButton
defaultPermission={subscribeAble}
onClick={subscriptAsset}
tip={(checkedKeys||[]).length===0?'请先选择资产':''}
tip={(checkedKeys||[]).length===0?'请先选择资源':''}
disabled={(checkedKeys||[]).length===0}
>
收藏
......@@ -1240,7 +1240,7 @@ const AssetTable = (props) => {
{
reference===AssetManageReference && <PermissionButton
defaultPermission={changeDirectoryAble}
tip={(checkedKeys||[]).length===0?'请先选择资产':''}
tip={(checkedKeys||[]).length===0?'请先选择资源':''}
onClick={onBatchCatalogChangeBtnClick}
disabled={(checkedKeys||[]).length===0}
>
......@@ -1250,7 +1250,7 @@ const AssetTable = (props) => {
{
reference===AssetManageReference && <PermissionButton
defaultPermission={deleteAble}
tip={(checkedKeys||[]).length===0?'请先选择资产':''}
tip={(checkedKeys||[]).length===0?'请先选择资源':''}
onClick={deleteAssets}
disabled={(checkedKeys||[]).length===0}
>
......@@ -1288,7 +1288,7 @@ const AssetTable = (props) => {
</Select>
}
<Input size="middle"
placeholder="请输入资产目录要素值"
placeholder="请输入资源目录要素值"
value={keyword} allowClear
onChange={(e) => {
setKeyword(e.target.value);
......
src/view/Manage/AssetManage/Component/AssetTagModal.jsx
......@@ -212,7 +212,7 @@ const AssetTagModal = (props) => {
<Modal
forceRender
className='asset-add'
title='资产目录打标签'
title='资源目录打标签'
visible={ visible }
width={ 600 }
onCancel={() => {
......@@ -234,7 +234,7 @@ const AssetTagModal = (props) => {
value?.onGlobalStateChange&&value?.onGlobalStateChange((state, prev) => {
if (state.message === 'data-govern-show-metadata-list-callback-message') {
setMetadataId(state.data?.metadataId||'');
form?.setFieldsValue({ '资产项': state.data?.metadataInfoJson||'' });
form?.setFieldsValue({ '资源项': state.data?.metadataInfoJson||'' });
if ((state.data?.metadataId||'') !== '') {
fillElementValueBeforeCreate(state.data?.metadataId||'');
......@@ -245,7 +245,7 @@ const AssetTagModal = (props) => {
return (
<>
<Form.Item
label='资产目录标签'
label='资源目录标签'
name='tag'
>
<span>{tag?.name||''}</span>
......@@ -264,7 +264,7 @@ const AssetTagModal = (props) => {
name={element.name}
key={index}
>
{ (element.name==='资产项') ? <MetadataInfo /> : <Input disabled={element.manualMaintain==='否'} /> }
{ (element.name==='资源项') ? <MetadataInfo /> : <Input disabled={element.manualMaintain==='否'} /> }
</Form.Item>
)
})}
......
src/view/Manage/AssetManage/Component/AssetTree.jsx
......@@ -425,7 +425,7 @@ const AssetTree = (props) => {
}
})
} else {
showMessage("warn","目录下有资产目录信息,不允许删除!");
showMessage("warn","目录下有资源目录信息,不允许删除!");
}
}
})
......
src/view/Manage/AssetManage/Component/AttributeMaintain.jsx
......@@ -92,11 +92,11 @@ const FC = (props) => {
const catalogs = useMemo(() => {
if (reference === AssetDraftReference) {
return [{ title: '字段级资产目录', key: '1' }]
return [{ title: '字段级资源目录', key: '1' }]
}
return [
{ title: '字段级资产目录', key: '1' },
{ title: '字段级资源目录', key: '1' },
{ title: '映射关系', key: '2' },
]
}, [reference])
......@@ -272,7 +272,7 @@ const FC = (props) => {
return (
<Drawer
visible={visible}
title='字段级资产目录维护'
title='字段级资源目录维护'
width={900}
placement="right"
closable={ true }
......
src/view/Manage/AssetManage/Component/AttributeRelationModal.jsx
......@@ -389,7 +389,7 @@ const AttributeRelationModal = (props) => {
return (
<Modal
forceRender
title={'资产目录属性关联'}
title={'资源目录属性关联'}
visible={visible}
width={1000}
onCancel={() => {
......
src/view/Manage/AssetManage/Component/CustomDirectoryModal.jsx
......@@ -14,7 +14,7 @@ import { showMessage } from '../../../../util';
const resourceTypes = [
{ key: 'innerSource', name: '内部资源' },
{ key: 'outerSource', name: '外部资源' },
{ key: 'dataAsset', name: '资产' },
{ key: 'dataAsset', name: '资源' },
]
const CustomDirectoryModal = (props) => {
......@@ -254,10 +254,10 @@ const CustomDirectoryModal = (props) => {
>
<Row gutter={30}>
<Col span={8} style={{ borderRight: '1px solid #EFEFEF' }}>
<div className='mb-3'>资产目录要素</div>
<div className='mb-3'>资源目录要素</div>
<Input
value={keyword}
placeholder='请输入资产目录要素'
placeholder='请输入资源目录要素'
style={{ marginBottom:10 }}
onChange={(e) => { onSearchChange(e) }}
/>
......
src/view/Manage/AssetManage/Component/FilterElementModal.jsx
......@@ -157,7 +157,7 @@ const FilterElementModal = (props) => {
<Modal
destroyOnClose centered
visible={visible}
title={type==='global'?'资产目录浏览管理':'可见列设置'}
title={type==='global'?'资源目录浏览管理':'可见列设置'}
width={520}
onCancel={cancel}
bodyStyle={{ padding: '15px 15px 0px 15px', maxHeight: '80vh', overflow: 'auto' }}
......
src/view/Manage/AssetManage/Component/ImportAssetDrawer.jsx
......@@ -186,7 +186,7 @@ const ImportAssetDrawer = (props) => {
<Drawer
forceRender
visible={ visible }
title='资产目录导入'
title='资源目录导入'
width={900}
placement="right"
closable={ true }
......
src/view/Manage/AssetManage/Component/ImportElement.jsx
......@@ -63,7 +63,7 @@ const ImportElement = (props) => {
<Modal
forceRender
visible={visible}
title='资产目录属性导入'
title='资源目录属性导入'
width={520}
confirmLoading={confirmLoading}
onCancel={() => {
......
src/view/Manage/AssetManage/Component/StartFlow.jsx
......@@ -44,7 +44,7 @@ const StartFlowModal = (props) => {
reset();
if (data) {
showNotifaction('申请提示', (data === 'ok')?'资产目录申请成功，请在我的流程》我的申请中查看详情':data, 5);
showNotifaction('申请提示', (data === 'ok')?'资源目录申请成功，请在我的流程》我的申请中查看详情':data, 5);
}
onCancel && onCancel(true);
......@@ -68,7 +68,7 @@ const StartFlowModal = (props) => {
<Modal
destroyOnClose
visible={visible}
title='资产目录申请'
title='资源目录申请'
width={520}
confirmLoading={confirmLoading}
onCancel={() => {
......@@ -84,7 +84,7 @@ const StartFlowModal = (props) => {
<Form.Item
label="申请原因"
name="desc"
rules={[{ required: true, message: '请在申请原因栏中描述用途说明以及必要性（资产目录和服务权限申请需要说明请求字段）' }]}
rules={[{ required: true, message: '请在申请原因栏中描述用途说明以及必要性（资源目录和服务权限申请需要说明请求字段）' }]}
>
<Input.TextArea rows={6} />
</Form.Item>
......
src/view/Manage/AssetManage/Component/UpdateDirectoryModal.jsx
......@@ -8,7 +8,7 @@ import SelectUser from '../../Model/Component/SelectUsers';
// const resourceTypes = [
// // { key: 'innerSource', name: '内部资源' },
// // { key: 'outerSource', name: '外部资源' },
// { key: 'dataAsset', name: '资产' },
// { key: 'dataAsset', name: '资源' },
// { key: 'custom', name: '自定义' },
// ]
......
src/view/Manage/AssetManage/Component/add-asset.jsx
......@@ -74,7 +74,7 @@ const FC = ({ visible, nodeId, template, onCancel }) => {
return (
<Modal
title='新增资产目录信息'
title='新增资源目录信息'
visible={visible}
footer={footer}
width='80%'
......
src/view/Manage/AssetManage/Component/asset-relation-assets.jsx
......@@ -64,7 +64,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex: 'relatedDataAssetPath',
},
{
title: '资产编码',
title: '资源编码',
dataIndex: 'relatedDataAssetCode',
},
{
......@@ -136,7 +136,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
{
action !== 'detail' && <React.Fragment>
<Button onClick={onEditClick}>新增</Button>
<Tooltip title={(selectedRows??[]).length===0?'请先选择资产':''}>
<Tooltip title={(selectedRows??[]).length===0?'请先选择资源':''}>
<Button disabled={(selectedRows??[]).length===0} onClick={onDeleteClick}>删除</Button>
</Tooltip>
</React.Fragment>
......
src/view/Manage/AssetManage/Component/post-relation.jsx
......@@ -77,7 +77,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex: 'path',
},
{
title: '资产编码',
title: '资源编码',
dataIndex: 'relatedAssetCode',
},
{
......@@ -118,7 +118,7 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
dataIndex: 'path',
},
{
title: '数据服务资产编号',
title: '数据服务资源编号',
dataIndex: 'relatedServiceCode',
},
{
......@@ -259,20 +259,20 @@ const FC = React.forwardRef(function ({ item, reference, action, onChange }, ref
setPagination({ ...pagination, pageNum: 1 })
setSelectedRows()
}}>
<Tabs.TabPane tab='关联资产' key='asset' />
<Tabs.TabPane tab='关联资源' key='asset' />
<Tabs.TabPane tab='关联服务' key='service' />
</Tabs>
<div style={{ display: 'flex', justifyContent: 'space-between' }}>
{
action !== 'detail' ? <Space>
<Button onClick={onEditClick}>编辑</Button>
<Tooltip title={(selectedRows??[]).length===0?(activeKey==='asset'?'请先选择资产':'请先选择服务'):''}>
<Tooltip title={(selectedRows??[]).length===0?(activeKey==='asset'?'请先选择资源':'请先选择服务'):''}>
<Button disabled={(selectedRows??[]).length===0} onClick={onDeleteClick}>删除</Button>
</Tooltip>
</Space> : <div />
}
<Input size="middle"
placeholder={activeKey==='asset'?'搜索资产名称':'搜索服务名称'}
placeholder={activeKey==='asset'?'搜索资源名称':'搜索服务名称'}
value={keyword}
bordered={true} allowClear
style={{ width: 200 }}
......
src/view/Manage/AssetManage/Component/select-asset.jsx
......@@ -131,7 +131,7 @@ const FC = (props) => {
}
}
if (name === '资产项') {
if (name === '资源项') {
column.width = 250
column.render = (text) => {
let metadata = null
......@@ -346,7 +346,7 @@ const FC = (props) => {
justifyContent: 'flex-end',
}}>
<Input size="middle"
placeholder="请输入资产目录要素值"
placeholder="请输入资源目录要素值"
value={args.keyword}
bordered={true} allowClear
onChange={(e) => {
......
src/view/Manage/AssetManage/Component/select-data-service.jsx
......@@ -11,7 +11,7 @@ import { dispatch } from '../../../../model'
import './select-data-service.less'
import { AppContext } from '../../../../App'
const visibleColNames = ['数据服务资产编码', '主题域分组', '主题域', '业务对象', '数据服务名称']
const visibleColNames = ['数据服务资源编码', '主题域分组', '主题域', '业务对象', '数据服务名称']
const FC = (props) => {
const { session, onChange } = props
......
src/view/Manage/AssetManage/Component/select-resource.jsx
......@@ -27,7 +27,7 @@ const FC = ({ visible, item, type, onCancel }) => {
const save = async () => {
const selectedRows = basicRef.current?.selectedRows
if ((selectedRows??[]).length === 0) {
message.warn(type==='asset'?'请先选择资产':'请先选择服务')
message.warn(type==='asset'?'请先选择资源':'请先选择服务')
return
}
......@@ -72,7 +72,7 @@ const FC = ({ visible, item, type, onCancel }) => {
return (
<Modal
title={type==='asset'?'新增资产':'新增服务'}
title={type==='asset'?'新增资源':'新增服务'}
visible={visible}
footer={footer}
width='80%'
......
src/view/Manage/AssetManage/Component/tag-help.jsx
......@@ -53,7 +53,7 @@ const FC = ({ type, id, did, tags, onChange }) => {
});
}
//资产或者资源详情里的标签同步
//资源或者资源详情里的标签同步
const syncTag = () => {
if (type === 'dataAsset') {
let event = new Event('storage')
......
src/view/Manage/AssetRecycle/Component/AssetMount.jsx
......@@ -19,7 +19,7 @@ const AssetMount = (props) => {
const onOk = () => {
if ((dirIds||[]).length === 0) {
showMessage('warn', '请先选择资产目录的目录');
showMessage('warn', '请先选择资源目录的目录');
return;
}
......
src/view/Manage/AssetTask/TaskDetail.jsx
......@@ -118,7 +118,7 @@ export const Basic = ({ task }) => {
<Descriptions.Item label="任务说明">{task?.comment}</Descriptions.Item>
<Descriptions.Item label="任务状态">{status[task?.status]}</Descriptions.Item>
<Descriptions.Item label="所属部门">{task?.department?.groupDisplayName??task?.department?.groupName}</Descriptions.Item>
<Descriptions.Item label="资产专员">{task?.specialist?.userDisplayName??task?.specialist?.userName}</Descriptions.Item>
<Descriptions.Item label="资源专员">{task?.specialist?.userDisplayName??task?.specialist?.userName}</Descriptions.Item>
<Descriptions.Item label="更新日期">{task?.updateTime}</Descriptions.Item>
<Descriptions.Item label="更新人">{task?.updateUser?.userDisplayName??task?.updateUser?.userName}</Descriptions.Item>
<Descriptions.Item label="创建日期">{task?.createTime}</Descriptions.Item>
......
src/view/Manage/AssetTask/UpdateTask.jsx
......@@ -202,9 +202,9 @@ const FC = (props) => {
<GroupsSelect data={groups} />
</Form.Item>
<Form.Item
label="资产专员"
label="资源专员"
name="specialist"
rules={[{ required: true, message: '请选择资产专员' }]}
rules={[{ required: true, message: '请选择资源专员' }]}
>
<UsersSelect data={users} />
</Form.Item>
......
src/view/Manage/AssetTask/index.jsx
......@@ -84,7 +84,7 @@ const FC = (props) => {
render: (department, _, __) => department?.groupDisplayName??department?.groupName,
},
{
title: '资产专员',
title: '资源专员',
dataIndex: 'specialist',
ellipsis: true,
render: (user, _, __) => user?.userDisplayName??user?.userName,
......
src/view/Manage/Pdata/Component/GrantedList.jsx
......@@ -23,7 +23,7 @@ const FC = (props) => {
ellipsis: true,
},
{
title: '数据服务资产编码',
title: '数据服务资源编码',
dataIndex: 'code',
ellipsis: true,
render: (_, record) => record.basicInfo?.code
......
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