子页面样式问题

one_stop_public/Table/index.jsx

@@ -50,7 +50,7 @@ export default class ZdyTable extends Component {
       formDeafault = '', // 为二维码快捷发起默认值
     } = this.props;
     if (isPreview || isChild) {
-      this.setState({ ...this.state, ...this.props, isReady: true });
+      this.setState({ ...this.state, ...this.props, isReady: true ,formConfig:{...this.state.formConfig,style:this.props.style }});
       return;
     }
 
@@ -233,7 +233,7 @@ export default class ZdyTable extends Component {
       isChild, // 是否为子表单
     } = nextProps;
     if (isPreview || isChild) {
-      this.setState({ ...this.state, ...this.props, isReady: true });
+      this.setState({ ...this.state, ...this.props, isReady: true,formConfig:{...this.state.formConfig,style:this.props.style }});
       return;
     }
 
@@ -390,6 +390,7 @@ export default class ZdyTable extends Component {
   render() {
     let {
       width,
+      isRowCol,
       isBorder,
       sqlData,
       mapData,
@@ -710,6 +711,7 @@ export default class ZdyTable extends Component {
                     })
                   : ''}
                 <IsNewTable
+                isRowCol={isRowCol}
                   modalInit={modalInit}
                   items={items}
                   checkAllHidden={this.checkAllHidden}

one_stop_public/Table/isNewMobileTable.jsx

@@ -8,6 +8,7 @@ import { Row, Col } from 'antd';
 export default class isNewTable extends Component {
   render() {
     const {
+      isRowCol,
       items,
       checkAllHidden,
       isBorder,
@@ -105,20 +106,33 @@ export default class isNewTable extends Component {
         </>
       );
     }
-    return (
-      <>
-        {/* { //  Row Col 模式
-                    items.map((item, i) => {
+    if(isRowCol){
+      return (   items.map((item, i) => {
         console.log(item)
         const allhidden = checkAllHidden(items)
-                        return <> <Row>
+        return  <Row  style={{
+                         
+          ...style,
+        }}>
             
         
             {
                 item.map((ary, j) => {
+                  let styles = {};
+                  if (ary.content && ary.content.styles) {
+                    try {
+                      styles = JSON.parse(ary.content.styles);
+                    } catch (e) {
+                      console.log(`第${i}行第${j}列样式配置有误,${e}`);
+                    }
+                  }
                     if(ary.content?.comName==="Label"){
                         console.log(ary)
                         return <Col
+                        style={{
+                         
+                          ...styles,
+                        }}
                         span={ary.content?.labelSpan}
                         >
                         {!allhidden && ary.hidden ? ""
@@ -181,17 +195,18 @@ export default class isNewTable extends Component {
             }
         
         </Row>
-                        </>
-                    })
-                } */}
-        {// 卡片模式
+      
+    }))
+    }
+    return (
+      
         items.map((item, i) => {
           const allhidden = checkAllHidden(items);
-          console.log(style)
           return (
             <>
               {' '}
               <Card full
+
                 style={{
                   ...style
                 }}
@@ -300,8 +315,7 @@ export default class isNewTable extends Component {
               <WhiteSpace />
             </>
           );
-        })}
-      </>
+        })
     );
   }
 }