Merge remote-tracking branch 'origin/master'

FormInsertDiy/AffairPage/ApplyPage/List.js

@@ -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();

one_stop_public/App/DraftEditor.less

@@ -4,4 +4,4 @@
             color:gray
         }
     }
-}
\ No newline at end of file
+}

one_stop_public/App/DraftEditorCom.js

@@ -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,

one_stop_public/tableCompon/index.jsx

@@ -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) ||