提交 818f8e38 authored 作者: 钟是志's avatar 钟是志

iframe页面的Modal 直接从父级获取

上级 d8e149ce
...@@ -7,7 +7,6 @@ import React, {Component} from 'react'; ...@@ -7,7 +7,6 @@ import React, {Component} from 'react';
import {Modal, Button} from 'antd'; import {Modal, Button} from 'antd';
import styles from './index.less'; import styles from './index.less';
import {getContainer} from "@/webPublic/one_stop_public/utils/utils";
export default class WebModal extends Component { export default class WebModal extends Component {
constructor(props) { constructor(props) {
...@@ -55,7 +54,6 @@ export default class WebModal extends Component { ...@@ -55,7 +54,6 @@ export default class WebModal extends Component {
closable={false} closable={false}
visible={visible} visible={visible}
footer={null} footer={null}
getContainer={getContainer !== undefined ? getContainer : undefined}
destroyOnClose={true} destroyOnClose={true}
width={!!width ? width : 800} width={!!width ? width : 800}
handleCancel={handleCancel} handleCancel={handleCancel}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @param { jsx } addition 附件按钮 由外部添加 * @param { jsx } addition 附件按钮 由外部添加
*/ */
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Input, Row, Col, Modal, Checkbox } from 'antd'; import { Input, Checkbox } from 'antd';
import Btn from '../pagesBtn'; import Btn from '../pagesBtn';
import MyModal from '../Modal'; import MyModal from '../Modal';
import styles from './styles.less'; import styles from './styles.less';
...@@ -168,10 +168,6 @@ export default class userButton extends Component { ...@@ -168,10 +168,6 @@ export default class userButton extends Component {
{/* <Btn get='2' btnOne={()=>{this.showModal('不同意')}} btnTwo={()=>{this.showModal('驳回')}} btnThree={()=>{this.showModal('通过')}}/> */} {/* <Btn get='2' btnOne={()=>{this.showModal('不同意')}} btnTwo={()=>{this.showModal('驳回')}} btnThree={()=>{this.showModal('通过')}}/> */}
<MyModal <MyModal
visible={visibleOk} visible={visibleOk}
getContainer={() => {
let dom = document.getElementById('btnsModalMountDiv');
return dom || document.body;
}}
title={isSecond ? '重新发起' : '审批'} title={isSecond ? '重新发起' : '审批'}
width={600} width={600}
handleCancel={this.handleCancelOk}> handleCancel={this.handleCancelOk}>
......
...@@ -659,7 +659,6 @@ export default class ZdyTable extends Component { ...@@ -659,7 +659,6 @@ export default class ZdyTable extends Component {
defaultValues, defaultValues,
items, items,
init, init,
modalTitle,
currentFormKey, currentFormKey,
currentFormTitle, currentFormTitle,
isEdit, isEdit,
......
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
* web端文件预览功能 * web端文件预览功能
*/ */
import React, {Component} from 'react'; import React, {Component} from 'react';
import {Modal, Popconfirm} from 'antd'; import { Popconfirm } from 'antd';
import {checkIsImage} from '@/webPublic/one_stop_public/libs/UploadCom'; import {checkIsImage} from '@/webPublic/one_stop_public/libs/UploadCom';
import {getContainer} from "@/webPublic/one_stop_public/utils/utils"; import { getModal } from '@/webPublic/one_stop_public/utils/utils';
const FileViewer = CLIENT_TYPE === 'mobile' ? null : require('react-file-viewer');
const Modal = getModal();
const FileViewer = CLIENT_TYPE == 'mobile' ? null : require('react-file-viewer');
export default class index extends Component { export default class index extends Component {
constructor(props) { constructor(props) {
...@@ -41,6 +43,7 @@ export default class index extends Component { ...@@ -41,6 +43,7 @@ export default class index extends Component {
render() { render() {
let {path, pathName, width, height} = this.props; let {path, pathName, width, height} = this.props;
const {visible} = this.state; const {visible} = this.state;
let isShow = false; let isShow = false;
let type; let type;
...@@ -99,9 +102,6 @@ export default class index extends Component { ...@@ -99,9 +102,6 @@ export default class index extends Component {
visible={visible} visible={visible}
width={1200} width={1200}
destroyOnClose destroyOnClose
getContainer={() => {
return getContainer(this.imageDom.parentNode.parentNode.parentNode);
}}
centered={true} centered={true}
onOk={this.handleOk} onOk={this.handleOk}
onCancel={this.handleCancel}> onCancel={this.handleCancel}>
...@@ -126,9 +126,6 @@ export default class index extends Component { ...@@ -126,9 +126,6 @@ export default class index extends Component {
<FileViewer <FileViewer
fileType={type} fileType={type}
filePath={path} filePath={path}
// onError={this.onError}
// errorComponent={Error}
// unsupportedComponent={Error}
/> />
)} )}
</div> </div>
......
import React from 'react'; import React from 'react';
import { Tree, Upload, Icon, Button, message, Modal } from 'antd'; import { Button } from 'antd';
import 'brace/mode/javascript'; import 'brace/mode/javascript';
import AceEditor from 'react-ace'; import AceEditor from 'react-ace';
import FormulaForm from './FormulaForm'; import FormulaForm from './FormulaForm';
import { getModal } from '@/webPublic/one_stop_public/utils/utils';
const Modal = getModal();
export default class FormulaAll extends React.Component { export default class FormulaAll extends React.Component {
constructor(props) { constructor(props) {
......
...@@ -208,7 +208,6 @@ export default function PictureSignature({ ...@@ -208,7 +208,6 @@ export default function PictureSignature({
destroyOnClose={true} destroyOnClose={true}
maskClosable={false} maskClosable={false}
onCancel={changeShowModal} onCancel={changeShowModal}
getContainer={false}
className={styles.ModalClass} className={styles.ModalClass}
footer={<Footer />} footer={<Footer />}
title={'图片签章'} title={'图片签章'}
......
import React from "react"; import React from "react";
import { Button, message, Modal, Table, Tag } from "antd"; import { Button, message, Table, Tag } from "antd";
import FormList from "./formList/index"; import FormList from "./formList/index";
import { connect } from "dva"; import { connect } from "dva";
import { getModal } from '@/webPublic/one_stop_public/utils/utils';
const Modal = getModal();
@connect(({ DataColumn, SqlManageEntity, loading }) => ({ @connect(({ DataColumn, SqlManageEntity, loading }) => ({
DataColumn, DataColumn,
......
// 图片上传组件 // 图片上传组件
import React from 'react'; import React from 'react';
import { Button, Icon, message, Modal, Upload } from 'antd'; import { Button, Icon, message, Upload } from 'antd';
import { queryApiActionPath } from '../utils/queryConfig'; import { queryApiActionPath } from '../utils/queryConfig';
import config from '@/webPublic/one_stop_public/config'; import config from '@/webPublic/one_stop_public/config';
import styles from './style.less'; import styles from './style.less';
import UploadComDiyForQnZy from '@/webPublic/one_stop_public/libs/UploadComDiyForQnZy'; import UploadComDiyForQnZy from '@/webPublic/one_stop_public/libs/UploadComDiyForQnZy';
// import { getContainer } from '@/webPublic/one_stop_public/utils/utils';
import Viewer from 'react-viewer'; import Viewer from 'react-viewer';
message.config({ message.config({
......
import React from "react"; import React from "react";
import { Button, Icon, message, Modal, Upload } from "antd"; import { Button, Icon, message, Upload } from "antd";
import { queryApiActionPath } from "../utils/queryConfig"; import { queryApiActionPath } from "../utils/queryConfig";
import config from "@/webPublic/one_stop_public/config"; import config from "@/webPublic/one_stop_public/config";
import styles from "./style.less"; import styles from "./style.less";
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
* 通知提醒框二次封装 * 通知提醒框二次封装
*/ */
import React from 'react'; import React from 'react';
import { notification, Modal } from 'antd'; import { notification } from 'antd';
import { getModal } from '@/webPublic/one_stop_public/utils/utils';
const Modal = getModal();
/** /**
* *
......
import { message, Modal } from 'antd';
export function callbackSubmitData(infoData) { export function callbackSubmitData(infoData) {
console.log(infoData); console.log(infoData);
if (window.callbackSubmitInfoZhiYong && typeof window.callbackSubmitInfoZhiYong === 'function') { if (window.callbackSubmitInfoZhiYong && typeof window.callbackSubmitInfoZhiYong === 'function') {
......
/* eslint no-useless-escape:0 import/prefer-default-export:0 */ /* eslint no-useless-escape:0 import/prefer-default-export:0 */
import { Modal } from 'antd';
const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/; const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
const isUrl = (path) => reg.test(path); const isUrl = (path) => reg.test(path);
...@@ -27,11 +29,11 @@ export const dispatch = (type, payload, callback) => { ...@@ -27,11 +29,11 @@ export const dispatch = (type, payload, callback) => {
window.g_app._store.dispatch({ type, payload, callback }); window.g_app._store.dispatch({ type, payload, callback });
}; };
export const getContainer = (node) => {
// console.log(node); export const getModal = () =>{
console.log(window.parent?.document); if(window?.parent?.iframeParentComponent?.Modal){
if(window.parent?.document && node){ return window?.parent?.iframeParentComponent?.Modal;
return node; }else{
return Modal;
} }
return document.body;
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论