提交 64e392b8 authored 作者: 钟是志's avatar 钟是志

1

...@@ -28,6 +28,7 @@ import { ...@@ -28,6 +28,7 @@ import {
RichUtils, RichUtils,
} from 'draft-js'; } from 'draft-js';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
const FormItem = Form.Item; const FormItem = Form.Item;
function getBlockStyle(block) { function getBlockStyle(block) {
...@@ -507,7 +508,7 @@ class AttrForm extends React.Component { ...@@ -507,7 +508,7 @@ class AttrForm extends React.Component {
onChangemultiple={false} onChangemultiple={false}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<a href={config.httpServer + url} target="_blank"> <a href={queryFileUrl(url)} target="_blank">
{name} {name}
</a> </a>
) : ( ) : (
...@@ -600,7 +601,7 @@ class VideoForm extends React.Component { ...@@ -600,7 +601,7 @@ class VideoForm extends React.Component {
onChangemultiple={false} onChangemultiple={false}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<video src={config.httpServer + url} controls="controls"> <video src={queryFileUrl(url)} controls="controls">
您的浏览器不支持 video 标签。 您的浏览器不支持 video 标签。
</video> </video>
) : ( ) : (
...@@ -692,7 +693,7 @@ class PicForm extends React.Component { ...@@ -692,7 +693,7 @@ class PicForm extends React.Component {
multiple={false} multiple={false}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<img src={config.httpServer + url} style={{ height: 400, width: '100%' }} /> <img src={queryFileUrl(url)} style={{ height: 400, width: '100%' }} />
) : ( ) : (
<p className="ant-upload-drag-icon" style={{ marginBottom: 0, height: 400 }}> <p className="ant-upload-drag-icon" style={{ marginBottom: 0, height: 400 }}>
<Icon type="video" /> <Icon type="video" />
......
...@@ -27,6 +27,7 @@ import { ...@@ -27,6 +27,7 @@ import {
CompositeDecorator, CompositeDecorator,
RichUtils, RichUtils,
} from 'draft-js'; } from 'draft-js';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
const FormItem = Form.Item; const FormItem = Form.Item;
function getBlockStyle(block) { function getBlockStyle(block) {
...@@ -510,7 +511,7 @@ class AttrForm extends React.Component { ...@@ -510,7 +511,7 @@ class AttrForm extends React.Component {
onChangemultiple={false} onChangemultiple={false}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<a href={config.httpServer + url} target="_blank"> <a href={queryFileUrl(url)} target="_blank">
{name} {name}
</a> </a>
) : ( ) : (
...@@ -603,7 +604,7 @@ class VideoForm extends React.Component { ...@@ -603,7 +604,7 @@ class VideoForm extends React.Component {
}} }}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<video src={config.httpServer + url} controls="controls"> <video src={queryFileUrl(url)} controls="controls">
您的浏览器不支持 video 标签。 您的浏览器不支持 video 标签。
</video> </video>
) : ( ) : (
...@@ -695,7 +696,7 @@ class PicForm extends React.Component { ...@@ -695,7 +696,7 @@ class PicForm extends React.Component {
multiple={false} multiple={false}
style={{ padding: 0 }}> style={{ padding: 0 }}>
{url ? ( {url ? (
<img src={config.httpServer + url} style={{ height: 400, width: '100%' }} /> <img src={queryFileUrl(url)} style={{ height: 400, width: '100%' }} />
) : ( ) : (
<p className="ant-upload-drag-icon" style={{ marginBottom: 0, height: 400 }}> <p className="ant-upload-drag-icon" style={{ marginBottom: 0, height: 400 }}>
<Icon type="video" /> <Icon type="video" />
......
...@@ -4,6 +4,7 @@ import table from '../assets/专家经验系统切图/智能报告/table.png'; ...@@ -4,6 +4,7 @@ import table from '../assets/专家经验系统切图/智能报告/table.png';
import chart from '../assets/专家经验系统切图/智能报告/chart.png'; import chart from '../assets/专家经验系统切图/智能报告/chart.png';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
const ReactHighcharts = config.ReactHighcharts; const ReactHighcharts = config.ReactHighcharts;
@connect(({ Report, loading }) => ({ @connect(({ Report, loading }) => ({
...@@ -200,14 +201,14 @@ const AtomicComponent = (props) => { ...@@ -200,14 +201,14 @@ const AtomicComponent = (props) => {
const { src } = entity.getData(); const { src } = entity.getData();
return ( return (
<div> <div>
<img src={config.httpServer + src} style={{ maxWidth: '100%' }} /> <img src={queryFileUrl(src)} style={{ maxWidth: '100%' }} />
</div> </div>
); );
} }
if (type === 'attr') { if (type === 'attr') {
const { src, name } = entity.getData(); const { src, name } = entity.getData();
return ( return (
<a href={config.httpServer + src} target="_blank"> <a href={queryFileUrl(src)} target="_blank">
{name} {name}
</a> </a>
); );
...@@ -215,7 +216,7 @@ const AtomicComponent = (props) => { ...@@ -215,7 +216,7 @@ const AtomicComponent = (props) => {
const { src } = entity.getData(); const { src } = entity.getData();
return ( return (
<div> <div>
<video src={config.httpServer + src} controls="controls"> <video src={queryFileUrl(src)} controls="controls">
您的浏览器不支持 video 标签。 您的浏览器不支持 video 标签。
</video> </video>
</div> </div>
......
...@@ -42,7 +42,11 @@ import { ...@@ -42,7 +42,11 @@ import {
submitValues, submitValues,
checkNeedWriteAuditInfo, checkNeedWriteAuditInfo,
} from './splitDetailSplit'; } from './splitDetailSplit';
import { queryApiVersion, queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import {
queryApiVersion,
queryApiActionPath,
queryFileUrl,
} from '@/webPublic/one_stop_public/utils/queryConfig';
import { isJSON } from '@/webPublic/zyd_public/utils/utils'; import { isJSON } from '@/webPublic/zyd_public/utils/utils';
import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList'; import HistoryFormList from '@/webPublic/one_stop_public/DetailForAudit/HistoryFormList';
...@@ -758,11 +762,7 @@ class DetailSplit extends Component { ...@@ -758,11 +762,7 @@ class DetailSplit extends Component {
marginTop: -25, marginTop: -25,
border: item.taskVariable?.sign ? '1px solid #ccc' : '', border: item.taskVariable?.sign ? '1px solid #ccc' : '',
}} }}
src={ src={queryFileUrl(item.taskVariable?.sign)}
item.taskVariable?.sign
? queryApiActionPath() + item.taskVariable?.sign
: ''
}
alt="" alt=""
/> />
) : ( ) : (
...@@ -828,11 +828,7 @@ class DetailSplit extends Component { ...@@ -828,11 +828,7 @@ class DetailSplit extends Component {
marginTop: -25, marginTop: -25,
border: item.taskVariable?.sign ? '1px solid #ccc' : '', border: item.taskVariable?.sign ? '1px solid #ccc' : '',
}} }}
src={ src={queryFileUrl(item.taskVariable?.sign)}
item.taskVariable?.sign
? queryApiActionPath() + item.taskVariable?.sign
: ''
}
alt="" alt=""
/> />
) : ( ) : (
......
...@@ -115,7 +115,7 @@ export default class Signature extends Component { ...@@ -115,7 +115,7 @@ export default class Signature extends Component {
Modal.info({ Modal.info({
title: '查看签名', title: '查看签名',
content: <div className={styles.showDiv}> content: <div className={styles.showDiv}>
<img src={config.httpServer + url}/> <img src={queryFileUrl(url)}/>
</div>, </div>,
footer: null, footer: null,
}); });
...@@ -138,7 +138,7 @@ export default class Signature extends Component { ...@@ -138,7 +138,7 @@ export default class Signature extends Component {
className={styles.reSign}> className={styles.reSign}>
重新签名 重新签名
</Button>*/} </Button>*/}
<img src={config.httpServer + url} className={styles.littleSign} onClick={this.showSignImage}/> <img src={queryFileUrl(url)} className={styles.littleSign} onClick={this.showSignImage}/>
</div> </div>
); );
} else { } else {
...@@ -233,7 +233,7 @@ export default class Signature extends Component { ...@@ -233,7 +233,7 @@ export default class Signature extends Component {
<this.EditIcon /> <this.EditIcon />
<img <img
onClick={this.showSignImage} onClick={this.showSignImage}
src={config.httpServer + url} src={queryFileUrl(url)}
style={{ style={{
height, height,
width, width,
......
...@@ -3,6 +3,7 @@ import {Upload, message} from 'antd'; ...@@ -3,6 +3,7 @@ import {Upload, message} from 'antd';
import config from '@/webPublic/one_stop_public/config'; import config from '@/webPublic/one_stop_public/config';
import {zipImage} from "@/webPublic/zyd_public/utils/handlePhoto"; import {zipImage} from "@/webPublic/zyd_public/utils/handlePhoto";
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
export default class ImgUploadCom extends React.Component { export default class ImgUploadCom extends React.Component {
constructor(props) { constructor(props) {
...@@ -75,7 +76,7 @@ export default class ImgUploadCom extends React.Component { ...@@ -75,7 +76,7 @@ export default class ImgUploadCom extends React.Component {
style={{padding: 0}} style={{padding: 0}}
> >
{url ? ( {url ? (
<img src={config.httpServer + url} style={{ <img src={queryFileUrl(url)} style={{
height: json.height, height: json.height,
width: json.width, width: json.width,
maxWidth: '60vw', // 解决图片在移动端过宽的bug maxWidth: '60vw', // 解决图片在移动端过宽的bug
......
import React from 'react'; import React from 'react';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { isFromIframe } from '@/webPublic/one_stop_public/utils/utils'; import { isFromIframe } from '@/webPublic/one_stop_public/utils/utils';
import getOneStopUploadUrl from '@/webPublic/one_stop_public/Base16/getOneStopUploadUrl'; import getOneStopUploadUrl from '@/webPublic/one_stop_public/Base16/getOneStopUploadUrl';
const oneSetItemP = { const oneSetItemP = {
marginBottom: 0, marginBottom: 0,
userSelect: 'none', userSelect: 'none',
...@@ -157,7 +158,7 @@ export const uploadFile = (file) => { ...@@ -157,7 +158,7 @@ export const uploadFile = (file) => {
export const zipImage = (path, fileName, limitWidth = 1200) => { export const zipImage = (path, fileName, limitWidth = 1200) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let image = new Image(); //新建一个img标签(还没嵌入DOM节点) let image = new Image(); //新建一个img标签(还没嵌入DOM节点)
let imageUrl = queryApiActionPath() + path; let imageUrl = queryFileUrl(path);
image.setAttribute('crossOrigin', 'Anonymous'); image.setAttribute('crossOrigin', 'Anonymous');
image.src = imageUrl; image.src = imageUrl;
image.onload = () => { image.onload = () => {
......
// 图片上传组件 // 图片上传组件
import React from 'react'; import React from 'react';
import { Button, Icon, message, Upload } from 'antd'; import { Button, Icon, message, Upload } from 'antd';
import { queryApiActionPath } from '../utils/queryConfig'; import { queryApiActionPath, queryFileUrl } 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';
...@@ -211,14 +211,13 @@ class UploadCom extends React.Component { ...@@ -211,14 +211,13 @@ class UploadCom extends React.Component {
<img <img
style={{ width: '100px', height: 'auto' }} style={{ width: '100px', height: 'auto' }}
className={styles.img} className={styles.img}
src={queryApiActionPath() + f.path} src={queryFileUrl(f.path)}
/> />
<div <div
className={styles.mask} className={styles.mask}
onClick={() => { onClick={() => {
// window.open(queryApiActionPath() + f.path);
this.setState({ this.setState({
previewImage: queryApiActionPath() + f.path, previewImage: queryFileUrl(f.path),
previewImageName : f.name, previewImageName : f.name,
previewVisible: true, previewVisible: true,
}); });
...@@ -238,7 +237,7 @@ class UploadCom extends React.Component { ...@@ -238,7 +237,7 @@ class UploadCom extends React.Component {
} }
return ( return (
<li key={f.path}> <li key={f.path}>
<a target="_blank" key={f.path} href={queryApiActionPath() + f.path}> <a target="_blank" key={f.path} href={queryFileUrl(f.path)}>
{f.name} {f.name}
</a>{' '} </a>{' '}
{!disabled && ( {!disabled && (
......
import React from "react"; import React from "react";
import { Button, Icon, message, Upload } from "antd"; import { Button, Icon, message, Upload } from "antd";
import { queryApiActionPath } from "../utils/queryConfig"; import { queryApiActionPath, queryFileUrl } 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 { checkIsImage } from "./UploadCom"; import { checkIsImage } from "./UploadCom";
...@@ -140,15 +140,14 @@ export default class UploadComDiyForQnZy extends React.Component { ...@@ -140,15 +140,14 @@ export default class UploadComDiyForQnZy extends React.Component {
<img <img
style={{ width: 100, height: 100 }} style={{ width: 100, height: 100 }}
className={styles.img} className={styles.img}
src={queryApiActionPath() + f.path} src={queryFileUrl(f.path)}
/> />
<div <div
className={styles.mask} className={styles.mask}
onClick={() => { onClick={() => {
// window.open(queryApiActionPath() + f.path);
this.setState({ this.setState({
previewVisible: true, previewVisible: true,
previewImage: queryApiActionPath() + f.path, previewImage: queryFileUrl(f.path),
previewImageName: f.name, previewImageName: f.name,
}); });
}}> }}>
...@@ -167,7 +166,7 @@ export default class UploadComDiyForQnZy extends React.Component { ...@@ -167,7 +166,7 @@ export default class UploadComDiyForQnZy extends React.Component {
} }
return ( return (
<li key={f.path}> <li key={f.path}>
<a target="_blank" key={f.path} href={queryApiActionPath() + f.path}> <a target="_blank" key={f.path} href={queryFileUrl(f.path)}>
{f.name} {f.name}
</a>{" "} </a>{" "}
{!disabled && ( {!disabled && (
......
...@@ -30,7 +30,7 @@ import SearchInfo from '../../App/SearchInfo'; ...@@ -30,7 +30,7 @@ import SearchInfo from '../../App/SearchInfo';
import { Base16Encode } from '../../Base16/index'; import { Base16Encode } from '../../Base16/index';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import FilePreview from '@/webPublic/one_stop_public/filePreview'; import FilePreview from '@/webPublic/one_stop_public/filePreview';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom'; import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom';
import { getModal, getPopconfirm } from '@/webPublic/one_stop_public/utils/utils'; import { getModal, getPopconfirm } from '@/webPublic/one_stop_public/utils/utils';
...@@ -494,7 +494,7 @@ class TreeList extends React.Component { ...@@ -494,7 +494,7 @@ class TreeList extends React.Component {
{files.map((f, index2) => { {files.map((f, index2) => {
return ( return (
<li key={index2}> <li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} /> <FilePreview path={queryFileUrl(f.path)} pathName={f.name} />
</li> </li>
); );
})} })}
......
...@@ -29,7 +29,7 @@ import SearchInfo from '../../App/SearchInfo'; ...@@ -29,7 +29,7 @@ import SearchInfo from '../../App/SearchInfo';
import { Base16Encode } from '../../Base16/index'; import { Base16Encode } from '../../Base16/index';
import { isEmpty } from 'lodash'; import { isEmpty } from 'lodash';
import FilePreview from '@/webPublic/one_stop_public/filePreview'; import FilePreview from '@/webPublic/one_stop_public/filePreview';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom'; import UploadCom from '@/webPublic/one_stop_public/libs/UploadCom';
import { cloneDeep } from '../../copy/index'; import { cloneDeep } from '../../copy/index';
import { getPopconfirm, getModal } from '@/webPublic/one_stop_public/utils/utils'; import { getPopconfirm, getModal } from '@/webPublic/one_stop_public/utils/utils';
...@@ -538,7 +538,7 @@ class FormList extends React.Component { ...@@ -538,7 +538,7 @@ class FormList extends React.Component {
{files.map((f, index2) => { {files.map((f, index2) => {
return ( return (
<li key={index2}> <li key={index2}>
<FilePreview path={queryApiActionPath() + f.path} pathName={f.name} /> <FilePreview path={queryFileUrl(f.path)} pathName={f.name} />
</li> </li>
); );
})} })}
......
...@@ -5,6 +5,7 @@ import { isNaN } from 'lodash'; ...@@ -5,6 +5,7 @@ import { isNaN } from 'lodash';
import React from 'react'; import React from 'react';
import config from '@/webPublic/one_stop_public/config'; import config from '@/webPublic/one_stop_public/config';
import { isJSON } from '@/webPublic/one_stop_public/2022beidianke/isJSON'; import { isJSON } from '@/webPublic/one_stop_public/2022beidianke/isJSON';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
const codeMessage = { const codeMessage = {
200: '服务器成功返回请求的数据。', 200: '服务器成功返回请求的数据。',
...@@ -184,12 +185,7 @@ const getRender = (com, props) => { ...@@ -184,12 +185,7 @@ const getRender = (com, props) => {
if (com == 'canvas') return <canvas {...props} />; if (com == 'canvas') return <canvas {...props} />;
if (com == 'iframe') return <iframe {...props} />; if (com == 'iframe') return <iframe {...props} />;
if (com == 'img') { if (com == 'img') {
const src = const src = queryFileUrl(props.src)
props.src != null
? props.src.indexOf('http') > -1
? props.src
: config.httpServer + props.src
: null;
const pp = { const pp = {
...props, ...props,
src: src src: src
......
...@@ -139,4 +139,19 @@ export const queryIsBinary = () => queryConfig('IS_BINARY'); // 是否开启接 ...@@ -139,4 +139,19 @@ export const queryIsBinary = () => queryConfig('IS_BINARY'); // 是否开启接
export const resetLoginUrl = () => queryConfig('resetLoginUrl'); // 是否退出登录注销token 解决北电科安全测评 export const resetLoginUrl = () => queryConfig('resetLoginUrl'); // 是否退出登录注销token 解决北电科安全测评
export const hiddenExitButton = () => queryConfig('hiddenExitButton'); export const hiddenExitButton = () => queryConfig('hiddenExitButton');
export const queryFileUrl = (url = '', defaultFile = '') => {
if (url && typeof url === 'string' && url.length > 10) {
if (url.indexOf('http') > -1) {
return url;
}
const prefix = window.CONFIG['FILE_PATH'] || window.CONFIG['API_ACTION_PATH'];
return prefix + url;
} else {
if (defaultFile) {
return defaultFile;
}
return '';
}
};
export default queryConfig; export default queryConfig;
...@@ -8,68 +8,64 @@ const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|( ...@@ -8,68 +8,64 @@ const reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(
const isUrl = (path) => reg.test(path); const isUrl = (path) => reg.test(path);
const isAntDesignPro = () => { const isAntDesignPro = () => {
if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') { if (ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION === 'site') {
return true; return true;
} }
return window.location.hostname === 'preview.pro.ant.design'; return window.location.hostname === 'preview.pro.ant.design';
}; // 给官方演示站点用,用于关闭真实开发环境不需要使用的特性 }; // 给官方演示站点用,用于关闭真实开发环境不需要使用的特性
const isAntDesignProOrDev = () => { const isAntDesignProOrDev = () => {
const { NODE_ENV } = process.env; const { NODE_ENV } = process.env;
if (NODE_ENV === 'development') { if (NODE_ENV === 'development') {
return true; return true;
} }
return isAntDesignPro(); return isAntDesignPro();
}; };
export { isAntDesignProOrDev, isAntDesignPro, isUrl }; export { isAntDesignProOrDev, isAntDesignPro, isUrl };
export const dispatch = (type, payload, callback) => { export const dispatch = (type, payload, callback) => {
window.g_app._store.dispatch({ window.g_app._store.dispatch({
type, type,
payload, payload,
callback, callback,
}); });
}; };
export const isFromIframe = () => {
export const isFromIframe = () => { // 判断是否来自iframe 嵌入页面 暂时放弃使用 // 判断是否来自iframe 嵌入页面 暂时放弃使用
return false; return false;
let isFromIframe = window.frames.length !== parent.frames.length; let isFromIframe = window.frames.length !== parent.frames.length;
if (window.location.origin.indexOf('localhost') > -1) { if (window.location.origin.indexOf('localhost') > -1) {
return false; return false;
} }
return isFromIframe; return isFromIframe;
}; };
export const getModal = () => { export const getModal = () => {
return isFromIframe() ? window?.parent?.iframeParentComponent?.Modal : Modal; return isFromIframe() ? window?.parent?.iframeParentComponent?.Modal : Modal;
}; };
export const getPopconfirm = () => { export const getPopconfirm = () => {
return isFromIframe() ? window?.parent?.iframeParentComponent?.Popconfirm : Popconfirm; return isFromIframe() ? window?.parent?.iframeParentComponent?.Popconfirm : Popconfirm;
}; };
export const getMessage = () => { export const getMessage = () => {
return isFromIframe() ? window?.parent?.iframeParentComponent?.message : message; return isFromIframe() ? window?.parent?.iframeParentComponent?.message : message;
}; };
export const getOneStopMyInfo = (params = {}) => { export const getOneStopMyInfo = (params = {}) => {
return uaaRequest('/UserApi/getMy', params) return uaaRequest('/UserApi/getMy', params).then((res) => {
.then((res) => { if (res) {
if (res) { if (!res.groupsId) {
if (!res.groupsId) { res.groupsId = 'pub';
res.groupsId = 'pub'; }
} res.differenceBetweenServerAndClientTime = -50;
return getTime() localStorage.setItem('user', JSON.stringify(res));
.then((t) => { return res;
res.differenceBetweenServerAndClientTime = t; }
localStorage.setItem('user', JSON.stringify(res)); });
return res;
});
}
});
}; };
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import Editor from '@/webPublic/zyd_public/WangEditor/includes/wangEditor.min'; import Editor from '@/webPublic/zyd_public/WangEditor/includes/wangEditor.min';
import { message } from 'antd'; import { message } from 'antd';
import { uploadFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem'; import { uploadFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
const E = Editor; const E = Editor;
const { BtnMenu } = E; const { BtnMenu } = E;
...@@ -43,7 +43,7 @@ export default class PdfMenu extends BtnMenu { ...@@ -43,7 +43,7 @@ export default class PdfMenu extends BtnMenu {
.then((res) => { .then((res) => {
setTimeout(() => { setTimeout(() => {
if (res && res.length > 10) { if (res && res.length > 10) {
let url = queryApiActionPath() + res; let url = queryFileUrl(res);
window.message.success('上传文件成功'); window.message.success('上传文件成功');
this.editor.txt.append(` this.editor.txt.append(`
<p class='wangEditor-pdfReader'> <p class='wangEditor-pdfReader'>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
import Editor from '@/webPublic/zyd_public/WangEditor/includes/wangEditor.min'; import Editor from '@/webPublic/zyd_public/WangEditor/includes/wangEditor.min';
import { message } from 'antd'; import { message } from 'antd';
import { uploadFile } from "@/webPublic/one_stop_public/libs/PictureSignature/ShowItem"; import { uploadFile } from "@/webPublic/one_stop_public/libs/PictureSignature/ShowItem";
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import videoSvg from './video.svg'; import videoSvg from './video.svg';
const E = Editor; const E = Editor;
...@@ -38,7 +38,7 @@ export default class VideoMenu extends BtnMenu { ...@@ -38,7 +38,7 @@ export default class VideoMenu extends BtnMenu {
const fileName = file.name; const fileName = file.name;
uploadFile(file).then((res) => { uploadFile(file).then((res) => {
if (res && res.length > 10) { if (res && res.length > 10) {
let url = queryApiActionPath() + res; let url = queryFileUrl(res);
setTimeout(()=>{ setTimeout(()=>{
window.message.success('上传成功'); window.message.success('上传成功');
this.editor.txt.append(` this.editor.txt.append(`
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import WangEditor from './includes/wangEditor.min'; import WangEditor from './includes/wangEditor.min';
import { uploadFile } from "@/webPublic/one_stop_public/libs/PictureSignature/ShowItem"; import { uploadFile } from "@/webPublic/one_stop_public/libs/PictureSignature/ShowItem";
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import PdfMenu from '@/webPublic/zyd_public/WangEditor/DiyMenu/PdfMenu'; import PdfMenu from '@/webPublic/zyd_public/WangEditor/DiyMenu/PdfMenu';
import VideoMenu from '@/webPublic/zyd_public/WangEditor/DiyMenu/VideoMenu'; import VideoMenu from '@/webPublic/zyd_public/WangEditor/DiyMenu/VideoMenu';
let editor = null; let editor = null;
...@@ -61,7 +61,7 @@ export default function Index({ ...@@ -61,7 +61,7 @@ export default function Index({
// 重写上传图片的方法 // 重写上传图片的方法
uploadFile(resultFiles[0]).then((y) => { uploadFile(resultFiles[0]).then((y) => {
if (y && y.length) { if (y && y.length) {
insertImgFn(queryApiActionPath() + y); insertImgFn(queryFileUrl(y));
} }
}); });
// insertImgFn(imgUrl); // insertImgFn(imgUrl);
......
import { uploadFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem'; import { uploadFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { message } from 'antd'; import { message } from 'antd';
import { isJSON } from '@/webPublic/one_stop_public/tableCompon/Split_Index/staticInfo'; import { isJSON } from '@/webPublic/one_stop_public/tableCompon/Split_Index/staticInfo';
...@@ -45,7 +45,7 @@ class MyMenu { ...@@ -45,7 +45,7 @@ class MyMenu {
.then((res) => { .then((res) => {
setTimeout(() => { setTimeout(() => {
if (res && typeof res === 'string' && res.length > 10 && res.indexOf('errMsg') <= -1) { if (res && typeof res === 'string' && res.length > 10 && res.indexOf('errMsg') <= -1) {
let url = queryApiActionPath() + res; let url = queryFileUrl(res);
message.success('上传文件成功'); message.success('上传文件成功');
const v = `<p class='wangEditor-pdfReader'><embed width='100%' const v = `<p class='wangEditor-pdfReader'><embed width='100%'
height='768px' height='768px'
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
import styles from './css/style.less'; import styles from './css/style.less';
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import compressImage from '@/webPublic/zyd_public/WangEditor/compressImage'; import compressImage from '@/webPublic/zyd_public/WangEditor/compressImage';
import { queryApiActionPath } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { uploadFile as uploadOnestopFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem'; import { uploadFile as uploadOnestopFile } from '@/webPublic/one_stop_public/libs/PictureSignature/ShowItem';
import loadCss from '@/webPublic/zyd_public/WangEditor/WangEditor5/css/cssLoader'; import loadCss from '@/webPublic/zyd_public/WangEditor/WangEditor5/css/cssLoader';
import myMenuConf from '@/webPublic/zyd_public/WangEditor/WangEditor5/DiyMenu/pdfMenu'; import myMenuConf from '@/webPublic/zyd_public/WangEditor/WangEditor5/DiyMenu/pdfMenu';
...@@ -58,7 +58,7 @@ function WangEditorReactComponent(props) { ...@@ -58,7 +58,7 @@ function WangEditorReactComponent(props) {
uploadOnestopFile(fileNew).then((y) => { uploadOnestopFile(fileNew).then((y) => {
// 使用一站式的文件上传接口 // 使用一站式的文件上传接口
if (y && y.length) { if (y && y.length) {
insertFn(queryApiActionPath() + y, file.name); insertFn(queryFileUrl(y), file.name);
} }
}); });
}); });
......
...@@ -10,16 +10,15 @@ export const getTime = () => { ...@@ -10,16 +10,15 @@ export const getTime = () => {
method: 'POST', method: 'POST',
body: {}, body: {},
}, },
) ).then(t => {
.then(t => { if (t) {
if (t) { return t - new Date().getTime(); // 服务器时间 与 客户端时间的差值;
return t - new Date().getTime(); // 服务器时间 与 客户端时间的差值; } else {
} else { return 0;
return 0; }
} });
});
} else { } else {
return new Promise((resolve) => { return new Promise(resolve => {
resolve(0); resolve(0);
return 0; return 0;
}); });
...@@ -27,23 +26,19 @@ export const getTime = () => { ...@@ -27,23 +26,19 @@ export const getTime = () => {
}; };
export async function queryCurrent() { export async function queryCurrent() {
// let t = await getTime();
const config = window.specialImportantSystemConfig || {}; const config = window.specialImportantSystemConfig || {};
let token = getToken(); let token = getToken();
let userInfo = getCurrentUser(); let userInfo = getCurrentUser();
if (token && userInfo.token === token) { if (token && userInfo.token === token) {
return new Promise((resolve) => { return new Promise(resolve => {
resolve(userInfo); resolve(userInfo);
return userInfo; return userInfo;
}); });
} }
if (config.mockServer) { if (config.mockServer) {
return request( return request(`${config.mockServer}/${config.gateWayUrl.zydxg}/UserApi/queryCurrent`, {
`${config.mockServer}/${config.gateWayUrl.zydxg}/UserApi/queryCurrent`, method: 'POST',
{ body: {},
method: 'POST', });
body: {},
},
);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论