Merge remote-tracking branch 'origin/master'

one_stop_public/AffairButton/AuditButton/Modal/index.jsx

@@ -38,7 +38,7 @@ export default class WebModal extends Component {
   }
 
   render() {
-    let {visible, handleCancel, title, width} = this.props;
+    let {visible, handleCancel, title, width, getContainer} = this.props;
     const {top} = this.state;
     const style = {
       borderRadius: 4,
@@ -55,9 +55,7 @@ export default class WebModal extends Component {
           closable={false}
           visible={visible}
           footer={null}
-          getContainer={() => {
-            return getContainer(dom);
-          }}
+          getContainer={getContainer !== undefined ? getContainer : undefined}
           destroyOnClose={true}
           width={!!width ? width : 800}
           handleCancel={handleCancel}

one_stop_public/AffairButton/AuditButton/userTable/index.jsx

@@ -167,6 +167,7 @@ export default class userButton extends Component {
 				{/* <Btn get='2' btnOne={()=>{this.showModal('不同意')}} btnTwo={()=>{this.showModal('驳回')}} btnThree={()=>{this.showModal('通过')}}/> */}
 				<MyModal
 					visible={visibleOk}
+          getContainer={false}
 					title={isSecond ? '重新发起' : '通过审批'}
 					width={600}
 					handleCancel={this.handleCancelOk}>

one_stop_public/filePreview/index.jsx

@@ -115,6 +115,7 @@ export default class index extends Component {
             <div
               style={{
                 height: 650,
+                maxWidth: 1200,
               }}>
               <a target={'_blank'} href={path} download={pathName}>
                 下载文件

one_stop_public/libs/FormulaForm.jsx

@@ -5,13 +5,11 @@
  */
 import React, { Component } from 'react';
 import styles from './style.less';
-import { Icon, Alert, Select, Button } from 'antd';
-import AceEditor from 'react-ace';
+import { Icon  } from 'antd';
 import AllImg from '../assets/AllFuc.png';
 import All2Img from '../assets/AllFuc2.png';
 import ExcelBtn from '../excelInitFuc';
 import RollTab from './rollTab';
-const { Option } = Select;
 export default class FormulaForm extends Component {
 	constructor(props) {
 		super(props);
@@ -149,27 +147,6 @@ export default class FormulaForm extends Component {
 							this.refs.rolltab.setCloseAll();
 						}}>
 						{this.props.editor}
-						{/* <AceEditor height={600} width={1200}
-                        placeholder='"请输入js语句"'
-                        mode={"javascript"}
-                        theme={"textmate"}
-                        fontSize={12}
-                        value={aceValue}
-                        onChange={this.onAceChange.bind(this)}
-                        showPrintMargin={true}
-                        showGutter={true}
-                        highlightActiveLine={true}
-                        name="UNIQUE_ID_OF_DIV"
-                        // keyboardHandler="vim"
-                        setOptions={{
-                        enableBasicAutocompletion: true,
-                        enableLiveAutocompletion: true,
-                        enableSnippets: true,
-                        showLineNumbers: true,
-                        tabSize: 2,
-                        }}
-                        editorProps={{ $blockScrolling: true }}
-                        /> */}
 					</div>
 				</div>
 

one_stop_public/libs/PictureSignature/styles.less

@@ -29,7 +29,7 @@
   place-items: center;
   //min-height: 800px;
   img{
-    width: 1200px;
+    //width: 1200px;
     height: auto;
   }
 }

one_stop_public/libs/UploadCom.js

@@ -6,6 +6,10 @@ import styles from './style.less';
 import UploadComDiyForQnZy from '@/webPublic/one_stop_public/libs/UploadComDiyForQnZy';
 import {getContainer} from "@/webPublic/one_stop_public/utils/utils";
 
+message.config({
+  top: 300,
+})
+
 export function checkIsImage(path) {
   if (!path) {
     return false;
@@ -239,7 +243,16 @@ class UploadCom extends React.Component {
       onCancel={() => this.setState({previewVisible: false})}
       width={'90vw'}
     >
-      <img alt="example" style={{width: '100%', height: 'auto'}} src={previewImage}/>
+      <div style={{
+        textAlign: 'center',
+        width: '100%',
+      }}>
+      <img alt="example" style={{
+        maxWidth: '1200px',
+        maxHeight: '700px',
+        height: 'auto',
+      }} src={previewImage}/>
+      </div>
     </Modal>
   </div>
   );