@kevlns/xlmerge 1.2.1 → 1.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +75 -12
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,18 +1,37 @@
|
|
|
1
|
+
<div align="center">
|
|
2
|
+
|
|
3
|
+
<img src="https://raw.githubusercontent.com/kevlns/xlmerge/main/logo.png" alt="xlmerge logo" width="320" />
|
|
4
|
+
|
|
1
5
|
# xlmerge
|
|
2
6
|
|
|
3
|
-
|
|
7
|
+
**解决 Git 仓库中 `.xlsx` / `.xlsm` 策划配置表未合并冲突(merge conflict)的可视化工具。**
|
|
8
|
+
|
|
9
|
+
[](https://www.npmjs.com/package/@kevlns/xlmerge)
|
|
10
|
+
[](https://www.npmjs.com/package/@kevlns/xlmerge)
|
|
11
|
+
[](https://github.com/kevlns/xlmerge/actions/workflows/test.yml)
|
|
12
|
+
[](./LICENSE)
|
|
13
|
+
|
|
14
|
+
[Getting started](#getting-started) · [Usage](#usage) · [Development](#development) · [Package family](#package-family)
|
|
15
|
+
|
|
16
|
+
</div>
|
|
17
|
+
|
|
18
|
+
---
|
|
19
|
+
|
|
20
|
+
## Why xlmerge?
|
|
21
|
+
|
|
22
|
+
Git 对二进制 `.xlsx`/`.xlsm` 只会整文件冲突,无法像文本一样逐行合并。xlmerge 用**三方结构化差异引擎 + 本地可视化 UI**把这件事变得可控:自动提取 Git index 的 base/ours/theirs 三方版本,按 Sheet、逻辑行、逻辑列、Cell 四级计算差异,浏览器中逐 Cell 选择本地/远端版本,最终写回工作簿并生成结构化 commit。
|
|
4
23
|
|
|
5
|
-
|
|
24
|
+
- **逻辑 ID 定位** - 冲突身份用逻辑 ID(非物理坐标),插行删行后选择不会漂移
|
|
25
|
+
- **保真写回** - 保留公式(注入缓存值,`data_only` 读取正确)、样式、批注、合并单元格、冻结窗格、行高列宽
|
|
26
|
+
- **VBA 安全** - `.xlsm` 全程 `keep_vba`,保存后逐字节校验 VBA/ActiveX 负载
|
|
27
|
+
- **Luban 表头识别** - 自动识别 `##var` / `##type` / `##group`,注释列、占位列参与对齐
|
|
28
|
+
- **默认不越权** - 服务只监听 `127.0.0.1`,不自动 push
|
|
6
29
|
|
|
7
|
-
|
|
8
|
-
- `.xlsm` 全程 `keep_vba`,保存后逐字节校验 VBA/ActiveX 负载
|
|
9
|
-
- 自动识别 Luban 风格表头(`##var` / `##type` / `##group`),注释列、占位列参与对齐
|
|
10
|
-
- 服务只监听 `127.0.0.1`,不自动 push
|
|
30
|
+
## Getting started
|
|
11
31
|
|
|
12
|
-
|
|
32
|
+
### Install
|
|
13
33
|
|
|
14
34
|
```bash
|
|
15
|
-
# 正式版直接安装
|
|
16
35
|
npm install -g @kevlns/xlmerge
|
|
17
36
|
|
|
18
37
|
# 或直接从 GitHub 仓库安装开发版本
|
|
@@ -21,6 +40,16 @@ npm install -g git+https://github.com/kevlns/xlmerge.git
|
|
|
21
40
|
|
|
22
41
|
要求:Node.js >= 16,系统 Python >= 3.9。首次运行若缺少依赖,会在 `~/.xlmerge/venv` 自动创建用户级 venv 并安装 `openpyxl==3.1.5`、`bottle==0.13.4`。
|
|
23
42
|
|
|
43
|
+
### Quick start
|
|
44
|
+
|
|
45
|
+
```bash
|
|
46
|
+
# 检测未合并的 .xlsx/.xlsm(输出 JSON)
|
|
47
|
+
xlmerge --repo <仓库路径> detect
|
|
48
|
+
|
|
49
|
+
# 提取三方版本并后台启动可视化解析器,返回 url(自动打开浏览器)
|
|
50
|
+
xlmerge --repo <仓库路径> launch
|
|
51
|
+
```
|
|
52
|
+
|
|
24
53
|
环境变量:
|
|
25
54
|
|
|
26
55
|
| 变量 | 作用 |
|
|
@@ -28,7 +57,7 @@ npm install -g git+https://github.com/kevlns/xlmerge.git
|
|
|
28
57
|
| `XLMERGE_PYTHON` | 指定解释器路径(如嵌入式 Python),跳过自动探测 |
|
|
29
58
|
| `XLMERGE_VENV` | 覆盖默认 venv 目录 |
|
|
30
59
|
|
|
31
|
-
##
|
|
60
|
+
## Usage
|
|
32
61
|
|
|
33
62
|
```bash
|
|
34
63
|
# 检测未合并的 .xlsx/.xlsm(输出 JSON)
|
|
@@ -65,7 +94,7 @@ decisions.json 格式(Cell 用 manifest 中的稳定逻辑 ID,如 `row:base:
|
|
|
65
94
|
|
|
66
95
|
包根 `AGENTS.md` 是 AI Agent 调用规范正本,包含适用场景、快速流程、禁止事项与边界。首次通过 v-cli 调用前应运行 `v-cli agent docs xlmerge` 掌握该规范;独立安装时也可直接读取包内 `AGENTS.md`。
|
|
67
96
|
|
|
68
|
-
##
|
|
97
|
+
## Development
|
|
69
98
|
|
|
70
99
|
```bash
|
|
71
100
|
# 单元测试(72 个,覆盖引擎与解析器全流程)
|
|
@@ -81,7 +110,7 @@ python e2e_test.py bin/xlmerge.js node
|
|
|
81
110
|
npm pack
|
|
82
111
|
```
|
|
83
112
|
|
|
84
|
-
|
|
113
|
+
### 包结构
|
|
85
114
|
|
|
86
115
|
```
|
|
87
116
|
bin/xlmerge.js # Node 启动垫片:探测 Python、按需建 venv、透传参数
|
|
@@ -96,6 +125,40 @@ python/
|
|
|
96
125
|
|
|
97
126
|
> 注:为兼容嵌入式 Python 发行版(`._pth` 忽略 `PYTHONPATH`),模块内使用包内自举的 `sys.path` 注入而非纯包导入;这是有意为之。
|
|
98
127
|
|
|
128
|
+
## Package family
|
|
129
|
+
|
|
130
|
+
kevlns 工具家族共享同一套发布约定(tag 驱动、CI 护栏、MIT)。
|
|
131
|
+
|
|
132
|
+
| Package | Purpose | Status |
|
|
133
|
+
| --- | --- | --- |
|
|
134
|
+
| [`v-cli`](https://github.com/kevlns/v-cli) | 个人工具箱 CLI | v0.2.1 |
|
|
135
|
+
| [`xlmerge`](https://github.com/kevlns/xlmerge) | Git 中 .xlsx/.xlsm 冲突可视化解决工具(本仓库) | v1.2.2 |
|
|
136
|
+
| [`u-cli-mod`](https://github.com/kevlns/u-cli-mod) | Unity 精确版本路由 + CLI + pipeline 包(Windows-first) | v0.1.1 |
|
|
137
|
+
|
|
138
|
+
## Compatibility
|
|
139
|
+
|
|
140
|
+
| Runtime | Supported versions |
|
|
141
|
+
| --- | --- |
|
|
142
|
+
| Node.js | `16` and later |
|
|
143
|
+
| Python | `3.9` and later |
|
|
144
|
+
|
|
145
|
+
## Contributing
|
|
146
|
+
|
|
147
|
+
```bash
|
|
148
|
+
git clone https://github.com/kevlns/xlmerge.git
|
|
149
|
+
cd xlmerge
|
|
150
|
+
python -m unittest discover -s python/tests -v
|
|
151
|
+
npm run check:manifest
|
|
152
|
+
```
|
|
153
|
+
|
|
154
|
+
For bugs and feature requests, use [GitHub Issues](https://github.com/kevlns/xlmerge/issues).
|
|
155
|
+
|
|
99
156
|
## License
|
|
100
157
|
|
|
101
|
-
[MIT](LICENSE)
|
|
158
|
+
Released under the [MIT License](./LICENSE).
|
|
159
|
+
|
|
160
|
+
<div align="center">
|
|
161
|
+
|
|
162
|
+
Part of the **kevlns** tool family.
|
|
163
|
+
|
|
164
|
+
</div>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kevlns/xlmerge",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.2",
|
|
4
4
|
"description": "Visual resolver for unresolved Git merge conflicts in .xlsx/.xlsm workbooks: three-way sheet/row/cell diff, local UI, write-back and commit.",
|
|
5
5
|
"bin": {
|
|
6
6
|
"xlmerge": "bin/xlmerge.js"
|