Compare commits
58 Commits
fc7c6708b4
...
test
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8aa567cdf2 | ||
|
|
a3b3018de7 | ||
|
|
761095d61d | ||
| 643c16fdf7 | |||
| 5082436289 | |||
| 7193b9a000 | |||
| 042f6ee99e | |||
|
|
8fd88b0088 | ||
|
|
319b111485 | ||
|
|
f060a17f6a | ||
|
|
ecdc2e320f | ||
|
|
aa9f39ca18 | ||
|
|
f444e86136 | ||
|
|
22d9fb39f1 | ||
| 68493d6a62 | |||
| f3c30a80a3 | |||
| f09d82571f | |||
|
|
cb435ecade | ||
|
|
c8942cedac | ||
|
|
1f6e75f006 | ||
|
|
5438dc99ba | ||
|
|
f65b5bf32a | ||
|
|
da93289799 | ||
|
|
1554c85616 | ||
|
|
70410d2c4b | ||
|
|
3c8821b225 | ||
|
|
496c5be90a | ||
|
|
ec6be8233c | ||
|
|
d0331d9361 | ||
|
|
8e79380ba4 | ||
|
|
6acb1db093 | ||
|
|
af0ebda419 | ||
|
|
ae9f7b84f4 | ||
|
|
ac74c28f64 | ||
|
|
41c17fcde1 | ||
|
|
5789974d2e | ||
|
|
221f3faace | ||
|
|
560c590067 | ||
|
|
02cf3c0f78 | ||
|
|
9a7571f832 | ||
|
|
14dd164545 | ||
|
|
ff3d6e5bf9 | ||
|
|
97df0f6407 | ||
|
|
58a25b3e07 | ||
|
|
c4743bcadd | ||
|
|
f9b3cf53da | ||
|
|
fe1784fa20 | ||
|
|
140ece742e | ||
|
|
97cda4031b | ||
|
|
9c3ffce1e2 | ||
|
|
23bfc73bcf | ||
|
|
4a5a34b0aa | ||
|
|
2f48f1b6b4 | ||
|
|
b175407d4b | ||
|
|
ce4a9ac2ca | ||
|
|
be78f480a5 | ||
|
|
f804eac811 | ||
|
|
77cd53c241 |
165
Html/apps/_docs/前端/helpTip.md
Normal file
165
Html/apps/_docs/前端/helpTip.md
Normal file
@@ -0,0 +1,165 @@
|
|||||||
|
# HelpTip 组件文档
|
||||||
|
|
||||||
|
## 功能介绍
|
||||||
|
|
||||||
|
HelpTip 是一个通用的提示框组件,用于在鼠标悬停时显示提示信息。它具有以下特点:
|
||||||
|
|
||||||
|
- 提示框跟随鼠标移动
|
||||||
|
- 支持多行文本
|
||||||
|
- 自动防出界
|
||||||
|
- 平滑的显示/隐藏动画
|
||||||
|
- 支持在不同页面复用
|
||||||
|
- 代码标准化,易于维护
|
||||||
|
|
||||||
|
## 文件结构
|
||||||
|
|
||||||
|
```
|
||||||
|
/static/
|
||||||
|
├── css/
|
||||||
|
│ └── helpTip.css # 样式文件
|
||||||
|
└── js/
|
||||||
|
└── helpTip.js # 核心功能文件
|
||||||
|
```
|
||||||
|
|
||||||
|
## 使用方法
|
||||||
|
|
||||||
|
### 1. 引入文件
|
||||||
|
|
||||||
|
在需要使用 HelpTip 的 HTML 页面中引入以下文件:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!-- 样式文件 -->
|
||||||
|
<link rel="stylesheet" href="/static/css/helpTip.css">
|
||||||
|
|
||||||
|
<!-- 功能文件 -->
|
||||||
|
<script src="/static/js/helpTip.js"></script>
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 基本用法
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// 获取需要绑定提示框的元素
|
||||||
|
const element = document.getElementById('target-element');
|
||||||
|
|
||||||
|
// 绑定提示框
|
||||||
|
attachImmediateTooltip(element, '这是一条提示信息');
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 支持换行的提示信息
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
attachImmediateTooltip(element, `这是一条\n多行提示信息\n\n支持换行符`);
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. 与问号图标配合使用
|
||||||
|
|
||||||
|
```html
|
||||||
|
<!-- HTML -->
|
||||||
|
<span>这是一个元素<span class="help-icon">?</span></span>
|
||||||
|
```
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// JavaScript
|
||||||
|
const helpIcon = document.querySelector('.help-icon');
|
||||||
|
attachImmediateTooltip(helpIcon, '这是一条详细的提示信息');
|
||||||
|
```
|
||||||
|
|
||||||
|
## API 说明
|
||||||
|
|
||||||
|
### attachImmediateTooltip(anchorEl, text)
|
||||||
|
|
||||||
|
绑定提示框到指定元素。
|
||||||
|
|
||||||
|
#### 参数
|
||||||
|
|
||||||
|
- `anchorEl` (HTMLElement): 触发提示框的元素
|
||||||
|
- `text` (string): 提示框显示的文本内容,支持换行符 `\n`
|
||||||
|
|
||||||
|
#### 返回值
|
||||||
|
|
||||||
|
- `Function`: 清理函数,用于移除事件监听器
|
||||||
|
|
||||||
|
## 样式说明
|
||||||
|
|
||||||
|
### 问号图标样式
|
||||||
|
|
||||||
|
| 类名 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| `.help-icon` | 问号图标基础样式 |
|
||||||
|
| `.help-icon:hover` | 问号图标悬停样式 |
|
||||||
|
|
||||||
|
### 提示框样式
|
||||||
|
|
||||||
|
| 类名 | 说明 |
|
||||||
|
|------|------|
|
||||||
|
| `.tooltip-portal` | 提示框基础样式 |
|
||||||
|
| `.tooltip-portal.show` | 提示框显示状态 |
|
||||||
|
| `.tooltip-portal.fade` | 提示框动画效果 |
|
||||||
|
|
||||||
|
## 示例场景
|
||||||
|
|
||||||
|
### 1. 进度条提示
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// 为进度条的每个阶段绑定提示框
|
||||||
|
for (let i = 0; i < progressItems.length; i++) {
|
||||||
|
const item = progressItems[i];
|
||||||
|
attachImmediateTooltip(item, `阶段 ${i + 1}: ${item.title}`);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 表单字段提示
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// 为表单字段绑定提示框
|
||||||
|
const formFields = document.querySelectorAll('.form-field');
|
||||||
|
formFields.forEach(field => {
|
||||||
|
const tip = field.getAttribute('data-tip');
|
||||||
|
if (tip) {
|
||||||
|
attachImmediateTooltip(field, tip);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 工具栏图标提示
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// 为工具栏图标绑定提示框
|
||||||
|
const toolbarIcons = document.querySelectorAll('.toolbar-icon');
|
||||||
|
toolbarIcons.forEach(icon => {
|
||||||
|
const title = icon.getAttribute('title');
|
||||||
|
if (title) {
|
||||||
|
attachImmediateTooltip(icon, title);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
|
## 注意事项
|
||||||
|
|
||||||
|
1. 确保在 DOM 加载完成后再调用 `attachImmediateTooltip` 函数
|
||||||
|
2. 如果元素是动态生成的,需要在元素生成后再绑定提示框
|
||||||
|
3. 提示框会自动添加到 `document.body` 中,不会被父元素的 `overflow` 属性裁切
|
||||||
|
4. 提示框的 `z-index` 为 999999,确保它能覆盖所有元素
|
||||||
|
5. 提示框默认支持多行文本,使用 `white-space: pre-wrap` 样式
|
||||||
|
|
||||||
|
## 浏览器兼容性
|
||||||
|
|
||||||
|
- Chrome/Edge (最新版)
|
||||||
|
- Firefox (最新版)
|
||||||
|
- Safari (最新版)
|
||||||
|
|
||||||
|
## 代码优化建议
|
||||||
|
|
||||||
|
1. 对于大量元素需要绑定提示框的情况,建议使用事件委托
|
||||||
|
2. 如果页面中不再需要使用提示框,可以调用返回的清理函数移除事件监听器
|
||||||
|
3. 提示文本应简洁明了,避免过长
|
||||||
|
|
||||||
|
## 更新日志
|
||||||
|
|
||||||
|
- v1.0.0: 初始版本,实现了基本的提示框功能
|
||||||
|
- v1.0.1: 优化了样式,增加了动画效果
|
||||||
|
- v1.0.2: 支持多行文本,自动防出界
|
||||||
|
|
||||||
|
## 贡献指南
|
||||||
|
|
||||||
|
如果您发现问题或有改进建议,欢迎提出 Issue 或 Pull Request。
|
||||||
@@ -70,10 +70,8 @@ class ASEngineClient:
|
|||||||
# ACK事件处理
|
# ACK事件处理
|
||||||
@self.sio.on('ack', namespace=self.namespace)
|
@self.sio.on('ack', namespace=self.namespace)
|
||||||
def on_ack(data):
|
def on_ack(data):
|
||||||
print(f"Received ACK: {data}")
|
|
||||||
ack_id = data.get('ack_id')
|
ack_id = data.get('ack_id')
|
||||||
if ack_id and ack_id in self.ack_events:
|
if ack_id and ack_id in self.ack_events:
|
||||||
print(f"Received ACK for message: {ack_id}")
|
|
||||||
event = self.ack_events[ack_id]
|
event = self.ack_events[ack_id]
|
||||||
event.set() # 触发事件,通知等待的线程
|
event.set() # 触发事件,通知等待的线程
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ class ChatManager:
|
|||||||
_lock = threading.RLock()
|
_lock = threading.RLock()
|
||||||
def __init__(self, restart=False):
|
def __init__(self, restart=False):
|
||||||
self.restart = restart
|
self.restart = restart
|
||||||
self.chapter_chain_now = -1
|
|
||||||
self.ase_client = None
|
self.ase_client = None
|
||||||
self.app = None
|
self.app = None
|
||||||
self.socketio = None
|
self.socketio = None
|
||||||
@@ -49,7 +48,8 @@ class ChatManager:
|
|||||||
self.chapter_chain = None
|
self.chapter_chain = None
|
||||||
self.function_manager = FunctionManager()
|
self.function_manager = FunctionManager()
|
||||||
self.bb = None
|
self.bb = None
|
||||||
self.chat_historys = None
|
self.chat_historys = []
|
||||||
|
self.scores = []
|
||||||
self.vscode_ws = None
|
self.vscode_ws = None
|
||||||
self._vscode_queue = deque()
|
self._vscode_queue = deque()
|
||||||
self._lock = Semaphore(1)
|
self._lock = Semaphore(1)
|
||||||
@@ -69,6 +69,9 @@ class ChatManager:
|
|||||||
self.chapter_chain = load_chapters(raw_markdown, raw_markdown_prompts, raw_score_prompts)
|
self.chapter_chain = load_chapters(raw_markdown, raw_markdown_prompts, raw_score_prompts)
|
||||||
self.bb = None
|
self.bb = None
|
||||||
self.chat_historys = []
|
self.chat_historys = []
|
||||||
|
self.chapter_chain_now = 0
|
||||||
|
self.scores = []
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def send_to_vscode(self, event: str, data: dict, room: str = None, namespace: str = '/vscode'):
|
def send_to_vscode(self, event: str, data: dict, room: str = None, namespace: str = '/vscode'):
|
||||||
@@ -119,6 +122,7 @@ class ChatManager:
|
|||||||
|
|
||||||
|
|
||||||
def next_chapter(self):
|
def next_chapter(self):
|
||||||
|
print(f"now next chapter {self.chapter_chain_now} and len {len(self.chapter_chain)}")
|
||||||
assert self.chapter_chain_now + 1 < len(self.chapter_chain), "chapter_chain_now out of range"
|
assert self.chapter_chain_now + 1 < len(self.chapter_chain), "chapter_chain_now out of range"
|
||||||
self.chapter_chain_now += 1
|
self.chapter_chain_now += 1
|
||||||
self.bb.next_chapter()
|
self.bb.next_chapter()
|
||||||
@@ -129,10 +133,11 @@ class ChatManager:
|
|||||||
self.chapter_chain_now = chapter_index
|
self.chapter_chain_now = chapter_index
|
||||||
self.chapter_chain[chapter_index].Focus()
|
self.chapter_chain[chapter_index].Focus()
|
||||||
|
|
||||||
def load_now_chapter(self):
|
def load_now_chapter(self, load_code = True):
|
||||||
print(f"now load now chapter markdown {self.chapter_chain_now}")
|
print(f"now load now chapter markdown {self.chapter_chain_now}")
|
||||||
self.ase_client.loadmarkdown(self.chapter_chain[self.chapter_chain_now].chapter, self.chapter_chain[self.chapter_chain_now].chapter_prompt, self.chapter_chain[self.chapter_chain_now].score_prompt)
|
self.ase_client.loadmarkdown(self.chapter_chain[self.chapter_chain_now].chapter, self.chapter_chain[self.chapter_chain_now].chapter_prompt, self.chapter_chain[self.chapter_chain_now].score_prompt)
|
||||||
self.load_code_in_markdown()
|
if load_code:
|
||||||
|
self.load_code_in_markdown()
|
||||||
|
|
||||||
|
|
||||||
def upload_bb(self):
|
def upload_bb(self):
|
||||||
|
|||||||
@@ -2,6 +2,28 @@ import requests
|
|||||||
from flask_socketio import Namespace
|
from flask_socketio import Namespace
|
||||||
|
|
||||||
|
|
||||||
|
def clear_user_session(asengine_url, asengine_token, user_id):
|
||||||
|
'''
|
||||||
|
快速清理用户会话的函数
|
||||||
|
'''
|
||||||
|
try:
|
||||||
|
base_url = asengine_url
|
||||||
|
clear_url = f"{base_url}/api/sync/clear_user_session"
|
||||||
|
payload = {
|
||||||
|
'namespace_url': asengine_token, # WebSocket命名空间URL
|
||||||
|
'user_id': user_id, # 用户ID,对应session_info.id
|
||||||
|
'clear_type': 'all' # 清理类型,默认为全部
|
||||||
|
}
|
||||||
|
headers = {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
response = requests.post(clear_url, json=payload, headers=headers)
|
||||||
|
response.raise_for_status() # 检查请求是否成功
|
||||||
|
print(f"User session {user_id} cleared successfully. Response: {response.json()}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error clearing user session: {e}")
|
||||||
|
|
||||||
|
|
||||||
def on_connect_to_ase(client, entry, init_data, **kwargs):
|
def on_connect_to_ase(client, entry, init_data, **kwargs):
|
||||||
'''
|
'''
|
||||||
此时刚刚建立好aseclient连接,并向前端发送打开code-server-like指令。
|
此时刚刚建立好aseclient连接,并向前端发送打开code-server-like指令。
|
||||||
@@ -9,25 +31,19 @@ def on_connect_to_ase(client, entry, init_data, **kwargs):
|
|||||||
namespace_entry, ase_client = entry
|
namespace_entry, ase_client = entry
|
||||||
namespace_entry.emit('open-iframe',"", room=init_data['room'], namespace='/agent')
|
namespace_entry.emit('open-iframe',"", room=init_data['room'], namespace='/agent')
|
||||||
namespace_entry.emit('message', "Agents服务已连接, 加载教案中", room=init_data['room'], namespace='/agent')
|
namespace_entry.emit('message', "Agents服务已连接, 加载教案中", room=init_data['room'], namespace='/agent')
|
||||||
|
|
||||||
|
restart = init_data.get("restart", False)
|
||||||
|
# 不再需要手动next_chapter,因为已经在on_login中根据mongo进度恢复了正确的章节
|
||||||
|
# if restart: # 重启时,从-1章进入 0章
|
||||||
|
# ase_client.chatmanager.next_chapter()
|
||||||
|
|
||||||
if init_data.get("restart", False):
|
# 根据restart决定是否重新加载代码
|
||||||
try:
|
ase_client.chatmanager.load_now_chapter(load_code=restart)
|
||||||
base_url = namespace_entry.app.config['ASE_ENGINE_URL']
|
print("load_now_chapter with restart:", restart)
|
||||||
clear_url = f"{base_url}/clear_user_session"
|
|
||||||
payload = {
|
# 只有当需要restart时才发送chapter-start
|
||||||
'namespace_url': namespace_entry.app.config['ASE_ENGINE_URL_TOKEN'], # WebSocket命名空间URL
|
if restart:
|
||||||
'user_id': init_data['room'], # 用户ID,对应session_info.id
|
ase_client.send_text("chapter-start", "")
|
||||||
'clear_type': 'all' # 清理类型,默认为全部
|
|
||||||
}
|
|
||||||
headers = {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
}
|
|
||||||
response = requests.post(clear_url, json=payload, headers=headers)
|
|
||||||
response.raise_for_status() # 检查请求是否成功
|
|
||||||
except Exception as e:
|
|
||||||
print(f"Error clearing user session: {e}")
|
|
||||||
ase_client.chatmanager.load_now_chapter()
|
|
||||||
ase_client.send_text("chapter-start", "")
|
|
||||||
namespace_entry.emit('message', "教案加载完毕", room=init_data['room'], namespace='/agent')
|
namespace_entry.emit('message', "教案加载完毕", room=init_data['room'], namespace='/agent')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ def save_learning_progress(chatmanager, user_id: str) -> bool:
|
|||||||
"chat_historys": chatmanager.chat_historys,
|
"chat_historys": chatmanager.chat_historys,
|
||||||
"scores": chatmanager.scores,
|
"scores": chatmanager.scores,
|
||||||
"multiagents_dialogs": his_data,
|
"multiagents_dialogs": his_data,
|
||||||
|
"chapter_chain_length": len(chatmanager.chapter_chain),
|
||||||
"updated_at": datetime.now()
|
"updated_at": datetime.now()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,6 +93,7 @@ def get_multiagents_dialog_list(user_id: str) -> List[Dict]:
|
|||||||
|
|
||||||
# 检查响应
|
# 检查响应
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
|
current_app.logger.info(f"获取MultiAgents对话列表成功: user_id={user_id}, json={response.json()}")
|
||||||
return response.json()
|
return response.json()
|
||||||
else:
|
else:
|
||||||
current_app.logger.error(f"获取MultiAgents对话列表失败: HTTP {response.status_code}")
|
current_app.logger.error(f"获取MultiAgents对话列表失败: HTTP {response.status_code}")
|
||||||
@@ -145,6 +147,7 @@ def load_learning_progress(user_id: str, material_id: str, chapter_name: str, le
|
|||||||
"chat_historys": [],
|
"chat_historys": [],
|
||||||
"scores": [],
|
"scores": [],
|
||||||
"chapter_chain_now": None,
|
"chapter_chain_now": None,
|
||||||
|
"chapter_chain_length": 0,
|
||||||
"updated_at": datetime.now().isoformat()
|
"updated_at": datetime.now().isoformat()
|
||||||
},
|
},
|
||||||
"message": "未找到学习记录,返回默认值"
|
"message": "未找到学习记录,返回默认值"
|
||||||
@@ -163,6 +166,7 @@ def load_learning_progress(user_id: str, material_id: str, chapter_name: str, le
|
|||||||
"chat_historys": [],
|
"chat_historys": [],
|
||||||
"scores": [],
|
"scores": [],
|
||||||
"chapter_chain_now": None,
|
"chapter_chain_now": None,
|
||||||
|
"chapter_chain_length": 0,
|
||||||
"updated_at": datetime.now().isoformat()
|
"updated_at": datetime.now().isoformat()
|
||||||
},
|
},
|
||||||
"message": error_msg
|
"message": error_msg
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ def load_markdown_file(course_id, chapter_name, lesson_name):
|
|||||||
break
|
break
|
||||||
if file_link is None:
|
if file_link is None:
|
||||||
return None
|
return None
|
||||||
print(f"load_markdown_file: {file_link}")
|
|
||||||
return get_text_file(file_link)
|
return get_text_file(file_link)
|
||||||
|
|
||||||
def convert_markdown_to_html(md_file: str) -> str:
|
def convert_markdown_to_html(md_file: str) -> str:
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ from ..services.asectrl_service import (
|
|||||||
receive_ase_process,
|
receive_ase_process,
|
||||||
receive_ase_judge,
|
receive_ase_judge,
|
||||||
receive_ase_next_chapter,
|
receive_ase_next_chapter,
|
||||||
receive_ase_chapter_score
|
receive_ase_chapter_score,
|
||||||
|
clear_user_session
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -62,6 +63,51 @@ class VSCodeNamespace(Namespace):
|
|||||||
|
|
||||||
|
|
||||||
class AgentNamespace(Namespace):
|
class AgentNamespace(Namespace):
|
||||||
|
def _load_learning_progress(self, chatmanager, user_id, course_id, chapter_name, lesson_name, continue_learn):
|
||||||
|
"""加载并恢复用户学习进度
|
||||||
|
|
||||||
|
Args:
|
||||||
|
chatmanager: 聊天管理器实例
|
||||||
|
user_id: 用户ID
|
||||||
|
course_id: 课程ID
|
||||||
|
chapter_name: 章节名称
|
||||||
|
lesson_name: 课时名称
|
||||||
|
continue_learn: 是否继续学习(现在总是为True,保持兼容性)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
int: 需要跳过的章节数
|
||||||
|
"""
|
||||||
|
# 总是从mongo加载学习进度
|
||||||
|
progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
|
||||||
|
|
||||||
|
if progress_result['exists']:
|
||||||
|
progress = progress_result['data']
|
||||||
|
# 恢复学习进度数据
|
||||||
|
if 'scores' in progress:
|
||||||
|
chatmanager.scores = progress['scores']
|
||||||
|
|
||||||
|
# 恢复聊天历史
|
||||||
|
if 'chat_historys' in progress:
|
||||||
|
chatmanager.chat_historys = progress['chat_historys']
|
||||||
|
else:
|
||||||
|
chatmanager.chat_historys = []
|
||||||
|
|
||||||
|
# 恢复当前章节链
|
||||||
|
if 'chapter_chain_now' in progress:
|
||||||
|
chatmanager.chapter_chain_now = progress['chapter_chain_now']
|
||||||
|
upload_learning_progress_to_cloud(progress)
|
||||||
|
|
||||||
|
# 计算需要跳过的章节数:从初始的-1到当前的chapter_chain_now
|
||||||
|
need_skip_chapters = chatmanager.chapter_chain_now
|
||||||
|
else:
|
||||||
|
# 使用默认值,确保有完整的结构
|
||||||
|
chatmanager.chat_historys = progress_result['data']['chat_historys']
|
||||||
|
chatmanager.scores = progress_result['data']['scores']
|
||||||
|
chatmanager.chapter_chain_now = 0
|
||||||
|
need_skip_chapters = 0
|
||||||
|
|
||||||
|
return need_skip_chapters
|
||||||
|
|
||||||
def on_login(self, data):
|
def on_login(self, data):
|
||||||
self.app = current_app
|
self.app = current_app
|
||||||
ex = current_app.extensions
|
ex = current_app.extensions
|
||||||
@@ -84,51 +130,39 @@ class AgentNamespace(Namespace):
|
|||||||
chatmanager = user_uuid2chatmanager[user_uuid]
|
chatmanager = user_uuid2chatmanager[user_uuid]
|
||||||
chatmanager.function_manager.add_function(judge, {'course_id': course_id, 'root_path': f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}'})
|
chatmanager.function_manager.add_function(judge, {'course_id': course_id, 'root_path': f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}'})
|
||||||
chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
|
chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
|
||||||
|
|
||||||
|
clear_user_session(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_URL_TOKEN"], user_id)
|
||||||
|
|
||||||
if not chatmanager.restart:# 尝试加载用户学习进度
|
# 总是从mongo加载进度,不管restart状态
|
||||||
progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
|
need_skip_chapters = self._load_learning_progress(chatmanager, user_id, course_id, chapter_name, lesson_name, True)
|
||||||
need_skip_chapters = 0
|
|
||||||
|
|
||||||
if progress_result['exists']:
|
|
||||||
progress = progress_result['data']
|
|
||||||
# 恢复学习进度数据
|
|
||||||
if 'scores' in progress:
|
|
||||||
# 根据scores的数量确定需要跳过的章节数
|
|
||||||
need_skip_chapters = len(progress['scores'])
|
|
||||||
chatmanager.scores = progress['scores']
|
|
||||||
|
|
||||||
# 恢复聊天历史
|
|
||||||
if 'chat_historys' in progress:
|
|
||||||
chatmanager.chat_historys = progress['chat_historys']
|
|
||||||
else:
|
|
||||||
chatmanager.chat_historys = []
|
|
||||||
|
|
||||||
# 恢复当前章节链
|
|
||||||
if 'chapter_chain_now' in progress:
|
|
||||||
chatmanager.chapter_chain_now = progress['chapter_chain_now']
|
|
||||||
upload_learning_progress_to_cloud(progress)
|
|
||||||
else:
|
|
||||||
# 使用默认值,确保有完整的结构
|
|
||||||
chatmanager.chat_historys = progress_result['data']['chat_historys']
|
|
||||||
chatmanager.scores = progress_result['data']['scores']
|
|
||||||
|
|
||||||
fmd,fmdp,fsp = load_full_markdown_file(course_id, chapter_name, lesson_name)
|
fmd,fmdp,fsp = load_full_markdown_file(course_id, chapter_name, lesson_name)
|
||||||
user_uuid2ase_client[user_uuid] = HSAEngineClient(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_NAMESPACE"],id=user_id, chatmanager = chatmanager)
|
user_uuid2ase_client[user_uuid] = HSAEngineClient(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_NAMESPACE"],id=user_id, chatmanager = chatmanager)
|
||||||
chatmanager.init(user_uuid, user_uuid2ase_client[user_uuid], fmd, fmdp, fsp, course_id, chapter_name, lesson_name, max_iter=5, app=current_app, socketio=self)
|
chatmanager.init(user_uuid, user_uuid2ase_client[user_uuid],
|
||||||
backboard_manager.add_backboard(user_uuid, user_id, course_id, lesson_name, root_path=f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}')
|
fmd, fmdp, fsp, course_id, chapter_name, lesson_name, max_iter=5, app=current_app, socketio=self)
|
||||||
|
backboard_manager.add_backboard(user_uuid, user_id, course_id,
|
||||||
|
lesson_name, root_path=f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}')
|
||||||
chatmanager.bb = backboard_manager.get_backboard(user_uuid)
|
chatmanager.bb = backboard_manager.get_backboard(user_uuid)
|
||||||
if not progress:
|
|
||||||
chatmanager.next_chapter()
|
|
||||||
|
|
||||||
# 如果有保存的进度,需要跳过已经完成的章节
|
# 总是根据进度跳过章节,恢复对话历史
|
||||||
for _ in range(need_skip_chapters):
|
for _ in range(need_skip_chapters):
|
||||||
chatmanager.next_chapter()
|
chatmanager.next_chapter()
|
||||||
|
emit('next_chapter', room=user_uuid, namespace='/agent')
|
||||||
|
# 恢复对话历史到前端 - 使用批量发送消息列表
|
||||||
|
if chatmanager.chat_historys:
|
||||||
|
emit('messages', chatmanager.chat_historys, room=user_uuid, namespace='/agent')
|
||||||
|
|
||||||
self.chatmanager = chatmanager
|
self.chatmanager = chatmanager
|
||||||
self.ase_client = user_uuid2ase_client[user_uuid]
|
self.ase_client = user_uuid2ase_client[user_uuid]
|
||||||
|
|
||||||
|
# 将restart设置为False,避免后续重复处理
|
||||||
|
restart = chatmanager.restart
|
||||||
|
chatmanager.restart = False
|
||||||
|
|
||||||
user_uuid2ase_client[user_uuid].register_on_connect_entry(
|
user_uuid2ase_client[user_uuid].register_on_connect_entry(
|
||||||
callback=on_connect_to_ase,
|
callback=on_connect_to_ase,
|
||||||
entry=(self, user_uuid2ase_client[user_uuid]),
|
entry=(self, user_uuid2ase_client[user_uuid]),
|
||||||
init_data={'room':user_uuid, 'restart':chatmanager.restart}
|
init_data={'room':user_uuid, 'restart':restart}
|
||||||
)
|
)
|
||||||
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
user_uuid2ase_client[user_uuid].register_route_with_entry(
|
||||||
route='dialog',
|
route='dialog',
|
||||||
|
|||||||
6
Html/apps/static/cdnback/css/editor/editor.main.css
Normal file
6
Html/apps/static/cdnback/css/editor/editor.main.css
Normal file
File diff suppressed because one or more lines are too long
218
Html/apps/static/cdnback/css/xterm.css
Normal file
218
Html/apps/static/cdnback/css/xterm.css
Normal file
@@ -0,0 +1,218 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2014 The xterm.js authors. All rights reserved.
|
||||||
|
* Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
|
||||||
|
* https://github.com/chjj/term.js
|
||||||
|
* @license MIT
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* Originally forked from (with the author's permission):
|
||||||
|
* Fabrice Bellard's javascript vt100 for jslinux:
|
||||||
|
* http://bellard.org/jslinux/
|
||||||
|
* Copyright (c) 2011 Fabrice Bellard
|
||||||
|
* The original design remains. The terminal itself
|
||||||
|
* has been extended to include xterm CSI codes, among
|
||||||
|
* other features.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Default styles for xterm.js
|
||||||
|
*/
|
||||||
|
|
||||||
|
.xterm {
|
||||||
|
cursor: text;
|
||||||
|
position: relative;
|
||||||
|
user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm.focus,
|
||||||
|
.xterm:focus {
|
||||||
|
outline: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-helpers {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
/**
|
||||||
|
* The z-index of the helpers must be higher than the canvases in order for
|
||||||
|
* IMEs to appear on top.
|
||||||
|
*/
|
||||||
|
z-index: 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-helper-textarea {
|
||||||
|
padding: 0;
|
||||||
|
border: 0;
|
||||||
|
margin: 0;
|
||||||
|
/* Move textarea out of the screen to the far left, so that the cursor is not visible */
|
||||||
|
position: absolute;
|
||||||
|
opacity: 0;
|
||||||
|
left: -9999em;
|
||||||
|
top: 0;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
|
z-index: -5;
|
||||||
|
/** Prevent wrapping so the IME appears against the textarea at the correct position */
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
resize: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .composition-view {
|
||||||
|
/* TODO: Composition position got messed up somewhere */
|
||||||
|
background: #000;
|
||||||
|
color: #FFF;
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
white-space: nowrap;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .composition-view.active {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-viewport {
|
||||||
|
/* On OS X this is required in order for the scroll bar to appear fully opaque */
|
||||||
|
background-color: #000;
|
||||||
|
overflow-y: scroll;
|
||||||
|
cursor: default;
|
||||||
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-screen {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-screen canvas {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-scroll-area {
|
||||||
|
visibility: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-char-measure-element {
|
||||||
|
display: inline-block;
|
||||||
|
visibility: hidden;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: -9999em;
|
||||||
|
line-height: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm.enable-mouse-events {
|
||||||
|
/* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm.xterm-cursor-pointer,
|
||||||
|
.xterm .xterm-cursor-pointer {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm.column-select.focus {
|
||||||
|
/* Column selection mode */
|
||||||
|
cursor: crosshair;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-accessibility:not(.debug),
|
||||||
|
.xterm .xterm-message {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
bottom: 0;
|
||||||
|
right: 0;
|
||||||
|
z-index: 10;
|
||||||
|
color: transparent;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-accessibility-tree:not(.debug) *::selection {
|
||||||
|
color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .xterm-accessibility-tree {
|
||||||
|
user-select: text;
|
||||||
|
white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm .live-region {
|
||||||
|
position: absolute;
|
||||||
|
left: -9999px;
|
||||||
|
width: 1px;
|
||||||
|
height: 1px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-dim {
|
||||||
|
/* Dim should not apply to background, so the opacity of the foreground color is applied
|
||||||
|
* explicitly in the generated class and reset to 1 here */
|
||||||
|
opacity: 1 !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-underline-1 { text-decoration: underline; }
|
||||||
|
.xterm-underline-2 { text-decoration: double underline; }
|
||||||
|
.xterm-underline-3 { text-decoration: wavy underline; }
|
||||||
|
.xterm-underline-4 { text-decoration: dotted underline; }
|
||||||
|
.xterm-underline-5 { text-decoration: dashed underline; }
|
||||||
|
|
||||||
|
.xterm-overline {
|
||||||
|
text-decoration: overline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-overline.xterm-underline-1 { text-decoration: overline underline; }
|
||||||
|
.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; }
|
||||||
|
.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; }
|
||||||
|
.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; }
|
||||||
|
.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; }
|
||||||
|
|
||||||
|
.xterm-strikethrough {
|
||||||
|
text-decoration: line-through;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-screen .xterm-decoration-container .xterm-decoration {
|
||||||
|
z-index: 6;
|
||||||
|
position: absolute;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer {
|
||||||
|
z-index: 7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-decoration-overview-ruler {
|
||||||
|
z-index: 8;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.xterm-decoration-top {
|
||||||
|
z-index: 2;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
51
Html/apps/static/cdnback/js/addons/fit/fit.js
Normal file
51
Html/apps/static/cdnback/js/addons/fit/fit.js
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.fit = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
|
||||||
|
"use strict";
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
function proposeGeometry(term) {
|
||||||
|
if (!term.element.parentElement) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
var parentElementStyle = window.getComputedStyle(term.element.parentElement);
|
||||||
|
var parentElementHeight = parseInt(parentElementStyle.getPropertyValue('height'));
|
||||||
|
var parentElementWidth = Math.max(0, parseInt(parentElementStyle.getPropertyValue('width')));
|
||||||
|
var elementStyle = window.getComputedStyle(term.element);
|
||||||
|
var elementPadding = {
|
||||||
|
top: parseInt(elementStyle.getPropertyValue('padding-top')),
|
||||||
|
bottom: parseInt(elementStyle.getPropertyValue('padding-bottom')),
|
||||||
|
right: parseInt(elementStyle.getPropertyValue('padding-right')),
|
||||||
|
left: parseInt(elementStyle.getPropertyValue('padding-left'))
|
||||||
|
};
|
||||||
|
var elementPaddingVer = elementPadding.top + elementPadding.bottom;
|
||||||
|
var elementPaddingHor = elementPadding.right + elementPadding.left;
|
||||||
|
var availableHeight = parentElementHeight - elementPaddingVer;
|
||||||
|
var availableWidth = parentElementWidth - elementPaddingHor - term._core.viewport.scrollBarWidth;
|
||||||
|
var geometry = {
|
||||||
|
cols: Math.floor(availableWidth / term._core.renderer.dimensions.actualCellWidth),
|
||||||
|
rows: Math.floor(availableHeight / term._core.renderer.dimensions.actualCellHeight)
|
||||||
|
};
|
||||||
|
return geometry;
|
||||||
|
}
|
||||||
|
exports.proposeGeometry = proposeGeometry;
|
||||||
|
function fit(term) {
|
||||||
|
var geometry = proposeGeometry(term);
|
||||||
|
if (geometry) {
|
||||||
|
if (term.rows !== geometry.rows || term.cols !== geometry.cols) {
|
||||||
|
term._core.renderer.clear();
|
||||||
|
term.resize(geometry.cols, geometry.rows);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exports.fit = fit;
|
||||||
|
function apply(terminalConstructor) {
|
||||||
|
terminalConstructor.prototype.proposeGeometry = function () {
|
||||||
|
return proposeGeometry(this);
|
||||||
|
};
|
||||||
|
terminalConstructor.prototype.fit = function () {
|
||||||
|
fit(this);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
exports.apply = apply;
|
||||||
|
|
||||||
|
},{}]},{},[1])(1)
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=fit.js.map
|
||||||
27
Html/apps/static/cdnback/js/addons/fullscreen/fullscreen.js
Normal file
27
Html/apps/static/cdnback/js/addons/fullscreen/fullscreen.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.fullscreen = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
|
||||||
|
"use strict";
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
function toggleFullScreen(term, fullscreen) {
|
||||||
|
var fn;
|
||||||
|
if (typeof fullscreen === 'undefined') {
|
||||||
|
fn = (term.element.classList.contains('fullscreen')) ? 'remove' : 'add';
|
||||||
|
}
|
||||||
|
else if (!fullscreen) {
|
||||||
|
fn = 'remove';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
fn = 'add';
|
||||||
|
}
|
||||||
|
term.element.classList[fn]('fullscreen');
|
||||||
|
}
|
||||||
|
exports.toggleFullScreen = toggleFullScreen;
|
||||||
|
function apply(terminalConstructor) {
|
||||||
|
terminalConstructor.prototype.toggleFullScreen = function (fullscreen) {
|
||||||
|
toggleFullScreen(this, fullscreen);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
exports.apply = apply;
|
||||||
|
|
||||||
|
},{}]},{},[1])(1)
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=fullscreen.js.map
|
||||||
126
Html/apps/static/cdnback/js/addons/search/search.js
Normal file
126
Html/apps/static/cdnback/js/addons/search/search.js
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.search = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
|
||||||
|
"use strict";
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
var SearchHelper = (function () {
|
||||||
|
function SearchHelper(_terminal) {
|
||||||
|
this._terminal = _terminal;
|
||||||
|
}
|
||||||
|
SearchHelper.prototype.findNext = function (term) {
|
||||||
|
if (!term || term.length === 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var result;
|
||||||
|
var startRow = this._terminal._core.buffer.ydisp;
|
||||||
|
if (this._terminal._core.selectionManager.selectionEnd) {
|
||||||
|
startRow = this._terminal._core.selectionManager.selectionEnd[1];
|
||||||
|
}
|
||||||
|
for (var y = startRow + 1; y < this._terminal._core.buffer.ybase + this._terminal.rows; y++) {
|
||||||
|
result = this._findInLine(term, y);
|
||||||
|
if (result) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
for (var y = 0; y < startRow; y++) {
|
||||||
|
result = this._findInLine(term, y);
|
||||||
|
if (result) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this._selectResult(result);
|
||||||
|
};
|
||||||
|
SearchHelper.prototype.findPrevious = function (term) {
|
||||||
|
if (!term || term.length === 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var result;
|
||||||
|
var startRow = this._terminal._core.buffer.ydisp;
|
||||||
|
if (this._terminal._core.selectionManager.selectionStart) {
|
||||||
|
startRow = this._terminal._core.selectionManager.selectionStart[1];
|
||||||
|
}
|
||||||
|
for (var y = startRow - 1; y >= 0; y--) {
|
||||||
|
result = this._findInLine(term, y);
|
||||||
|
if (result) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!result) {
|
||||||
|
for (var y = this._terminal._core.buffer.ybase + this._terminal.rows - 1; y > startRow; y--) {
|
||||||
|
result = this._findInLine(term, y);
|
||||||
|
if (result) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return this._selectResult(result);
|
||||||
|
};
|
||||||
|
SearchHelper.prototype._findInLine = function (term, y) {
|
||||||
|
var lowerStringLine = this._terminal._core.buffer.translateBufferLineToString(y, true).toLowerCase();
|
||||||
|
var lowerTerm = term.toLowerCase();
|
||||||
|
var searchIndex = lowerStringLine.indexOf(lowerTerm);
|
||||||
|
if (searchIndex >= 0) {
|
||||||
|
var line = this._terminal._core.buffer.lines.get(y);
|
||||||
|
for (var i = 0; i < searchIndex; i++) {
|
||||||
|
var charData = line[i];
|
||||||
|
var char = charData[1];
|
||||||
|
if (char.length > 1) {
|
||||||
|
searchIndex -= char.length - 1;
|
||||||
|
}
|
||||||
|
var charWidth = charData[2];
|
||||||
|
if (charWidth === 0) {
|
||||||
|
searchIndex++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
term: term,
|
||||||
|
col: searchIndex,
|
||||||
|
row: y
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
|
SearchHelper.prototype._selectResult = function (result) {
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
this._terminal._core.selectionManager.setSelection(result.col, result.row, result.term.length);
|
||||||
|
this._terminal.scrollLines(result.row - this._terminal._core.buffer.ydisp);
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
return SearchHelper;
|
||||||
|
}());
|
||||||
|
exports.SearchHelper = SearchHelper;
|
||||||
|
|
||||||
|
},{}],2:[function(require,module,exports){
|
||||||
|
"use strict";
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
var SearchHelper_1 = require("./SearchHelper");
|
||||||
|
function findNext(terminal, term) {
|
||||||
|
var addonTerminal = terminal;
|
||||||
|
if (!addonTerminal.__searchHelper) {
|
||||||
|
addonTerminal.__searchHelper = new SearchHelper_1.SearchHelper(addonTerminal);
|
||||||
|
}
|
||||||
|
return addonTerminal.__searchHelper.findNext(term);
|
||||||
|
}
|
||||||
|
exports.findNext = findNext;
|
||||||
|
function findPrevious(terminal, term) {
|
||||||
|
var addonTerminal = terminal;
|
||||||
|
if (!addonTerminal.__searchHelper) {
|
||||||
|
addonTerminal.__searchHelper = new SearchHelper_1.SearchHelper(addonTerminal);
|
||||||
|
}
|
||||||
|
return addonTerminal.__searchHelper.findPrevious(term);
|
||||||
|
}
|
||||||
|
exports.findPrevious = findPrevious;
|
||||||
|
function apply(terminalConstructor) {
|
||||||
|
terminalConstructor.prototype.findNext = function (term) {
|
||||||
|
return findNext(this, term);
|
||||||
|
};
|
||||||
|
terminalConstructor.prototype.findPrevious = function (term) {
|
||||||
|
return findPrevious(this, term);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
exports.apply = apply;
|
||||||
|
|
||||||
|
},{"./SearchHelper":1}]},{},[2])(2)
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=search.js.map
|
||||||
41
Html/apps/static/cdnback/js/addons/webLinks/webLinks.js
Normal file
41
Html/apps/static/cdnback/js/addons/webLinks/webLinks.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.webLinks = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
|
||||||
|
"use strict";
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
var protocolClause = '(https?:\\/\\/)';
|
||||||
|
var domainCharacterSet = '[\\da-z\\.-]+';
|
||||||
|
var negatedDomainCharacterSet = '[^\\da-z\\.-]+';
|
||||||
|
var domainBodyClause = '(' + domainCharacterSet + ')';
|
||||||
|
var tldClause = '([a-z\\.]{2,6})';
|
||||||
|
var ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
|
||||||
|
var localHostClause = '(localhost)';
|
||||||
|
var portClause = '(:\\d{1,5})';
|
||||||
|
var hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
|
||||||
|
var pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
|
||||||
|
var queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
|
||||||
|
var queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
|
||||||
|
var hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
|
||||||
|
var negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
|
||||||
|
var bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;
|
||||||
|
var start = '(?:^|' + negatedDomainCharacterSet + ')(';
|
||||||
|
var end = ')($|' + negatedPathCharacterSet + ')';
|
||||||
|
var strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);
|
||||||
|
function handleLink(event, uri) {
|
||||||
|
window.open(uri, '_blank');
|
||||||
|
}
|
||||||
|
function webLinksInit(term, handler, options) {
|
||||||
|
if (handler === void 0) { handler = handleLink; }
|
||||||
|
if (options === void 0) { options = {}; }
|
||||||
|
options.matchIndex = 1;
|
||||||
|
term.registerLinkMatcher(strictUrlRegex, handler, options);
|
||||||
|
}
|
||||||
|
exports.webLinksInit = webLinksInit;
|
||||||
|
function apply(terminalConstructor) {
|
||||||
|
terminalConstructor.prototype.webLinksInit = function (handler, options) {
|
||||||
|
webLinksInit(this, handler, options);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
exports.apply = apply;
|
||||||
|
|
||||||
|
},{}]},{},[1])(1)
|
||||||
|
});
|
||||||
|
//# sourceMappingURL=webLinks.js.map
|
||||||
File diff suppressed because one or more lines are too long
1
Html/apps/static/cdnback/js/tex-mml-chtml.js
Normal file
1
Html/apps/static/cdnback/js/tex-mml-chtml.js
Normal file
File diff suppressed because one or more lines are too long
8588
Html/apps/static/cdnback/js/xterm.js
Normal file
8588
Html/apps/static/cdnback/js/xterm.js
Normal file
File diff suppressed because it is too large
Load Diff
@@ -107,13 +107,7 @@
|
|||||||
.btn-group-toggle .btn {
|
.btn-group-toggle .btn {
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
}
|
}
|
||||||
#leftSidebar, .vscode-web, #rightSidebar {
|
/* 主容器,使用 grid 布局 */
|
||||||
height: 100%;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* 主容器,使用 grid 布局 */
|
|
||||||
#maxcontainer {
|
#maxcontainer {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 2fr 5px 3fr 5px 2fr; /* 默认宽度比例 */
|
grid-template-columns: 2fr 5px 3fr 5px 2fr; /* 默认宽度比例 */
|
||||||
@@ -122,7 +116,20 @@
|
|||||||
|
|
||||||
/* 各区域基础样式 */
|
/* 各区域基础样式 */
|
||||||
.sidebar {
|
.sidebar {
|
||||||
overflow: auto; /* 确保内容可以滚动 */
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
overflow: hidden; /* 隐藏溢出内容,让内部元素单独滚动 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 左侧边栏样式 */
|
||||||
|
#leftSidebar {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 中间和右侧边栏样式 */
|
||||||
|
.vscode-web, #rightSidebar {
|
||||||
|
height: 100%;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.vscode-web {
|
.vscode-web {
|
||||||
@@ -162,55 +169,75 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Markdown内容区域样式 */
|
||||||
|
#markdown-content {
|
||||||
|
flex: 1; /* 占满剩余空间 */
|
||||||
|
overflow-y: auto; /* 只有内容区域可以垂直滚动 */
|
||||||
|
overflow-x: hidden; /* 隐藏水平滚动条 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 设置进度条容器样式 */
|
||||||
|
#markdown-content-process {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-end; /* 让进度条靠底部对齐 */
|
||||||
|
padding: 0 10px 10px 10px; /* 添加底部内边距,调整与底部的距离 */
|
||||||
|
box-sizing: border-box;
|
||||||
|
flex-shrink: 0; /* 防止进度条被压缩 */
|
||||||
|
}
|
||||||
|
|
||||||
/* 设置每个子框的基本样式 */
|
/* 设置每个子框的基本样式 */
|
||||||
.progress-box {
|
.progress-box {
|
||||||
height: 100%; /* 高度为 100%,撑满容器 */
|
width: 100%; /* 宽度为 100%,撑满容器 */
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row; /* 使子框横向排列 */
|
flex-direction: row; /* 使子框横向排列 */
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
gap: 2px; /* 进度条之间的间距 */
|
||||||
|
margin-bottom: 0; /* 移除底部边距 */
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-title {
|
.progress-title {
|
||||||
height: 60px;
|
height: 8px; /* 更细的进度条 */
|
||||||
text-align: center;
|
flex: 1; /* 均匀分配宽度 */
|
||||||
line-height: 60px;
|
border-radius: 4px; /* 圆角设计,更扁平化 */
|
||||||
margin-right: 2px;
|
transition: all 0.3s ease; /* 平滑过渡效果 */
|
||||||
border: 1px solid #ddd;
|
|
||||||
transition: background-color 0.3s ease;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
cursor: pointer;
|
||||||
/* 新增以下属性实现文字溢出省略 */
|
box-shadow: 0 1px 3px rgba(0,0,0,0.1); /* 轻微阴影,增加层次感 */
|
||||||
white-space: nowrap; /* 防止文字换行 */
|
overflow: visible; /* 允许文字溢出 */
|
||||||
overflow: hidden; /* 隐藏溢出内容 */
|
|
||||||
text-overflow: ellipsis; /* 溢出部分显示为省略号 */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 颜色方案:已学习为蓝色,当前学习为绿色,未学习为白色 */
|
||||||
|
.blue {
|
||||||
|
background-color: #007bff; /* 蓝色 - 已学习 */
|
||||||
|
}
|
||||||
|
|
||||||
.green {
|
.green {
|
||||||
background-color: green;
|
background-color: #28a745; /* 绿色 - 当前学习 */
|
||||||
color: white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.white {
|
.white {
|
||||||
background-color: white;
|
background-color: #e9ecef; /* 浅灰色 - 未学习,比纯白色更美观 */
|
||||||
color: black;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.progress-box > .progress-title:last-child {
|
/* 进度条悬停效果 */
|
||||||
margin-bottom: 0; /* 防止最后一个子框出现多余的间距 */
|
.progress-title:hover {
|
||||||
|
transform: translateY(-1px); /* 轻微上浮效果 */
|
||||||
|
box-shadow: 0 2px 5px rgba(0,0,0,0.2); /* 增强阴影 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 进度条详细信息的样式 */
|
/* 进度条详细信息的样式 */
|
||||||
#progress-detail {
|
#progress-detail {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
display: none;
|
display: none;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
background-color: rgba(0, 0, 0, 0.7);
|
background-color: rgba(0, 0, 0, 0.8);
|
||||||
color: white;
|
color: white;
|
||||||
border-radius: 5px;
|
border-radius: 6px;
|
||||||
max-width: 200px;
|
max-width: 200px;
|
||||||
|
font-size: 14px;
|
||||||
|
z-index: 1000;
|
||||||
|
pointer-events: none; /* 防止干扰鼠标事件 */
|
||||||
|
box-shadow: 0 2px 10px rgba(0,0,0,0.3); /* 增强阴影 */
|
||||||
}
|
}
|
||||||
|
|
||||||
.button {
|
.button {
|
||||||
|
|||||||
51
Html/apps/static/css/helpTip.css
Normal file
51
Html/apps/static/css/helpTip.css
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
/* HelpTip 组件样式 */
|
||||||
|
|
||||||
|
/* 问号图标样式 */
|
||||||
|
.help-icon {
|
||||||
|
display: inline-block;
|
||||||
|
margin-left: 8px;
|
||||||
|
color: #888;
|
||||||
|
font-weight: bold;
|
||||||
|
cursor: help;
|
||||||
|
font-size: 14px;
|
||||||
|
line-height: 1;
|
||||||
|
transition: color 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.help-icon:hover {
|
||||||
|
color: #4CAF50;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 全局提示框样式(挂在 body 下) */
|
||||||
|
.tooltip-portal {
|
||||||
|
position: fixed; /* 不受父级 overflow 影响 */
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
z-index: 999999; /* 足够高,覆盖所有元素 */
|
||||||
|
display: none;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 0.08s linear;
|
||||||
|
|
||||||
|
background: rgba(0, 0, 0, 0.9);
|
||||||
|
color: #fff;
|
||||||
|
padding: 6px 10px;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 13px;
|
||||||
|
line-height: 1.4;
|
||||||
|
pointer-events: none; /* 鼠标穿透,避免闪烁 */
|
||||||
|
white-space: pre-wrap; /* 支持换行符 */
|
||||||
|
max-width: 300px;
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.25);
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 提示框显示状态 */
|
||||||
|
.tooltip-portal.show {
|
||||||
|
display: block;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 提示框动画效果 */
|
||||||
|
.tooltip-portal.fade {
|
||||||
|
transition: opacity 0.2s ease;
|
||||||
|
}
|
||||||
@@ -1,35 +1,3 @@
|
|||||||
/* 问号图标 */
|
|
||||||
.help-icon {
|
|
||||||
display: inline-block;
|
|
||||||
margin-left: 8px;
|
|
||||||
color: #888;
|
|
||||||
font-weight: bold;
|
|
||||||
cursor: help;
|
|
||||||
}
|
|
||||||
.help-icon:hover { color: #4CAF50; }
|
|
||||||
|
|
||||||
/* Portal Tooltip(挂在 body 下) */
|
|
||||||
.tooltip-portal {
|
|
||||||
position: fixed; /* 不受父级 overflow 影响 */
|
|
||||||
left: 0; top: 0;
|
|
||||||
z-index: 999999; /* 足够高,覆盖侧栏等 */
|
|
||||||
display: none;
|
|
||||||
opacity: 0;
|
|
||||||
transition: opacity .08s linear;
|
|
||||||
|
|
||||||
background: rgba(0,0,0,.9);
|
|
||||||
color: #fff;
|
|
||||||
padding: 6px 10px;
|
|
||||||
border-radius: 6px;
|
|
||||||
font-size: 13px;
|
|
||||||
line-height: 1.4;
|
|
||||||
pointer-events: none; /* 鼠标穿透,避免闪烁 */
|
|
||||||
white-space: nowrap;
|
|
||||||
box-shadow: 0 4px 12px rgba(0,0,0,.25);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
.add-step-btn, .add-phase-btn {
|
.add-step-btn, .add-phase-btn {
|
||||||
background-color: #4CAF50;
|
background-color: #4CAF50;
|
||||||
color: white;
|
color: white;
|
||||||
|
|||||||
@@ -3,13 +3,28 @@
|
|||||||
background: linear-gradient(135deg, var(--primary-blue), var(--accent-blue));
|
background: linear-gradient(135deg, var(--primary-blue), var(--accent-blue));
|
||||||
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
|
||||||
padding: 0.8rem 1rem;
|
padding: 0.8rem 1rem;
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar .logo h1 {
|
.navbar .logo h1 {
|
||||||
color: rgb(245, 245, 245);
|
color: rgb(245, 245, 245);
|
||||||
|
font-size: 18px;
|
||||||
font-size: 24px;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
margin: 0;
|
||||||
|
white-space: nowrap;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-links {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
flex: 1;
|
||||||
|
margin: 0 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.navbar-links a {
|
.navbar-links a {
|
||||||
@@ -69,4 +84,41 @@
|
|||||||
/* 下拉浮框 hover 显示 */
|
/* 下拉浮框 hover 显示 */
|
||||||
.dropdown:hover .dropdown-content {
|
.dropdown:hover .dropdown-content {
|
||||||
display: block;
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 响应式设计 */
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.navbar {
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-links {
|
||||||
|
margin: 0;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-links a {
|
||||||
|
margin: 0 0.75rem;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar .logo h1 {
|
||||||
|
font-size: 16px;
|
||||||
|
max-width: 250px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 480px) {
|
||||||
|
.navbar .logo h1 {
|
||||||
|
font-size: 14px;
|
||||||
|
max-width: 200px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.navbar-links a {
|
||||||
|
margin: 0 0.5rem;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -60,6 +60,7 @@
|
|||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
position: relative; /* 添加相对定位 */
|
||||||
}
|
}
|
||||||
|
|
||||||
.course-image {
|
.course-image {
|
||||||
@@ -81,6 +82,27 @@
|
|||||||
.course-description {
|
.course-description {
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
color: #555;
|
color: #555;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
display: -webkit-box; /* 使用-webkit-box实现文本截断 */
|
||||||
|
-webkit-line-clamp: 3; /* 限制显示3行 */
|
||||||
|
-webkit-box-orient: vertical; /* 垂直排列 */
|
||||||
|
overflow: hidden; /* 隐藏溢出内容 */
|
||||||
|
text-overflow: ellipsis; /* 用省略号表示截断 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 课程日期信息 */
|
||||||
|
.course-date {
|
||||||
|
position: absolute; /* 绝对定位到底部 */
|
||||||
|
bottom: 10px; /* 距离底部10px */
|
||||||
|
left: 0; /* 左对齐 */
|
||||||
|
right: 0; /* 右对齐 */
|
||||||
|
padding: 10px; /* 内边距 */
|
||||||
|
background-color: white; /* 白色背景 */
|
||||||
|
border-radius: 5px; /* 圆角 */
|
||||||
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影 */
|
||||||
|
font-size: 12px; /* 字体大小 */
|
||||||
|
color: #666; /* 字体颜色 */
|
||||||
|
line-height: 1.5; /* 行高 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 课程目录弹出框 */
|
/* 课程目录弹出框 */
|
||||||
@@ -159,11 +181,14 @@
|
|||||||
/* 浮窗内容 */
|
/* 浮窗内容 */
|
||||||
.modal-content {
|
.modal-content {
|
||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
margin: 15% auto;
|
margin: 10% auto; /* 修改为10%以缩小顶部距离 */
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
width: 40%;
|
width: 80%; /* 修改为80%以适应小屏幕 */
|
||||||
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
|
max-width: 600px; /* 设置最大宽度 */
|
||||||
|
box-shadow: 0 4px 8px rgba(0, 0, 0, 0 1);
|
||||||
|
overflow-y: auto; /* 添加垂直滚动条 */
|
||||||
|
max-height: 80vh; /* 设置最大高度 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 按钮样式 */
|
/* 按钮样式 */
|
||||||
@@ -205,7 +230,34 @@ label {
|
|||||||
margin-top: 20px; /* 上方间距 */
|
margin-top: 20px; /* 上方间距 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 选择课程或新建课程的下拉框 */
|
||||||
|
.course-selection-container {
|
||||||
|
margin: 10px 0;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
#course-selection {
|
||||||
|
width: 100%; /* 占满一行 */
|
||||||
|
padding: 12px; /* 增加内边距 */
|
||||||
|
font-size: 16px; /* 调整字体大小 */
|
||||||
|
margin: 10px 0; /* 上下留间距 */
|
||||||
|
border: 2px solid #ccc; /* 边框 */
|
||||||
|
border-radius: 8px; /* 圆角边框 */
|
||||||
|
background-color: #f9f9f9; /* 背景色 */
|
||||||
|
transition: border 0.3s ease, box-shadow 0.3s ease; /* 添加过渡效果 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 鼠标悬停时下拉框的效果 */
|
||||||
|
#course-selection:hover {
|
||||||
|
border-color: #4CAF50; /* 悬停时的边框颜色 */
|
||||||
|
box-shadow: 0 0 10px rgba(76, 175, 80, 0.5); /* 悬停时的阴影效果 */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* 下拉框选中项的样式 */
|
||||||
|
#course-selection option {
|
||||||
|
padding: 10px;
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
/* 添加课程按钮样式 */
|
/* 添加课程按钮样式 */
|
||||||
.add-course-button {
|
.add-course-button {
|
||||||
@@ -433,6 +485,20 @@ label[for="course-description"] {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.delete-course-btn {
|
||||||
|
background-color: #e74c3c;
|
||||||
|
color: white;
|
||||||
|
padding: 10px;
|
||||||
|
border-radius: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
width: 100%;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.delete-course-btn:hover {
|
||||||
|
background-color: #c0392b;
|
||||||
|
}
|
||||||
|
|
||||||
/* 编辑弹窗 */
|
/* 编辑弹窗 */
|
||||||
.edit-modal {
|
.edit-modal {
|
||||||
display: none;
|
display: none;
|
||||||
|
|||||||
@@ -2,6 +2,57 @@
|
|||||||
var socket;
|
var socket;
|
||||||
let system_message_idx = 0
|
let system_message_idx = 0
|
||||||
const activeApprovals = {};
|
const activeApprovals = {};
|
||||||
|
let chatManager; // 全局聊天管理器实例
|
||||||
|
|
||||||
|
// 聊天消息管理器 - 更现代的数据结构
|
||||||
|
class ChatMessageManager {
|
||||||
|
constructor() {
|
||||||
|
this.chatbox = document.getElementById('chatbox');
|
||||||
|
this.messageTemplate = {
|
||||||
|
user: `<div class="chat-message user-message"><b>你:</b> {{content}}</div>`,
|
||||||
|
assistant: `<div><b>华实君:</b></div><div class="chat-message server-message"> {{content}}</div>`
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 渲染单个消息
|
||||||
|
renderMessage(message) {
|
||||||
|
let html;
|
||||||
|
let content;
|
||||||
|
|
||||||
|
// 处理不同的数据格式
|
||||||
|
if (typeof message === 'string') {
|
||||||
|
// 旧格式:直接字符串
|
||||||
|
content = marked.parse(message);
|
||||||
|
html = this.messageTemplate.assistant.replace('{{content}}', content);
|
||||||
|
} else if (typeof message === 'object' && message !== null) {
|
||||||
|
// 新格式:{role, content} 对象
|
||||||
|
content = marked.parse(message.content);
|
||||||
|
if (message.role === 'user') {
|
||||||
|
html = this.messageTemplate.user.replace('{{content}}', content);
|
||||||
|
} else {
|
||||||
|
html = this.messageTemplate.assistant.replace('{{content}}', content);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (html) {
|
||||||
|
const messageDiv = document.createElement('div');
|
||||||
|
messageDiv.innerHTML = html;
|
||||||
|
this.chatbox.appendChild(messageDiv);
|
||||||
|
this.scrollToBottom();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 渲染多条消息(用于恢复历史)
|
||||||
|
renderMessages(messages) {
|
||||||
|
messages.forEach(message => this.renderMessage(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 滚动到底部
|
||||||
|
scrollToBottom() {
|
||||||
|
this.chatbox.scrollTop = this.chatbox.scrollHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 清理过期的批准记录
|
// 清理过期的批准记录
|
||||||
function cleanupExpiredApprovals() {
|
function cleanupExpiredApprovals() {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
@@ -24,6 +75,10 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
folder: data.folder
|
folder: data.folder
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 初始化聊天消息管理器
|
||||||
|
chatManager = new ChatMessageManager();
|
||||||
|
|
||||||
socket.on('connect', function () {
|
socket.on('connect', function () {
|
||||||
console.log('Connected to server');
|
console.log('Connected to server');
|
||||||
socket.emit('login',JSON.stringify(data));
|
socket.emit('login',JSON.stringify(data));
|
||||||
@@ -38,12 +93,13 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
input.value += data;
|
input.value += data;
|
||||||
});
|
});
|
||||||
socket.on('message', function (data) {
|
socket.on('message', function (data) {
|
||||||
// 显示服务器的回复消息
|
// 显示服务器的回复消息 - 单个消息
|
||||||
const serverMessage = document.createElement('div');
|
chatManager.renderMessage(data);
|
||||||
serverMessage.innerHTML = `<div><b>华实君:</b></div><div class="chat-message server-message"> ${marked.parse(data)}</div>`;
|
});
|
||||||
document.getElementById('chatbox').appendChild(serverMessage);
|
|
||||||
// 滚动到最新消息
|
socket.on('messages', function (data) {
|
||||||
document.getElementById('chatbox').scrollTop = document.getElementById('chatbox').scrollHeight;
|
// 显示服务器发送的消息列表 - 用于恢复对话历史
|
||||||
|
chatManager.renderMessages(data);
|
||||||
});
|
});
|
||||||
socket.on('message-hint', function(data){
|
socket.on('message-hint', function(data){
|
||||||
console.log('get message-hint');
|
console.log('get message-hint');
|
||||||
@@ -90,7 +146,7 @@ document.addEventListener('DOMContentLoaded', function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const approveButton = document.createElement('button');
|
const approveButton = document.createElement('button');
|
||||||
approveButton.innerHTML = '<i class="fas fa-check-circle-check"></i>';
|
approveButton.innerHTML = '<i class="bi bi-check-circle-fill"></i>';
|
||||||
approveButton.data = element;
|
approveButton.data = element;
|
||||||
approveButton.className = 'approve-button';
|
approveButton.className = 'approve-button';
|
||||||
approveButton.onclick = function (event) {
|
approveButton.onclick = function (event) {
|
||||||
@@ -210,22 +266,14 @@ function sendMessage() {
|
|||||||
const input = document.getElementById('messageInput').value;
|
const input = document.getElementById('messageInput').value;
|
||||||
if (input.trim() === '') return;
|
if (input.trim() === '') return;
|
||||||
|
|
||||||
// 使用 marked.js 解析 markdown
|
|
||||||
const markdownHtml = marked.parse(input);
|
|
||||||
|
|
||||||
// 显示用户发送的消息
|
|
||||||
const userMessage = document.createElement('div');
|
|
||||||
userMessage.innerHTML = `<div class="chat-message user-message"><b>你:</b> ${markdownHtml}</div>`;
|
|
||||||
document.getElementById('chatbox').appendChild(userMessage);
|
|
||||||
|
|
||||||
// 发送消息到服务器
|
// 发送消息到服务器
|
||||||
socket.emit('message', JSON.stringify({ data: input, type: 'text' }));
|
socket.emit('message', JSON.stringify({ data: input, type: 'text' }));
|
||||||
|
|
||||||
|
// 使用聊天管理器显示用户消息
|
||||||
|
chatManager.renderMessage({ role: 'user', content: input });
|
||||||
|
|
||||||
// 清空输入框
|
// 清空输入框
|
||||||
document.getElementById('messageInput').value = '';
|
document.getElementById('messageInput').value = '';
|
||||||
|
|
||||||
// 滚动到最新消息
|
|
||||||
document.getElementById('chatbox').scrollTop = document.getElementById('chatbox').scrollHeight;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -376,14 +424,11 @@ window.addEventListener('beforeunload', () => {
|
|||||||
|
|
||||||
let currentChapterIndex = -1;
|
let currentChapterIndex = -1;
|
||||||
function next_chapter(data) {
|
function next_chapter(data) {
|
||||||
// 获取所有的 h3 元素
|
var container = document.getElementById('markdown-content-container');
|
||||||
var iframe = document.getElementById('markdown-content-iframe');
|
var titles = [];
|
||||||
|
var h3Elements = container.querySelectorAll('h3');
|
||||||
// 访问 iframe 的文档对象
|
console.log("h3Elements next");
|
||||||
var iframeDocument = iframe.contentDocument || iframe.contentWindow.document;
|
|
||||||
var titles = []
|
|
||||||
var h3Elements = iframeDocument.querySelectorAll('h3');
|
|
||||||
console.log("h3Elements next")
|
|
||||||
if (currentChapterIndex >= h3Elements.length) {
|
if (currentChapterIndex >= h3Elements.length) {
|
||||||
return; // 如果已经到了最后一个章节,则不进行任何操作
|
return; // 如果已经到了最后一个章节,则不进行任何操作
|
||||||
}
|
}
|
||||||
@@ -391,7 +436,7 @@ function next_chapter(data) {
|
|||||||
// 隐藏当前章节及其后的内容
|
// 隐藏当前章节及其后的内容
|
||||||
for (let i = 0; i < h3Elements.length; i++) {
|
for (let i = 0; i < h3Elements.length; i++) {
|
||||||
h3Elements[i].style.display = 'none';
|
h3Elements[i].style.display = 'none';
|
||||||
titles.push(h3Elements[i].innerText)
|
titles.push(h3Elements[i].innerText);
|
||||||
let nextSibling = h3Elements[i].nextElementSibling;
|
let nextSibling = h3Elements[i].nextElementSibling;
|
||||||
while (nextSibling && nextSibling.tagName !== 'H3') {
|
while (nextSibling && nextSibling.tagName !== 'H3') {
|
||||||
nextSibling.style.display = 'none';
|
nextSibling.style.display = 'none';
|
||||||
@@ -421,48 +466,31 @@ function generateProgressBar(N, idx, titles) {
|
|||||||
const progressBox = document.createElement('div');
|
const progressBox = document.createElement('div');
|
||||||
progressBox.className = 'progress-box';
|
progressBox.className = 'progress-box';
|
||||||
|
|
||||||
// 获取详细信息容器
|
|
||||||
const detailBox = document.getElementById('progress-detail');
|
|
||||||
|
|
||||||
// 根据N值动态调整每个进度节点的宽度
|
|
||||||
const nodeWidth = 100 / N; // 每个节点的宽度为 100% / N
|
|
||||||
|
|
||||||
// 根据N值生成子框并设置颜色
|
// 根据N值生成子框并设置颜色
|
||||||
for (let i = 0; i < N; i++) {
|
for (let i = 0; i < N; i++) {
|
||||||
const titleBox = document.createElement('div');
|
const titleBox = document.createElement('div');
|
||||||
titleBox.className = 'progress-title';
|
titleBox.className = 'progress-title';
|
||||||
|
|
||||||
// 设置进度条的颜色
|
// 设置进度条的颜色:已学习为蓝色,当前学习为绿色,未学习为白色
|
||||||
if (i < idx) {
|
if (i < idx) {
|
||||||
titleBox.classList.add('green'); // 已完成部分
|
titleBox.classList.add('blue'); // 已完成部分 - 蓝色
|
||||||
|
} else if (i === idx) {
|
||||||
|
titleBox.classList.add('green'); // 当前正在学习 - 绿色
|
||||||
} else {
|
} else {
|
||||||
titleBox.classList.add('white'); // 未完成部分
|
titleBox.classList.add('white'); // 未完成部分 - 白色
|
||||||
}
|
}
|
||||||
|
|
||||||
// 设置每个子框的标题
|
// 移除进度条上的文字,因为现在进度条很细
|
||||||
titleBox.innerHTML = titles[i] || `Step ${i + 1}`;
|
titleBox.innerHTML = '';
|
||||||
|
|
||||||
// 设置每个进度节点的宽度
|
// 使用attachImmediateTooltip函数,使提示框跟随鼠标移动
|
||||||
titleBox.style.width = `${nodeWidth}%`;
|
const tooltipText = `Step ${i + 1}: ${titles[i] || "No title"}`;
|
||||||
|
attachImmediateTooltip(titleBox, tooltipText);
|
||||||
// 监听鼠标移入事件来显示详情
|
|
||||||
titleBox.addEventListener('mouseenter', function () {
|
|
||||||
detailBox.innerHTML = `Step ${i + 1}: ${titles[i] || "No title"}`;// - Additional details here...`;
|
|
||||||
detailBox.style.display = 'block';
|
|
||||||
// 根据进度条位置显示详情
|
|
||||||
const rect = titleBox.getBoundingClientRect();
|
|
||||||
detailBox.style.top = `${rect.top + window.scrollY - 100}px`; // 微调位置
|
|
||||||
detailBox.style.left = `${rect.left + window.scrollX + rect.width / 2 - detailBox.offsetWidth / 2}px`;
|
|
||||||
});
|
|
||||||
|
|
||||||
// 监听鼠标移出事件来隐藏详情
|
|
||||||
titleBox.addEventListener('mouseleave', function () {
|
|
||||||
detailBox.style.display = 'none';
|
|
||||||
});
|
|
||||||
|
|
||||||
progressBox.appendChild(titleBox);
|
progressBox.appendChild(titleBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 将生成的进度条添加到容器中
|
// 将生成的进度条添加到容器中
|
||||||
container.appendChild(progressBox);
|
container.appendChild(progressBox);
|
||||||
|
|
||||||
}
|
}
|
||||||
58
Html/apps/static/js/helpTip.js
Normal file
58
Html/apps/static/js/helpTip.js
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
// helpTip.js - 全局tooltip功能,可在不同页面复用
|
||||||
|
|
||||||
|
// 在页面里复用一个全局 tooltip 节点
|
||||||
|
let __globalTooltip;
|
||||||
|
|
||||||
|
// 确保tooltip节点存在
|
||||||
|
function ensureTooltip() {
|
||||||
|
if (!__globalTooltip) {
|
||||||
|
__globalTooltip = document.createElement('div');
|
||||||
|
__globalTooltip.className = 'tooltip-portal';
|
||||||
|
document.body.appendChild(__globalTooltip);
|
||||||
|
}
|
||||||
|
return __globalTooltip;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 绑定到任意图标:移入→显示;移动→跟随;移出→隐藏
|
||||||
|
function attachImmediateTooltip(anchorEl, text) {
|
||||||
|
const tip = ensureTooltip();
|
||||||
|
let shown = false;
|
||||||
|
|
||||||
|
function show(e) {
|
||||||
|
tip.textContent = text;
|
||||||
|
tip.style.display = 'block';
|
||||||
|
tip.style.opacity = '1';
|
||||||
|
position(e);
|
||||||
|
shown = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function position(e) {
|
||||||
|
// 以鼠标位置为准
|
||||||
|
const padding = 8;
|
||||||
|
const tipRect = tip.getBoundingClientRect();
|
||||||
|
let x = e.clientX + 12;
|
||||||
|
let y = e.clientY - tipRect.height - 12;
|
||||||
|
|
||||||
|
// 简易防出界
|
||||||
|
const vw = window.innerWidth, vh = window.innerHeight;
|
||||||
|
if (x + tipRect.width + padding > vw) x = vw - tipRect.width - padding;
|
||||||
|
if (y < padding) y = e.clientY + 16; // 放到下面
|
||||||
|
|
||||||
|
tip.style.left = `${x}px`;
|
||||||
|
tip.style.top = `${y}px`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function hide() {
|
||||||
|
tip.style.opacity = '0';
|
||||||
|
// 用小延迟避免闪烁
|
||||||
|
setTimeout(() => { if (!shown) return; tip.style.display = 'none'; }, 100);
|
||||||
|
shown = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
anchorEl.addEventListener('mouseenter', show);
|
||||||
|
anchorEl.addEventListener('mousemove', position);
|
||||||
|
anchorEl.addEventListener('mouseleave', hide);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 导出函数,供其他文件使用
|
||||||
|
window.attachImmediateTooltip = attachImmediateTooltip;
|
||||||
@@ -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(courses_data)
|
||||||
console.log(user_selected_courses)
|
console.log(user_selected_courses)
|
||||||
}
|
}
|
||||||
function show_course_details(course_id){
|
function show_course_details(course_id) {
|
||||||
window.location.href = '/course/' + course_id
|
window.location.href = '/course/' + course_id
|
||||||
}
|
}
|
||||||
|
|
||||||
function on_click_select_course(event){
|
function on_click_select_course(event) {
|
||||||
event.stopPropagation(); // 阻止事件冒泡
|
event.stopPropagation(); // 阻止事件冒泡
|
||||||
const courseId = event.currentTarget.getAttribute('data-course-id');
|
const button = event.currentTarget;
|
||||||
if (event.currentTarget.classList.contains("selected-button")) {alert('课程已选择'); return;}
|
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`, {
|
fetch(`/select_course`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
'X-CSRFToken': '{{ csrf_token() }}' // 如果使用 CSRF 保护
|
|
||||||
},
|
},
|
||||||
body: JSON.stringify({ course_id: courseId })
|
body: JSON.stringify({ course_id: courseId })
|
||||||
})
|
})
|
||||||
.then(response => response.json())
|
.then(async (response) => {
|
||||||
.then(data => {
|
let data = null;
|
||||||
if (data.success) {
|
try {
|
||||||
// 更新按钮样式或显示消息
|
data = await response.json();
|
||||||
this.classList.remove('select-button');
|
} catch (_) {
|
||||||
this.classList.add('selected-button');
|
}
|
||||||
this.textContent = '已选择';
|
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('选择课程成功');
|
alert('选择课程成功');
|
||||||
} else {
|
})
|
||||||
alert('选择课程失败');
|
.catch(error => {
|
||||||
}
|
console.error('Error:', error);
|
||||||
})
|
alert(error?.message || '选择课程失败');
|
||||||
.catch(error => {
|
button.disabled = false;
|
||||||
console.error('Error:', error);
|
});
|
||||||
alert('选择课程失败');
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
116
Html/apps/static/js/render-desktop-markdown.js
Normal file
116
Html/apps/static/js/render-desktop-markdown.js
Normal file
@@ -0,0 +1,116 @@
|
|||||||
|
// 动态加载 Markdown 文件
|
||||||
|
function loadMarkdown(course_id, chapter_name, lesson_name) {
|
||||||
|
fetch(`/${course_id}-${chapter_name}-${lesson_name}-markdown`)
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.markdown_content) {
|
||||||
|
// 使用 marked 解析 Markdown 内容
|
||||||
|
const html = marked.parse(data.markdown_content);
|
||||||
|
|
||||||
|
// 创建包含 MathJax 支持的 HTML 结构
|
||||||
|
const markdownContainer = document.createElement('div');
|
||||||
|
markdownContainer.id = 'markdown-content-container';
|
||||||
|
markdownContainer.innerHTML = html;
|
||||||
|
|
||||||
|
// 处理代码块,实现缩略显示
|
||||||
|
const codeBlocks = markdownContainer.querySelectorAll('pre code');
|
||||||
|
codeBlocks.forEach(codeBlock => {
|
||||||
|
const preBlock = codeBlock.parentElement;
|
||||||
|
|
||||||
|
// 保存原始代码内容
|
||||||
|
const originalContent = preBlock.innerHTML;
|
||||||
|
|
||||||
|
// 创建缩略提示元素
|
||||||
|
const codeHint = document.createElement('div');
|
||||||
|
codeHint.className = 'code-hint';
|
||||||
|
codeHint.innerHTML = '<div style="padding: 10px; background-color: #f5f5f5; border: 1px solid #ddd; border-radius: 4px; color: #666; font-size: 14px; text-align: center;">💡 代码已放置在代码区中,点击展开查看</div>';
|
||||||
|
|
||||||
|
// 创建展开/折叠按钮
|
||||||
|
const toggleButton = document.createElement('button');
|
||||||
|
toggleButton.className = 'toggle-code';
|
||||||
|
toggleButton.innerHTML = '展开代码';
|
||||||
|
toggleButton.style.cssText = 'margin: 5px; padding: 5px 10px; background-color: #007bff; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 12px;';
|
||||||
|
|
||||||
|
// 添加到提示元素中
|
||||||
|
codeHint.appendChild(toggleButton);
|
||||||
|
|
||||||
|
// 替换原始代码块为提示
|
||||||
|
preBlock.innerHTML = '';
|
||||||
|
preBlock.appendChild(codeHint);
|
||||||
|
|
||||||
|
// 保存原始代码,用于切换
|
||||||
|
preBlock.dataset.originalContent = originalContent;
|
||||||
|
preBlock.dataset.isExpanded = 'false';
|
||||||
|
|
||||||
|
// 添加切换事件
|
||||||
|
toggleButton.addEventListener('click', () => {
|
||||||
|
if (preBlock.dataset.isExpanded === 'false') {
|
||||||
|
// 展开代码
|
||||||
|
preBlock.innerHTML = preBlock.dataset.originalContent;
|
||||||
|
toggleButton.innerHTML = '折叠代码';
|
||||||
|
preBlock.appendChild(toggleButton);
|
||||||
|
preBlock.dataset.isExpanded = 'true';
|
||||||
|
// 如果MathJax已加载,重新排版
|
||||||
|
if (typeof MathJax !== 'undefined') {
|
||||||
|
MathJax.typesetPromise([preBlock]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 折叠代码
|
||||||
|
preBlock.innerHTML = '';
|
||||||
|
preBlock.appendChild(codeHint.cloneNode(true));
|
||||||
|
preBlock.appendChild(toggleButton.cloneNode(true));
|
||||||
|
preBlock.dataset.isExpanded = 'false';
|
||||||
|
// 重新添加事件监听
|
||||||
|
const newToggleButton = preBlock.querySelector('.toggle-code');
|
||||||
|
newToggleButton.addEventListener('click', arguments.callee);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// 清空内容容器并添加渲染后的内容
|
||||||
|
const contentElement = document.getElementById('markdown-content');
|
||||||
|
contentElement.innerHTML = '';
|
||||||
|
contentElement.appendChild(markdownContainer);
|
||||||
|
|
||||||
|
// 配置并加载 MathJax
|
||||||
|
if (typeof MathJax === 'undefined') {
|
||||||
|
// 动态加载 MathJax
|
||||||
|
const script = document.createElement('script');
|
||||||
|
script.src = '/static/cdnback/js/tex-mml-chtml.js';
|
||||||
|
script.async = true;
|
||||||
|
script.onload = function() {
|
||||||
|
MathJax.config = {
|
||||||
|
tex: {
|
||||||
|
inlineMath: [['$', '$'], ['\\(', '\\)']]
|
||||||
|
},
|
||||||
|
svg: {
|
||||||
|
fontCache: 'global'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
MathJax.typesetPromise([markdownContainer]);
|
||||||
|
// 初始化课程进度
|
||||||
|
next_chapter();
|
||||||
|
};
|
||||||
|
document.head.appendChild(script);
|
||||||
|
} else {
|
||||||
|
// MathJax 已加载,直接排版
|
||||||
|
MathJax.typesetPromise([markdownContainer]);
|
||||||
|
// 初始化课程进度
|
||||||
|
next_chapter();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.error('Markdown file not found');
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Error loading markdown:', error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 文档加载完成后初始化
|
||||||
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
// 从全局变量获取课程信息
|
||||||
|
if (window.appData) {
|
||||||
|
loadMarkdown(window.appData.course_id, window.appData.chapter_name, window.appData.lesson_name);
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -292,13 +292,50 @@ function closeAddCourseModal() {
|
|||||||
document.getElementById('add-course-modal').style.display = 'none';
|
document.getElementById('add-course-modal').style.display = 'none';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 显示删除课程确认弹窗
|
||||||
|
function showDeleteCourseConfirmation() {
|
||||||
|
if (!material_id) {
|
||||||
|
alert('无法删除课程:未找到课程ID');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (confirm('确定要删除这个课程吗?此操作无法撤销!')) {
|
||||||
|
deleteCourse(material_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除课程
|
||||||
|
function deleteCourse(courseId) {
|
||||||
|
fetch(`/materials/${courseId}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.message) {
|
||||||
|
alert(data.message);
|
||||||
|
if (data.success) {
|
||||||
|
// 关闭侧边栏并刷新页面
|
||||||
|
closeCourseDetails();
|
||||||
|
location.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('删除课程时出错:', error);
|
||||||
|
alert('删除课程失败,请稍后再试!');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function onTeacherboardPageLoad(){
|
function onTeacherboardPageLoad(){
|
||||||
// 提交表单处理
|
// 提交表单处理
|
||||||
document.getElementById('add-course-form').addEventListener('submit', function(event) {
|
document.getElementById('add-course-form').addEventListener('submit', function(event) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
|
||||||
const courseName = document.getElementById('course-name').value;
|
const courseName = document.getElementById('course-name').value;
|
||||||
const courseSelection = document.getElementById('course-selection').value;
|
const courseSelection = document.getElementById('course-selection').value; // 获取选择值
|
||||||
const coverImage = document.getElementById('cover-preview').src;
|
const coverImage = document.getElementById('cover-preview').src;
|
||||||
const courseDescription = document.getElementById('course-description').value;
|
const courseDescription = document.getElementById('course-description').value;
|
||||||
// 构建发送的数据
|
// 构建发送的数据
|
||||||
@@ -312,7 +349,7 @@ document.getElementById('add-course-form').addEventListener('submit', function(e
|
|||||||
// 如果选择了已有课程,可以通过 courseSelection 传递课程ID(根据需要修改)
|
// 如果选择了已有课程,可以通过 courseSelection 传递课程ID(根据需要修改)
|
||||||
if (courseSelection !== 'new') {
|
if (courseSelection !== 'new') {
|
||||||
// 如果是修改已有课程,设置相关的章节信息或其他数据
|
// 如果是修改已有课程,设置相关的章节信息或其他数据
|
||||||
data.chapters = ["Chapter 1", "Chapter 2"]; // 示例章节信息
|
data.chapters = ["Chapter 1", "Chapter 2"];
|
||||||
}
|
}
|
||||||
|
|
||||||
// 发送 POST 请求到 /create_material
|
// 发送 POST 请求到 /create_material
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
</style>
|
</style>
|
||||||
<link rel="stylesheet" href="/static/css/desktop.css">
|
<link rel="stylesheet" href="/static/css/desktop.css">
|
||||||
<link rel="stylesheet" href="/static/css/chatbox_approve_icon.css">
|
<link rel="stylesheet" href="/static/css/chatbox_approve_icon.css">
|
||||||
|
<link rel="stylesheet" href="/static/css/helpTip.css">
|
||||||
<script>
|
<script>
|
||||||
document.cookie = "vscode-tkn=44edc269-6f88-46ab-9790-dc253f66ac36; path=/; SameSite=None; Secure";
|
document.cookie = "vscode-tkn=44edc269-6f88-46ab-9790-dc253f66ac36; path=/; SameSite=None; Secure";
|
||||||
</script>
|
</script>
|
||||||
@@ -140,9 +141,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="/static/js/process_show_floating_window.js"></script>
|
<script src="/static/js/process_show_floating_window.js"></script>
|
||||||
|
<script src="/static/js/helpTip.js"></script>
|
||||||
|
|
||||||
|
|
||||||
<script src="/static/js/chatbox.js"></script>
|
<script src="/static/js/chatbox.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -193,7 +192,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 使用 fetch 发送请求到 Flask 服务器,获取 session 信息
|
// 使用 fetch 发送请求到 Flask 服务器,获取 session 信息
|
||||||
fetch('/get_session', {
|
fetch('/get_session', {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
@@ -230,31 +228,6 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 动态加载 Markdown 文件
|
|
||||||
function loadMarkdown(course_id, chapter_name, lesson_name) {
|
|
||||||
fetch(`/${course_id}-${chapter_name}-${lesson_name}-markdown`)
|
|
||||||
.then(response => response.json())
|
|
||||||
.then(data => {
|
|
||||||
if (data.html_url) {
|
|
||||||
document.getElementById('markdown-content').innerHTML = `<iframe id="markdown-content-iframe" src="${data.html_url}"style="width: 100%;height: 100%;"></iframe>`;
|
|
||||||
document.getElementById('markdown-content-iframe').addEventListener('load', function() {
|
|
||||||
// 在这里执行你想要的操作
|
|
||||||
console.log('Iframe has finished loading');
|
|
||||||
next_chapter();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
console.error('Markdown file not found');
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error('Error loading markdown:', error);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
loadMarkdown('{{course_id}}','{{chapter_name}}','{{lesson_name}}');
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// 侧边工具栏切换
|
// 侧边工具栏切换
|
||||||
const sidebarTools = document.getElementById('sidebarTools');
|
const sidebarTools = document.getElementById('sidebarTools');
|
||||||
const toggleButton = document.getElementById('toggleButton');
|
const toggleButton = document.getElementById('toggleButton');
|
||||||
@@ -270,5 +243,7 @@
|
|||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
<!-- 引入 Markdown 渲染脚本 -->
|
||||||
|
<script src="/static/js/render-desktop-markdown.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -61,16 +61,26 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="confirm-container">
|
<div class="confirm-container">
|
||||||
<h1>加载历史数据确认</h1>
|
{% if is_course_finished %}
|
||||||
<p>您即将进入学习环境,是否需要加载您之前的对话历史记录和学习进度数据?</p>
|
<h1>重新学习确认</h1>
|
||||||
<div class="btn-group">
|
<p>您已经完成了该课程的学习,是否要重新开始学习?</p>
|
||||||
<a href="{{ url_for('vscode.desktop', user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history='true') }}" class="btn btn-primary">
|
<div class="btn-group">
|
||||||
是,加载历史数据
|
<a href="{{ url_for('vscode.desktop', user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history='false') }}" class="btn btn-primary">
|
||||||
</a>
|
重新开始学习
|
||||||
<a href="{{ url_for('vscode.desktop', user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history='false') }}" class="btn btn-secondary">
|
</a>
|
||||||
否,重新开始
|
</div>
|
||||||
</a>
|
{% else %}
|
||||||
</div>
|
<h1>加载历史数据确认</h1>
|
||||||
|
<p>您即将进入学习环境,是否需要加载您之前的对话历史记录和学习进度数据?</p>
|
||||||
|
<div class="btn-group">
|
||||||
|
<a href="{{ url_for('vscode.desktop', user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history='true') }}" class="btn btn-primary">
|
||||||
|
是,加载历史数据
|
||||||
|
</a>
|
||||||
|
<a href="{{ url_for('vscode.desktop', user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history='false') }}" class="btn btn-secondary">
|
||||||
|
否,重新开始
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% include 'foot.html' %}
|
{% include 'footer-brief.html' %}
|
||||||
</body>
|
</body>
|
||||||
<script>
|
<script>
|
||||||
var course_id = "{{course_id}}";
|
var course_id = "{{course_id}}";
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>华实学伴 - 专业的在线学习平台</title>
|
<title>华实学伴 - 专业的在线学习平台</title>
|
||||||
|
<script src="/static/cdnback/jquery.min.js"></script>
|
||||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||||
<link rel="stylesheet" href="/static/css/dashboard.css">
|
<link rel="stylesheet" href="/static/css/dashboard.css">
|
||||||
@@ -13,7 +14,6 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{% include 'navbar.html' %} <!-- 引入navbar.html -->
|
{% include 'navbar.html' %} <!-- 引入navbar.html -->
|
||||||
{% include 'learning-path.html' %} <!-- 引入learning-path.html -->
|
|
||||||
<section class="search-section">
|
<section class="search-section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row justify-content-center">
|
<div class="row justify-content-center">
|
||||||
@@ -81,7 +81,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% include 'foot.html' %}
|
{% include 'footer-brief.html' %}
|
||||||
|
|
||||||
<script src="/static/js/dashboard.js"></script>
|
<script src="/static/js/dashboard.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
11
Html/apps/templates/footer-brief.html
Normal file
11
Html/apps/templates/footer-brief.html
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<link rel="stylesheet" href="/static/css/footer.css">
|
||||||
|
<footer class="hs-footer">
|
||||||
|
<div class="footer-main">
|
||||||
|
|
||||||
|
<div class="footer-bottom">
|
||||||
|
<div class="footer-bottom-right">
|
||||||
|
<span>© 2025 华实学伴. 保留所有权利</span>
|
||||||
|
<a href="https://beian.miit.gov.cn" target="_blank">沪ICP备2025142149号</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
@@ -1,8 +1,9 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="zh">
|
<html lang="zh">
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>课程选择主页</title>
|
<title>课程选择主页</title>
|
||||||
<script src="/static/cdnback/jquery.min.js"></script>
|
<script src="/static/cdnback/jquery.min.js"></script>
|
||||||
|
|
||||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||||
@@ -12,6 +13,7 @@
|
|||||||
<script src="/static/cdnback/js/bootstrap.bundle.min.js"></script>
|
<script src="/static/cdnback/js/bootstrap.bundle.min.js"></script>
|
||||||
<link rel="stylesheet" href="/static/css/index.css">
|
<link rel="stylesheet" href="/static/css/index.css">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
{% include 'navbar.html' %}
|
{% include 'navbar.html' %}
|
||||||
|
|
||||||
@@ -38,7 +40,7 @@
|
|||||||
<h2>课程列表</h2>
|
<h2>课程列表</h2>
|
||||||
<div class="course-cards" id="course-cards">
|
<div class="course-cards" id="course-cards">
|
||||||
{% for course in courses_data %}
|
{% for course in courses_data %}
|
||||||
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
||||||
<img src="{{ course.image_url }}" alt="{{ course.course_name }}">
|
<img src="{{ course.image_url }}" alt="{{ course.course_name }}">
|
||||||
<h3>{{ course.name }}</h3>
|
<h3>{{ course.name }}</h3>
|
||||||
<p>{{ course.description }}</p>
|
<p>{{ course.description }}</p>
|
||||||
@@ -49,10 +51,9 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</div> -->
|
</div> -->
|
||||||
|
|
||||||
<div class="col-md-6 col-lg-4">
|
<div class="col-md-6 col-lg-4">
|
||||||
<div class="course-card card h-100" onclick="openCourseProgress('{{course._id}}')">
|
<div class="course-card card h-100" onclick="openCourseProgress('{{course._id}}')">
|
||||||
<img src="{{course.image_url}}"
|
<img src="{{course.image_url}}" class="course-img" alt="课程封面">
|
||||||
class="course-img" alt="课程封面">
|
|
||||||
<div class="card-body d-flex flex-column">
|
<div class="card-body d-flex flex-column">
|
||||||
<span class="course-category">算法设计</span>
|
<span class="course-category">算法设计</span>
|
||||||
<h5 class="course-title">{{course.name}}</h5>
|
<h5 class="course-title">{{course.name}}</h5>
|
||||||
@@ -62,11 +63,15 @@
|
|||||||
<span class="course-rating"><i class="fas fa-star"></i> 4.7</span>
|
<span class="course-rating"><i class="fas fa-star"></i> 4.7</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-auto d-grid gap-2 d-md-flex">
|
<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 %}
|
{% 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 %}
|
{% 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 %}
|
{% endif %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -74,13 +79,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
|
|
||||||
{% include 'foot.html' %}
|
{% include 'footer-brief.html' %}
|
||||||
</body>
|
</body>
|
||||||
<script>
|
<script>
|
||||||
window.appData = {
|
window.appData = {
|
||||||
@@ -88,5 +93,6 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<script src="/static/js/index.js"></script>
|
<script src="/static/js/index.js"></script>
|
||||||
</html>
|
<script src="/static/js/dashboard.js"></script>
|
||||||
|
|
||||||
|
</html>
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
<link rel="stylesheet" href="/static/css/teacherboard.css">
|
<link rel="stylesheet" href="/static/css/teacherboard.css">
|
||||||
<link rel="stylesheet" href="/static/css/dashboard.css">
|
<link rel="stylesheet" href="/static/css/dashboard.css">
|
||||||
<link rel="stylesheet" href="/static/css/lesson.css">
|
<link rel="stylesheet" href="/static/css/lesson.css">
|
||||||
|
<link rel="stylesheet" href="/static/css/helpTip.css">
|
||||||
<link rel="stylesheet" href="/static/css/teacher_course_setting.css">
|
<link rel="stylesheet" href="/static/css/teacher_course_setting.css">
|
||||||
<link rel="stylesheet" href="/static/css/lesson_setting.css">
|
<link rel="stylesheet" href="/static/css/lesson_setting.css">
|
||||||
<link rel="stylesheet" href="/static/css/modelinput.css">
|
<link rel="stylesheet" href="/static/css/modelinput.css">
|
||||||
@@ -100,6 +101,7 @@
|
|||||||
<script src="/static/js/teacherboard.js"></script>
|
<script src="/static/js/teacherboard.js"></script>
|
||||||
<script src="/static/js/teacher_course_setting.js"></script>
|
<script src="/static/js/teacher_course_setting.js"></script>
|
||||||
<script src="/static/js/lesson_markdown.js"></script>
|
<script src="/static/js/lesson_markdown.js"></script>
|
||||||
|
<script src="/static/js/helpTip.js"></script>
|
||||||
<script src="/static/js/lesson.js"></script>
|
<script src="/static/js/lesson.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<link rel="stylesheet" href="/static/css/navbar.css">
|
|
||||||
|
|
||||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||||
<link rel="stylesheet" href="/static/css/dashboard.css">
|
<link rel="stylesheet" href="/static/css/dashboard.css">
|
||||||
|
<link rel="stylesheet" href="/static/css/navbar.css">
|
||||||
<header class="navbar">
|
<header class="navbar">
|
||||||
<div class="logo">
|
<div class="logo">
|
||||||
<h1>华实学伴:教学练评一体的虚拟助教</h1>
|
<h1>华实学伴:教学练评一体的虚拟助教</h1>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</ul>
|
</ul>
|
||||||
<button class="add-chapter-btn" onclick="showInputForNewChapter()">新增章节</button>
|
<button class="add-chapter-btn" onclick="showInputForNewChapter()">新增章节</button>
|
||||||
|
<button class="delete-course-btn" onclick="showDeleteCourseConfirmation()">删除课程</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 编辑章节或课时弹窗 -->
|
<!-- 编辑章节或课时弹窗 -->
|
||||||
@@ -90,9 +90,9 @@
|
|||||||
<div class="cover-image-container">
|
<div class="cover-image-container">
|
||||||
<div id="cover-image" class="cover-image-placeholder">
|
<div id="cover-image" class="cover-image-placeholder">
|
||||||
<span class="plus-sign">+</span>
|
<span class="plus-sign">+</span>
|
||||||
<input type="file" id="cover-image-input" style="display: none;" accept="image/*" />
|
<input type="file" id="cover-image-input" style="display: none;" accept="image/*" />
|
||||||
</div>
|
</div>
|
||||||
<img id="cover-preview" src="" alt="封面预览" style="display: none;" />
|
<img id="cover-preview" src="" alt="封面预览" style="display: none;" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form id="add-course-form">
|
<form id="add-course-form">
|
||||||
@@ -100,8 +100,8 @@
|
|||||||
<label for="course-selection">从课程创建或新建课程:</label>
|
<label for="course-selection">从课程创建或新建课程:</label>
|
||||||
<select id="course-selection">
|
<select id="course-selection">
|
||||||
<option value="new">新建课程</option>
|
<option value="new">新建课程</option>
|
||||||
{% for course in courses %}
|
{% for course in materials %}
|
||||||
<option value="{{ course.id }}">{{ course.name }}</option>
|
<option value="{{ course._id }}">{{ course.name }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
<br><br>
|
<br><br>
|
||||||
@@ -121,6 +121,6 @@
|
|||||||
<script src="/static/js/course_current.js"></script>
|
<script src="/static/js/course_current.js"></script>
|
||||||
<script src="/static/js/teacherboard.js"></script>
|
<script src="/static/js/teacherboard.js"></script>
|
||||||
<script src="/static/js/teacher_course_setting.js"></script>
|
<script src="/static/js/teacher_course_setting.js"></script>
|
||||||
{% include 'foot.html' %}
|
{% include 'footer-brief.html' %}
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -14,17 +14,8 @@ bp = Blueprint("markdown", __name__)
|
|||||||
def convert_md(course_id, chapter_name, lesson_name):
|
def convert_md(course_id, chapter_name, lesson_name):
|
||||||
print(f"convert_md: {course_id}, {chapter_name}, {lesson_name}")
|
print(f"convert_md: {course_id}, {chapter_name}, {lesson_name}")
|
||||||
md_file = load_markdown_file(course_id, chapter_name, lesson_name)
|
md_file = load_markdown_file(course_id, chapter_name, lesson_name)
|
||||||
# 配置Markdown解析器,启用数学公式支持
|
# 直接返回Markdown源文件内容,不进行服务器端渲染
|
||||||
md = MarkdownIt()
|
return jsonify({"markdown_content": md_file})
|
||||||
md.use(texmath.texmath_plugin) # 添加数学公式插件
|
|
||||||
# 转换markdown为html(包含公式标记)
|
|
||||||
html = md.render(md_file)
|
|
||||||
# 包装样式时添加MathJax支持,用于在浏览器中渲染公式
|
|
||||||
html_with_styles = wrap_with_styles(html)
|
|
||||||
# 保存HTML文件到static
|
|
||||||
html_output_path = os.path.join(current_app.config["STATIC_DIR"], f"{course_id}-{chapter_name}-{lesson_name}.html")
|
|
||||||
save_html(html_with_styles, html_output_path)
|
|
||||||
return jsonify({"html_url": f"/static/{course_id}-{chapter_name}-{lesson_name}.html"})
|
|
||||||
|
|
||||||
# 提供静态文件访问
|
# 提供静态文件访问
|
||||||
@bp.route("/static/<path:filename>")
|
@bp.route("/static/<path:filename>")
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from flask import Blueprint, request, jsonify, current_app, session, render_template, session
|
from flask import Blueprint, request, jsonify, current_app, session, render_template, session
|
||||||
|
from bson import ObjectId
|
||||||
from ..services.course_service import create_material, update_material, get_materials_by_teacher, load_material, get_materials_by_teacher_dict, add_material_chapter, add_material_chapter_lesson, delete_material_chapter_lesson, reorder_material_structure, rename_material_structure
|
from ..services.course_service import create_material, update_material, get_materials_by_teacher, load_material, get_materials_by_teacher_dict, add_material_chapter, add_material_chapter_lesson, delete_material_chapter_lesson, reorder_material_structure, rename_material_structure
|
||||||
from ..auth.decorators import require_role
|
from ..auth.decorators import require_role
|
||||||
from ..services.cos_service import upload_file
|
from ..services.cos_service import upload_file
|
||||||
@@ -37,24 +38,60 @@ def create_new_material():
|
|||||||
material_id = create_material(teacher_id, material_name, description, chapters, image_url)
|
material_id = create_material(teacher_id, material_name, description, chapters, image_url)
|
||||||
return jsonify({"message": "教材创建成功", "material_id": material_id}), 201
|
return jsonify({"message": "教材创建成功", "material_id": material_id}), 201
|
||||||
|
|
||||||
@bp.route('/materials/<material_id>', methods=['GET'])
|
@bp.route('/materials/<material_id>', methods=['GET', 'PUT', 'DELETE'])
|
||||||
@require_role(roles="teacher")
|
@require_role(roles="teacher")
|
||||||
def get_material(material_id):
|
def handle_material(material_id):
|
||||||
if material_id is None:
|
|
||||||
return jsonify({"message": "教材名称不能为空"}), 400
|
|
||||||
material = load_material(material_id)
|
|
||||||
print(material)
|
|
||||||
return jsonify( material.model_dump()), 200
|
|
||||||
|
|
||||||
|
if request.method == 'GET':
|
||||||
@bp.route('/materials/<material_id>', methods=['PUT'])
|
if material_id is None:
|
||||||
@require_role(roles="teacher")
|
return jsonify({"message": "教材名称不能为空"}), 400
|
||||||
def update_existing_material(material_id):
|
material = load_material(material_id)
|
||||||
data = request.get_json()
|
print(material)
|
||||||
chapters = data.get('chapters')
|
return jsonify(material.model_dump()), 200
|
||||||
if update_material(material_id, chapters):
|
|
||||||
return jsonify({"message": "教材更新成功"}), 200
|
elif request.method == 'PUT':
|
||||||
return jsonify({"message": "教材未找到"}), 404
|
data = request.get_json()
|
||||||
|
chapters = data.get('chapters')
|
||||||
|
if update_material(material_id, chapters):
|
||||||
|
return jsonify({"message": "教材更新成功"}), 200
|
||||||
|
else:
|
||||||
|
return jsonify({"message": "教材更新失败"}), 500
|
||||||
|
|
||||||
|
elif request.method == 'DELETE':
|
||||||
|
# 获取当前教师信息
|
||||||
|
teacher_uuid = session.get("user_uuid")
|
||||||
|
teacher_id = current_app.extensions["uuid2username"][teacher_uuid]
|
||||||
|
|
||||||
|
# 检查材料是否存在,并且是否为当前教师创建
|
||||||
|
mongo = current_app.extensions["mongo"]
|
||||||
|
print(f"尝试删除课程ID: {material_id}, 当前教师ID: {teacher_id}")
|
||||||
|
try:
|
||||||
|
material = mongo.db.materials.find_one({'_id': ObjectId(material_id)})
|
||||||
|
print(f"找到的材料: {material}")
|
||||||
|
|
||||||
|
if not material:
|
||||||
|
return jsonify({"message": "课程不存在", "success": False}), 404
|
||||||
|
|
||||||
|
# 验证是否为当前教师创建的课程
|
||||||
|
if material.get('teacher_id') != teacher_id:
|
||||||
|
return jsonify({"message": "权限不足,无法删除他人课程", "success": False}), 403
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"查询材料时出错: {e}")
|
||||||
|
return jsonify({"message": f"查询课程时出错: {str(e)}", "success": False}), 500
|
||||||
|
|
||||||
|
# 执行删除操作
|
||||||
|
try:
|
||||||
|
result = mongo.db.materials.delete_one({'_id': ObjectId(material_id), 'teacher_id': teacher_id})
|
||||||
|
print(f"删除操作结果: {result.deleted_count}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"删除材料时出错: {e}")
|
||||||
|
return jsonify({"message": f"删除课程时出错: {str(e)}", "success": False}), 500
|
||||||
|
|
||||||
|
if result.deleted_count > 0:
|
||||||
|
return jsonify({"message": "课程删除成功", "success": True}), 200
|
||||||
|
else:
|
||||||
|
return jsonify({"message": "删除失败", "success": False}), 500
|
||||||
|
|
||||||
@bp.route('/materials/addchapter/<material_id>', methods=['POST'])
|
@bp.route('/materials/addchapter/<material_id>', methods=['POST'])
|
||||||
@require_role(roles="teacher")
|
@require_role(roles="teacher")
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from ..services.backboard_service import realtime_response
|
|||||||
from ..extension_ase.ase_client.manager import ChatManager
|
from ..extension_ase.ase_client.manager import ChatManager
|
||||||
import subprocess
|
import subprocess
|
||||||
from ..auth.decorators import require_role
|
from ..auth.decorators import require_role
|
||||||
|
from ..services.course_service import load_learning_progress
|
||||||
|
|
||||||
bp = Blueprint("vscode", __name__)
|
bp = Blueprint("vscode", __name__)
|
||||||
|
|
||||||
@@ -19,11 +20,14 @@ def desktop(user_uuid, course_id, chapter_name, lesson_name):
|
|||||||
return redirect(url_for("auth.login"))
|
return redirect(url_for("auth.login"))
|
||||||
|
|
||||||
# 检查是否有 load_history 参数
|
# 检查是否有 load_history 参数
|
||||||
load_history = request.args.get('load_history')
|
load_history_str = request.args.get('load_history')
|
||||||
if load_history is None:
|
if load_history_str is None:
|
||||||
# 如果没有参数,跳转到确认页面
|
# 如果没有参数,跳转到确认页面
|
||||||
return redirect(url_for("vscode.desktop_nouser", course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name))
|
return redirect(url_for("vscode.desktop_nouser", course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name))
|
||||||
|
|
||||||
|
# 将字符串转换为布尔值
|
||||||
|
load_history = load_history_str.lower() == 'true'
|
||||||
|
|
||||||
# 全局映射
|
# 全局映射
|
||||||
user_id = uuid2username[user_uuid]
|
user_id = uuid2username[user_uuid]
|
||||||
userid_recorder[f"{user_id}&{course_id}"] = session["user_uuid"]
|
userid_recorder[f"{user_id}&{course_id}"] = session["user_uuid"]
|
||||||
@@ -65,9 +69,23 @@ def desktop(user_uuid, course_id, chapter_name, lesson_name):
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
chatmanager = ChatManager(restart=not load_history)
|
restart = not load_history
|
||||||
print(f"now user uuid {user_uuid}")
|
chatmanager = ChatManager(restart=restart)
|
||||||
current_app.extensions["user_uuid2chatmanager"][user_uuid] = chatmanager
|
current_app.extensions["user_uuid2chatmanager"][user_uuid] = chatmanager
|
||||||
|
|
||||||
|
# 如果restart为True,删除mongo中的学习进度
|
||||||
|
if restart:
|
||||||
|
try:
|
||||||
|
mongo = current_app.extensions["mongo"]
|
||||||
|
mongo.db.learning_progress.delete_one({
|
||||||
|
"user_id": user_id,
|
||||||
|
"material_id": course_id,
|
||||||
|
"chapter_name": chapter_name,
|
||||||
|
"lesson_name": lesson_name
|
||||||
|
})
|
||||||
|
current_app.logger.info(f"删除学习进度成功: user_id={user_id}, course_id={course_id}, chapter={chapter_name}, lesson={lesson_name}")
|
||||||
|
except Exception as e:
|
||||||
|
current_app.logger.error(f"删除学习进度失败: {str(e)}")
|
||||||
code_server_port = 10000 + int(uuid.uuid4().int % 10000)
|
code_server_port = 10000 + int(uuid.uuid4().int % 10000)
|
||||||
# chatmanager.start_code_server(user_uuid, user_id, path_dir, code_server_port)
|
# chatmanager.start_code_server(user_uuid, user_id, path_dir, code_server_port)
|
||||||
|
|
||||||
@@ -147,13 +165,33 @@ def desktop(user_uuid, course_id, chapter_name, lesson_name):
|
|||||||
def desktop_nouser(course_id, chapter_name, lesson_name):
|
def desktop_nouser(course_id, chapter_name, lesson_name):
|
||||||
if "user_uuid" not in session:
|
if "user_uuid" not in session:
|
||||||
return redirect(url_for("auth.login")) # 如果你有 auth 蓝图
|
return redirect(url_for("auth.login")) # 如果你有 auth 蓝图
|
||||||
|
|
||||||
user_uuid = session["user_uuid"]
|
user_uuid = session["user_uuid"]
|
||||||
|
uuid2username = current_app.extensions["uuid2username"]
|
||||||
|
user_id = uuid2username[user_uuid]
|
||||||
|
|
||||||
|
# 检查是否有学习记录
|
||||||
|
progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
|
||||||
|
|
||||||
|
if not progress_result["exists"]:
|
||||||
|
# 没有学习记录,直接跳转到学习页面,不显示确认加载历史的页面
|
||||||
|
return redirect(url_for("vscode.desktop", user_uuid=user_uuid, course_id=course_id, chapter_name=chapter_name, lesson_name=lesson_name, load_history="false"))
|
||||||
|
|
||||||
|
# 获取学习记录数据
|
||||||
|
progress_data = progress_result["data"]
|
||||||
|
chapter_chain_now = progress_data.get("chapter_chain_now", -1)
|
||||||
|
chapter_chain_length = progress_data.get("chapter_chain_length", 0)
|
||||||
|
|
||||||
|
# 检查是否已经学完所有章节
|
||||||
|
is_course_finished = chapter_chain_now >= chapter_chain_length - 1
|
||||||
|
|
||||||
return render_template(
|
return render_template(
|
||||||
"confirm_load_history.html",
|
"confirm_load_history.html",
|
||||||
user_uuid=user_uuid,
|
user_uuid=user_uuid,
|
||||||
course_id=course_id,
|
course_id=course_id,
|
||||||
chapter_name=chapter_name,
|
chapter_name=chapter_name,
|
||||||
lesson_name=lesson_name
|
lesson_name=lesson_name,
|
||||||
|
is_course_finished=is_course_finished
|
||||||
)
|
)
|
||||||
|
|
||||||
@bp.route("/vscode_data", methods=["POST"])
|
@bp.route("/vscode_data", methods=["POST"])
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
|
|||||||
model=gpt-4.1-nano
|
model=gpt-4.1-nano
|
||||||
|
|
||||||
[VSCODE_WEB]
|
[VSCODE_WEB]
|
||||||
url = https://hsamooc.cn
|
url = https://hsamooc.com
|
||||||
[CODE_LIKE]
|
[CODE_LIKE]
|
||||||
url = /vsc-like
|
url = /vsc-like
|
||||||
#http://asengine.net:8282
|
#http://asengine.net:8282
|
||||||
@@ -27,6 +27,6 @@ bucket = hsamooc-cdn-1374354408
|
|||||||
region = ap-guangzhou
|
region = ap-guangzhou
|
||||||
|
|
||||||
[ASE_ENGINE]
|
[ASE_ENGINE]
|
||||||
url = https://test.asengine.net
|
url = https://asengine.net
|
||||||
namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
namespace = /socket.io/afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||||
url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
url_token = afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||||
|
|||||||
1
Html/db/data/user/_10235101560.json
Normal file
1
Html/db/data/user/_10235101560.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"username": "_10235101560"}
|
||||||
1
Html/db/data/user/shanks.json
Normal file
1
Html/db/data/user/shanks.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"username": "shanks"}
|
||||||
1
Html/db/data/user/ts88.json
Normal file
1
Html/db/data/user/ts88.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"username": "ts88"}
|
||||||
1
Html/db/data/user/xuans.json
Normal file
1
Html/db/data/user/xuans.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"username": "xuans"}
|
||||||
1
Html/db/data/user/xuans_.json
Normal file
1
Html/db/data/user/xuans_.json
Normal file
@@ -0,0 +1 @@
|
|||||||
|
{"username": "xuans_"}
|
||||||
@@ -1,5 +1,32 @@
|
|||||||
import eventlet
|
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 flask import Flask
|
||||||
from .views.routes import main_bp
|
from .views.routes import main_bp
|
||||||
from .views.file import file_bp
|
from .views.file import file_bp
|
||||||
|
|||||||
@@ -13,4 +13,5 @@ class Config:
|
|||||||
|
|
||||||
# 自定义其他全局配置
|
# 自定义其他全局配置
|
||||||
ROOT_WORKSPACE_PATH = GLOBAL_CONFIG['Global']['ROOT_WORKSPACE_PATH']
|
ROOT_WORKSPACE_PATH = GLOBAL_CONFIG['Global']['ROOT_WORKSPACE_PATH']
|
||||||
|
DEBUG = GLOBAL_CONFIG['Global'].getboolean('DEBUG', False)
|
||||||
|
|
||||||
|
|||||||
@@ -29,8 +29,12 @@ terminal_bp = Blueprint('terminal', __name__, url_prefix='/vsc-like')
|
|||||||
|
|
||||||
|
|
||||||
def set_winsize(fd, row, col, xpix=0, ypix=0):
|
def set_winsize(fd, row, col, xpix=0, ypix=0):
|
||||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
try:
|
||||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
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):
|
def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
||||||
@@ -39,35 +43,70 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
|||||||
"""
|
"""
|
||||||
max_read_bytes = 1024 * 20
|
max_read_bytes = 1024 * 20
|
||||||
timeout=0.1
|
timeout=0.1
|
||||||
while True:
|
try:
|
||||||
socketio.sleep(timeout)
|
while True:
|
||||||
timeout=min(timeout*2, 0.4)
|
socketio.sleep(timeout)
|
||||||
# using flask default web server, or uwsgi production web server
|
timeout=min(timeout*2, 0.4)
|
||||||
# when the child process is terminated, it will not disappear from linux process list
|
# using flask default web server, or uwsgi production web server
|
||||||
# and keep staying as a zombie process until the parent exits.
|
# when the child process is terminated, it will not disappear from linux process list
|
||||||
try:
|
# and keep staying as a zombie process until the parent exits.
|
||||||
child_process = psutil.Process(pid)
|
try:
|
||||||
except psutil.NoSuchProcess as err:
|
child_process = psutil.Process(pid)
|
||||||
return
|
except psutil.NoSuchProcess as err:
|
||||||
if child_process.status() not in ('running', 'sleeping'):
|
# Process already terminated, clean up any zombie
|
||||||
return
|
|
||||||
if fd:
|
|
||||||
timeout_sec = 0
|
|
||||||
(data_ready, _, _) = select.select([fd], [], [], timeout_sec)
|
|
||||||
if data_ready:
|
|
||||||
# output = os.read(fd, max_read_bytes).decode('ascii')
|
|
||||||
timeout=0.1
|
|
||||||
try:
|
try:
|
||||||
output = os.read(fd, max_read_bytes).decode()
|
os.waitpid(pid, os.WNOHANG)
|
||||||
except Exception as err:
|
except Exception:
|
||||||
output = """
|
pass
|
||||||
***AQUI WEB TERM ERR***
|
return
|
||||||
{}
|
if child_process.status() not in ('running', 'sleeping'):
|
||||||
***********************
|
# Process is terminated or in other state, clean up
|
||||||
""".format(err)
|
try:
|
||||||
# the key for different visitor to get different terminal (instead of mixing up)
|
child_process.wait(timeout=1)
|
||||||
# is to let the background task push pty response to each one's own (default) ROOM!
|
except Exception:
|
||||||
namespace.emit("pty_output", {"output": output}, room=room_id)
|
try:
|
||||||
|
os.waitpid(pid, os.WNOHANG)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
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:
|
||||||
|
timeout=0.1
|
||||||
|
try:
|
||||||
|
output = os.read(fd, max_read_bytes).decode()
|
||||||
|
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:
|
||||||
|
try:
|
||||||
|
os.close(fd)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
|
||||||
class VSCLikeNameSpace(Namespace):
|
class VSCLikeNameSpace(Namespace):
|
||||||
def on_connect(self):
|
def on_connect(self):
|
||||||
@@ -137,7 +176,13 @@ class VSCLikeNameSpace(Namespace):
|
|||||||
if fd:
|
if fd:
|
||||||
# print("writing to ptd: %s" % data["input"])
|
# print("writing to ptd: %s" % data["input"])
|
||||||
# os.write(fd, data["input"].encode('ascii'))
|
# os.write(fd, data["input"].encode('ascii'))
|
||||||
os.write(fd, data["input"].encode())
|
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):
|
def on_resize(self, data):
|
||||||
@@ -153,18 +198,55 @@ class VSCLikeNameSpace(Namespace):
|
|||||||
return
|
return
|
||||||
fd = session.get('terminal_config').get('fd')
|
fd = session.get('terminal_config').get('fd')
|
||||||
if fd:
|
if fd:
|
||||||
set_winsize(fd, data["rows"], data["cols"])
|
# 检查文件描述符是否有效
|
||||||
|
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):
|
def on_disconnect(self):
|
||||||
try:
|
terminal_config = session.get('terminal_config', {})
|
||||||
child_process = psutil.Process(session.get('terminal_config', {}).get('child_pid'))
|
child_pid = terminal_config.get('child_pid')
|
||||||
except psutil.NoSuchProcess as err:
|
fd = terminal_config.get('fd')
|
||||||
disconnect()
|
|
||||||
session['terminal_config'] = TERM_INIT_CONFIG
|
# 先关闭文件描述符,避免其他操作尝试使用无效的文件描述符
|
||||||
return
|
if fd:
|
||||||
if child_process.status() in ('running', 'sleeping'):
|
try:
|
||||||
# if visitor just close the browser tab then left alone the pty here
|
os.close(fd)
|
||||||
# it should be terminated by the parent process after
|
except Exception:
|
||||||
child_process.terminate()
|
pass
|
||||||
current_app.logger.debug('user left the pty alone, terminated')
|
|
||||||
|
if child_pid:
|
||||||
|
try:
|
||||||
|
child_process = psutil.Process(child_pid)
|
||||||
|
if child_process.status() in ('running', 'sleeping'):
|
||||||
|
# if visitor just close the browser tab then left alone the pty here
|
||||||
|
# it should be terminated by the parent process after
|
||||||
|
child_process.terminate()
|
||||||
|
# Wait for the process to terminate and collect its exit status
|
||||||
|
child_process.wait(timeout=2)
|
||||||
|
current_app.logger.debug('user left the pty alone, terminated and waited')
|
||||||
|
except psutil.NoSuchProcess as err:
|
||||||
|
# Process already terminated, try to wait anyway to clean up any zombie
|
||||||
|
try:
|
||||||
|
os.waitpid(child_pid, os.WNOHANG)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
except psutil.TimeoutExpired:
|
||||||
|
# If process didn't terminate in time, kill it forcefully
|
||||||
|
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}')
|
||||||
|
|
||||||
|
# Reset session config
|
||||||
|
session['terminal_config'] = TERM_INIT_CONFIG
|
||||||
current_app.logger.debug('Client disconnected')
|
current_app.logger.debug('Client disconnected')
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
from eventlet.green import subprocess
|
||||||
from flask import Blueprint, request, jsonify, current_app, render_template, session
|
from flask import Blueprint, request, jsonify, current_app, render_template, session
|
||||||
from ..services.file_service import get_file_tree, load_config
|
from ..services.file_service import get_file_tree, load_config
|
||||||
|
|
||||||
@@ -42,32 +42,34 @@ def vsc_like(user_uuid, user_id, course_id, chapter_name, lesson_name, port):
|
|||||||
subprocess.run(["sudo", "chown", "-R", user_id, user_root]) # 设置目录权限为新用户
|
subprocess.run(["sudo", "chown", "-R", user_id, user_root]) # 设置目录权限为新用户
|
||||||
|
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print(f"Error creating user {user_id}: {e}")
|
# 用户可能已经存在,这是正常情况,继续执行
|
||||||
|
print(f"Useradd command returned non-zero exit status, this is expected if user already exists: {e}")
|
||||||
try:
|
try:
|
||||||
# 使用 sudo 执行 mkdir 命令来创建目录
|
# 使用 sudo 执行 mkdir 命令来创建目录
|
||||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=True)
|
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=current_app.config['DEBUG'])
|
||||||
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=True)
|
subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=current_app.config['DEBUG'])
|
||||||
flask_pub_key = "/home/flask/.ssh/id_ed25519.pub"
|
flask_pub_key = "/home/flask/.ssh/id_ed25519.pub"
|
||||||
subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=True)
|
subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
|
||||||
subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=True)
|
subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=current_app.config['DEBUG'])
|
||||||
subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=True)
|
subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
|
||||||
print(f"Directory {path} created successfully for user {user_id}")
|
print(f"Directory {path} created successfully for user {user_id}")
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print(f"Error creating directory {path} details {str(e)}")
|
print(f"Error creating directory {path} details {str(e)}")
|
||||||
try:#使用sudo创建shared_group
|
try:#使用sudo创建shared_group
|
||||||
subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=True)
|
subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=current_app.config['DEBUG'])
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print(f"Error creating shared_group: {e}")
|
# 组可能已经存在,这是正常情况,继续执行
|
||||||
|
print(f"Groupadd command returned non-zero exit status, this is expected if group already exists: {e}")
|
||||||
try:#使用sudo将user_id加入shared_group
|
try:#使用sudo将user_id加入shared_group
|
||||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=True)
|
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=current_app.config['DEBUG'])
|
||||||
# 自己也加入
|
# 自己也加入
|
||||||
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=True)
|
subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=current_app.config['DEBUG'])
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print(f"Error adding user {user_id} to shared_group: {e}")
|
print(f"Error adding user {user_id} to shared_group: {e}")
|
||||||
try:
|
try:
|
||||||
subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=True)
|
subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=current_app.config['DEBUG'])
|
||||||
subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=True)
|
subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=current_app.config['DEBUG'])
|
||||||
subprocess.run(["sudo", "chmod", "-R", "775", path], check=True)
|
subprocess.run(["sudo", "chmod", "-R", "775", path], check=current_app.config['DEBUG'])
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print(f"Error changing directory {path} to shared_group_{user_id}: {e}")
|
print(f"Error changing directory {path} to shared_group_{user_id}: {e}")
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
[Global]
|
[Global]
|
||||||
SECRET_KEY = cakebaker
|
SECRET_KEY = cakebaker
|
||||||
ROOT_WORKSPACE_PATH = /home
|
ROOT_WORKSPACE_PATH = /home
|
||||||
|
DEBUG = False
|
||||||
|
|||||||
@@ -1,12 +1,32 @@
|
|||||||
from app import create_app
|
from app import create_app
|
||||||
from app.extensions import socketio
|
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()
|
app = create_app()
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
socketio.run(
|
try:
|
||||||
app,
|
socketio.run(
|
||||||
host="0.0.0.0",
|
app,
|
||||||
port=5200,
|
host="0.0.0.0",
|
||||||
debug=False, # 开发期打开
|
port=5200,
|
||||||
allow_unsafe_werkzeug=True, # 避免 dev server 的安全限制提示
|
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()
|
||||||
|
|||||||
@@ -4,17 +4,17 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Cloud IDE</title>
|
<title>Cloud IDE</title>
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.css">
|
<link rel="stylesheet" href="/static/cdnback/css/editor/editor.main.css">
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.5.1/socket.io.min.js"></script>
|
<script src="/static/cdnback/socket.io.min.js"></script>
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
|
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/xterm/5.5.0/xterm.css" />
|
<link rel="stylesheet" href="/static/cdnback/css/xterm.css" />
|
||||||
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/xterm/5.5.0/xterm.js"></script> -->
|
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/xterm/5.5.0/xterm.js"></script> -->
|
||||||
<script src="https://unpkg.com/xterm@3.6.0/dist/xterm.js"></script>
|
<script src="/static/cdnback/js/xterm.js"></script>
|
||||||
<script src="https://unpkg.com/xterm@3.6.0/dist/addons/fit/fit.js"></script>
|
<script src="/static/cdnback/js/addons/fit/fit.js"></script>
|
||||||
<script src="https://unpkg.com/xterm@3.6.0/dist/addons/webLinks/webLinks.js"></script>
|
<script src="/static/cdnback/js/addons/webLinks/webLinks.js"></script>
|
||||||
<script src="https://unpkg.com/xterm@3.6.0/dist/addons/fullscreen/fullscreen.js"></script>
|
<script src="/static/cdnback/js/addons/fullscreen/fullscreen.js"></script>
|
||||||
<script src="https://unpkg.com/xterm@3.6.0/dist/addons/search/search.js"></script>
|
<script src="/static/cdnback/js/addons/search/search.js"></script>
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
|
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||||
|
|
||||||
<link rel="stylesheet" href="/vsc-like/static/css/index.css">
|
<link rel="stylesheet" href="/vsc-like/static/css/index.css">
|
||||||
<link rel="stylesheet" href="/vsc-like/static/css/notification.css">
|
<link rel="stylesheet" href="/vsc-like/static/css/notification.css">
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="notificationsContainer"></div>
|
<div id="notificationsContainer"></div>
|
||||||
|
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.js"></script>
|
<script src="/static/cdnback/js/monaco-editor/0.34.0/min/vs/loader.js"></script>
|
||||||
<script src="/vsc-like/static/js/code-like-extension.js"></script>
|
<script src="/vsc-like/static/js/code-like-extension.js"></script>
|
||||||
<script src="/vsc-like/static/js/file.js"></script>
|
<script src="/vsc-like/static/js/file.js"></script>
|
||||||
<script src="/vsc-like/static/js/terminal.js"></script>
|
<script src="/vsc-like/static/js/terminal.js"></script>
|
||||||
|
|||||||
69
et --hard HEAD@{1}
Normal file
69
et --hard HEAD@{1}
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
[33m68493d6a[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmain[m[33m, [m[1;31morigin/main[m[33m)[m HEAD@{0}: pull origin main: Fast-forward
|
||||||
|
[33m0852e121[m HEAD@{1}: reset: moving to HEAD
|
||||||
|
[33m0852e121[m HEAD@{2}: commit: cdn fix more
|
||||||
|
[33m7dc4714a[m HEAD@{3}: commit: index style
|
||||||
|
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{4}: merge feature/paste_detecte_new: Fast-forward
|
||||||
|
[33m7862647b[m HEAD@{5}: checkout: moving from feature/paste_detecte_new to main
|
||||||
|
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{6}: commit (merge): Merge branch 'main' into feature/paste_detecte_new
|
||||||
|
[33m0cf1896b[m HEAD@{7}: checkout: moving from main to feature/paste_detecte_new
|
||||||
|
[33m7862647b[m HEAD@{8}: commit: style fix
|
||||||
|
[33m6b9c8e9e[m HEAD@{9}: commit: cdn change to local and use markdown and style change
|
||||||
|
[33m33844786[m HEAD@{10}: commit: use markdown to edit
|
||||||
|
[33mce88ae64[m HEAD@{11}: commit: use queue to allow send vscode_ws when it is none
|
||||||
|
[33m6c38e906[m HEAD@{12}: pull: Fast-forward
|
||||||
|
[33m9759c93a[m HEAD@{13}: commit: fix funciton response
|
||||||
|
[33mecf19f49[m HEAD@{14}: commit: fix function double promlem
|
||||||
|
[33mf5d50772[m HEAD@{15}: commit: function call can be expire
|
||||||
|
[33m4a390adb[m HEAD@{16}: commit: fix style bug
|
||||||
|
[33m960d1f1d[m HEAD@{17}: commit: style fix
|
||||||
|
[33mc73ea447[m HEAD@{18}: commit: fix index
|
||||||
|
[33m33bf569f[m HEAD@{19}: commit: fix nextchapter bug
|
||||||
|
[33mb921bda4[m HEAD@{20}: commit: auto get domain
|
||||||
|
[33m9921848d[m HEAD@{21}: commit: remove prefix of http url
|
||||||
|
[33m4d81aef8[m HEAD@{22}: commit (merge): Merge branch 'feature/paste_deteced'
|
||||||
|
[33m8fe5ee16[m HEAD@{23}: checkout: moving from feature/paste_deteced to main
|
||||||
|
[33m9ce212e9[m[33m ([m[1;31morigin/feature/paste_deteced[m[33m, [m[1;32mfeature/paste_deteced[m[33m)[m HEAD@{24}: checkout: moving from main to feature/paste_deteced
|
||||||
|
[33m8fe5ee16[m HEAD@{25}: commit (merge): 准备合并main
|
||||||
|
[33m908d5915[m HEAD@{26}: checkout: moving from syt to main
|
||||||
|
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{27}: checkout: moving from main to syt
|
||||||
|
[33m908d5915[m HEAD@{28}: commit: ready
|
||||||
|
[33m02b12791[m HEAD@{29}: checkout: moving from syt to main
|
||||||
|
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{30}: checkout: moving from main to syt
|
||||||
|
[33m02b12791[m HEAD@{31}: pull: Fast-forward
|
||||||
|
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{32}: checkout: moving from syt to main
|
||||||
|
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{33}: commit: first
|
||||||
|
[33m0196f37e[m HEAD@{34}: pull: Merge made by the 'ort' strategy.
|
||||||
|
[33m57eb1197[m HEAD@{35}: commit: ok
|
||||||
|
[33m382f2006[m HEAD@{36}: checkout: moving from main to syt
|
||||||
|
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{37}: commit (merge): Merge branch 'main' of https://gitee.com/CakeCN/code-agent
|
||||||
|
[33m5f8f6c94[m HEAD@{38}: commit: many ok
|
||||||
|
[33me24aa12e[m HEAD@{39}: commit: ready to process
|
||||||
|
[33m6766ca85[m HEAD@{40}: commit (merge): Merge branch 'feature/voice_send'
|
||||||
|
[33m3c9c7553[m HEAD@{41}: checkout: moving from feature/voice_send to main
|
||||||
|
[33m58a95e9f[m[33m ([m[1;31morigin/feature/voice_send[m[33m, [m[1;32mfeature/voice_send[m[33m)[m HEAD@{42}: commit: ready merge to main
|
||||||
|
[33m79125ffc[m HEAD@{43}: commit: change .cn to .com
|
||||||
|
[33m2f9bc7df[m HEAD@{44}: checkout: moving from main to feature/voice_send
|
||||||
|
[33m3c9c7553[m HEAD@{45}: reset: moving to HEAD
|
||||||
|
[33m3c9c7553[m HEAD@{46}: checkout: moving from feature/voice_send to main
|
||||||
|
[33m2f9bc7df[m HEAD@{47}: pull: Fast-forward
|
||||||
|
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{48}: checkout: moving from main to feature/voice_send
|
||||||
|
[33m3c9c7553[m HEAD@{49}: commit: cn/com allow all
|
||||||
|
[33m7122c3be[m HEAD@{50}: commit (merge): fix url
|
||||||
|
[33me07c41fb[m HEAD@{51}: commit: fix code-server reboot problem(close debug)
|
||||||
|
[33m821e20c9[m HEAD@{52}: commit: clear double iframe more safe
|
||||||
|
[33m053584a7[m HEAD@{53}: checkout: moving from feature/voice_send to main
|
||||||
|
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{54}: checkout: moving from main to feature/voice_send
|
||||||
|
[33m053584a7[m HEAD@{55}: commit: clear iframe double
|
||||||
|
[33m10481b0b[m HEAD@{56}: commit: fix permisson bug
|
||||||
|
[33mdc0eeaa9[m HEAD@{57}: commit: add hint
|
||||||
|
[33ma24df620[m HEAD@{58}: commit: fix some bug
|
||||||
|
[33m3ad36c29[m HEAD@{59}: commit: 25/09/24 10:00~11:30 停机维护
|
||||||
|
[33m07cf2363[m HEAD@{60}: commit: fix many bug
|
||||||
|
[33m6aac4200[m HEAD@{61}: commit: try hello message
|
||||||
|
[33m271672c9[m HEAD@{62}: commit: check to code-server-like
|
||||||
|
[33m252c426c[m HEAD@{63}: pull: Merge made by the 'ort' strategy.
|
||||||
|
[33m588fc3b6[m HEAD@{64}: commit: ready to code-like
|
||||||
|
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{65}: merge code-like-autosave: Fast-forward
|
||||||
|
[33m24f191d5[m HEAD@{66}: checkout: moving from code-like-autosave to main
|
||||||
|
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{67}: checkout: moving from main to code-like-autosave
|
||||||
|
[33m24f191d5[m HEAD@{68}: clone: from https://gitee.com/CakeCN/code-agent.git
|
||||||
Reference in New Issue
Block a user