@kevlns/xlmerge 2.0.1 → 2.0.3
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/AGENTS.md +169 -141
- package/LICENSE +21 -21
- package/README.md +111 -193
- package/bin/xlmerge.js +152 -152
- package/docs/documentation.md +24 -0
- package/package.json +7 -5
- package/python/xlsx_merge_engine/__init__.py +2 -2
- package/python/xlsx_merge_engine/xlsx_git_merge_bridge.py +1614 -1611
- package/python/xlsx_resolver/__init__.py +2 -2
- package/python/xlsx_resolver/__main__.py +4 -4
- package/python/xlsx_resolver/formula_values.py +660 -565
- package/python/xlsx_resolver/loading_ui.html +44 -0
- package/python/xlsx_resolver/merge_server.py +179 -126
- package/python/xlsx_resolver/merge_ui.html +1634 -1522
- package/python/xlsx_resolver/prepare_progress.py +34 -0
- package/python/xlsx_resolver/recalculate_workbook.ps1 +141 -155
- package/python/xlsx_resolver/resolve_xlsx_conflict.py +236 -222
- package/python/xlsx_resolver/xlsx_conflict.py +2317 -1994
- package/v-cli.plugin.json +248 -194
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kevlns/xlmerge",
|
|
3
|
-
"version": "2.0.
|
|
4
|
-
"description": "
|
|
3
|
+
"version": "2.0.3",
|
|
4
|
+
"description": "在浏览器中审阅 Git 冲突工作簿的三方差异,校验后写回并提交合并结果。",
|
|
5
5
|
"bin": {
|
|
6
6
|
"xlmerge": "bin/xlmerge.js"
|
|
7
7
|
},
|
|
@@ -10,7 +10,8 @@
|
|
|
10
10
|
"python/xlsx_merge_engine/",
|
|
11
11
|
"python/xlsx_resolver/",
|
|
12
12
|
"v-cli.plugin.json",
|
|
13
|
-
"AGENTS.md"
|
|
13
|
+
"AGENTS.md",
|
|
14
|
+
"docs/"
|
|
14
15
|
],
|
|
15
16
|
"vCli": {
|
|
16
17
|
"manifest": "v-cli.plugin.json"
|
|
@@ -18,7 +19,8 @@
|
|
|
18
19
|
"scripts": {
|
|
19
20
|
"test": "node bin/xlmerge.js --selfcheck",
|
|
20
21
|
"test:python": "python -m unittest discover -s python/tests -v",
|
|
21
|
-
"check:manifest": "python -m unittest discover -s python/tests -p test_v_cli_plugin_manifest.py -v"
|
|
22
|
+
"check:manifest": "python -m unittest discover -s python/tests -p test_v_cli_plugin_manifest.py -v",
|
|
23
|
+
"docs:style": "node scripts/check-documentation.mjs"
|
|
22
24
|
},
|
|
23
25
|
"repository": {
|
|
24
26
|
"type": "git",
|
|
@@ -28,7 +30,7 @@
|
|
|
28
30
|
"bugs": {
|
|
29
31
|
"url": "https://github.com/kevlns/xlmerge/issues"
|
|
30
32
|
},
|
|
31
|
-
"author": "
|
|
33
|
+
"author": "Vant",
|
|
32
34
|
"engines": {
|
|
33
35
|
"node": ">=16"
|
|
34
36
|
},
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""XLSX/XLSM 三方结构化差异引擎(源自 XlsxGitMergeBridge)。"""
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""XLSX/XLSM 三方结构化差异引擎(源自 XlsxGitMergeBridge)。"""
|