diff --git a/js/pdfview/index.html b/js/pdfview/index.html index 2366a8b0f6..2327526197 100644 --- a/js/pdfview/index.html +++ b/js/pdfview/index.html @@ -13,6 +13,9 @@ location.href.replace(pattern, function (attr, key, value) { parames[key] = decodeURI(value); }); + if(parames.nocredentials){ + parames.url = parames.url.indexOf("?") > -1 ? parames.url + "&nocredentials=true" : parames.url + } var pdfUrl = decodeURIComponent(parames.url || "http://localhost:8000/api/attachments/4390023?disposition=inline&filesize=247403") diff --git a/js/pdfview/js/pdf.js b/js/pdfview/js/pdf.js index a6ee5091a3..be71fc7721 100644 --- a/js/pdfview/js/pdf.js +++ b/js/pdfview/js/pdf.js @@ -9952,7 +9952,7 @@ class PDFFetchStreamReader { this._isRangeSupported = !source.disableRange; this._headers = createHeaders(this._stream.httpHeaders); const url = source.url; - fetch(url, createFetchOptions(this._headers, this._withCredentials, this._abortController)).then(response => { + fetch(url, createFetchOptions(this._headers, url.indexOf("nocredentials") > -1 ? false : this._withCredentials, this._abortController)).then(response => { if (!(0, _network_utils.validateResponseStatus)(response.status)) { throw (0, _network_utils.createResponseStatusError)(response.status, url); } diff --git a/p__Account__Secure__index.async.js b/p__Account__Secure__index.async.js index 1c436daee4..561fdd58ff 100644 --- a/p__Account__Secure__index.async.js +++ b/p__Account__Secure__index.async.js @@ -936,7 +936,7 @@ var Secure = function Secure(_ref) { })), children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - padding: '8px 24px' + padding: '8px 20px' }, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("p", { children: "\u624B\u673A\u53F7\u89E3\u7ED1\u540E\uFF0C\u5C06\u65E0\u6CD5\u4F7F\u7528\u8BE5\u624B\u673A\u53F7\u767B\u5F55\u5E73\u53F0\uFF0C\u8BF7\u77E5\u6089" @@ -1032,7 +1032,7 @@ var Secure = function Secure(_ref) { })), children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { - padding: '8px 24px' + padding: '8px 20px' }, children: [/*#__PURE__*/(0,jsx_runtime.jsx)("p", { children: "\u82E5\u539F\u8D26\u53F7\u53EA\u6709\u7ED1\u5B9A\u4E86\u624B\u673A\u53F7\u4E00\u79CD\u767B\u5F55\u65B9\u5F0F\uFF0C\u5F3A\u5236\u89E3\u7ED1\u540E\u4F1A\u5BFC\u81F4\u539F\u8D26\u53F7\u65E0\u6CD5\u767B\u5F55\uFF0C\u8BF7\u786E\u5B9A\u662F\u5426\u5F3A\u5236\u89E3\u7ED1" @@ -1046,7 +1046,7 @@ var Secure = function Secure(_ref) { return setUntieValue(e.target.value); }, style: { - width: '240px' + width: '230px' } }), " ", /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, { disabled: countdownFlag, diff --git a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js index f7db2237c1..e797a28b84 100644 --- a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js @@ -7982,7 +7982,7 @@ var Group = function Group(_ref) { justifyContent: "end", marginRight: 10 }, - children: "\u5206\u73ED\u89C4\u5219\uFF1A" + children: "\u5206\u7EC4\u89C4\u5219\uFF1A" }), /*#__PURE__*/(0,jsx_runtime.jsxs)(es_checkbox/* default */.Z.Group, { onChange: function onChange(e) { setCheckboxData({ diff --git a/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js index b325a8a230..b69d51b5f5 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js @@ -4528,7 +4528,7 @@ var Comment_ShixunsListPage = function ShixunsListPage(_ref) { if (shixunHomeworks.actionTabs.key === '导出实训报告' && (shixunWorkReport === null || shixunWorkReport === void 0 ? void 0 : shixunWorkReport.students_count) > 0) { exportReport('all'); } - }, [shixunWorkReport]); + }, [shixunWorkReport === null || shixunWorkReport === void 0 ? void 0 : shixunWorkReport.students_count]); (0,_react_17_0_2_react.useEffect)(function () { setParams(objectSpread2_default()({}, _params)); }, [location.pathname]); diff --git a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js index 47653fa7fe..5f3fd40522 100644 --- a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js +++ b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js @@ -5538,7 +5538,6 @@ var WorkList = function WorkList(_ref) { setbackGroupContnet = _useState38[1]; (0,_react_17_0_2_react.useEffect)(function () { getData(true); - getHeaderData(); return function () { setWorkList([]); setStudentList([]); diff --git a/p__MyProblem__index.async.js b/p__MyProblem__index.async.js index ac9c659677..395b9b2e19 100644 --- a/p__MyProblem__index.async.js +++ b/p__MyProblem__index.async.js @@ -5523,7 +5523,7 @@ var difficultyMappingcolor = { submitting: submitting, submitRecords: submitRecords, submitResult: submitResult - }) : /*#__PURE__*/(0,jsx_runtime.jsx)(NoData/* default */.Z, {}) + }, (submitResult === null || submitResult === void 0 ? void 0 : submitResult.id) || 1) : /*#__PURE__*/(0,jsx_runtime.jsx)(NoData/* default */.Z, {}) }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", { className: "".concat(LeftPanelmodules["tab-panel-body"], " ").concat(index === '2' ? '' : 'hide'), style: { diff --git a/p__virtualSpaces__Lists__Lesson__Detail__index.async.js b/p__virtualSpaces__Lists__Lesson__Detail__index.async.js index ba435cad5b..fda6c0eb14 100644 --- a/p__virtualSpaces__Lists__Lesson__Detail__index.async.js +++ b/p__virtualSpaces__Lists__Lesson__Detail__index.async.js @@ -1195,7 +1195,8 @@ var LessonPage = function LessonPage(_ref) { method: "get", headers: { "Content-Type": "application/xml" - } + }, + credentials: 'omit' }); case 7: res = _context2.sent; @@ -1203,7 +1204,7 @@ var LessonPage = function LessonPage(_ref) { case 9: setData({ type: result.file_type, - content: env/* default */.Z.API_SERVER + result.url + content: result.url + "&nocredentials=true" }); case 10: case "end": diff --git a/umi.js b/umi.js index ea9df466d4..fb8b595df8 100644 --- a/umi.js +++ b/umi.js @@ -50590,7 +50590,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { // PROXY_SERVER: 'https://data.educoder.net', - PROXY_SERVER: 'https://pre-data.educoder.net', + PROXY_SERVER: 'https://data.educoder.net', API_SERVER: '', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net',