diff --git a/public/react/src/common/UrlTool.js b/public/react/src/common/UrlTool.js index 432395fde..cb1674958 100644 --- a/public/react/src/common/UrlTool.js +++ b/public/react/src/common/UrlTool.js @@ -52,7 +52,10 @@ export function getUrl2(path, goTest) { } return `${path ? path: ''}`; } -export function getUploadActionUrl(id) { +export function getUploadActionUrl(path, goTest) { + return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}` +} +export function getUploadActionUrltwo(id) { return `${getUrl()}/api/shixuns/${id}/upload_data_sets.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}` } diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index 004cd91c0..9b32466d8 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -3,10 +3,10 @@ // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; export { getImageUrl as getImageUrl, getUrl as getUrl, getUrl2 as getUrl2, setImagesUrl as setImagesUrl - , getUploadActionUrl as getUploadActionUrl, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth + , getUploadActionUrl as getUploadActionUrl, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth,getUploadActionUrltwo as getUploadActionUrltwo , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode } from './UrlTool'; export { default as queryString } from './UrlTool2'; - + export { SnackbarHOC as SnackbarHOC } from './SnackbarHOC'; export { trigger as trigger, on as on, off as off @@ -31,7 +31,7 @@ export { trace_collapse, trace, debug, info, warn, error, trace_c, debug_c, info export { EDU_ADMIN, EDU_BUSINESS, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL} from './Const' - + export { default as AttachmentList } from './components/attachment/AttachmentList' export { themes, ThemeContext } from './context/ThemeContext' diff --git a/public/react/src/modules/tpm/TPMDataset.js b/public/react/src/modules/tpm/TPMDataset.js index 24b1173fe..717219057 100644 --- a/public/react/src/modules/tpm/TPMDataset.js +++ b/public/react/src/modules/tpm/TPMDataset.js @@ -7,7 +7,7 @@ import TPMRightSection from './component/TPMRightSection'; import TPMNav from './component/TPMNav'; import axios from 'axios'; import './tpmmodel/tpmmodel.css' -import {getUploadActionUrl,appendFileSizeToUploadFileAll} from 'educoder'; +import {getUploadActionUrltwo,appendFileSizeToUploadFileAll} from 'educoder'; import moment from 'moment'; const confirm = Modal.confirm; @@ -421,7 +421,7 @@ class TPMDataset extends Component { // https://github.com/ant-design/ant-design/issues/15505 // showUploadList={false},然后外部拿到 fileList 数组自行渲染列表。 // showUploadList: false, - action: `${getUploadActionUrl(id)}`, + action: `${getUploadActionUrltwo(id)}`, showUploadList:false, onChange: this.handleChange, onRemove: this.onAttachmentRemove,