提交 9327d9dd authored 作者: 徐立's avatar 徐立

修复bug

上级 96b111a8
...@@ -374,6 +374,9 @@ export default class ZdyTable extends Component { ...@@ -374,6 +374,9 @@ export default class ZdyTable extends Component {
const borderStyle={ const borderStyle={
borderRight:"1px solid gray",borderTop:"1px solid gray",borderLeft:"1px solid gray",borderBottom:"1px solid gray" borderRight:"1px solid gray",borderTop:"1px solid gray",borderLeft:"1px solid gray",borderBottom:"1px solid gray"
} }
const borderStyleTwo={ // 处理隐藏组件边框样式问题
borderRight:"1px solid gray",borderLeft:"1px solid gray"
}
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}:{overflow: "auto", width: "100%" }
if(!isReady) return<></> if(!isReady) return<></>
...@@ -421,12 +424,10 @@ export default class ZdyTable extends Component { ...@@ -421,12 +424,10 @@ export default class ZdyTable extends Component {
console.log(`第${i}行第${j}列样式配置有误,${e}`) console.log(`第${i}行第${j}列样式配置有误,${e}`)
} }
} }
console.log(borderStyle)
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", overflow: "auto",
textAlign: cell.content&&cell.content.calign?cell.content.calign:"left", textAlign: cell.content&&cell.content.calign?cell.content.calign:"left",
...isBorder?(cell.content.comName=="InputHidden"?{}:borderStyle):{}, ...isBorder?(cell.content.comName=="InputHidden"||!cell?.content?.comName?{}:borderStyle):{},
...styles ...styles
}} > }} >
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
*/ */
import React from 'react'; import React from 'react';
import { Tree, Table, Spin } from 'antd'; import { Tree, Table, Spin } from 'antd';
import FormList from './formList/index'; import FormList from './formList';
import { connect } from 'dva'; import { connect } from 'dva';
export default class TableList extends React.Component { export default class TableList extends React.Component {
......
...@@ -271,7 +271,6 @@ class FormList extends React.Component { ...@@ -271,7 +271,6 @@ class FormList extends React.Component {
//渲染值 //渲染值
componentDidMount() { componentDidMount() {
const { dispatch, isFormCom, isSelect, callback, valueName } = this.props; const { dispatch, isFormCom, isSelect, callback, valueName } = this.props;
window.addEventListener('resize', this.resize); window.addEventListener('resize', this.resize);
if(this.props.objCode){ if(this.props.objCode){
const { dispatch, objCode,sql} = this.props; const { dispatch, objCode,sql} = this.props;
...@@ -858,6 +857,8 @@ class FormList extends React.Component { ...@@ -858,6 +857,8 @@ class FormList extends React.Component {
render() { render() {
const { modalVisible, selectedRows, querys,tableWidth,rights ,data,isReady} = this.state; const { modalVisible, selectedRows, querys,tableWidth,rights ,data,isReady} = this.state;
console.log(this.state,this.props,isReady,this.columns)
if(!isReady){ if(!isReady){
return <div style={{width:20,margin:"auto"}}><Spin/></div> return <div style={{width:20,margin:"auto"}}><Spin/></div>
} }
......
...@@ -1932,8 +1932,6 @@ export default class tableCom extends Component { ...@@ -1932,8 +1932,6 @@ export default class tableCom extends Component {
case 'Table': case 'Table':
console.log(json.objCode == null || json.objCode == "")
if (json.objCode == null || json.objCode == "") { if (json.objCode == null || json.objCode == "") {
cm = <></> cm = <></>
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论