diff --git a/41794.async.js b/41794.async.js index 05ad8e7c8e..cd1b45da63 100644 --- a/41794.async.js +++ b/41794.async.js @@ -867,7 +867,7 @@ var difficultyDesc = { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-zhongzhishixun" }), "\u91CD\u7F6E\u4EE3\u7801\u4ED3\u5E93"] - }), (tab_type === 3 || is_jupyter_notebook || is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { + }), (tab_type === 3 || tab_type === 4 || is_jupyter_notebook || is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { onClick: function onClick() { return uploadFile(); }, @@ -876,7 +876,7 @@ var difficultyDesc = { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", { className: "iconfont icon-shangchuanwenjian" }), "\u4E0A\u4F20\u6587\u4EF6"] - }), (tab_type === 3 || is_jupyter_notebook || is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { + }), (tab_type === 3 || tab_type === 4 || is_jupyter_notebook || is_jupyter_lab) && /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { onClick: function onClick() { return downloadFile(); }, diff --git a/7845.async.js b/7845.async.js index e4dca06f6e..c99ab3bc43 100644 --- a/7845.async.js +++ b/7845.async.js @@ -2463,7 +2463,8 @@ var Page = function Page(_ref) { data === null || data === void 0 ? void 0 : (_data$questionList = data.questionList) === null || _data$questionList === void 0 ? void 0 : _data$questionList.forEach(function (item) { var _item$questions; (_item$questions = item.questions) === null || _item$questions === void 0 ? void 0 : _item$questions.forEach(function (e) { - item_bank_scores.push(item.questions_score / item.questions_count); + var s = item.questions_score / item.questions_count; + s = s && s.toFixed(1); if (item.type === 'COMBINATION') { combination_item_banks.push({ id: e.id, @@ -2476,6 +2477,7 @@ var Page = function Page(_ref) { shixun_ids.push(e.id); } else { item_bank_ids.push(e.id); + item_bank_scores.push(s); } }); }); diff --git a/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js b/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js index 2f33b9fc94..7e6887f5fb 100644 --- a/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js +++ b/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js @@ -3086,6 +3086,10 @@ var Answer = function Answer(_ref) { return function () { window.removeEventListener('message', handleMessage); window.removeEventListener("beforeunload", onBeforeunload); + dispatch({ + type: "globalSetting/headerFooterToggle", + payload: true + }); if (location.pathname.indexOf("/detail") > -1) (0,fullscreen/* exitFull */.BU)(); }; }, [params.categoryId, user.userInfo.login]); diff --git a/p__Paperlibrary__Random__Edit__index.async.js b/p__Paperlibrary__Random__Edit__index.async.js index 049bdc218b..b0a0ab2de5 100644 --- a/p__Paperlibrary__Random__Edit__index.async.js +++ b/p__Paperlibrary__Random__Edit__index.async.js @@ -5291,7 +5291,7 @@ var FileFolder = function FileFolder(_ref) { setteamvalue = _useState8[1]; var _onCheck = function onCheck(checkedKeys, info, type) { var checkedNodes = info.checkedNodes; - console.log("type:", type, checkedNodes); + console.log("type:", type, checkedNodes, selectData); if (type === '0') { setMyCheckedKeys(checkedKeys); if (getRuleValue(ruleValue) === RuleValueKeyType.OnlyFileFolder) { @@ -5449,7 +5449,7 @@ var FileFolder = function FileFolder(_ref) { var getData = /*#__PURE__*/function () { var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee(params) { var _res$navigation$, _res$navigation$2; - var res, rootDifficultyArr, rootTagNodeArr, _res$navigation$3, _res$navigation$4, _res$navigation$5, _res$navigation$6, _res$navigation$7, normalChildren, normalChildren2, _res$navigation$8, _res$navigation$9, _res$navigation$10, _res$navigation$11, _normalChildren; + var res, rootDifficultyArr, rootTagNodeArr, _res$navigation$3, _res$navigation$4, _res$navigation$5, _res$navigation$6, _res$navigation$7, normalChildren, normalChildren2, _res$navigation$8, _res$navigation$9, _res$navigation$10, _res$navigation$11, _res$navigation$12, _normalChildren; return regeneratorRuntime_default()().wrap(function _callee$(_context) { while (1) switch (_context.prev = _context.next) { case 0: @@ -5612,15 +5612,12 @@ var FileFolder = function FileFolder(_ref) { children: getRuleValue(ruleValue) === RuleValueKeyType.OnlyFileFolder || getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff ? normalChildren : [].concat(toConsumableArray_default()(normalChildren2), toConsumableArray_default()(rootTagNodeArr)) }]); } else { - _normalChildren = generateTree(res.data, ruleValue, '3'); - console.log('---', _normalChildren); - - // return + _normalChildren = generateTree(res.data, ruleValue, '3'); // return setPublicFolderData([{ title: getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff ? /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, { justify: "space-between", children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { - children: "\u6839\u76EE\u5F55" + children: "\u6839\u76EE\u5F55\uFF08".concat((_res$navigation$8 = res.navigation[0]) === null || _res$navigation$8 === void 0 ? void 0 : _res$navigation$8.child_count, "\uFF09") }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, { children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", { className: "mr15", @@ -5640,7 +5637,7 @@ var FileFolder = function FileFolder(_ref) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default.Item */.Z.Item, { noStyle: true, name: ["0", 'diffNum'], - initialValue: (_res$navigation$8 = res.navigation[0]) === null || _res$navigation$8 === void 0 ? void 0 : _res$navigation$8.difficulty_count, + initialValue: (_res$navigation$9 = res.navigation[0]) === null || _res$navigation$9 === void 0 ? void 0 : _res$navigation$9.difficulty_count, children: /*#__PURE__*/(0,jsx_runtime.jsx)("input", { type: "hidden" }) @@ -5661,11 +5658,11 @@ var FileFolder = function FileFolder(_ref) { style: { color: '#232B40' }, - children: "\u6839\u76EE\u5F55\uFF08".concat((_res$navigation$9 = res.navigation[0]) === null || _res$navigation$9 === void 0 ? void 0 : _res$navigation$9.child_count, "\uFF09") + children: "\u6839\u76EE\u5F55\uFF08".concat((_res$navigation$10 = res.navigation[0]) === null || _res$navigation$10 === void 0 ? void 0 : _res$navigation$10.child_count, "\uFF09") }), key: '0', name: '根目录', - item_banks_count: (_res$navigation$10 = res.navigation[0]) === null || _res$navigation$10 === void 0 ? void 0 : _res$navigation$10.child_count, + item_banks_count: (_res$navigation$11 = res.navigation[0]) === null || _res$navigation$11 === void 0 ? void 0 : _res$navigation$11.child_count, checkable: getRuleValue(ruleValue) === RuleValueKeyType.OnlyFileFolder, icon: function icon(e) { if (e.expanded) { @@ -5683,7 +5680,7 @@ var FileFolder = function FileFolder(_ref) { } }, isLeaf: false, - disabled: ((_res$navigation$11 = res.navigation[0]) === null || _res$navigation$11 === void 0 ? void 0 : _res$navigation$11.child_count) > 0 ? false : true, + disabled: ((_res$navigation$12 = res.navigation[0]) === null || _res$navigation$12 === void 0 ? void 0 : _res$navigation$12.child_count) > 0 ? false : true, children: getRuleValue(ruleValue) === RuleValueKeyType.OnlyFileFolder || getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff ? _normalChildren : [].concat(toConsumableArray_default()(_normalChildren), toConsumableArray_default()(rootTagNodeArr)) }]); } @@ -5740,9 +5737,9 @@ var FileFolder = function FileFolder(_ref) { return acc + cur.item_bank_num; }, 0)) || 0); } - if (getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff) { + if (getRuleValue(ruleValue) === RuleValueKeyType.All) { if (activeKey === "1") { - var _selectData$my3; + var _selectData$my3, _selectData$filter; setMyCheckedKeys(selectData === null || selectData === void 0 ? void 0 : (_selectData$my3 = selectData.my) === null || _selectData$my3 === void 0 ? void 0 : _selectData$my3.map(function (item) { return item.id; })); @@ -5751,8 +5748,18 @@ var FileFolder = function FileFolder(_ref) { }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter = selectData.filter(function (item) { + return !item.is_share; + })) === null || _selectData$filter === void 0 ? void 0 : _selectData$filter.forEach(function (item) { + var prev = form.getFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue']) || []; + console.log("prev:", prev); + if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { + form.setFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); + } + // form.setFieldValue([`${item.group_id}`, 'diffValue'], [...prev, item.difficulty]) + }); } else if (activeKey === "2") { - var _selectData$public3; + var _selectData$public3, _selectData$filter2; setPublicCheckedKeys(selectData === null || selectData === void 0 ? void 0 : (_selectData$public3 = selectData["public"]) === null || _selectData$public3 === void 0 ? void 0 : _selectData$public3.map(function (item) { return item.id; })); @@ -5761,23 +5768,33 @@ var FileFolder = function FileFolder(_ref) { }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter2 = selectData.filter(function (item) { + return !!item.is_share; + })) === null || _selectData$filter2 === void 0 ? void 0 : _selectData$filter2.forEach(function (item) { + var prev = form.getFieldValue(["".concat(item.teacher_group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue']) || []; + if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { + form.setFieldValue(["".concat(item.teacher_group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); + } + // form.setFieldValue([`${item.teacher_group_id}`, 'diffValue'], [...prev, item.difficulty]) + }); } } + if (getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff) { form.resetFields(); setTimeout(function () { setSelectData(selectData); }, 300); if (activeKey === "1") { - var _selectData$filter; + var _selectData$filter3; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter3 = selectData.filter(function (item) { return !item.is_share; - })) === null || _selectData$filter === void 0 ? void 0 : _selectData$filter.forEach(function (item) { + })) === null || _selectData$filter3 === void 0 ? void 0 : _selectData$filter3.forEach(function (item) { var prev = form.getFieldValue(["".concat(item.group_id), 'diffValue']) || []; console.log("prev:", prev); if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { @@ -5786,15 +5803,15 @@ var FileFolder = function FileFolder(_ref) { // form.setFieldValue([`${item.group_id}`, 'diffValue'], [...prev, item.difficulty]) }); } else { - var _selectData$filter2; + var _selectData$filter4; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !!item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter2 = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter4 = selectData.filter(function (item) { return !!item.is_share; - })) === null || _selectData$filter2 === void 0 ? void 0 : _selectData$filter2.forEach(function (item) { + })) === null || _selectData$filter4 === void 0 ? void 0 : _selectData$filter4.forEach(function (item) { var prev = form.getFieldValue(["".concat(item.teacher_group_id), 'diffValue']) || []; if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { form.setFieldValue(["".concat(item.teacher_group_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); @@ -5804,6 +5821,7 @@ var FileFolder = function FileFolder(_ref) { } } }, [activeKey]); + console.log("1111111111:", myCheckedKeys, publicCheckedKeys); (0,react.useEffect)(function () { // if(!isFirst){ // return @@ -5857,66 +5875,84 @@ var FileFolder = function FileFolder(_ref) { } case RuleValueKeyType.FileFolderAndKnowledge: { + var _ref3; var _myData = []; var _publicData = []; - var _iterator3 = createForOfIteratorHelper_default()(defaultData), + var _iterator3 = createForOfIteratorHelper_default()((selectData === null || selectData === void 0 ? void 0 : selectData.my) || []), _step3; try { for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) { var _item2 = _step3.value; - if (_item2 !== null && _item2 !== void 0 && _item2.group_name) { - _myData.push(_item2); - } else { - _publicData.push(_item2); - } + // if (item?.group_name) { + _myData.push(_item2); + // } else { + // publicData.push(item) + // } } } catch (err) { _iterator3.e(err); } finally { _iterator3.f(); } - setSelectedNum(defaultData.reduce(function (acc, cur) { + var _iterator4 = createForOfIteratorHelper_default()((selectData === null || selectData === void 0 ? void 0 : selectData["public"]) || []), + _step4; + try { + for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) { + var _item3 = _step4.value; + // if (item?.group_name) { + // myData.push(item) + // } else { + _publicData.push(_item3); + // } + } + } catch (err) { + _iterator4.e(err); + } finally { + _iterator4.f(); + } + setSelectedNum((_ref3 = activeKey === "1" ? _myData : _publicData) === null || _ref3 === void 0 ? void 0 : _ref3.reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)); setMyCheckedKeys(_myData.map(function (item) { return "".concat(item.group_id, "_").concat(item.tag_discipline_id); })); setPublicCheckedKeys(_publicData.map(function (item) { - return "".concat(item.group_id, "_").concat(item.tag_discipline_id); + return "".concat(item.teacher_group_id, "_").concat(item.tag_discipline_id); })); break; } case RuleValueKeyType.All: { if (activeKey === "1") { - var _selectData$filter3; + var _selectData$filter5; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter3 = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter5 = selectData.filter(function (item) { return !item.is_share; - })) === null || _selectData$filter3 === void 0 ? void 0 : _selectData$filter3.forEach(function (item) { - var prev = form.getFieldValue(["".concat(item.group_id, "_").concat(item.tag_discipline_id), 'diffValue']) || []; + })) === null || _selectData$filter5 === void 0 ? void 0 : _selectData$filter5.forEach(function (item) { + var prev = form.getFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue']) || []; console.log("prev:", prev, item.difficulty, item); if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { - form.setFieldValue(["".concat(item.group_id, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); + form.setFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); } }); } else { - var _selectData$filter4; + var _selectData$filter6; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !!item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter4 = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter6 = selectData.filter(function (item) { return !!item.is_share; - })) === null || _selectData$filter4 === void 0 ? void 0 : _selectData$filter4.forEach(function (item) { - var prev = form.getFieldValue(["".concat(item.group_id, "_").concat(item.tag_discipline_id), 'diffValue']) || []; + })) === null || _selectData$filter6 === void 0 ? void 0 : _selectData$filter6.forEach(function (item) { + var prev = form.getFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue']) || []; + console.log("prev:", prev, item.difficulty, item); if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { - form.setFieldValue(["".concat(item.group_id, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); + form.setFieldValue(["".concat(item.group_id || 0, "_").concat(item.tag_discipline_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); } // form.setFieldValue([`${item.group_id}`, 'diffValue'], [...prev, item.difficulty]) }); @@ -5933,15 +5969,15 @@ var FileFolder = function FileFolder(_ref) { case RuleValueKeyType.FileFolderAndDiff: { if (activeKey === "1") { - var _selectData$filter5; + var _selectData$filter7; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter5 = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter7 = selectData.filter(function (item) { return !item.is_share; - })) === null || _selectData$filter5 === void 0 ? void 0 : _selectData$filter5.forEach(function (item) { + })) === null || _selectData$filter7 === void 0 ? void 0 : _selectData$filter7.forEach(function (item) { var prev = form.getFieldValue(["".concat(item.group_id), 'diffValue']) || []; console.log("prev:", prev, item.difficulty); if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { @@ -5949,15 +5985,15 @@ var FileFolder = function FileFolder(_ref) { } }); } else { - var _selectData$filter6; + var _selectData$filter8; setSelectedNum((selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return !!item.is_share; }).reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0)) || 0); - selectData === null || selectData === void 0 ? void 0 : (_selectData$filter6 = selectData.filter(function (item) { + selectData === null || selectData === void 0 ? void 0 : (_selectData$filter8 = selectData.filter(function (item) { return !!item.is_share; - })) === null || _selectData$filter6 === void 0 ? void 0 : _selectData$filter6.forEach(function (item) { + })) === null || _selectData$filter8 === void 0 ? void 0 : _selectData$filter8.forEach(function (item) { var prev = form.getFieldValue(["".concat(item.group_id), 'diffValue']) || []; if (!(prev !== null && prev !== void 0 && prev.includes[item.difficulty])) { form.setFieldValue(["".concat(item.group_id), 'diffValue'], Array.from(new Set([].concat(toConsumableArray_default()(prev), [item.difficulty])))); @@ -5984,7 +6020,7 @@ var FileFolder = function FileFolder(_ref) { return /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z, { form: form, onValuesChange: /*#__PURE__*/function () { - var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(c, v) { + var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(c, v) { var count, values, valuesd, arr, _i, _Object$keys, _values$id, _values$id$diffValue, id, obj, map, _arr, _loop, _i2, _Object$keys2; return regeneratorRuntime_default()().wrap(function _callee2$(_context3) { while (1) switch (_context3.prev = _context3.next) { @@ -6098,7 +6134,7 @@ var FileFolder = function FileFolder(_ref) { } if (activeKey === "2") { newItem.is_share = true; - newItem.teacher_group_id = tag_discipline_id; + newItem.teacher_group_id = extra.id || 0; newItem.teacher_group_name = extra.name; } if (currentDiffNum > 0) { @@ -6135,7 +6171,7 @@ var FileFolder = function FileFolder(_ref) { }, _callee2); })); return function (_x2, _x3) { - return _ref3.apply(this, arguments); + return _ref4.apply(this, arguments); }; }(), children: /*#__PURE__*/(0,jsx_runtime.jsx)(tabs/* default */.Z, { @@ -6731,6 +6767,26 @@ var RuleModal = function RuleModal(_ref) { }); break; } + case RuleValueKeyType.FileFolderAndKnowledge: + { + setDefaultData({ + my: defaultSelectData === null || defaultSelectData === void 0 ? void 0 : defaultSelectData.filter(function (item) { + return parseInt(item.teacher_group_id) !== "NaN" && !item.teacher_group_id && item.teacher_group_id !== 0; + }), + "public": defaultSelectData === null || defaultSelectData === void 0 ? void 0 : defaultSelectData.filter(function (item) { + return parseInt(item.teacher_group_id) >= 0; + }) + }); + setSelectData({ + my: defaultSelectData === null || defaultSelectData === void 0 ? void 0 : defaultSelectData.filter(function (item) { + return parseInt(item.teacher_group_id) !== "NaN" && !item.teacher_group_id && item.teacher_group_id !== 0; + }), + "public": defaultSelectData === null || defaultSelectData === void 0 ? void 0 : defaultSelectData.filter(function (item) { + return parseInt(item.teacher_group_id) >= 0; + }) + }); + break; + } case RuleValueKeyType.FileFolderAndDiff: { setDefaultData(defaultSelectData); @@ -7787,7 +7843,7 @@ var getColumns = function getColumns(ruleValueKey, dispatch, currentItemType, di teacher_group_name = record.teacher_group_name, teacher_group_id = record.teacher_group_id; var name = group_name || teacher_group_name; - var iconUrl = teacher_group_id ? folder : folder_closed; + var iconUrl = teacher_group_id || teacher_group_id === 0 ? folder : folder_closed; return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { display: 'flex' @@ -7809,7 +7865,7 @@ var getColumns = function getColumns(ruleValueKey, dispatch, currentItemType, di render: function render(value, record) { var teacher_group_id = record.teacher_group_id; return /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: teacher_group_id ? '团队共享' : '我创建的' + children: teacher_group_id || teacher_group_id === 0 ? '团队共享' : '我创建的' }); } }, { diff --git a/p__Paperlibrary__index.async.js b/p__Paperlibrary__index.async.js index 131e298a1e..b6cd867af0 100644 --- a/p__Paperlibrary__index.async.js +++ b/p__Paperlibrary__index.async.js @@ -1567,7 +1567,11 @@ var PaperlibraryPage = function PaperlibraryPage(_ref) { }, []); (0,react.useEffect)(function () { (0,util/* setDocumentTitle */.Dk)('试卷库'); - }); + dispatch({ + type: 'globalSetting/headerFooterToggle', + payload: true + }); + }, []); var getCustomDisciplines = function getCustomDisciplines(key) { dispatch({ type: 'paperlibrary/getCustomDisciplines', diff --git a/p__tasks__index.async.js b/p__tasks__index.async.js index e929e9429c..37cc435a58 100644 --- a/p__tasks__index.async.js +++ b/p__tasks__index.async.js @@ -10545,7 +10545,7 @@ function VncTimer(_ref4) { }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, { children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_modal/* default */.Z, { title: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, { - className: "modalIconYellow" + className: "modalIconYellow mr10" }), time !== 0 ? '实验环境延时提醒' : '实验环境结束提醒'], maskClosable: false, closable: false, diff --git a/umi.js b/umi.js index abaa0515f1..1941858348 100644 --- a/umi.js +++ b/umi.js @@ -76800,7 +76800,7 @@ __webpack_require__.d(__webpack_exports__, { ;// CONCATENATED MODULE: ./src/utils/env/dev.ts var DEV = { // PROXY_SERVER: 'https://data.educoder.net', - PROXY_SERVER: 'https://data.educoder.net', + PROXY_SERVER: 'https://pre-data.educoder.net', API_SERVER: '', REPORT_SERVER: 'http://192.168.1.57:3001', IMG_SERVER: 'https://new-testali-cdn.educoder.net', @@ -131304,10 +131304,10 @@ function _getRoutes() { return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Review__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(25159), __webpack_require__.e(46744), __webpack_require__.e(67631), __webpack_require__.e(85410), __webpack_require__.e(31795), __webpack_require__.e(69814), __webpack_require__.e(31365), __webpack_require__.e(53254), __webpack_require__.e(40477), __webpack_require__.e(30536), __webpack_require__.e(37098), __webpack_require__.e(4977), __webpack_require__.e(8691), __webpack_require__.e(12768), __webpack_require__.e(66390), __webpack_require__.e(64768), __webpack_require__.e(14662)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Review/index.tsx */ 38117)); }), '36': /*#__PURE__*/react.lazy(function () { - return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__SubmitWork__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(25159), __webpack_require__.e(46744), __webpack_require__.e(67631), __webpack_require__.e(85410), __webpack_require__.e(31795), __webpack_require__.e(69814), __webpack_require__.e(31365), __webpack_require__.e(53254), __webpack_require__.e(40477), __webpack_require__.e(46463), __webpack_require__.e(4977), __webpack_require__.e(8691), __webpack_require__.e(12768), __webpack_require__.e(66390), __webpack_require__.e(64768), __webpack_require__.e(28072)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/SubmitWork/index.tsx */ 31303)); + return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__SubmitWork__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(25159), __webpack_require__.e(46744), __webpack_require__.e(67631), __webpack_require__.e(85410), __webpack_require__.e(31795), __webpack_require__.e(69814), __webpack_require__.e(31365), __webpack_require__.e(53254), __webpack_require__.e(40477), __webpack_require__.e(73105), __webpack_require__.e(4977), __webpack_require__.e(8691), __webpack_require__.e(12768), __webpack_require__.e(66390), __webpack_require__.e(64768), __webpack_require__.e(28072)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/SubmitWork/index.tsx */ 31303)); }), '37': /*#__PURE__*/react.lazy(function () { - return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__EditWork__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(25159), __webpack_require__.e(46744), __webpack_require__.e(67631), __webpack_require__.e(85410), __webpack_require__.e(31795), __webpack_require__.e(69814), __webpack_require__.e(31365), __webpack_require__.e(53254), __webpack_require__.e(40477), __webpack_require__.e(73105), __webpack_require__.e(4977), __webpack_require__.e(8691), __webpack_require__.e(12768), __webpack_require__.e(66390), __webpack_require__.e(64768), __webpack_require__.e(60479)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/EditWork/index.tsx */ 54524)); + return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__EditWork__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(25159), __webpack_require__.e(46744), __webpack_require__.e(67631), __webpack_require__.e(85410), __webpack_require__.e(31795), __webpack_require__.e(69814), __webpack_require__.e(31365), __webpack_require__.e(53254), __webpack_require__.e(40477), __webpack_require__.e(46463), __webpack_require__.e(4977), __webpack_require__.e(8691), __webpack_require__.e(12768), __webpack_require__.e(66390), __webpack_require__.e(64768), __webpack_require__.e(60479)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/EditWork/index.tsx */ 54524)); }), '38': /*#__PURE__*/react.lazy(function () { return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Detail__components__DuplicateChecking__CheckDetail__index */[__webpack_require__.e(48555), __webpack_require__.e(62709), __webpack_require__.e(83062), __webpack_require__.e(90026), __webpack_require__.e(37402), __webpack_require__.e(73358), __webpack_require__.e(15804), __webpack_require__.e(79035), __webpack_require__.e(79169), __webpack_require__.e(17845), __webpack_require__.e(68508), __webpack_require__.e(78045), __webpack_require__.e(35874), __webpack_require__.e(42339), __webpack_require__.e(83338), __webpack_require__.e(46744), __webpack_require__.e(14533), __webpack_require__.e(282), __webpack_require__.e(63889), __webpack_require__.e(31795), __webpack_require__.e(8691), __webpack_require__.e(85297)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Detail/components/DuplicateChecking/CheckDetail/index.tsx */ 51450));