Merge remote-tracking branch 'origin/master'

one_stop_public/Table/index.jsx

@@ -421,10 +421,22 @@ export default class ZdyTable extends Component {
         const borderStyleTwo = { // 处理隐藏组件边框样式问题
             borderRight: "1px solid gray", 
             borderLeft: "1px solid gray", 
-            borderTop: "1px solid gray"
+            borderTop: "1px solid gray",
         }
         let updateTime
-        const styleDiv = this.props.height ? { overflow: "auto", width: "100%", height: this.props.height } : { overflow: "auto", width: "100%" }
+        const styleDiv = this.props.height ?   
+                                { 
+                                    overflow: "auto", 
+                                    width: "100%", 
+                                    height: this.props.height,
+                                    paddingBottom:'10px'
+                                    
+                                } 
+                                : { 
+                                    overflow: "auto", 
+                                    width: "100%",
+                                    paddingBottom:'10px'
+                                }
         if (!isReady) return <></>
         if (this.props.postData?.isUpdate) {
             updateTime = moment(+this.props.postData?.updateTime).format('llll')

one_stop_public/libs/formList/index.js

@@ -856,7 +856,7 @@ class FormList extends React.Component {
 
     return (
       <Form layout="inline">
-        <Row >
+        <Row  style={{padding:"15px"}}>
           {querys.map((item) =>
             <Col style={{height:58}} span={get==='mobile'?24:8}  key={item.id}>
               {this.getItem(true,form, {
@@ -866,7 +866,7 @@ class FormList extends React.Component {
             </Col>
           )}
 
-          <Col span={get==='mobile'?24:8} 
+          <Col span={get==='mobile'?24:8}
               style={{
                 textAlign:get==='mobile'?'right':'',
                 paddingRight: get==='mobile'?12:''
@@ -889,7 +889,7 @@ class FormList extends React.Component {
     );
   }
   render() {
-    const { 
+    const {
         modalVisible,
         selectedRows,
         querys,
@@ -933,25 +933,14 @@ class FormList extends React.Component {
     };
 
 
-    if(!isSelect&&!rights.includes('edit')&&!rights.includes('delete')&&!rights.includes("view")){
-      const column = {
-        title: '操作',
-        fixed: 'right',
-        width: 150,
-        render: (text, record) => {
-          return  <Fragment>
-            <div >
-              {record.process_biz_key?<><a onClick={this.view.bind(this, record)}>查看详情</a></>:''}
-            </div>
-          </Fragment>
-        }
-      }
-      if(this.columns.length>0&&this.columns[this.columns.length-1].title=="操作"){
-        this.columns[this.columns.length-1]=column;
-      }
+    if(!isSelect&&!rights.includes('edit')&&!rights.includes('delete')&&!rights.includes("view")&&!rights.includes("viewProcess")){
+
     }else{
 
       let width=0;
+      if(rights && rights.includes('viewProcess')){
+        width=width+75;
+      }
       if(rights && rights.includes('view')){
         width=width+75;
       }
@@ -976,7 +965,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"/></>}
-           {record.process_biz_key?<><a onClick={this.viewProcess.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('delete') ? '' : <> <Popconfirm
              title="确定删除该数据?"
              onConfirm={this.delete.bind(this, record)}