Merge branch 'master' of http://scjoyedu.eicp.net:9121/front-team/webPublic

one_stop_public/libs/TableList.js

@@ -9,6 +9,7 @@
 import React from 'react';
 import { Tree, Table, Spin } from 'antd';
 import FormList from './formList';
+import TreeList from './formList/TreeList'
 import { connect } from 'dva';
 
 export default class TableList extends React.Component {
@@ -40,7 +41,30 @@ export default class TableList extends React.Component {
   }
 
   render() {
-    return <FormList
+    const {isTree} = this.props
+    return isTree?
+    <TreeList 
+    
+    onSelectRow={this.props.value.onSelectRow}
+    istableCom={true} 
+    showHeader={this.props.showHeader} 
+    get={this.props.get}
+    isHiddenPage={
+        this.props.isHiddenPage!=null?
+              this.props.isHiddenPage
+              :false} 
+    loading={this.props.loading} 
+    pageSize={this.props.pageSize||10} 
+    value={this.state}  
+    notShowBack={true} 
+    rights={this.props.rights || []} 
+    objCode={this.props.objCode} 
+    isFormCom={true} 
+    sql={this.props.sql}/>:
+    
+    
+    
+    <FormList
                 onSelectRow={this.props.value.onSelectRow}
                 istableCom={true} 
                 showHeader={this.props.showHeader} 

one_stop_public/libs/formList/index.js

@@ -962,7 +962,7 @@ class FormList extends React.Component {
              onClick={this.view.bind(this, record)}>查看详情</a><Divider type="vertical"/></>}
            {rights && !rights.includes('edit') ? '' : <><a
              onClick={this.modify.bind(this, record)}>编辑</a><Divider type="vertical"/></>}
-           {rignt&&rights.includes("viewProcess")&&record.process_biz_key?<><a onClick={this.viewProcess.bind(this, record)}>查看流程详情</a><Divider type="vertical"/></>:''}
+           {rights&&rights.includes("viewProcess")&&record.process_biz_key?<><a onClick={this.viewProcess.bind(this, record)}>查看流程详情</a><Divider type="vertical"/></>:''}
            {rights && !rights.includes('delete') ? '' : <> <Popconfirm
              title="确定删除该数据?"
              onConfirm={this.delete.bind(this, record)}

one_stop_public/tableCompon/index.jsx

@@ -2087,6 +2087,8 @@ export default class tableCom extends Component {
           }
           cm = <TableList
             get={get}
+            isTree = {json.isTree}
+            json={json}
             loading={this.props.loading}
             showHeader={json.showHeader}
             isHiddenPage={json.isHiddenPage}
@@ -2730,6 +2732,8 @@ export default class tableCom extends Component {
               initialValue: initValue || {}
 
             })(<TableList 
+                     json={json}
+                      isTree = {json.isTree}
                       isHiddenPage={json.isHiddenPage} 
                       showHeader={json.showHeader} 
                       loading={this.props.loading}