Commit 0f8b66c9 by zhaochengxiang

样式调整

parent 966fe9e8
...@@ -84,7 +84,7 @@ const AssetBrowse = (props) => { ...@@ -84,7 +84,7 @@ const AssetBrowse = (props) => {
<div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}> <div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
{ {
expandRelation && <React.Fragment> expandRelation && <React.Fragment>
<div style={{ flex: 1, height: '100%', overflow: 'hidden' }}> <div style={{ flex: 'none', width: 450, height: '100%', overflow: 'hidden' }}>
<RelationContainer reference={reference} nodeParams={nodeParams} onChange={onRelationChange} resize={resizeRelation} dirs={dirs} /> <RelationContainer reference={reference} nodeParams={nodeParams} onChange={onRelationChange} resize={resizeRelation} dirs={dirs} />
</div> </div>
<Separate width={15} /> <Separate width={15} />
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
align-items: center; align-items: center;
background: #f2f5fc; background: #f2f5fc;
position: absolute; position: absolute;
left: calc(50% + 7.5px); left: 465px;
top: calc(50% - 40px); top: calc(50% - 40px);
width: 12px; width: 12px;
height: 80px; height: 80px;
......
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import {Card, Spin, Tooltip, Tree, Modal, AutoComplete, Select,Button, Menu, Dropdown} from 'antd'; import {Card, Spin, Tooltip, Tree, Modal, AutoComplete, Select,Button, Menu, Dropdown, Space} from 'antd';
import { ReloadOutlined, SettingOutlined, UnorderedListOutlined } from '@ant-design/icons'; import { ReloadOutlined, SettingOutlined, UnorderedListOutlined } from '@ant-design/icons';
import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify"; import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
import LocalStorage from 'local-storage'; import LocalStorage from 'local-storage';
...@@ -609,12 +609,9 @@ const AssetTree = (props) => { ...@@ -609,12 +609,9 @@ const AssetTree = (props) => {
<Card <Card
className='asset-tree' className='asset-tree'
title={ title={
<div <Space
className='flex'
style={{ style={{
height: 57, height: 57,
alignItems: 'center',
justifyContent: 'space-between',
padding: '0 15px' padding: '0 15px'
}} }}
> >
...@@ -641,11 +638,9 @@ const AssetTree = (props) => { ...@@ -641,11 +638,9 @@ const AssetTree = (props) => {
</Tooltip> </Tooltip>
</Dropdown> </Dropdown>
<Tooltip title="刷新目录"> <Tooltip title="刷新目录">
<ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer',flex:1}} /> <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer'}} />
</Tooltip> </Tooltip>
<div style={{ flex: 1, width: 32 }}></div> </Space>
<div style={{ flex: 1, width: 32 }}></div>
</div>
} }
bordered={false} bordered={false}
bodyStyle={{ padding: '10px 15px' }} bodyStyle={{ padding: '10px 15px' }}
......
...@@ -155,11 +155,12 @@ const FilterElementModal = (props) => { ...@@ -155,11 +155,12 @@ const FilterElementModal = (props) => {
return ( return (
<Modal <Modal
forceRender destroyOnClose centered
visible={visible} visible={visible}
title={type==='global'?'资产目录浏览管理':'可见列设置'} title={type==='global'?'资产目录浏览管理':'可见列设置'}
width={520} width={520}
onCancel={cancel} onCancel={cancel}
bodyStyle={{ padding: '15px 15px 0px 15px', maxHeight: '80vh' }}
footer={[ footer={[
<Button <Button
key="0" key="0"
...@@ -185,7 +186,7 @@ const FilterElementModal = (props) => { ...@@ -185,7 +186,7 @@ const FilterElementModal = (props) => {
style={{ marginLeft: 'auto' }} style={{ marginLeft: 'auto' }}
/> />
</div> </div>
<div className='mt-3' style={{ maxHeight: 450, overflow: 'auto' }}> <div>
{ {
(typesOfElements||[]).map((typeOfElements, index) => { (typesOfElements||[]).map((typeOfElements, index) => {
const _type = typeOfElements.type||''; const _type = typeOfElements.type||'';
......
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