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

one_stop_public/Table/isNewMobileTable.jsx

@@ -67,7 +67,6 @@ export default class isNewTable extends Component {
                   ) : (
                     <div
                       style={{
-                        display: 'inline-block',
                         ...styles,
                       }}
                     >
@@ -106,18 +105,17 @@ export default class isNewTable extends Component {
         </>
       );
     }
-    if(isRowCol){
-      return (   items.map((item, i) => {
-        console.log(item)
-        const allhidden = checkAllHidden(items)
-        return  <Row  style={{
-                         
+    if (isRowCol) {
+      return items.map((item, i) => {
+        console.log(item);
+        const allhidden = checkAllHidden(items);
+        return (
+          <Row
+            style={{
               ...style,
-        }}>
-            
-        
-            {
-                item.map((ary, j) => {
+            }}
+          >
+            {item.map((ary, j) => {
               let styles = {};
               if (ary.content && ary.content.styles) {
                 try {
@@ -126,17 +124,20 @@ export default class isNewTable extends Component {
                   console.log(`第${i}行第${j}列样式配置有误,${e}`);
                 }
               }
-                    if(ary.content?.comName==="Label"){
-                        console.log(ary)
-                        return <Col
+              if (ary.content?.comName === 'Label') {
+                console.log(ary);
+                return (
+                  <Col
                     style={{
-                         
                       ...styles,
                     }}
                     span={ary.content?.labelSpan}
                   >
-                        {!allhidden && ary.hidden ? ""
-                        :<><TableCom
+                    {!allhidden && ary.hidden ? (
+                      ''
+                    ) : (
+                      <>
+                        <TableCom
                           formCode={formCode}
                           formId={formId}
                           i={i}
@@ -159,14 +160,19 @@ export default class isNewTable extends Component {
                           routerState={routerState} // 兼容表单设计器路由传参
                           defaultValues={defaultValues || {}}
                           messageData={messageData} // 场景设计器共享变量参数
-                            /></>
-                        }</Col>
+                        />
+                      </>
+                    )}
+                  </Col>
+                );
               }
-                    return <Col
-                        span={24}
-                        >
-                        {!allhidden && ary.hidden ? ""
-                        :<><TableCom
+              return (
+                <Col span={24}>
+                  {!allhidden && ary.hidden ? (
+                    ''
+                  ) : (
+                    <>
+                      <TableCom
                         formCode={formCode}
                         formId={formId}
                         i={i}
@@ -189,26 +195,25 @@ export default class isNewTable extends Component {
                         routerState={routerState} // 兼容表单设计器路由传参
                         defaultValues={defaultValues || {}}
                         messageData={messageData} // 场景设计器共享变量参数
-                            /></>
-                        }</Col>
-                })
-            }
-        
+                      />
+                    </>
+                  )}
+                </Col>
+              );
+            })}
           </Row>
-      
-    }))
+        );
+      });
     }
-    return (
-      
-        items.map((item, i) => {
+    return items.map((item, i) => {
       const allhidden = checkAllHidden(items);
       return (
         <>
           {' '}
-              <Card full
-
+          <Card
+            full
             style={{
-                  ...style
+              ...style,
             }}
           >
             {item.map((ary, j) => {
@@ -232,9 +237,11 @@ export default class isNewTable extends Component {
                       ) : (
                         <div
                           style={{
-                              display: 'inline-block',
+                            width: '100%',
+                            height: '100%',
                             ...styles,
-                            }}>
+                          }}
+                        >
                           <TableCom
                             modalInit={modalInit}
                             formCode={formCode}
@@ -279,9 +286,9 @@ export default class isNewTable extends Component {
                   {' '}
                   <div
                     style={{
-                            display: 'inline-block',
                       ...styles,
-                          }}>
+                    }}
+                  >
                     <TableCom
                       modalInit={modalInit}
                       formCode={formCode}
@@ -315,7 +322,6 @@ export default class isNewTable extends Component {
           <WhiteSpace />
         </>
       );
-        })
-    );
+    });
   }
 }