合并

one_stop_public/libs/formList/index.js

@@ -278,6 +278,7 @@ class FormList extends React.Component {
       if(objCode==1||objCode=="1"){
         this.initColumn();
       }else{
+        console.log('!!!!!!')
         dispatch({
           type: 'DataObj/findByCode',
           payload: { objCode:this.props.objCode },
@@ -857,6 +858,8 @@ class FormList extends React.Component {
 
   render() {
     const { modalVisible, selectedRows, querys,tableWidth,rights ,data,isReady} = this.state;
+    console.log(this.state,this.props,isReady,this.columns)
+
     if(!isReady){
       return <div style={{width:20,margin:"auto"}}><Spin/></div>
     }
@@ -881,8 +884,7 @@ class FormList extends React.Component {
     }
     let showDiv = document.querySelector('#mobelDiv')?
     document.querySelector('#mobelDiv').clientWidth
-    :'100%'
-
+    :1100
     const parentMethods = {
       handleAdd: this.handleAdd,
       handleModalVisible: this.handleModalVisible,