Commit fa06e11f by zhaochengxiang

资产地图打开资产详情问题

parent 851bde60
import React, { useEffect, useState, useContext, useMemo, useRef } from 'react'; import React, { useEffect, useState, useContext, useMemo, useRef } from 'react';
import { Form, Spin, Input, Descriptions, Space, Button, Tooltip, Select, Cascader, Radio, Divider, Typography, Modal, Row, Col, Pagination } from 'antd'; import { Form, Spin, Input, Descriptions, Space, Button, Tooltip, Select, Cascader, Radio, Divider, Typography, Modal, Row, Col, Pagination } from 'antd';
import { DownOutlined, UpOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { DownOutlined, UpOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import LocalStorage from 'local-storage';
import MetadataInfo from './MetadataInfo'; import MetadataInfo from './MetadataInfo';
import { dispatch } from '../../../../model'; import { dispatch } from '../../../../model';
...@@ -277,7 +278,7 @@ const AssetAction = (props) => { ...@@ -277,7 +278,7 @@ const AssetAction = (props) => {
type: 'assetmanage.getPermission', type: 'assetmanage.getPermission',
payload: { payload: {
permissionId, permissionId,
env: app?.env?.domainId env: app?.env?.domainId||LocalStorage.get('assetsEnv')
}, },
callback: data => { callback: data => {
setPermissions(data.columnPermissions); setPermissions(data.columnPermissions);
...@@ -302,7 +303,7 @@ const AssetAction = (props) => { ...@@ -302,7 +303,7 @@ const AssetAction = (props) => {
dispatch({ dispatch({
type: 'assetmanage.getSystems', type: 'assetmanage.getSystems',
payload: { payload: {
env: app?.env?.domainId, env: app?.env?.domainId||LocalStorage.get('assetsEnv'),
}, },
callback: data => { callback: data => {
setLoadingSystems(false); setLoadingSystems(false);
...@@ -498,7 +499,7 @@ const AssetAction = (props) => { ...@@ -498,7 +499,7 @@ const AssetAction = (props) => {
payload: { payload: {
data: ids, data: ids,
params: { params: {
catalog: app?.env?.domainId, catalog: app?.env?.domainId||LocalStorage.get('assetsEnv'),
} }
}, },
callback: data => { callback: data => {
...@@ -986,7 +987,7 @@ const AssetAction = (props) => { ...@@ -986,7 +987,7 @@ const AssetAction = (props) => {
> >
{ {
(currentAction==='add'||currentAction==='edit') ? (currentAction==='add'||currentAction==='edit') ?
<Row gutter={8}> <Row gutter={8} align='middle'>
<Col span={22}> <Col span={22}>
<Form.Item <Form.Item
label='' label=''
...@@ -1000,20 +1001,20 @@ const AssetAction = (props) => { ...@@ -1000,20 +1001,20 @@ const AssetAction = (props) => {
{ {
interpretation && <Col span={2}> interpretation && <Col span={2}>
<Tooltip placement="left" title={interpretation}> <Tooltip placement="left" title={interpretation}>
<QuestionCircleOutlined style={{ marginTop: 8, fontSize: 16 }} /> <QuestionCircleOutlined style={{ fontSize: 16 }} />
</Tooltip> </Tooltip>
</Col> </Col>
} }
</Row> </Row>
: <React.Fragment> : <React.Fragment>
<Row gutter={8}> <Row gutter={8} align='middle'>
<Col span={22}> <Col span={22}>
{ elementDetailComponent(element) } { elementDetailComponent(element) }
</Col> </Col>
{ {
interpretation && <Col span={2}> interpretation && <Col span={2}>
<Tooltip placement="left" title={interpretation}> <Tooltip placement="left" title={interpretation}>
<QuestionCircleOutlined style={{ marginTop: 8, fontSize: 16 }} /> <QuestionCircleOutlined style={{ fontSize: 16 }} />
</Tooltip> </Tooltip>
</Col> </Col>
} }
...@@ -1091,7 +1092,7 @@ const AssetAction = (props) => { ...@@ -1091,7 +1092,7 @@ const AssetAction = (props) => {
payload: { payload: {
fileList: [files[0]], fileList: [files[0]],
params: { params: {
catalog: app?.env?.domainId, catalog: app?.env?.domainId||LocalStorage.get('assetsEnv'),
} }
}, },
callback: (data) => { callback: (data) => {
......
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import AssetDetail from './AssetDetail'; import AssetAction from "./AssetAction";
import { getQueryParam } from '../../../../util'; import { getQueryParam } from '../../../../util';
import './AssetDetailPage.less'; import './AssetDetailPage.less';
...@@ -27,7 +27,7 @@ const AssetDetailPage = (props)=>{ ...@@ -27,7 +27,7 @@ const AssetDetailPage = (props)=>{
</div> </div>
<div className='detail-container'> <div className='detail-container'>
<div className='detail-container-card'> <div className='detail-container-card'>
<AssetDetail id={id} dirId={dirId} /> <AssetAction id={id} dirId={dirId} action='detail' />
</div> </div>
</div> </div>
</div> </div>
......
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