修改成table

package.json

@@ -149,6 +149,6 @@
       "react-app"
     ]
   },
-  "proxy": "http://192.168.0.216:8762",
+  "proxy": "http://139.198.126.96:9011",
   "homepage": "http://myhost/data-platform"
 }

src/view/Manage/Assets/components/AssetListHelper.js

@@ -92,6 +92,7 @@ export class DataPreview extends Component {
         pagination={false}
         columns={columns}
         loading={dataPreview === undefined}
+        scroll={{x:columns.length*150}}
         dataSource={data}
       />
     );

src/view/Manage/Assets/index.jsx

@@ -3,9 +3,11 @@ import { Row, Col, Card, Input, Pagination } from 'antd';
 
 import AssetTreeCOM from './components/AssetTree';
 import AssetListCOM from './components/AssetList';
+import AssetTable from "./components/AssetTable"
 import { dispatchLatest } from '../../../model';
 import PageHeaderWrapper from '../../../layout/PageHeaderWrapper';
 import './style.less';
+const bodyheight = document.body.clientHeight
 
 const { Search } = Input;
 
@@ -14,7 +16,7 @@ class Assets extends Component {
   constructor(props) {
     super(props);
 
-    this.state = { treeData: null, items: null, total: 0, keyword: '', pageNum: 1, pageSize: 10, currentNode: null, loading: false };
+    this.state = { treeData: null, items: null, total: 0, keyword: '', pageNum: 1, pageSize: 20, currentNode: null, loading: false };
   }
 
   componentDidMount() {
@@ -33,7 +35,7 @@ class Assets extends Component {
 
   }
 
-  getList = (node, pageNum = 1, pageSize = 10) => {
+  getList = (node, pageNum = 1, pageSize = 20) => {
     const { keyword } = this.state;
     if (node) {
       this.setState({ currentNode: node, pageNum, pageSize, loading: true });
@@ -82,10 +84,16 @@ class Assets extends Component {
           </Col>
           <Col md={19}>
             <Card bordered={false} className='asset-table'>
-              <AssetListCOM
+              {/* <AssetListCOM
                 loading={loading}
                 tableModels={items}
                 updateItems={this.updateItems.bind(this)}
+              /> */}
+              <AssetTable 
+                loading={loading}
+                tableModels={items}
+                updateItems={this.updateItems.bind(this)}
+                bodyheight={bodyheight-310}
               />
               <Pagination
                   className="text-center"

src/view/Manage/Search/index.jsx

@@ -2,17 +2,20 @@ import React, { Component } from "react";
 import { Card, Pagination } from 'antd';
 import { SearchBar } from './components/SearchHelper';
 import AssetListCOM from '../Assets/components/AssetList';
+import AssetTable from "../Assets/components/AssetTable"
 import { dispatchLatest } from '../../../model';
 import PageHeaderWrapper from '../../../layout/PageHeaderWrapper';
 import './style.less'; 
 
+const bodyheight = document.body.clientHeight
+
 class SearchResult extends Component {
   constructor(props) {
     super(props);
-    this.state = { items: null,loading: false, total: 0, pageNum: 1, pageSize: 10, keyword: '', domain: '' };
+    this.state = { items: null,loading: false, total: 0, pageNum: 1, pageSize: 20, keyword: '', domain: '' };
   }
 
-  getList = ( keyword, domain, pageNum = 1, pageSize = 10) => {
+  getList = ( keyword, domain, pageNum = 1, pageSize = 20) => {
     this.setState({ keyword, domain, pageNum, pageSize, loading: true },() => {
       dispatchLatest({
         type: 'assets.searchTableModelsByPage',
@@ -48,11 +51,15 @@ class SearchResult extends Component {
             onChange={this.onSearchBarChange} 
             {...this.props}
           />
-          <AssetListCOM
+          <AssetTable 
             loading={loading}
             tableModels={items}
             updateItems={this.updateItems.bind(this)}
+            bodyheight={bodyheight-420}
           />
+          {/* <AssetListCOM
+            
+          /> */}
           <Pagination
               className="text-center"
               showSizeChanger

src/view/Metadata/Indicator/components/MetadataList.js

 import React, { Component } from 'react';
 import {
   List,
-  Skeleton,
+  Table,
   Row,
   Col,
   Typography,
@@ -13,6 +13,9 @@ import '../style.less';
 
 const { Text } = Typography;
 const { TabPane } = Tabs;
+const { Column } = Table
+
+const bodyheight = document.body.clientHeight
 
 export default class MetadataListCOM extends Component {
 
@@ -80,7 +83,33 @@ export default class MetadataListCOM extends Component {
 
     return (
       <React.Fragment>
-        <List
+        <Table
+          loading={loading}
+          dataSource={_tableModels || []}
+          size={'middle'}
+          scroll={{y:bodyheight-300}}
+          pagination={false}
+          style={{marginBottom:8}}
+        >
+          <Column title={"名称"} dataIndex={'cnName'} key={'cnName'} render={
+            (text,item)=>{
+              return <div
+                className="pointer text-primary"
+                onClick={e => {
+                  this.setState({ showModal: true, tableModel: item });
+                }}
+              >
+                <span dangerouslySetInnerHTML={{ __html: item.cnName || '' }} />
+              </div>
+            }
+          } />
+          <Column title="类型" dataIndex="type" key="type" />
+          <Column title="标签编号" dataIndex="name" key="name" />
+          {/* <Column title="路径" dataIndex="path" key="path"  /> */}
+          <Column title="业务定义" dataIndex="comment" key="comment" width={'35%'} ellipsis={true} />
+          <Column title="更新时间" dataIndex="lastUpdateTime" key="lastUpdateTime" width={180} />
+        </Table>
+        {/* <List
           loading={loading}
           className='metadata-list'
           itemLayout="vertical"
@@ -104,7 +133,7 @@ export default class MetadataListCOM extends Component {
               </Skeleton>
             </List.Item>
           )}
-        />
+        /> */}
 
         {tableModel && (
           <Modal

src/view/Metadata/Indicator/index.jsx

@@ -15,10 +15,10 @@ export default class Indicator extends Component {
   constructor(props) {
     super(props);
 
-    this.state = { items: null, total: 0, keyword: '', pageNum: 1, pageSize: 10, loading: false, treeSelectId: '' };
+    this.state = { items: null, total: 0, keyword: '', pageNum: 1, pageSize: 20, loading: false, treeSelectId: '' };
   }
 
-  getList = (treeSelectId, pageNum = 1, pageSize = 10) => {
+  getList = (treeSelectId, pageNum = 1, pageSize = 20) => {
     const { keyword } = this.state;
     
     this.setState({ treeSelectId, pageNum, pageSize, loading: true });