提交 d7edd4da authored 作者: 徐立's avatar 徐立

调整样式

上级 5c8dfe88
...@@ -421,7 +421,7 @@ export default class ZdyTable extends Component { ...@@ -421,7 +421,7 @@ 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",
......
...@@ -40,9 +40,21 @@ export default class TableList extends React.Component { ...@@ -40,9 +40,21 @@ export default class TableList extends React.Component {
} }
render() { render() {
return <FormList
istableCom={true}
return <FormList istableCom={true} showHeader={this.props.showHeader} isHiddenPage={this.props.isHiddenPage!=null?this.props.isHiddenPage:false} loading={this.props.loading} pageSize={this.props.pageSize||10} value={this.state} notShowBack={true} rights={this.props.rights || []} objCode={this.props.objCode} isFormCom={true} sql={this.props.sql} /> showHeader={this.props.showHeader}
isHiddenPage={
this.props.isHiddenPage!=null?
this.props.isHiddenPage
:false}
loading={this.props.loading}
pageSize={this.props.pageSize||10}
value={this.state}
notShowBack={true}
rights={this.props.rights || []}
objCode={this.props.objCode}
isFormCom={true}
sql={this.props.sql} />
} }
} }
...@@ -1713,7 +1713,7 @@ export default class tableCom extends Component { ...@@ -1713,7 +1713,7 @@ export default class tableCom extends Component {
// cm = <img src={queryApiActionPath()+obj[dataColumn.base52]} /> // cm = <img src={queryApiActionPath()+obj[dataColumn.base52]} />
// break; // break;
case 'TextArea': case 'TextArea':
cm = <span style={{ padding: '0 24px' }}>{obj[dataColumn.base52]}</span>; cm = <span>{obj[dataColumn.base52]}</span>;
break; break;
case 'Switch': case 'Switch':
...@@ -1932,12 +1932,20 @@ export default class tableCom extends Component { ...@@ -1932,12 +1932,20 @@ 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 = <></>
} }
cm = <TableList loading={this.props.loading} showHeader={json.showHeader} isHiddenPage={json.isHiddenPage} pageSize={json.pageSize} value={obj[dataColumn.base52 || this.props.uuid] || {}} objCode={json.objCode} sql={json.filterSql} rights={json.rights} /> cm = <TableList
loading={this.props.loading}
showHeader={json.showHeader}
isHiddenPage={json.isHiddenPage}
pageSize={json.pageSize}
value={obj[dataColumn.base52 || this.props.uuid] || {}}
objCode={json.objCode}
sql={json.filterSql}
rights={json.rights} />
break; break;
default: default:
cm = <span>缺乏字段{json.comName}的匹配项</span> cm = <span>缺乏字段{json.comName}的匹配项</span>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论