diff --git a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js index 7e6ca2ad01..7e7ea4a0a1 100644 --- a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js +++ b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js @@ -5407,7 +5407,7 @@ var WorkList = function WorkList(_ref) { } return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { children: [!(0,authority/* isAdmin */.GJ)() && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { - children: /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, { + children: /*#__PURE__*/(0,jsx_runtime.jsx)("a", { target: "_blank" // to={ (workList.is_jupyter||workList.is_jupyter_lab)? `/classrooms/${params.coursesId}/common_homework/${params.categoryId}/${record.id}/comment`:`/classrooms/${params.coursesId}/common_homework/${params.categoryId // }/review/${record.work_id || record.id}`} diff --git a/p__Classrooms__Lists__OnlineLearning__index.async.js b/p__Classrooms__Lists__OnlineLearning__index.async.js index 3c3efc5be3..c8c17746d7 100644 --- a/p__Classrooms__Lists__OnlineLearning__index.async.js +++ b/p__Classrooms__Lists__OnlineLearning__index.async.js @@ -108,10 +108,10 @@ var col = __webpack_require__(43604); var tooltip = __webpack_require__(6848); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js var es_button = __webpack_require__(3113); -// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules -var input = __webpack_require__(1056); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/divider/index.js + 1 modules var divider = __webpack_require__(28103); +// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules +var input = __webpack_require__(1056); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/skeleton/index.js + 12 modules var skeleton = __webpack_require__(59981); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/radio/index.js + 5 modules @@ -127,7 +127,7 @@ var dayjs_min = __webpack_require__(9498); var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min); ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/OnlineLearning/index.less?modules // extracted by mini-css-extract-plugin -/* harmony default export */ var OnlineLearningmodules = ({"flex_box_center":"flex_box_center___Eli3_","flex_space_between":"flex_space_between___b9mMZ","flex_box_vertical_center":"flex_box_vertical_center___HDlqC","flex_box_center_end":"flex_box_center_end___wxSjo","flex_box_column":"flex_box_column___riQIC","icons":"icons___fU5ZJ","shixuns":"shixuns___HhH4T","buttons":"buttons___Xd62N","addStage":"addStage___Ap4gr","color4CA":"color4CA___dMAG4","color204":"color204___ySVKY","completed":"completed___pNt1x","actionTabs":"actionTabs___x3cPl","tab":"tab___BFnIn","s1":"s1___O6K2P","tabActive":"tabActive___v3_qF","total":"total___oZdqK"}); +/* harmony default export */ var OnlineLearningmodules = ({"flex_box_center":"flex_box_center___Eli3_","flex_space_between":"flex_space_between___b9mMZ","flex_box_vertical_center":"flex_box_vertical_center___HDlqC","flex_box_center_end":"flex_box_center_end___wxSjo","flex_box_column":"flex_box_column___riQIC","icons":"icons___fU5ZJ","shixuns":"shixuns___HhH4T","buttons":"buttons___Xd62N","addStage":"addStage___Ap4gr","color4CA":"color4CA___dMAG4","color204":"color204___ySVKY","completed":"completed___pNt1x","actionTabs":"actionTabs___x3cPl","tab":"tab___BFnIn","s1":"s1___O6K2P","tabActive":"tabActive___v3_qF","total":"total___oZdqK","introContent":"introContent___dSvDD","introContentMaxHeight":"introContentMaxHeight___NxSzO"}); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/drawer/index.js + 9 modules var drawer = __webpack_require__(43428); // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/checkbox/index.js + 3 modules @@ -1962,6 +1962,7 @@ var _excluded = ["classroomList", "user", "globalSetting", "loading", "dispatch" + var Stage = function Stage(_ref) { @@ -2071,6 +2072,7 @@ var Stage = function Stage(_ref) { _useState30 = slicedToArray_default()(_useState29, 2), typeData = _useState30[0], setTypeData = _useState30[1]; + var content = (0,_react_17_0_2_react.useRef)(); (0,_react_17_0_2_react.useEffect)(function () { getData(); }, [params === null || params === void 0 ? void 0 : params.coursesId]); @@ -2382,11 +2384,10 @@ var Stage = function Stage(_ref) { res = _context5.sent; (res === null || res === void 0 ? void 0 : res.stages) && setData(res !== null && res !== void 0 && res.stages ? toConsumableArray_default()(res === null || res === void 0 ? void 0 : res.stages) : []); setOriginData(res ? objectSpread2_default()({}, res) : {}); - console.log('---------', originData); setTreeLoading(false); clearAddStatus(); setEditKey(-1); - case 10: + case 9: case "end": return _context5.stop(); } @@ -2736,7 +2737,7 @@ var Stage = function Stage(_ref) { }, index); }; var renderDom = function renderDom(val, key) { - var _val$stage_tag, _val$stage_descriptio, _globalSetting$settin, _val$attachments_list, _val$attachments_list3; + var _val$stage_tag, _globalSetting$settin, _val$attachments_list, _val$attachments_list3; if (visibleType !== 'All' && !((_val$stage_tag = val.stage_tag) !== null && _val$stage_tag !== void 0 && _val$stage_tag.includes(visibleType))) { return null; } @@ -2803,19 +2804,35 @@ var Stage = function Stage(_ref) { })] })] })] - }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, { - gutter: [5, 20], + }), !!val.stage_description && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { style: { marginTop: 12 }, - children: /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, { - span: 24, - children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", { - dangerouslySetInnerHTML: { - __html: (_val$stage_descriptio = val.stage_description) === null || _val$stage_descriptio === void 0 ? void 0 : _val$stage_descriptio.replace(/[\r|\n]/gi, "
") - } + children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", { + ref: content, + className: "".concat(OnlineLearningmodules.introContent, " ").concat(!(val !== null && val !== void 0 && val.showReadFull) ? OnlineLearningmodules.introContentMaxHeight : ''), + children: /*#__PURE__*/(0,jsx_runtime.jsx)(RenderHtml/* default */.Z, { + value: val === null || val === void 0 ? void 0 : val.stage_description }) - }) + }), (val === null || val === void 0 ? void 0 : val.showExpansion) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + onClick: function onClick(e) { + data[key].showReadFull = !(val !== null && val !== void 0 && val.showReadFull); + setData(toConsumableArray_default()(data)); + }, + children: /*#__PURE__*/(0,jsx_runtime.jsx)(divider/* default */.Z, { + dashed: false, + className: "", + style: { + cursor: 'pointer' + }, + children: /*#__PURE__*/(0,jsx_runtime.jsxs)("a", { + className: "font14 ".concat(OnlineLearningmodules.color999), + children: [!(val !== null && val !== void 0 && val.showReadFull) ? '阅读全文 ' : '收起全文 ', /*#__PURE__*/(0,jsx_runtime.jsx)("i", { + className: "iconfont font14 ".concat(!(val !== null && val !== void 0 && val.showReadFull) ? 'icon-jiantou9' : 'icon-changyongtubiao-xianxingdaochu-zhuanqu-') + })] + }) + }) + })] })] }), editKey === key && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: "pl20 pr20 pt20", @@ -3065,10 +3082,39 @@ var Stage = function Stage(_ref) { })] }, key) : null; }; + var getTextCount = function getTextCount(data) { + if (data) { + var len = 0; + for (var i = 0; i < data.length; i++) { + if (data.charCodeAt(i) > 127 || data.charCodeAt(i) == 94) { + len += 2; + } else { + len++; + } + } + return len; + } else { + return 0; + } + }; + var domList = function domList() { + for (var i in data) { + var _data$i; + if (getTextCount((_data$i = data[i]) === null || _data$i === void 0 ? void 0 : _data$i.stage_description) > 424) { + data[i].showExpansion = true; + } else { + data[i].showExpansion = false; + } + } + return data === null || data === void 0 ? void 0 : data.map(function (val, key) { + return /*#__PURE__*/(0,jsx_runtime.jsx)("div", { + children: renderDom(val, key) + }, key); + }); + }; var start_date = detailTopBanner.start_date, course_end = detailTopBanner.course_end; var isNotDiscuss = course_end || dayjs_min_default()(dayjs_min_default()().format('L')).valueOf() < dayjs_min_default()(start_date).valueOf(); - console.log(isNotDiscuss, 444); var addTags = function addTags() {}; return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", { className: "mb50", @@ -3200,11 +3246,7 @@ var Stage = function Stage(_ref) { children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z, { form: form, onFinish: onFinish, - children: data === null || data === void 0 ? void 0 : data.map(function (val, key) { - return /*#__PURE__*/(0,jsx_runtime.jsx)("div", { - children: renderDom(val, key) - }, key); - }) + children: domList }), (0,authority/* isAdmin */.GJ)() && !isAdd && visibleType === 'All' && editKey === -1 && !keywords && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", { className: OnlineLearningmodules.addStage, onClick: handleAddStage, diff --git a/p__Classrooms__Lists__OnlineLearning__index.chunk.css b/p__Classrooms__Lists__OnlineLearning__index.chunk.css index 331f132143..c243e4ad31 100644 --- a/p__Classrooms__Lists__OnlineLearning__index.chunk.css +++ b/p__Classrooms__Lists__OnlineLearning__index.chunk.css @@ -135,6 +135,13 @@ color: #0152d9; margin: 0 4px; } +.introContent___dSvDD { + text-align: justify; +} +.introContentMaxHeight___NxSzO { + max-height: 110px; + overflow: hidden; +} /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\ !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.0.87@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.0.87@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/Classrooms/Lists/OnlineLearning/components/SelectShixuns/index.less?modules ***!