调整样式

one_stop_public/Table/index.jsx

@@ -10,7 +10,7 @@ import TableCom from '../tableCompon'
 import {Toast} from 'antd-mobile'
 import router from 'umi/router'
 import { formulaList }  from '../excelInitFuc/functionList';
-
+import IsNewTable from './isNewTable';
 export default class ZdyTable extends Component {
     constructor(props){
         super(props)
@@ -418,7 +418,36 @@ export default class ZdyTable extends Component {
                             <Col span={24}>
                                 <div style={styleDiv} ref={ref => { this.root = ref }}
                                 >
-                                    <table style={{ overflow: "auto",  margin: max * width > 550 ? "auto" : '',...style }}  border={border} cellSpacing="0" cellPadding="0" >
+                                    {
+                                        false ?
+                                            <div
+                                                style={{
+                                                    overflow: "auto",  
+                                                    margin: max * width > 550 ? "auto" : '',
+                                                    ...style}}
+                                                    border={border}
+                                                >
+                                                <IsNewTable 
+                                                    items={items}
+                                                    checkAllHidden={this.checkAllHidden}
+                                                    isBorder={isBorder}
+                                                    borderStyle={borderStyle}
+                                                    width={width}
+                                                    fatherCode={fatherCode} 
+                                                    index={index} 
+                                                    datas={datas} 
+                                                    isEdit={isEdit} 
+                                                    currentFormKey={currentFormKey} 
+                                                    init={init} 
+                                                    get={get} 
+                                                    obj={ obj||{}}
+                                                    mapData={mapData} 
+                                                    form={this.props.form} 
+                                                    sqlData={sqlData} 
+                                                    defaultValues={defaultValues || {}}
+                                                    />
+                                            </div>
+                                            :<table style={{ overflow: "auto",  margin: max * width > 550 ? "auto" : '',...style }}  border={border} cellSpacing="0" cellPadding="0" >
                                                 <tbody>
                                                     {items.map((row, i) => {
                                                         const allhidden = this.checkAllHidden(row)
@@ -435,15 +464,39 @@ export default class ZdyTable extends Component {
                                                             }
         
         
-                                                    return !allhidden && cell.hidden ? "" : <td  width={i==0?((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))      :width * (cell.col ? cell.col : 1)} rowSpan={cell.row} colSpan={cell.col} key={j} style={{
+                                                            return !allhidden && cell.hidden ? 
+                                                                    "" 
+                                                                    : <td  
+                                                                            width={
+                                                                                i==0?
+                                                                                    ((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))      
+                                                                                    :width * (cell.col ? cell.col : 1)} 
+                                                                            rowSpan={cell.row} 
+                                                                            colSpan={cell.col} 
+                                                                            key={j} 
+                                                                            style={{
                                                                             overflow: "auto",
                                                                             textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
                                                                             ...isBorder?borderStyle:{},
-
                                                                             ...styles
                                                                             }} >
-
-                                                        <TableCom i={i}  j={j} fatherCode={fatherCode} index={index} datas={datas} uuid={cell.uuid} isEdit={isEdit} formKey={currentFormKey} init={init} get={get} json={cell.content} obj={ obj||{}} mapData={mapData} form={this.props.form} sqlData={sqlData} defaultValues={defaultValues || {}} />
+                                                                <TableCom 
+                                                                        i={i}  
+                                                                        j={j} 
+                                                                        fatherCode={fatherCode} 
+                                                                        index={index} 
+                                                                        datas={datas} 
+                                                                        uuid={cell.uuid} 
+                                                                        isEdit={isEdit} 
+                                                                        formKey={currentFormKey} 
+                                                                        init={init} 
+                                                                        get={get} 
+                                                                        json={cell.content} 
+                                                                        obj={ obj||{}}
+                                                                        mapData={mapData} 
+                                                                        form={this.props.form} 
+                                                                        sqlData={sqlData} 
+                                                                        defaultValues={defaultValues || {}} />
                                                             </td>}
                                                             )
         
@@ -455,6 +508,8 @@ export default class ZdyTable extends Component {
                                                     })}
                                                 </tbody>
                                             </table>
+                                    }
+                                    
 
                                     {style.pageBreakAfter!=null?<div style={{pageBreakAfter:style.pageBreakAfter}}></div>:""}
                                 </div>

one_stop_public/Table/isNewTable.jsx

+/**
+ * 测试新表格
+ */
+import React, { Component } from 'react'
+import TableCom from '../tableCompon/index';
+export default class isNewTable extends Component {
+    render() {
+        const {
+            items,
+            checkAllHidden,
+            isBorder,
+            borderStyle,
+            fatherCode,
+            index,
+            datas,
+            isEdit,
+            currentFormKey,
+            init,
+            get,
+            obj,
+            mapData,
+            form,
+            sqlData,
+            defaultValues,
+            width
+        } = this.props
+        return (
+            <>
+                {
+                    items.map((row,i)=>{
+                        const allhidden = checkAllHidden(row)
+                        console.log(row,items)
+                        return <div key={i}>
+                            {
+                                row.map((cell,j)=>{ // 每行渲染
+                                    let styles={}
+                                    if(cell.content&&cell.content.styles){
+                                        try{
+                                            styles= JSON.parse(cell.content.styles)
+                                        }catch (e) {
+                                            console.log(`第${i}行第${j}列样式配置有误,${e}`)
+                                        }
+                                    }
+                                    console.log(cell)
+                                    return !allhidden && cell.hidden ? 
+                                            "" 
+                                            :<div // 组件渲染
+                                                style = {{
+                                                    display:'inline-block',
+                                                    width:i==0?
+                                                    ((cell.content!=null&&cell.content.cwidth!=null?cell.content.cwidth:width) * (cell.col ? cell.col : 1))      
+                                                    :width * (cell.col ? cell.col : 1),
+                                                    overflow:'auto',
+                                                    textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
+                                                    ...isBorder?borderStyle:{},
+                                                    minWidth:100,
+                                                    minHeight:32
+                                                }}
+                                                key ={j}
+                                                >
+                                                    <TableCom 
+                                                        i={i}  
+                                                        j={j} 
+                                                        fatherCode={fatherCode} 
+                                                        index={index} 
+                                                        datas={datas} 
+                                                        uuid={cell.uuid} 
+                                                        isEdit={isEdit} 
+                                                        formKey={currentFormKey} 
+                                                        init={init} 
+                                                        get={get} 
+                                                        json={cell.content} 
+                                                        obj={ obj}
+                                                        mapData={mapData} 
+                                                        form={form} 
+                                                        sqlData={sqlData} 
+                                                        defaultValues={defaultValues}
+                                                        />
+                                            </div>
+                                            })
+                            }
+                        </div>
+                    })
+                }
+            </>
+        )
+    }
+}