Skip to content

Commit 32191eb

Browse files
committed
feat(cli/sync): 完成冲突对比合并页面交互功能
1 parent 8b8b23c commit 32191eb

File tree

1 file changed

+38
-17
lines changed

1 file changed

+38
-17
lines changed

packages/cli/src/server/index.html

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,43 @@
11
<!-- index.html -->
22
<!DOCTYPE html>
3-
<html lang="en">
4-
<head>
5-
<title>CLI Browser Interaction</title>
6-
</head>
7-
<body>
8-
<h1>操作监控页面</h1>
3+
<html lang="en">
4+
<head>
5+
<title>CLI Browser Interaction</title>
6+
<script src="https://unpkg.com/@tailwindcss/browser@4"></script>
7+
</head>
8+
<body>
9+
<div class="p-6 max-w-7xl mx-auto">
10+
<h1 class="text-2xl font-semibold text-gray-700 mb-6">GCM 冲突处理</h1>
911

10-
<!-- 示例交互元素 -->
11-
<button id="testBtn">测试按钮</button>
12-
<form id="testForm">
13-
<input type="text" name="username">
14-
<button type="submit">提交</button>
15-
</form>
12+
<div class="flex items-start gap-4 w-full h-96">
13+
<div class="flex-1 h-full flex flex-col">
14+
<h3 class="text-lg font-medium text-gray-700 mb-2">本地配置</h3>
15+
<textarea
16+
id="localConfig"
17+
class="w-full flex-1 p-4 rounded-lg border border-gray-200 shadow-sm bg-gray-50 focus:ring-2 focus:ring-blue-100 focus:border-blue-300 focus:outline-none transition-all duration-200"
18+
></textarea>
19+
</div>
20+
<div class="flex-1 h-full flex flex-col">
21+
<h3 class="text-lg font-medium text-gray-700 mb-2">远程配置</h3>
22+
<textarea
23+
id="remoteConfig"
24+
class="w-full flex-1 p-4 rounded-lg border border-gray-200 shadow-sm bg-gray-50 focus:ring-2 focus:ring-blue-100 focus:border-blue-300 focus:outline-none transition-all duration-200"
25+
></textarea>
26+
</div>
27+
</div>
1628

17-
<!-- 注入监控脚本 -->
18-
<script>
19-
// 这里放置之前提供的WebSocket客户端代码
20-
</script>
21-
</body>
29+
<div class="mt-8">
30+
<div class="flex items-center mb-3">
31+
<h3 class="text-lg font-medium text-gray-700 mb-2 flex-1">
32+
合并后配置
33+
</h3>
34+
<button class="px-3 h-8 leading-8 bg-blue-500 text-white rounded" id="submit_btn">提交</button>
35+
</div>
36+
<textarea
37+
id="mergedConfig"
38+
class="w-full flex-1 p-4 rounded-lg border border-gray-200 shadow-sm bg-gray-50 focus:ring-2 focus:ring-blue-100 focus:border-blue-300 focus:outline-none transition-all duration-200"
39+
></textarea>
40+
</div>
41+
</div>
42+
</body>
2243
</html>

0 commit comments

Comments
 (0)