Commit ab347c7e by zhaochengxiang

bug fix

parent a403180a
...@@ -301,7 +301,7 @@ export function getPreviewRangeByDirId(payload) { ...@@ -301,7 +301,7 @@ export function getPreviewRangeByDirId(payload) {
} }
export function getResourceBatchEditInfo(payload) { export function getResourceBatchEditInfo(payload) {
return GetJSON("/dataassetmanager/resourceApi/getBatchEditInfo", payload) return PostJSON("/dataassetmanager/resourceApi/getBatchEditInfo", payload)
} }
export function resourceBatchEdit(payload) { export function resourceBatchEdit(payload) {
......
...@@ -978,7 +978,7 @@ const FC = (props) => { ...@@ -978,7 +978,7 @@ const FC = (props) => {
if (refresh) { if (refresh) {
setTimeout(() => { setTimeout(() => {
window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}`) window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${AssetManageReference}`)
}, 300) }, 300)
} }
}} }}
......
...@@ -7,7 +7,7 @@ import LocalStorage from 'local-storage' ...@@ -7,7 +7,7 @@ import LocalStorage from 'local-storage'
import { dispatch } from '../../../model' import { dispatch } from '../../../model'
import { usePage } from '../../../util/hooks/page' import { usePage } from '../../../util/hooks/page'
import Table from '../../../util/Component/Table' import Table from '../../../util/Component/Table'
import { getQueryParam, isSzseEnv } from '../../../util' import { getAssetType, getQueryParam, isSzseEnv } from '../../../util'
import '../Model/Component/EditModel.less' import '../Model/Component/EditModel.less'
import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction' import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction'
...@@ -15,6 +15,8 @@ import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction' ...@@ -15,6 +15,8 @@ import { ElementItem, MultipleItem } from '../AssetManage/Component/AssetAction'
const FC = (props) => { const FC = (props) => {
const ids = getQueryParam('ids', props.location?.search) const ids = getQueryParam('ids', props.location?.search)
const elementIds = getQueryParam('elementIds', props.location?.search) const elementIds = getQueryParam('elementIds', props.location?.search)
const type = getQueryParam('type', props.location?.search)
const [action, setAction] = React.useState('edit') const [action, setAction] = React.useState('edit')
const [waiting, setWaiting] = React.useState(false) const [waiting, setWaiting] = React.useState(false)
...@@ -55,7 +57,10 @@ const FC = (props) => { ...@@ -55,7 +57,10 @@ const FC = (props) => {
dispatch({ dispatch({
type: 'assetmanage.resourceBatchEdit', type: 'assetmanage.resourceBatchEdit',
payload: { payload: {
data: modifyData data: modifyData,
params: {
dataAssetType: getAssetType(type),
}
}, },
callback: data => { callback: data => {
setWaiting(false) setWaiting(false)
...@@ -79,7 +84,7 @@ const FC = (props) => { ...@@ -79,7 +84,7 @@ const FC = (props) => {
</div> </div>
<div className='edit-container'> <div className='edit-container'>
<div className='edit-container-card' style={{ padding: '20px 20px 0' }}> <div className='edit-container-card' style={{ padding: '20px 20px 0' }}>
<EditAssets ref={editAssetsRef} action={action} ids={ids} elementIds={elementIds} /> <EditAssets ref={editAssetsRef} action={action} type={type} ids={ids} elementIds={elementIds} />
</div> </div>
</div> </div>
<div className='edit-footer'> <div className='edit-footer'>
...@@ -111,7 +116,7 @@ const FC = (props) => { ...@@ -111,7 +116,7 @@ const FC = (props) => {
export default FC export default FC
export const EditAssets = React.forwardRef(function ({ action, ids, elementIds }, ref) { export const EditAssets = React.forwardRef(function ({ action, type, ids, elementIds }, ref) {
const [elements, setElements] = React.useState() const [elements, setElements] = React.useState()
const [data, setData] = React.useState() const [data, setData] = React.useState()
const [modifyData, setModifyData] = React.useState() const [modifyData, setModifyData] = React.useState()
...@@ -282,8 +287,11 @@ export const EditAssets = React.forwardRef(function ({ action, ids, elementIds } ...@@ -282,8 +287,11 @@ export const EditAssets = React.forwardRef(function ({ action, ids, elementIds }
dispatch({ dispatch({
type: 'assetmanage.getResourceBatchEditInfo', type: 'assetmanage.getResourceBatchEditInfo',
payload: { payload: {
elementIds: elementIds, params: {
resourceIds: ids, elementIds: elementIds,
resourceIds: ids,
dataAssetType: getAssetType(type),
}
}, },
callback: data => { callback: data => {
setLoading(false) setLoading(false)
......
...@@ -1384,7 +1384,7 @@ const FC = (props) => { ...@@ -1384,7 +1384,7 @@ const FC = (props) => {
if (refresh) { if (refresh) {
setTimeout(() => { setTimeout(() => {
window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}`) window.open(`/data-govern/edit-assets?ids=${(selectedRows??[]).map(item => item.id).toString()}&elementIds=${(value??[]).toString()}&type=${ResourceManageReference}`)
}, 300) }, 300)
} }
}} }}
......
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