Compare commits
6 Commits
042f6ee99e
...
test
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8aa567cdf2 | ||
|
|
a3b3018de7 | ||
|
|
761095d61d | ||
| 643c16fdf7 | |||
| 5082436289 | |||
| 7193b9a000 |
@@ -1,41 +1,53 @@
|
||||
function show_books(courses_data, user_selected_courses){
|
||||
function show_books(courses_data, user_selected_courses) {
|
||||
console.log(courses_data)
|
||||
console.log(user_selected_courses)
|
||||
}
|
||||
function show_course_details(course_id){
|
||||
function show_course_details(course_id) {
|
||||
window.location.href = '/course/' + course_id
|
||||
}
|
||||
|
||||
function on_click_select_course(event){
|
||||
function on_click_select_course(event) {
|
||||
event.stopPropagation(); // 阻止事件冒泡
|
||||
const courseId = event.currentTarget.getAttribute('data-course-id');
|
||||
if (event.currentTarget.classList.contains("selected-button")) {alert('课程已选择'); return;}
|
||||
const button = event.currentTarget;
|
||||
const courseId = button.getAttribute('data-course-id');
|
||||
if (!courseId) { alert('缺少课程ID'); return; }
|
||||
if (button.classList.contains("selected-button")) { alert('课程已选择'); return; }
|
||||
if (button.disabled) { return; }
|
||||
button.disabled = true;
|
||||
fetch(`/select_course`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRFToken': '{{ csrf_token() }}' // 如果使用 CSRF 保护
|
||||
},
|
||||
body: JSON.stringify({ course_id: courseId })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
// 更新按钮样式或显示消息
|
||||
this.classList.remove('select-button');
|
||||
this.classList.add('selected-button');
|
||||
this.textContent = '已选择';
|
||||
alert('选择课程成功');
|
||||
} else {
|
||||
alert('选择课程失败');
|
||||
.then(async (response) => {
|
||||
let data = null;
|
||||
try {
|
||||
data = await response.json();
|
||||
} catch (_) {
|
||||
}
|
||||
if (!response.ok) {
|
||||
throw new Error(data?.message || `请求失败(${response.status})`);
|
||||
}
|
||||
return data;
|
||||
})
|
||||
.then((data) => {
|
||||
if (!data?.success) {
|
||||
throw new Error(data?.message || '选择课程失败');
|
||||
}
|
||||
button.classList.remove('select-button');
|
||||
button.classList.add('selected-button');
|
||||
button.textContent = '已选课';
|
||||
alert('选择课程成功');
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert('选择课程失败');
|
||||
alert(error?.message || '选择课程失败');
|
||||
button.disabled = false;
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
|
||||
});
|
||||
@@ -1,4 +1,4 @@
|
||||
window.addEventListener('load', ()=>{
|
||||
window.addEventListener('load', () => {
|
||||
console.log(window.material);
|
||||
console.log(window.lesson);
|
||||
editLesson(window.material.material_id, window.chapter.chapter_name, window.lesson.lesson_name);
|
||||
@@ -12,58 +12,58 @@ function parseHeadings(mdText) {
|
||||
|
||||
const lines = mdText.split('\n');
|
||||
const tokens = [];
|
||||
for (let i=0;i<lines.length;i++) {
|
||||
for (let i = 0; i < lines.length; i++) {
|
||||
const m = lines[i].match(/^(#{1,3})\s+(.*)$/);
|
||||
if (m) tokens.push({ level: m[1].length, text: m[2].trim(), line: i });
|
||||
}
|
||||
// 确定每个heading的区间(到下一个同级或上级前一行)
|
||||
for (let i=0;i<tokens.length;i++) {
|
||||
let j = i+1;
|
||||
while (j<tokens.length && tokens[j].level > tokens[i].level) j++;
|
||||
for (let i = 0; i < tokens.length; i++) {
|
||||
let j = i + 1;
|
||||
while (j < tokens.length && tokens[j].level > tokens[i].level) j++;
|
||||
// 找到第一个 >= 当前level 的 heading 或到文末
|
||||
let k = i+1;
|
||||
while (k<tokens.length && tokens[k].level > tokens[i].level) k++;
|
||||
const nextSameOrHigher = k<tokens.length ? tokens[k].line : lines.length;
|
||||
let k = i + 1;
|
||||
while (k < tokens.length && tokens[k].level > tokens[i].level) k++;
|
||||
const nextSameOrHigher = k < tokens.length ? tokens[k].line : lines.length;
|
||||
tokens[i].start = tokens[i].line;
|
||||
tokens[i].end = nextSameOrHigher - 1;
|
||||
}
|
||||
return { lines, tokens };
|
||||
}
|
||||
}
|
||||
|
||||
// 从解析结果中抽取一个 heading 段落文本
|
||||
function sliceSection(parsed, headingText, level) {
|
||||
const t = parsed.tokens.find(x => x.level===level && x.text===headingText);
|
||||
// 从解析结果中抽取一个 heading 段落文本
|
||||
function sliceSection(parsed, headingText, level) {
|
||||
const t = parsed.tokens.find(x => x.level === level && x.text === headingText);
|
||||
if (!t) return '';
|
||||
return parsed.lines.slice(t.start, t.end+1).join('\n');
|
||||
}
|
||||
return parsed.lines.slice(t.start, t.end + 1).join('\n');
|
||||
}
|
||||
|
||||
// 根据三个 md,构造统一大纲树(一级唯一“主题”,其下多个阶段##,其下多个步骤###)
|
||||
function buildUnifiedOutline(parsedLesson, parsedPrompt, parsedScore) {
|
||||
// 根据三个 md,构造统一大纲树(一级唯一“主题”,其下多个阶段##,其下多个步骤###)
|
||||
function buildUnifiedOutline(parsedLesson, parsedPrompt, parsedScore) {
|
||||
// 取 lesson 的结构为主(也可做三者交集/并集策略,这里简单以 lesson 为基准)
|
||||
const root1 = parsedLesson.tokens.find(t => t.level===1);
|
||||
const phases = parsedLesson.tokens.filter(t => t.level===2);
|
||||
const root1 = parsedLesson.tokens.find(t => t.level === 1);
|
||||
const phases = parsedLesson.tokens.filter(t => t.level === 2);
|
||||
const stepsByPhase = {};
|
||||
phases.forEach(ph => {
|
||||
stepsByPhase[ph.text] = parsedLesson.tokens.filter(t => t.level===3 && t.start>ph.start && t.end<=ph.end)
|
||||
stepsByPhase[ph.text] = parsedLesson.tokens.filter(t => t.level === 3 && t.start > ph.start && t.end <= ph.end)
|
||||
.map(s => s.text);
|
||||
});
|
||||
return { theme: root1 ? root1.text : '主题', phases, stepsByPhase };
|
||||
}
|
||||
}
|
||||
|
||||
let CURRENT = {
|
||||
let CURRENT = {
|
||||
material_id: null, chapter_name: null, lesson_name: null,
|
||||
links: { lesson:'', prompt:'', score:'' },
|
||||
raw: { lesson:'', prompt:'', score:'' },
|
||||
parsed:{ lesson:null, prompt:null, score:null },
|
||||
active:{ phase:null, step:null, lessontxt:null, prompt:null, score:null },
|
||||
outline:null
|
||||
};
|
||||
function bustCache(url) {
|
||||
links: { lesson: '', prompt: '', score: '' },
|
||||
raw: { lesson: '', prompt: '', score: '' },
|
||||
parsed: { lesson: null, prompt: null, score: null },
|
||||
active: { phase: null, step: null, lessontxt: null, prompt: null, score: null },
|
||||
outline: null
|
||||
};
|
||||
function bustCache(url) {
|
||||
const sep = url.includes("?") ? "&" : "?";
|
||||
return url + sep + "_ts=" + Date.now();
|
||||
}
|
||||
// 入口:从你的列表调用
|
||||
async function editLesson(material_id, chapter_name, lesson_name) {
|
||||
}
|
||||
// 入口:从你的列表调用
|
||||
async function editLesson(material_id, chapter_name, lesson_name) {
|
||||
|
||||
CURRENT.material_id = material_id;
|
||||
CURRENT.chapter_name = chapter_name;
|
||||
@@ -84,7 +84,7 @@ function parseHeadings(mdText) {
|
||||
detailsContent.innerHTML = `<h4>描述</h4><p>${meta.description || meta.material_description || '暂无描述'}</p>`;
|
||||
const chapterList = document.getElementById('chapter-list');
|
||||
chapterList.innerHTML = '';
|
||||
(meta.chapters||[]).forEach(ch=>{
|
||||
(meta.chapters || []).forEach(ch => {
|
||||
const li = document.createElement('li');
|
||||
li.textContent = ch.chapter_name;
|
||||
chapterList.appendChild(li);
|
||||
@@ -125,10 +125,10 @@ function parseHeadings(mdText) {
|
||||
document.getElementById('editor-prompt').value = CURRENT.raw.prompt;
|
||||
document.getElementById('editor-score').value = CURRENT.raw.score;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ===== 在渲染一级标题时调用 =====
|
||||
function addThemeWithHelp(tree, themeText) {
|
||||
// ===== 在渲染一级标题时调用 =====
|
||||
function addThemeWithHelp(tree, themeText) {
|
||||
const li = document.createElement('li');
|
||||
li.className = 'lvl1';
|
||||
|
||||
@@ -175,9 +175,9 @@ function parseHeadings(mdText) {
|
||||
);
|
||||
|
||||
tree.appendChild(li);
|
||||
}
|
||||
}
|
||||
|
||||
function renderOutline(outline) {
|
||||
function renderOutline(outline) {
|
||||
const tree = document.getElementById('outline-tree');
|
||||
tree.innerHTML = ''; // 清空大纲内容
|
||||
|
||||
@@ -220,7 +220,7 @@ function parseHeadings(mdText) {
|
||||
if (window.confirm(confirmMsg)) {
|
||||
saveUpdatedStep()
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
// 已存在新标题:保持原文不变
|
||||
alert("新标题已存在")
|
||||
}
|
||||
@@ -339,21 +339,21 @@ function addStepToPhase(phaseText) {
|
||||
renderOutline(CURRENT.outline);
|
||||
loadStepToEditors(phaseText, stepName);
|
||||
highlightActive(phaseText, stepName);
|
||||
}
|
||||
function highlightActive(phase, step) {
|
||||
document.querySelectorAll('#outline-tree li').forEach(li=>li.classList.remove('active'));
|
||||
}
|
||||
function highlightActive(phase, step) {
|
||||
document.querySelectorAll('#outline-tree li').forEach(li => li.classList.remove('active'));
|
||||
const target = Array.from(document.querySelectorAll('#outline-tree li.lvl3'))
|
||||
.find(li => li.dataset.phase===phase && li.dataset.step===step);
|
||||
.find(li => li.dataset.phase === phase && li.dataset.step === step);
|
||||
if (target) target.classList.add('active');
|
||||
CURRENT.active.phase=phase
|
||||
CURRENT.active.step=step
|
||||
}
|
||||
/**
|
||||
* 在 mdText 中,将 `### stepName` 插入到 `## phaseText` 阶段的末尾。
|
||||
* 若 phase 不存在,则创建 `## phaseText` 再插入。
|
||||
* skeleton 为插入文本模板(含### 标题本身及正文)。
|
||||
*/
|
||||
function insertStepIntoMarkdown(mdText, phaseText, stepName, skeleton, { allowDuplicate = false } = {}) {
|
||||
CURRENT.active.phase = phase
|
||||
CURRENT.active.step = step
|
||||
}
|
||||
/**
|
||||
* 在 mdText 中,将 `### stepName` 插入到 `## phaseText` 阶段的末尾。
|
||||
* 若 phase 不存在,则创建 `## phaseText` 再插入。
|
||||
* skeleton 为插入文本模板(含### 标题本身及正文)。
|
||||
*/
|
||||
function insertStepIntoMarkdown(mdText, phaseText, stepName, skeleton, { allowDuplicate = false } = {}) {
|
||||
const parsed = parseHeadings(mdText);
|
||||
const { lines, tokens } = parsed;
|
||||
// 找到目标阶段(##)
|
||||
@@ -419,35 +419,35 @@ function addStepToPhase(phaseText) {
|
||||
.concat(insertChunk)
|
||||
.concat(lines.slice(insertPos));
|
||||
return newLines.join('\n');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const outlineAside = document.querySelector('.outline');
|
||||
const outlineTree = document.getElementById('outline-tree');
|
||||
const btnDeleteMode = document.getElementById('toggle-outline-delete');
|
||||
const outlineAside = document.querySelector('.outline');
|
||||
const outlineTree = document.getElementById('outline-tree');
|
||||
const btnDeleteMode = document.getElementById('toggle-outline-delete');
|
||||
|
||||
// 切换删除模式
|
||||
function setDeleteMode(enabled) {
|
||||
// 切换删除模式
|
||||
function setDeleteMode(enabled) {
|
||||
btnDeleteMode.setAttribute('aria-pressed', String(enabled));
|
||||
outlineAside.classList.toggle('delete-mode', enabled);
|
||||
}
|
||||
}
|
||||
|
||||
// 点击按钮:进入/退出删除模式
|
||||
btnDeleteMode.addEventListener('click', (e) => {
|
||||
// 点击按钮:进入/退出删除模式
|
||||
btnDeleteMode.addEventListener('click', (e) => {
|
||||
e.preventDefault();
|
||||
const enabled = btnDeleteMode.getAttribute('aria-pressed') !== 'true';
|
||||
setDeleteMode(enabled);
|
||||
});
|
||||
});
|
||||
|
||||
// 工具:判断是否是 lvl2 / lvl3 节点(允许点到它的内部子元素)
|
||||
function findDeletableNode(el) {
|
||||
// 工具:判断是否是 lvl2 / lvl3 节点(允许点到它的内部子元素)
|
||||
function findDeletableNode(el) {
|
||||
if (!el) return null;
|
||||
if (el.classList?.contains('lvl2') || el.classList?.contains('lvl3')) return el;
|
||||
return el.closest?.('.lvl2, .lvl3') || null;
|
||||
}
|
||||
}
|
||||
|
||||
// 事件代理:删除模式下,点击二/三级标题进行删除确认
|
||||
outlineTree.addEventListener('click', (e) => {
|
||||
// 事件代理:删除模式下,点击二/三级标题进行删除确认
|
||||
outlineTree.addEventListener('click', (e) => {
|
||||
if (btnDeleteMode.getAttribute('aria-pressed') !== 'true') return; // 非删除模式,忽略
|
||||
const targetNode = findDeletableNode(e.target);
|
||||
if (!targetNode) return;
|
||||
@@ -472,7 +472,7 @@ function addStepToPhase(phaseText) {
|
||||
// 可选:如果你需要同步删除到正文内容(CURRENT.raw.xxx),可以在这里调用你的同步逻辑
|
||||
// 例:把正文中第一处行首 "## 标题" 或 "### 标题" 删除(仅示例,按你项目规则调整):
|
||||
deleteSectionInRaw(level, text);
|
||||
});
|
||||
});
|
||||
/**
|
||||
* 删除指定 level(2/3) 与 title 的小节:
|
||||
* 从 "^## title$" 或 "^### title$" 那一行开始,
|
||||
@@ -512,8 +512,8 @@ function deleteSectionInRaw(level, title) {
|
||||
|
||||
|
||||
|
||||
// 解析Markdown并定位章节/步骤
|
||||
function parseHeadings(mdText) {
|
||||
// 解析Markdown并定位章节/步骤
|
||||
function parseHeadings(mdText) {
|
||||
const lines = mdText.split('\n');
|
||||
const tokens = [];
|
||||
for (let i = 0; i < lines.length; i++) {
|
||||
@@ -531,19 +531,27 @@ function deleteSectionInRaw(level, title) {
|
||||
tokens[i].end = nextSameOrHigher - 1;
|
||||
}
|
||||
return { lines, tokens };
|
||||
}
|
||||
}
|
||||
|
||||
// 从解析结果中抽取一个 heading 段落文本
|
||||
function sliceSection(parsed, headingText, level) {
|
||||
// 从解析结果中抽取一个 heading 段落文本
|
||||
function sliceSection(parsed, headingText, level) {
|
||||
const t = parsed.tokens.find(x => x.level === level && x.text === headingText);
|
||||
if (!t) return '';
|
||||
return parsed.lines.slice(t.start, t.end + 1).join('\n');
|
||||
}
|
||||
function buildOriginSaveUrl() {
|
||||
return `/api/materials/save/${encodeURIComponent(CURRENT.material_id)}/${encodeURIComponent(CURRENT.chapter_name)}/${encodeURIComponent(CURRENT.lesson_name)}`;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
// 加载某个步骤到编辑器
|
||||
function buildOriginSaveUrl() {
|
||||
const mid = typeof CURRENT.material_id === 'string' && CURRENT.material_id
|
||||
|| (window.material && window.material.material_id) || '';
|
||||
const ch = typeof CURRENT.chapter_name === 'string' && CURRENT.chapter_name
|
||||
|| (window.chapter && window.chapter.chapter_name) || '';
|
||||
const ln = typeof CURRENT.lesson_name === 'string' && CURRENT.lesson_name
|
||||
|| (window.lesson && window.lesson.lesson_name) || '';
|
||||
return `/api/materials/save/${encodeURIComponent(mid)}/${encodeURIComponent(ch)}/${encodeURIComponent(ln)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 把三份文档(lesson/prompt/score)的 "CDN 外链 + 原文内容" 一次性提交给源站。
|
||||
* @param {Object} payload 形如:
|
||||
* {
|
||||
@@ -552,7 +560,7 @@ function deleteSectionInRaw(level, title) {
|
||||
* score: { cdn_link, content }
|
||||
* }
|
||||
*/
|
||||
async function saveToOrigin(payload) {
|
||||
async function saveToOrigin(payload) {
|
||||
const res = await fetch(buildOriginSaveUrl(), {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
@@ -565,11 +573,11 @@ function deleteSectionInRaw(level, title) {
|
||||
credentials: 'include' // 若需要带 cookie/会话,保留;不需要可移除
|
||||
});
|
||||
if (!res.ok) {
|
||||
const text = await res.text().catch(()=>'');
|
||||
const text = await res.text().catch(() => '');
|
||||
throw new Error(`保存失败(${res.status}): ${text}`);
|
||||
}
|
||||
return res.json().catch(()=> ({}));
|
||||
}
|
||||
return res.json().catch(() => ({}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -642,8 +650,8 @@ function sanitizeHeadingsBeyondFirst(text = "") {
|
||||
|
||||
|
||||
|
||||
// 保存某个步骤的更新
|
||||
async function saveUpdatedStep() {
|
||||
// 保存某个步骤的更新
|
||||
async function saveUpdatedStep() {
|
||||
const lEditor = document.getElementById('editor-lesson');
|
||||
const pEditor = document.getElementById('editor-prompt');
|
||||
const sEditor = document.getElementById('editor-score');
|
||||
@@ -651,7 +659,7 @@ function sanitizeHeadingsBeyondFirst(text = "") {
|
||||
|
||||
if (!check.ok) {
|
||||
alert("保存被阻止:" + check.report);
|
||||
return ;
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取原始的文档内容
|
||||
@@ -707,10 +715,10 @@ function sanitizeHeadingsBeyondFirst(text = "") {
|
||||
btn.innerText = ClearModifiedStat(btn.innerText)
|
||||
btn = document.getElementById("tab-btn-score");
|
||||
btn.innerText = ClearModifiedStat(btn.innerText)
|
||||
}
|
||||
}
|
||||
|
||||
// 更新对应步骤的内容
|
||||
function updateMarkdownContent(parsed, phaseText, stepText, newContent) {
|
||||
// 更新对应步骤的内容
|
||||
function updateMarkdownContent(parsed, phaseText, stepText, newContent) {
|
||||
const phaseIndex = parsed.tokens.findIndex(token => token.level === 2 && token.text === phaseText);
|
||||
if (phaseIndex === -1) return parsed.lines.join('\n'); // 找不到阶段
|
||||
|
||||
@@ -730,14 +738,14 @@ function sanitizeHeadingsBeyondFirst(text = "") {
|
||||
lines.splice(startLine, endLine - startLine + 1, newContent); // 用新内容替换
|
||||
|
||||
return lines.join('\n'); // 返回更新后的完整内容
|
||||
}
|
||||
}
|
||||
|
||||
// 获取所有 textarea
|
||||
function AddModifiedStat(str){
|
||||
function AddModifiedStat(str) {
|
||||
return str.charAt(str.length - 1) !== '*' ? str + '*' : str;
|
||||
}
|
||||
function ClearModifiedStat(str){
|
||||
return str.charAt(str.length - 1) !== '*' ? str:str.slice(0, str.length-1);
|
||||
function ClearModifiedStat(str) {
|
||||
return str.charAt(str.length - 1) !== '*' ? str : str.slice(0, str.length - 1);
|
||||
}
|
||||
function ValidTextareaNoBlankHead(textarea) {
|
||||
let lines = textarea.value.split("\n");
|
||||
@@ -753,25 +761,25 @@ const PREFIX = "### ";
|
||||
// 记录每个 textarea 最新的“标题内容”(不含前缀)
|
||||
const lastTitleMap = new Map();
|
||||
|
||||
// 防止循环触发
|
||||
let isProgrammaticUpdate = false;
|
||||
function getFirstLine(text) {
|
||||
// 防止循环触发
|
||||
let isProgrammaticUpdate = false;
|
||||
function getFirstLine(text) {
|
||||
const idx = text.indexOf("\n");
|
||||
return idx === -1 ? text : text.slice(0, idx);
|
||||
}
|
||||
function setFirstLine(text, newFirstLine) {
|
||||
}
|
||||
function setFirstLine(text, newFirstLine) {
|
||||
const idx = text.indexOf("\n");
|
||||
return idx === -1 ? newFirstLine : newFirstLine + text.slice(idx);
|
||||
}
|
||||
// 工具:规范化首行 -> 始终以 '### ' 开头,并返回 { line, title }
|
||||
function normalizeFirstLine(line) {
|
||||
}
|
||||
// 工具:规范化首行 -> 始终以 '### ' 开头,并返回 { line, title }
|
||||
function normalizeFirstLine(line) {
|
||||
// 去掉前导的 # 和空格,保留后面的标题内容
|
||||
const title = line.replace(/^#+\s*/,''); // 如果用户没写#,也直接当作标题
|
||||
const title = line.replace(/^#+\s*/, ''); // 如果用户没写#,也直接当作标题
|
||||
const normalized = PREFIX + title;
|
||||
return { line: normalized, title };
|
||||
}
|
||||
// 初始化 lastTitleMap(把当前值规范化一次)
|
||||
editorsDoc.forEach(ed => {
|
||||
}
|
||||
// 初始化 lastTitleMap(把当前值规范化一次)
|
||||
editorsDoc.forEach(ed => {
|
||||
const rawFirst = getFirstLine(ed.value || "");
|
||||
const { line, title } = normalizeFirstLine(rawFirst);
|
||||
if (line !== rawFirst) {
|
||||
@@ -780,9 +788,9 @@ const lastTitleMap = new Map();
|
||||
isProgrammaticUpdate = false;
|
||||
}
|
||||
lastTitleMap.set(ed, title);
|
||||
});
|
||||
// 同步到其他两个 textarea 的首行
|
||||
function syncOthers(sourceEditor, newTitle) {
|
||||
});
|
||||
// 同步到其他两个 textarea 的首行
|
||||
function syncOthers(sourceEditor, newTitle) {
|
||||
isProgrammaticUpdate = true;
|
||||
try {
|
||||
editorsDoc.forEach(ed => {
|
||||
@@ -798,7 +806,7 @@ const lastTitleMap = new Map();
|
||||
} finally {
|
||||
isProgrammaticUpdate = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ==== 前置:你的三编辑器实例与 id 映射(按你实际为准)====
|
||||
const ID_LESSON = 'editor-lesson';
|
||||
@@ -1018,12 +1026,12 @@ function loadStepToEditors(phaseText, stepText) {
|
||||
editors['editor-prompt'].value(pText);
|
||||
editors['editor-score'].value(sText);
|
||||
|
||||
CURRENT.active={ //保存打开时的三个文本
|
||||
phase:phaseText,
|
||||
step:stepText,
|
||||
lesson:lText,
|
||||
prompt:pText,
|
||||
score:sText
|
||||
CURRENT.active = { //保存打开时的三个文本
|
||||
phase: phaseText,
|
||||
step: stepText,
|
||||
lesson: lText,
|
||||
prompt: pText,
|
||||
score: sText
|
||||
}
|
||||
let btn = document.getElementById("tab-btn-lesson");
|
||||
btn.innerText = ClearModifiedStat(btn.innerText)
|
||||
@@ -1045,9 +1053,9 @@ document.addEventListener('click', (e) => {
|
||||
|
||||
// 广播 tab 变更(告诉别人当前激活的 tab id / 以及要用哪个 editorId)
|
||||
const editorIdMap = {
|
||||
'tab-lesson' : 'editor-lesson',
|
||||
'tab-prompt' : 'editor-prompt',
|
||||
'tab-score' : 'editor-score',
|
||||
'tab-lesson': 'editor-lesson',
|
||||
'tab-prompt': 'editor-prompt',
|
||||
'tab-score': 'editor-score',
|
||||
};
|
||||
const activeBtnId = e.target.id; // 如 'tab-btn-lesson'
|
||||
const editorId =
|
||||
@@ -1061,8 +1069,8 @@ document.addEventListener('click', (e) => {
|
||||
}
|
||||
});
|
||||
|
||||
// 保存全部:将三个编辑器中的文本保存回相应的 markdown 文件
|
||||
document.getElementById('save-all-btn')?.addEventListener('click', async () => {
|
||||
// 保存全部:将三个编辑器中的文本保存回相应的 markdown 文件
|
||||
document.getElementById('save-all-btn')?.addEventListener('click', async () => {
|
||||
|
||||
try {
|
||||
// 将各自的步骤更新保存回文件
|
||||
@@ -1070,10 +1078,10 @@ document.addEventListener('click', (e) => {
|
||||
} catch (err) {
|
||||
console.error('保存错误:', err);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
const STEP_TEMPLATES = {
|
||||
const STEP_TEMPLATES = {
|
||||
lesson: `在这里编写本步骤的课程内容...`,
|
||||
prompt: `#### 指令
|
||||
请严格遵循本步骤的教学目标,输出所需内容。
|
||||
@@ -1093,8 +1101,8 @@ document.addEventListener('click', (e) => {
|
||||
#### 打分
|
||||
请输出 JSON:
|
||||
{"score": 0-100, "reasons": ["...","..."]}`
|
||||
};
|
||||
const PHASE_TEMPLATES = {
|
||||
};
|
||||
const PHASE_TEMPLATES = {
|
||||
lesson: `### 新步骤
|
||||
本阶段描述:请在此补充阶段说明。
|
||||
|
||||
@@ -1112,7 +1120,7 @@ document.addEventListener('click', (e) => {
|
||||
- 维度A:...
|
||||
- 维度B:...
|
||||
`
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -1174,7 +1182,7 @@ function buildGlobalStepIndex(lines, tokens) {
|
||||
const phases = tokens.filter(t => t.level === 2);
|
||||
for (let i = 0; i < phases.length; i++) {
|
||||
const ph = phases[i];
|
||||
const phNextStart = (i + 1 < phases.length) ? phases[i+1].start : lines.length;
|
||||
const phNextStart = (i + 1 < phases.length) ? phases[i + 1].start : lines.length;
|
||||
// 该阶段内的所有 ###:
|
||||
const steps = tokens.filter(t => t.level === 3 && t.start > ph.start && t.start < phNextStart);
|
||||
for (const st of steps) {
|
||||
@@ -1186,7 +1194,7 @@ function buildGlobalStepIndex(lines, tokens) {
|
||||
}
|
||||
|
||||
|
||||
// ===== 选择器与小工具 =====
|
||||
// ===== 选择器与小工具 =====
|
||||
const treeEl = document.getElementById('outline-tree');
|
||||
const toggleOutlineBtn = document.getElementById('toggle-outline-reorder');
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>课程选择主页</title>
|
||||
@@ -12,6 +13,7 @@
|
||||
<script src="/static/cdnback/js/bootstrap.bundle.min.js"></script>
|
||||
<link rel="stylesheet" href="/static/css/index.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{% include 'navbar.html' %}
|
||||
|
||||
@@ -51,8 +53,7 @@
|
||||
|
||||
<div class="col-md-6 col-lg-4">
|
||||
<div class="course-card card h-100" onclick="openCourseProgress('{{course._id}}')">
|
||||
<img src="{{course.image_url}}"
|
||||
class="course-img" alt="课程封面">
|
||||
<img src="{{course.image_url}}" class="course-img" alt="课程封面">
|
||||
<div class="card-body d-flex flex-column">
|
||||
<span class="course-category">算法设计</span>
|
||||
<h5 class="course-title">{{course.name}}</h5>
|
||||
@@ -62,11 +63,15 @@
|
||||
<span class="course-rating"><i class="fas fa-star"></i> 4.7</span>
|
||||
</div>
|
||||
<div class="mt-auto d-grid gap-2 d-md-flex">
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i class="far fa-eye me-1"></i> 课程</button>
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i
|
||||
class="far fa-eye me-1"></i> 课程</button>
|
||||
{% if course._id in selected_courses %}
|
||||
<button class="btn btn-process flex-fill selected-button" data-course-id="{{course._id}}">已选课</button>
|
||||
<button class="btn btn-process flex-fill selected-button"
|
||||
data-course-id="{{course._id}}">已选课</button>
|
||||
{% else %}
|
||||
<button class="btn btn-process flex-fill select-button" onclick="on_click_select_course(event)" data-course-id="{{course._id}}">选择课程</button>
|
||||
<button class="btn btn-process flex-fill select-button"
|
||||
onclick="on_click_select_course(event)"
|
||||
data-course-id="{{course._id}}">选择课程</button>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
@@ -88,5 +93,6 @@
|
||||
}
|
||||
</script>
|
||||
<script src="/static/js/index.js"></script>
|
||||
</html>
|
||||
<script src="/static/js/dashboard.js"></script>
|
||||
|
||||
</html>
|
||||
@@ -1,5 +1,32 @@
|
||||
import eventlet
|
||||
eventlet.monkey_patch() # 进行猴子补丁操作
|
||||
import logging
|
||||
|
||||
# 配置 eventlet 日志,抑制 IOClosed 等错误日志
|
||||
logging.getLogger('eventlet.hubs').setLevel(logging.CRITICAL)
|
||||
logging.getLogger('eventlet.greenio').setLevel(logging.CRITICAL)
|
||||
|
||||
# 进行猴子补丁操作
|
||||
eventlet.monkey_patch()
|
||||
|
||||
# 配置 eventlet hub 以更优雅地处理 IOClosed 错误
|
||||
try:
|
||||
from eventlet.hubs import hub
|
||||
# 保存原始的 handle_error 方法
|
||||
original_handle_error = hub.Hub.handle_error
|
||||
|
||||
def custom_handle_error(self, context, type, value, tb):
|
||||
# 忽略 IOClosed 错误
|
||||
if type.__name__ == 'IOClosed' and 'Operation on closed file' in str(value):
|
||||
return
|
||||
# 其他错误调用原始方法
|
||||
original_handle_error(self, context, type, value, tb)
|
||||
|
||||
# 替换原始方法
|
||||
hub.Hub.handle_error = custom_handle_error
|
||||
except Exception as e:
|
||||
# 如果修改失败,忽略错误
|
||||
pass
|
||||
|
||||
from flask import Flask
|
||||
from .views.routes import main_bp
|
||||
from .views.file import file_bp
|
||||
|
||||
@@ -29,8 +29,12 @@ terminal_bp = Blueprint('terminal', __name__, url_prefix='/vsc-like')
|
||||
|
||||
|
||||
def set_winsize(fd, row, col, xpix=0, ypix=0):
|
||||
try:
|
||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
||||
except (OSError, IOError):
|
||||
# File descriptor closed or invalid, do nothing
|
||||
pass
|
||||
|
||||
|
||||
def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
||||
@@ -67,21 +71,35 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
||||
return
|
||||
if fd:
|
||||
timeout_sec = 0
|
||||
try:
|
||||
# Check if file descriptor is still valid by trying to select on it
|
||||
(data_ready, _, _) = select.select([fd], [], [], timeout_sec)
|
||||
if data_ready:
|
||||
# output = os.read(fd, max_read_bytes).decode('ascii')
|
||||
timeout=0.1
|
||||
try:
|
||||
output = os.read(fd, max_read_bytes).decode()
|
||||
except Exception as err:
|
||||
except (OSError, IOError, EOFError) as err:
|
||||
# File descriptor closed or other IO error, exit gracefully
|
||||
return
|
||||
except UnicodeDecodeError as err:
|
||||
output = """
|
||||
***AQUI WEB TERM ERR***
|
||||
{}
|
||||
Unicode decode error: {}
|
||||
***********************
|
||||
""".format(err)
|
||||
# the key for different visitor to get different terminal (instead of mixing up)
|
||||
# is to let the background task push pty response to each one's own (default) ROOM!
|
||||
try:
|
||||
namespace.emit("pty_output", {"output": output}, room=room_id)
|
||||
except Exception:
|
||||
# If emit fails, the client is probably disconnected, exit
|
||||
return
|
||||
except (OSError, IOError) as err:
|
||||
# File descriptor closed or invalid, exit gracefully
|
||||
return
|
||||
except Exception as e:
|
||||
# Catch any other unexpected exceptions to prevent server crash
|
||||
pass
|
||||
finally:
|
||||
# Clean up file descriptor if it's open
|
||||
if fd:
|
||||
@@ -158,7 +176,13 @@ class VSCLikeNameSpace(Namespace):
|
||||
if fd:
|
||||
# print("writing to ptd: %s" % data["input"])
|
||||
# os.write(fd, data["input"].encode('ascii'))
|
||||
try:
|
||||
os.write(fd, data["input"].encode())
|
||||
except (OSError, IOError):
|
||||
# File descriptor closed or invalid, clean up
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
|
||||
|
||||
def on_resize(self, data):
|
||||
@@ -174,10 +198,29 @@ class VSCLikeNameSpace(Namespace):
|
||||
return
|
||||
fd = session.get('terminal_config').get('fd')
|
||||
if fd:
|
||||
# 检查文件描述符是否有效
|
||||
try:
|
||||
# 尝试一个简单的操作来检查文件描述符是否有效
|
||||
os.fstat(fd)
|
||||
set_winsize(fd, data["rows"], data["cols"])
|
||||
except (OSError, IOError):
|
||||
# 文件描述符无效,清理资源
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
|
||||
def on_disconnect(self):
|
||||
child_pid = session.get('terminal_config', {}).get('child_pid')
|
||||
terminal_config = session.get('terminal_config', {})
|
||||
child_pid = terminal_config.get('child_pid')
|
||||
fd = terminal_config.get('fd')
|
||||
|
||||
# 先关闭文件描述符,避免其他操作尝试使用无效的文件描述符
|
||||
if fd:
|
||||
try:
|
||||
os.close(fd)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if child_pid:
|
||||
try:
|
||||
child_process = psutil.Process(child_pid)
|
||||
@@ -196,21 +239,14 @@ class VSCLikeNameSpace(Namespace):
|
||||
pass
|
||||
except psutil.TimeoutExpired:
|
||||
# If process didn't terminate in time, kill it forcefully
|
||||
child_process.kill()
|
||||
try:
|
||||
child_process.kill()
|
||||
child_process.wait(timeout=1)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as err:
|
||||
current_app.logger.error(f'Error terminating process: {err}')
|
||||
finally:
|
||||
# Close the file descriptor if it's open
|
||||
fd = session.get('terminal_config', {}).get('fd')
|
||||
if fd:
|
||||
try:
|
||||
os.close(fd)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Reset session config
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
current_app.logger.debug('Client disconnected')
|
||||
@@ -1,12 +1,32 @@
|
||||
from app import create_app
|
||||
from app.extensions import socketio
|
||||
import logging
|
||||
|
||||
# 配置日志,减少eventlet的调试日志
|
||||
logging.getLogger('eventlet').setLevel(logging.ERROR)
|
||||
logging.getLogger('socketio').setLevel(logging.ERROR)
|
||||
logging.getLogger('werkzeug').setLevel(logging.ERROR)
|
||||
|
||||
app = create_app()
|
||||
|
||||
if __name__ == '__main__':
|
||||
try:
|
||||
socketio.run(
|
||||
app,
|
||||
host="0.0.0.0",
|
||||
port=5200,
|
||||
debug=False, # 开发期打开
|
||||
allow_unsafe_werkzeug=True, # 避免 dev server 的安全限制提示
|
||||
log_output=False # 禁用详细输出
|
||||
)
|
||||
except KeyboardInterrupt:
|
||||
print("Server stopped by user")
|
||||
except Exception as e:
|
||||
# 捕获所有异常,包括 eventlet 内部的 IOClosed 错误
|
||||
if "IOClosed" in str(type(e).__name__) or "Operation on closed file" in str(e):
|
||||
# 优雅处理 eventlet 关闭文件的错误
|
||||
print("Eventlet IOClosed error handled gracefully")
|
||||
else:
|
||||
# 其他异常仍然打印
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
Reference in New Issue
Block a user