调整数据资产，指标，标准样式

config/config.ts

@@ -152,9 +152,9 @@ export default {
   */
   proxy: {
     '/api': {
-      // target: 'http://139.198.126.96:9011',
+      target: 'http://139.198.126.96:9011',
       // target: 'http://192.168.0.220',
-      target: 'http://139.198.127.54:18392',
+      // target: 'http://139.198.127.54:18392',
       changeOrigin: true,
     },
   },

src/global.less

@@ -66,3 +66,21 @@ ol {
   color: #007bff !important;
   background-color: #0168cf !important;
 }
+
+/* 滚动条 */
+::-webkit-scrollbar-track-piece {
+  background-color:#ededed;
+}
+
+::-webkit-scrollbar {
+  width:5px;
+  height:5px;
+}
+::-webkit-scrollbar-thumb {
+  background-color:#bbb;
+  background-clip:padding-box;
+  min-height:30px;
+}
+::-webkit-scrollbar-thumb:hover {
+  background-color:#bbb;
+}

src/pages/assets/index.tsx

 import React from 'react';
 import { connect } from 'dva';
 import { Dispatch } from 'redux';
-import { Row, Col, Card, Input, Pagination } from 'antd';
+import { Row, Col, Card, Input, Pagination, Divider } from 'antd';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
 
 import { StateType } from './model';
@@ -114,12 +114,13 @@ class DataAssetsCOM extends React.Component<DataAssetsProps, DataAssetsState> {
     );
     return (
       <PageHeaderWrapper extra={extraContent}>
-        <Row gutter={16}>
+        <Row>
           <Col md={6}>
             <AssetTreeCOM treeData={treeData} onSelect={this.getList} />
+            <Divider type={'vertical'} />
           </Col>
           <Col md={18}>
-            <Card bordered={false}>
+            <Card bordered={false} className={styles['asset-table']}>
               <AssetListCOM
                 loading={loadingList}
                 tableModels={tableModels}

src/pages/assets/style.less

@@ -5,10 +5,15 @@
   font-size: 14px;
 }
 
+.asset-table:global(.ant-card) {
+  height: calc(100vh - 176px);
+  overflow: auto;
+}
+
 .asset-tree:global(.ant-card) {
-  min-height: 300px;
-  max-height: calc(100vh - 180px);
+  height: calc(100vh - 176px);
   overflow: auto;
+  border-right: 1px solid #ededed;
 }
 
 .extraContentSearch {
@@ -29,4 +34,4 @@
   &::after {
     content: '，';
   }
-}
+}
\ No newline at end of file

src/pages/data/dataindicator/components/DomainTree.tsx

@@ -140,7 +140,7 @@ class DomainTree extends React.Component<DomainTreeProps, DomainTreeState> {
     const expandTreeKeys = this.getExpandTreeKey(treeParent, expandTreeKey);
 
     return (
-      <Card bordered={false}>
+      <Card bordered={false} className={styles['asset-tree']}>
         <Row style={{ marginBottom: '16px' }}>
           <Select<number>
             loading={loading.effects['dataindicator/queryDomain'] || false}
@@ -156,7 +156,7 @@ class DomainTree extends React.Component<DomainTreeProps, DomainTreeState> {
               ))}
           </Select>
         </Row>
-        <Row className={styles['asset-tree']}>
+        <Row>
           <Spin
             spinning={
               loading.effects['dataindicator/queryDomain'] ||

src/pages/data/dataindicator/index.tsx

@@ -203,7 +203,7 @@ class DataIndicator extends Component<DataIndicatorProps, DataIndicatorState> {
     );
     return (
       <PageHeaderWrapper extra={extraContent}>
-        <Row gutter={16}>
+        <Row>
           <Col md={6}>
             <DomainTree
               domainList={domainList}
@@ -217,7 +217,7 @@ class DataIndicator extends Component<DataIndicatorProps, DataIndicatorState> {
             />
           </Col>
           <Col md={18}>
-            <Card bordered={false}>
+            <Card bordered={false} className={styles['asset-table']}>
               <DataList
                 dataList={pageData}
                 domainList={domainList}

src/pages/data/datastandard/components/DomainTree.tsx

@@ -140,7 +140,7 @@ class DomainTree extends React.Component<DomainTreeProps, DomainTreeState> {
     const expandTreeKeys = this.getExpandTreeKey(treeParent, expandTreeKey);
 
     return (
-      <Card bordered={false}>
+      <Card bordered={false} className={styles['asset-tree']}>
         <Row style={{ marginBottom: '16px' }}>
           <Select<number>
             loading={loading.effects['dataStandard/queryDomain'] || false}
@@ -156,7 +156,7 @@ class DomainTree extends React.Component<DomainTreeProps, DomainTreeState> {
               ))}
           </Select>
         </Row>
-        <Row className={styles['asset-tree']}>
+        <Row>
           <Spin
             spinning={
               loading.effects['dataStandard/queryDomain'] ||

src/pages/data/datastandard/index.tsx

@@ -203,7 +203,7 @@ class DataStandard extends Component<DataStandardProps, DataStandardState> {
     );
     return (
       <PageHeaderWrapper extra={extraContent}>
-        <Row gutter={16}>
+        <Row>
           <Col md={6}>
             <DomainTree
               domainList={domainList}
@@ -217,7 +217,7 @@ class DataStandard extends Component<DataStandardProps, DataStandardState> {
             />
           </Col>
           <Col md={18}>
-            <Card bordered={false}>
+            <Card bordered={false} className={styles['asset-table']}>
               <DataList
                 dataList={pageData}
                 domainList={domainList}

src/pages/data/style.less

-.asset-tree {
-  min-height: 300px;
-  max-height: calc(100vh - 180px);
+.asset-table:global(.ant-card) {
+  height: calc(100vh - 176px);
   overflow: auto;
 }
 
+.asset-tree:global(.ant-card) {
+  height: calc(100vh - 176px);
+  overflow: auto;
+  border-right: 1px solid #ededed;
+}
+
 .asset-list :global(.ant-list-item-action) {
   text-align: right;
 }