From 9ed3b5ef7945badabfa46372e79e7d7c4ff7a70f Mon Sep 17 00:00:00 2001 From: autosubmit Date: Tue, 29 Aug 2023 21:40:07 +0800 Subject: [PATCH] Auto Submit --- 7845.async.js | 16 +- ...__Lists__Exercise__Detail__index.chunk.css | 1 + p__Paperlibrary__Random__Edit__index.async.js | 160 +++++++++++++----- ...aperlibrary__Random__Edit__index.chunk.css | 1 + ...rary__Random__PreviewEdit__index.chunk.css | 1 + 5 files changed, 128 insertions(+), 51 deletions(-) diff --git a/7845.async.js b/7845.async.js index 91fde22d05..e4dca06f6e 100644 --- a/7845.async.js +++ b/7845.async.js @@ -2445,7 +2445,7 @@ var Page = function Page(_ref) { onOk: function () { var _onOk2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() { var _data$questionList; - var item_bank_ids, item_bank_scores, combination_item_banks, params; + var item_bank_ids, item_bank_scores, combination_item_banks, shixun_ids, params; return regeneratorRuntime_default()().wrap(function _callee2$(_context2) { while (1) switch (_context2.prev = _context2.next) { case 0: @@ -2459,10 +2459,10 @@ var Page = function Page(_ref) { item_bank_ids = []; item_bank_scores = []; combination_item_banks = []; + shixun_ids = []; 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_ids.push(e.id); item_bank_scores.push(item.questions_score / item.questions_count); if (item.type === 'COMBINATION') { combination_item_banks.push({ @@ -2472,6 +2472,11 @@ var Page = function Page(_ref) { }) }); } + if (item.type === 'PRACTICAL') { + shixun_ids.push(e.id); + } else { + item_bank_ids.push(e.id); + } }); }); console.log('-----', combination_item_banks); @@ -2479,11 +2484,12 @@ var Page = function Page(_ref) { item_bank_ids: item_bank_ids, item_bank_scores: item_bank_scores, name: name, - combination_item_banks: combination_item_banks + combination_item_banks: combination_item_banks, + shixun_ids: shixun_ids }; - _context2.next = 11; + _context2.next = 12; return submit(params); - case 11: + case 12: case "end": return _context2.stop(); } diff --git a/p__Classrooms__Lists__Exercise__Detail__index.chunk.css b/p__Classrooms__Lists__Exercise__Detail__index.chunk.css index 979b6f3940..fadceb4512 100644 --- a/p__Classrooms__Lists__Exercise__Detail__index.chunk.css +++ b/p__Classrooms__Lists__Exercise__Detail__index.chunk.css @@ -2729,6 +2729,7 @@ span.CodeMirror-selectedtext { overflow-y: hidden; overflow-x: hidden; max-height: calc(100vh - 214px); + flex-shrink: 0; } .wrap___ulhwR .left___kyWln .title___jsO1D { width: 266px; diff --git a/p__Paperlibrary__Random__Edit__index.async.js b/p__Paperlibrary__Random__Edit__index.async.js index 41b9cede20..049bdc218b 100644 --- a/p__Paperlibrary__Random__Edit__index.async.js +++ b/p__Paperlibrary__Random__Edit__index.async.js @@ -4221,7 +4221,7 @@ var difficultyMap = { } }; var getFixedNumber = function getFixedNumber(num) { - return parseFloat(num.toFixed(1)); + return num && parseFloat(num.toFixed(1)); }; var reducer = function reducer(state, action) { switch (action.type) { @@ -4427,6 +4427,7 @@ var reducer = function reducer(state, action) { } case 'addShixun': { + var _stateCopy4$item_type; var _stateCopy4 = (0,lodash.cloneDeep)(state); var _currentItem4 = _stateCopy4.item_types.find(function (item) { return item.item_type === 'PRACTICAL'; @@ -4437,6 +4438,11 @@ var reducer = function reducer(state, action) { _currentItem4.item_bank_count = _currentItem4.item_bank_count || 1; _currentItem4.score = _currentItem4.score || 1; _currentItem4.total_score = _currentItem4.total_score || _currentItem4.score * _currentItem4.item_bank_count; + _stateCopy4.examination_bank.total_score = _stateCopy4 === null || _stateCopy4 === void 0 ? void 0 : (_stateCopy4$item_type = _stateCopy4.item_types) === null || _stateCopy4$item_type === void 0 ? void 0 : _stateCopy4$item_type.map(function (item) { + return item.total_score; + }).reduce(function (a, b) { + return a + b; + }); return _stateCopy4; } case 'deleteShixunQuestion': @@ -4904,7 +4910,8 @@ var SetScore = function SetScore(_ref) { return item.item_type === item_type; }); currentItem.score = Number(v); - currentItem.total_score = parseFloat(v * currentItem.item_bank_count).toFixed(1); + var new_total_score = v * currentItem.item_bank_count; + currentItem.total_score = new_total_score && Number(new_total_score.toFixed(1)); dataCopy.examination_bank.total_score = dataCopy.item_types.reduce(function (acc, cur) { return Number(acc) + Number(cur.total_score); }, 0); @@ -5715,6 +5722,7 @@ var FileFolder = function FileFolder(_ref) { console.log("selectData-active:", selectData, defaultData, activeKey); // setMyFolderData([]) // setPublicFolderData + if (activeKey === "1") { var _selectData$my, _selectData$my2, _selectData$my2$reduc; setMyCheckedKeys(selectData === null || selectData === void 0 ? void 0 : (_selectData$my = selectData.my) === null || _selectData$my === void 0 ? void 0 : _selectData$my.map(function (item) { @@ -5732,6 +5740,29 @@ var FileFolder = function FileFolder(_ref) { return acc + cur.item_bank_num; }, 0)) || 0); } + if (getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff) { + if (activeKey === "1") { + var _selectData$my3; + 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; + })); + 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); + } else if (activeKey === "2") { + var _selectData$public3; + 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; + })); + 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); + } + } if (getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff) { form.resetFields(); setTimeout(function () { @@ -5778,7 +5809,6 @@ var FileFolder = function FileFolder(_ref) { // return // } setTimeout(function () { - console.log("getRuleValue(ruleValue):", getRuleValue(ruleValue), defaultData); switch (getRuleValue(ruleValue)) { case RuleValueKeyType.OnlyFileFolder: { @@ -5803,7 +5833,6 @@ var FileFolder = function FileFolder(_ref) { var _item = _step2.value; publicData.push(_item); } - // setSelectedNum(defaultData.reduce((acc, cur) => acc + cur.item_bank_num, 0) || 0) } catch (err) { _iterator2.e(err); } finally { @@ -5815,7 +5844,6 @@ var FileFolder = function FileFolder(_ref) { setPublicCheckedKeys(publicData.map(function (item) { return "".concat(item.teacher_group_id); })); - // setSelectedNum(myData.reduce((acc, cur) => acc + cur.item_bank_num, 0)) if (activeKey === "1") { setSelectedNum(myData.reduce(function (acc, cur) { return acc + cur.item_bank_num; @@ -5856,43 +5884,64 @@ var FileFolder = function FileFolder(_ref) { setPublicCheckedKeys(_publicData.map(function (item) { return "".concat(item.group_id, "_").concat(item.tag_discipline_id); })); - console.log("defaultData:", defaultData, currentItemType, ruleValue); break; } case RuleValueKeyType.All: { - setSelectedNum(defaultData.reduce(function (acc, cur) { - return acc + cur.item_bank_num; - }, 0) || 0); - if (myFolderData.length > 0 || publicFolderData.length > 0) { - defaultData.forEach(function (item) { + if (activeKey === "1") { + 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$filter3 = 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']) || []; + 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])))); + } + }); + } else { + 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$filter4 = 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']) || []; - form.setFieldValue(["".concat(item.group_id, "_").concat(item.tag_discipline_id), 'diffValue'], [].concat(toConsumableArray_default()(prev), [item.difficulty])); + 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([`${item.group_id}`, 'diffValue'], [...prev, item.difficulty]) }); } + + // if (myFolderData.length > 0 || publicFolderData.length > 0) { + // defaultData.forEach(item => { + // const prev = form.getFieldValue([`${item.group_id}_${item.tag_discipline_id}`, 'diffValue']) || [] + // form.setFieldValue([`${item.group_id}_${item.tag_discipline_id}`, 'diffValue'], [...prev, item.difficulty]) + // }) + // } break; } case RuleValueKeyType.FileFolderAndDiff: { - var _myData2 = []; - var _publicData2 = []; - // for (const item of selectData?.my || []) { - // myData.push(item) - - // } - // for (const item of selectData?.public || []) { - // publicData.push(item) - // } 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) { + })) === null || _selectData$filter5 === void 0 ? void 0 : _selectData$filter5.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])) { @@ -5900,15 +5949,15 @@ var FileFolder = function FileFolder(_ref) { } }); } 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) { + })) === null || _selectData$filter6 === void 0 ? void 0 : _selectData$filter6.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])))); @@ -5932,7 +5981,6 @@ var FileFolder = function FileFolder(_ref) { _useState26 = slicedToArray_default()(_useState25, 2), selectedNum = _useState26[0], setSelectedNum = _useState26[1]; - console.log("filefolder:", selectData, defaultData); return /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z, { form: form, onValuesChange: /*#__PURE__*/function () { @@ -5944,7 +5992,7 @@ var FileFolder = function FileFolder(_ref) { console.log("onValuesChange:", v, c); count = 0; if (!(getRuleValue(ruleValue) === RuleValueKeyType.FileFolderAndDiff)) { - _context3.next = 16; + _context3.next = 15; break; } _context3.next = 5; @@ -5994,18 +6042,17 @@ var FileFolder = function FileFolder(_ref) { arr.push(newItem); }); }); - console.log('---valuesd', valuesd, arr); count = arr.reduce(function (acc, cur) { return acc + cur.item_bank_num; }, 0); setSelectData([].concat(arr, toConsumableArray_default()(selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { return activeKey === '1' ? item.is_share : !item.is_share; })))); - _context3.next = 26; + _context3.next = 25; break; - case 16: + case 15: if (!(getRuleValue(ruleValue) === RuleValueKeyType.All)) { - _context3.next = 26; + _context3.next = 25; break; } _arr = []; @@ -6017,6 +6064,7 @@ var FileFolder = function FileFolder(_ref) { case 0: id = _Object$keys2[_i2]; _v$id = v[id], _v$id$diffNum = _v$id.diffNum, diffNum = _v$id$diffNum === void 0 ? [] : _v$id$diffNum, _v$id$diffValue = _v$id.diffValue, diffValue = _v$id$diffValue === void 0 ? [] : _v$id$diffValue, _v$id$extra = _v$id.extra, extra = _v$id$extra === void 0 ? {} : _v$id$extra; + console.log('---', extra); _id$split = id.split('_'), _id$split2 = slicedToArray_default()(_id$split, 2), group_id = _id$split2[0], tag_discipline_id = _id$split2[1]; extraitem = (_extra$tag_discipline = extra.tag_disciplines) === null || _extra$tag_discipline === void 0 ? void 0 : (_extra$tag_discipline2 = _extra$tag_discipline.filter(function (item) { return parseInt(item.id) === parseInt(tag_discipline_id); @@ -6037,6 +6085,7 @@ var FileFolder = function FileFolder(_ref) { tag_discipline_name: (extraitem === null || extraitem === void 0 ? void 0 : extraitem.name) || extra.tag_discipline_name, id: "".concat(id, "_").concat(diffItemValue), group_id: group_id, + is_share: extraitem !== null && extraitem !== void 0 && extraitem.is_share || (extra === null || extra === void 0 ? void 0 : extra.type) === '3' ? true : false, tag_discipline_id: tag_discipline_id, difficulty: diffItemValue, item_bank_num: currentDiffNum @@ -6047,32 +6096,39 @@ var FileFolder = function FileFolder(_ref) { } else { newItem.teacher_group_name = extra.name; } + if (activeKey === "2") { + newItem.is_share = true; + newItem.teacher_group_id = tag_discipline_id; + newItem.teacher_group_name = extra.name; + } if (currentDiffNum > 0) { _arr.push(newItem); } }); - case 5: + case 6: case "end": return _context2.stop(); } }, _loop); }); _i2 = 0, _Object$keys2 = Object.keys(v); - case 20: + case 19: if (!(_i2 < _Object$keys2.length)) { - _context3.next = 25; + _context3.next = 24; break; } - return _context3.delegateYield(_loop(), "t0", 22); - case 22: + return _context3.delegateYield(_loop(), "t0", 21); + case 21: _i2++; - _context3.next = 20; + _context3.next = 19; break; + case 24: + setSelectData([].concat(_arr, toConsumableArray_default()(selectData === null || selectData === void 0 ? void 0 : selectData.filter(function (item) { + return activeKey === '1' ? item.is_share : !item.is_share; + })))); case 25: - setSelectData(_arr); - case 26: setSelectedNum(count); - case 27: + case 26: case "end": return _context3.stop(); } @@ -6646,6 +6702,7 @@ var RuleModal = function RuleModal(_ref) { var defaultSelectData = data === null || data === void 0 ? void 0 : (_data$item_types3 = data.item_types) === null || _data$item_types3 === void 0 ? void 0 : (_data$item_types3$fin = _data$item_types3.find(function (item) { return item.item_type === currentItemType; })) === null || _data$item_types3$fin === void 0 ? void 0 : _data$item_types3$fin.contents; + console.log('----xxx', getRuleValue(rules)); switch (getRuleValue(rules)) { case RuleValueKeyType.OnlyDifficulty: { @@ -6680,6 +6737,12 @@ var RuleModal = function RuleModal(_ref) { setSelectData(defaultSelectData); break; } + case RuleValueKeyType.All: + { + setDefaultData(defaultSelectData); + setSelectData(defaultSelectData); + break; + } default: setDefaultData(defaultSelectData); } @@ -7721,9 +7784,10 @@ var getColumns = function getColumns(ruleValueKey, dispatch, currentItemType, di title: '文件夹', render: function render(value, record) { var group_name = record.group_name, - teacher_group_name = record.teacher_group_name; + 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_name ? folder : folder_closed; + var iconUrl = teacher_group_id ? folder : folder_closed; return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { display: 'flex' @@ -7743,9 +7807,9 @@ var getColumns = function getColumns(ruleValueKey, dispatch, currentItemType, di }, { title: '类型', render: function render(value, record) { - var teacher_group_name = record.teacher_group_name; + var teacher_group_id = record.teacher_group_id; return /*#__PURE__*/(0,jsx_runtime.jsx)("span", { - children: teacher_group_name ? '团队共享' : '我创建的' + children: teacher_group_id ? '团队共享' : '我创建的' }); } }, { @@ -8877,6 +8941,10 @@ var QuestionInfo = function QuestionInfo(_ref) { }, onOk: function onOk(selectedRows) { console.log(selectedRows); + if ((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) <= 0) { + message/* default.info */.ZP.info('实训数不能为0'); + return; + } dispatch({ type: 'addShixun', payload: { diff --git a/p__Paperlibrary__Random__Edit__index.chunk.css b/p__Paperlibrary__Random__Edit__index.chunk.css index 0707f6f926..358f44aba6 100644 --- a/p__Paperlibrary__Random__Edit__index.chunk.css +++ b/p__Paperlibrary__Random__Edit__index.chunk.css @@ -2052,6 +2052,7 @@ button[class~='ant-btn-default']:disabled.btn___In02G { overflow-y: hidden; overflow-x: hidden; max-height: calc(100vh - 214px); + flex-shrink: 0; } .wrap___ulhwR .left___kyWln .title___jsO1D { width: 266px; diff --git a/p__Paperlibrary__Random__PreviewEdit__index.chunk.css b/p__Paperlibrary__Random__PreviewEdit__index.chunk.css index a9d66700db..fea1b7bf71 100644 --- a/p__Paperlibrary__Random__PreviewEdit__index.chunk.css +++ b/p__Paperlibrary__Random__PreviewEdit__index.chunk.css @@ -99,6 +99,7 @@ overflow-y: hidden; overflow-x: hidden; max-height: calc(100vh - 214px); + flex-shrink: 0; } .wrap___ulhwR .left___kyWln .title___jsO1D { width: 266px;