提交 63f03aea authored 作者: 钟是志's avatar 钟是志

组件修改

上级 d5bb11f0
......@@ -50,7 +50,7 @@ export default class List extends Component {
};
giveGetPageFields = () => {
const { listConfig, pageSearch, beforeGetPage } = this.props;
const { listConfig, pageSearch } = this.props;
const { pagination, formValues } = this.state;
const search = pageSearch.search;
let data = deepCopy(formValues);
......@@ -76,7 +76,7 @@ export default class List extends Component {
};
getPage = () => {
const { listConfig, pageSearch, dataBaseId, workId, addFields } = this.props;
const { listConfig, pageSearch, workId } = this.props;
const { pagination, sortGetPageFields } = this.state;
const { search } = pageSearch;
let data = this.giveGetPageFields();
......
......@@ -79,6 +79,8 @@ class AffairPage extends React.Component {
return record.statusName || record[process_status.dataIndex];
};
}
let findCz = columns.find((g) => g.dataIndex === 'operation');
if(!findCz){
columns.push({
dataIndex: 'operation',
title: '操作',
......@@ -100,6 +102,11 @@ class AffairPage extends React.Component {
);
},
});
}
this.setState({
columns,
});
......@@ -126,7 +133,6 @@ class AffairPage extends React.Component {
return [...otherButtons];
}
return [
{
type: 'add',
......@@ -137,8 +143,7 @@ class AffairPage extends React.Component {
{
showIframe: true,
},
() => {
},
() => {},
);
},
},
......@@ -263,7 +268,14 @@ class AffairPage extends React.Component {
};
render() {
const { workId, dataBaseId, addFields, showIframe, renderIframe, allConfigSetInfo } = this.state;
const {
workId,
dataBaseId,
addFields,
showIframe,
renderIframe,
allConfigSetInfo,
} = this.state;
if (!workId || !allConfigSetInfo) {
return null;
}
......@@ -279,7 +291,7 @@ class AffairPage extends React.Component {
listConfig.buttonArea = false;
}
return (
<PageHeaderWrapper title=''>
<PageHeaderWrapper title="">
<div
style={{
display: showIframe ? 'none' : 'block',
......@@ -309,10 +321,10 @@ class AffairPage extends React.Component {
display: showIframe ? 'block' : 'none',
}}>
<ButtonDiy
name='返回'
className='defaultBlue'
name="返回"
className="defaultBlue"
handleClick={this.returnList}
icon='arrow-left'
icon="arrow-left"
/>
</div>
</Shell>
......@@ -320,11 +332,11 @@ class AffairPage extends React.Component {
<iframe
src={iframeUrl}
frameBorder={0}
id='applyIframeId'
name='applyIframe'
marginWidth='0'
marginHeight='0'
allowtransparency='yes'
id="applyIframeId"
name="applyIframe"
marginWidth="0"
marginHeight="0"
allowtransparency="yes"
seamless
scrolling={'auto'}
style={{
......
......@@ -343,7 +343,7 @@ export default class DraftEditorCom extends React.Component {
const { modalVisible } = this.state;
return (
<div>
<div style={{border: '1px solid gray'}}>
<StyleControls
btns={btns}
editorState={this.state.editorState}
......@@ -361,6 +361,7 @@ export default class DraftEditorCom extends React.Component {
<Editor
ref={this.setEditor}
blockStyleFn={getBlockStyle}
readOnly={this.props.disabled}
customStyleMap={this.state.styleMap}
blockRendererFn={MyBlockRender.bind(
this,
......
......@@ -1853,7 +1853,6 @@ export default class tableCom extends Component {
// cm = <img src={queryApiActionPath()+obj[dataColumn.base52]} />
// break;
case 'RichText':
// console.log(obj[dataColumn.base52]);
cm = (
<Editor
key={dataColumn.base52}
......@@ -3066,13 +3065,14 @@ export default class tableCom extends Component {
}
break;
case 'RichText':
console.log(initValue, '22222222222222', dataColumn.base52, json);
cm = getFieldDecorator(dataColumn.base52, {
initialValue: initValue,
rules:
json.vlds && json.vlds.length > 0
? json.vlds
: [{ required: required, message: '请输入' }],
})(<DraftEditorCom placeholder={json.placeholder} />);
})(<DraftEditorCom placeholder={json.placeholder} disabled={json.disabled}/>);
if (
get === 'mobile' &&
((json.isMobileLabel != null && json.isMobileLabel) ||
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论