dsh-annotator 0.5.5 → 0.6.0
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 +4 -3
- package/lib/client.js +1697 -296
- package/lib/index.js +146 -32
- package/lib/overlay.js +321 -46
- package/lib/session.js +549 -47
- package/lib/shared/annotation-markdown.js +174 -0
- package/lib/shared/binding-action.js +3 -0
- package/lib/shared/page-roles.js +365 -0
- package/lib/shared/tool-schema.js +21 -0
- package/package.json +7 -3
package/lib/client.js
CHANGED
|
@@ -28,7 +28,16 @@ window.__ModuleLoader__.load({
|
|
|
28
28
|
var TAB_KIND = 'visual-annotator';
|
|
29
29
|
var API = '/api/visual-annotator';
|
|
30
30
|
/** Bumped together with HOST_REV (lib/index.js); a mismatch means panel and host came from different builds. */
|
|
31
|
-
var PANEL_BUILD = '
|
|
31
|
+
var PANEL_BUILD = 'v56';
|
|
32
|
+
/**
|
|
33
|
+
* 与 lib/shared/annotation-markdown.js 的 TASK_REFERENCE / TASK_PLAIN 逐字一致:插入到
|
|
34
|
+
* 输入框的草稿开头、复制出去的提示词开头必须是同一句任务。两处各写一份就会漂——
|
|
35
|
+
* 用户会同时看到「按标注改」与「任务:按「改动」标注…」两套说法。
|
|
36
|
+
* test/panel-target-visual.test.mjs 逐字比对这两个字面量,改一处漏一处会红。
|
|
37
|
+
*/
|
|
38
|
+
var TASK_REFERENCE =
|
|
39
|
+
'任务:按「改动」标注修改对应元素;「参照」只提供样式与结构,别改它指向的元素,也别改它的代码。';
|
|
40
|
+
var TASK_PLAIN = '任务:按下列标注修改对应元素。';
|
|
32
41
|
var POLL_VISIBLE_MS = 1500;
|
|
33
42
|
// macOS 的 Option 是组合键:快捷键提示按平台显示 ⌥Option+A / Alt+A。
|
|
34
43
|
var HOTKEY = /Mac|iPhone|iPad/i.test(navigator.platform || navigator.userAgent || '') ? '⌥Option+A' : 'Alt+A';
|
|
@@ -41,13 +50,21 @@ window.__ModuleLoader__.load({
|
|
|
41
50
|
'--vp-accent:#1f6feb;--vp-accent-fg:#fff;--vp-accent-weak:rgba(31,111,235,.10);' +
|
|
42
51
|
'--vp-danger:#cf222e;--vp-danger-weak:rgba(207,34,46,.10);' +
|
|
43
52
|
'--vp-ok:#1a7f37;--vp-warn:#9a6700;' +
|
|
53
|
+
// 「改动」一栏的专属色(暖橙):与参照的蓝分家,卡片边框、序号、归属 chip 都用它,
|
|
54
|
+
// 用户扫一眼就能把「这条改动」和「它照的几处蓝标」连起来。
|
|
55
|
+
'--vp-target:#b45309;--vp-target-fg:#fff;--vp-target-weak:rgba(180,83,9,.12);' +
|
|
56
|
+
'--vp-target-soft:rgba(180,83,9,.10);--vp-ref:#2f6fd0;--vp-ref-soft:rgba(47,111,208,.10);' +
|
|
44
57
|
'--vp-surface:rgba(127,127,127,.06);--vp-surface-2:rgba(127,127,127,.12);' +
|
|
45
58
|
'position:relative;display:flex;flex-direction:column;height:100%;min-height:0;' +
|
|
46
59
|
'font:13px/1.55 system-ui,-apple-system,"Segoe UI",sans-serif;color:inherit;container-type:inline-size}',
|
|
47
60
|
'@media (prefers-color-scheme:dark){.vp-root{--vp-accent:#79b8ff;--vp-accent-fg:#0b1c33;' +
|
|
48
|
-
'--vp-accent-weak:rgba(121,184,255,.16);--vp-danger:#ff7b72;--vp-ok:#3fb950;--vp-warn:#d29922
|
|
61
|
+
'--vp-accent-weak:rgba(121,184,255,.16);--vp-danger:#ff7b72;--vp-ok:#3fb950;--vp-warn:#d29922;' +
|
|
62
|
+
'--vp-target:#e8b473;--vp-target-fg:#2a1a06;--vp-target-weak:rgba(232,180,115,.18);' +
|
|
63
|
+
'--vp-target-soft:rgba(232,180,115,.16);--vp-ref:#9cc2ff;--vp-ref-soft:rgba(75,140,247,.18)}}',
|
|
49
64
|
'html[data-theme="dark"] .vp-root,.dark .vp-root{--vp-accent:#79b8ff;--vp-accent-fg:#0b1c33;' +
|
|
50
|
-
'--vp-accent-weak:rgba(121,184,255,.16);--vp-danger:#ff7b72;--vp-ok:#3fb950;--vp-warn:#d29922
|
|
65
|
+
'--vp-accent-weak:rgba(121,184,255,.16);--vp-danger:#ff7b72;--vp-ok:#3fb950;--vp-warn:#d29922;' +
|
|
66
|
+
'--vp-target:#e8b473;--vp-target-fg:#2a1a06;--vp-target-weak:rgba(232,180,115,.18);' +
|
|
67
|
+
'--vp-target-soft:rgba(232,180,115,.16);--vp-ref:#9cc2ff;--vp-ref-soft:rgba(75,140,247,.18)}',
|
|
51
68
|
'.vp-root :focus-visible{outline:2px solid var(--vp-accent);outline-offset:2px;border-radius:4px}',
|
|
52
69
|
'.vp-root button{font:inherit}',
|
|
53
70
|
|
|
@@ -64,10 +81,14 @@ window.__ModuleLoader__.load({
|
|
|
64
81
|
'.vp-pill[data-state="error"] .dot{background:var(--vp-danger)}',
|
|
65
82
|
'.vp-pill span{overflow:hidden;text-overflow:ellipsis}',
|
|
66
83
|
'.vp-spacer{flex:1}',
|
|
84
|
+
'.vp-headmode{display:flex;align-items:center;gap:6px;flex:none}',
|
|
85
|
+
'.vp-switch-label{font-size:12px;color:var(--vp-muted);flex:none;user-select:none}',
|
|
86
|
+
'.vp-switch-label.on{color:var(--vp-accent)}',
|
|
67
87
|
'.vp-icon-btn{display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;flex:none;' +
|
|
68
88
|
'border:1px solid transparent;border-radius:6px;background:transparent;color:var(--vp-muted);cursor:pointer}',
|
|
69
89
|
'.vp-icon-btn:hover{background:var(--vp-surface-2);color:inherit}',
|
|
70
|
-
|
|
90
|
+
// 菜单开着只换图标颜色,不再铺底色:底色 hover 同款,看着像一直被按下。
|
|
91
|
+
'.vp-icon-btn.on{background:transparent;color:inherit}',
|
|
71
92
|
|
|
72
93
|
/* ---- overflow menu ---------------------------------------------- */
|
|
73
94
|
'.vp-menu{position:absolute;right:10px;top:46px;z-index:20;min-width:168px;padding:4px;border-radius:8px;' +
|
|
@@ -127,15 +148,215 @@ window.__ModuleLoader__.load({
|
|
|
127
148
|
'.vp-tab:hover{background:var(--vp-surface-2)}',
|
|
128
149
|
'.vp-tab.on{background:var(--vp-accent-weak);border-color:transparent;color:var(--vp-accent);font-weight:600}',
|
|
129
150
|
'.vp-tab b{font-size:11px;opacity:.7;font-weight:600}',
|
|
151
|
+
'.vp-tab .vp-tab-warn{display:inline-flex;align-items:center;justify-content:center;width:13px;height:13px;' +
|
|
152
|
+
'font-size:10px;font-weight:700;border-radius:50%;color:#191210;background:#f0a05a;opacity:1}',
|
|
130
153
|
'.vp-tab span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
|
|
131
154
|
|
|
155
|
+
/* ---- 模式开关:一枚胶囊,普通 / 参考 ------------------------------ */
|
|
156
|
+
'.vp-mode{display:inline-flex;align-self:flex-start;gap:1px;margin:0 12px 8px;padding:2px;' +
|
|
157
|
+
'border-radius:999px;background:var(--vp-surface-2);flex:none;box-shadow:inset 0 0 0 1px var(--vp-border)}',
|
|
158
|
+
'.vp-mode button{display:inline-flex;align-items:center;gap:5px;height:24px;padding:0 12px;border:0;border-radius:999px;' +
|
|
159
|
+
'background:transparent;color:var(--vp-muted);font:600 12px/1 system-ui,sans-serif;cursor:pointer;white-space:nowrap}',
|
|
160
|
+
'.vp-mode button .dot{width:7px;height:7px;border-radius:50%;background:var(--vp-muted);opacity:.55}',
|
|
161
|
+
'.vp-mode button.on{background:var(--vp-accent);color:#fff;box-shadow:0 1px 3px rgba(0,0,0,.22)}',
|
|
162
|
+
'.vp-mode button.on .dot{background:#fff;opacity:1}',
|
|
163
|
+
'.vp-mode button.ref .dot{background:#4b8cf7;opacity:1}',
|
|
164
|
+
'.vp-mode button.on.ref{background:#2f6fd0}',
|
|
165
|
+
'.vp-mode .n{font-size:10.5px;opacity:.75;margin-left:2px}',
|
|
166
|
+
|
|
167
|
+
/* ---- 参照模式的两个页面槽:改动 / 参照 ----------------------------- */
|
|
168
|
+
'.vp-slot{position:relative;flex:1;min-width:0;display:flex;flex-direction:column;gap:3px}',
|
|
169
|
+
'.vp-slot .cap{font-size:11px;color:var(--vp-muted);letter-spacing:.02em}',
|
|
170
|
+
'.vp-slot-btn{display:flex;align-items:center;gap:5px;width:100%;height:30px;padding:0 8px;border-radius:8px;' +
|
|
171
|
+
'border:1px dashed var(--vp-border);background:transparent;color:inherit;font:12px/1 system-ui,sans-serif;' +
|
|
172
|
+
'cursor:pointer;text-align:left;min-width:0}',
|
|
173
|
+
'.vp-slot-btn:hover{background:var(--vp-surface-2)}',
|
|
174
|
+
'.vp-slot-btn .t{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;flex:1}',
|
|
175
|
+
'.vp-slot-btn .r{flex:none;font:600 10.5px/1 ui-monospace,SFMono-Regular,Menlo,monospace;padding:3px 5px;' +
|
|
176
|
+
'border-radius:4px;background:var(--vp-surface-2);color:var(--vp-muted)}',
|
|
177
|
+
'.vp-slot[data-role="target"] .vp-slot-btn{border-style:solid;' +
|
|
178
|
+
'border-color:color-mix(in srgb,var(--vp-accent) 45%,var(--vp-border))}',
|
|
179
|
+
'.vp-slot[data-role="target"] .r{background:var(--vp-accent-weak);color:var(--vp-accent)}',
|
|
180
|
+
'.vp-slot[data-role="reference"] .vp-slot-btn{border-style:solid;border-color:rgba(75,140,247,.5)}',
|
|
181
|
+
'.vp-slot[data-role="reference"] .r{background:rgba(75,140,247,.16);color:#2f6fd0}',
|
|
182
|
+
'html[data-theme="dark"] .vp-slot[data-role="reference"] .r,.dark .vp-slot[data-role="reference"] .r{color:#9cc2ff}',
|
|
183
|
+
'.vp-slotmenu{position:absolute;left:0;right:0;top:100%;margin-top:4px;z-index:30;padding:4px;border-radius:8px;' +
|
|
184
|
+
'border:1px solid var(--vp-border);background:var(--dsw-specific-menu-bg,Canvas);' +
|
|
185
|
+
'box-shadow:0 10px 26px rgba(0,0,0,.28);display:flex;flex-direction:column;gap:2px;max-height:224px;overflow:auto}',
|
|
186
|
+
'.vp-slotmenu button{display:flex;align-items:center;gap:6px;padding:6px 8px;border:none;border-radius:5px;' +
|
|
187
|
+
'background:transparent;color:inherit;font-size:12px;text-align:left;cursor:pointer;min-width:0}',
|
|
188
|
+
'.vp-slotmenu button:hover{background:var(--vp-surface-2)}',
|
|
189
|
+
'.vp-slotmenu button.on{color:var(--vp-accent);font-weight:600}',
|
|
190
|
+
'.vp-slotmenu .t{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0}',
|
|
191
|
+
'.vp-slotmenu .why{margin-left:auto;font-size:11px;color:var(--vp-muted);flex:none}',
|
|
192
|
+
|
|
193
|
+
/* ---- 一行一对:左=要改的,右=要参照的 ----------------------------- */
|
|
194
|
+
'.vp-slot .more{flex:none;font-size:10.5px;font-weight:600;padding:1px 4px;border-radius:999px;' +
|
|
195
|
+
'background:rgba(75,140,247,.16);color:#2f6fd0}',
|
|
196
|
+
'html[data-theme="dark"] .vp-slot .more,.dark .vp-slot .more{color:#9cc2ff}',
|
|
197
|
+
'.vp-closed{flex:none;font-size:10px;line-height:1;padding:2px 4px;border-radius:3px;' +
|
|
198
|
+
'background:color-mix(in srgb,var(--vp-warn, #b7791f) 18%,transparent);color:#8a5a10;white-space:nowrap}',
|
|
199
|
+
'html[data-theme="dark"] .vp-closed,.dark .vp-closed{color:#e5c07b}',
|
|
200
|
+
'.vp-plain{display:flex;flex-direction:column;gap:8px}',
|
|
201
|
+
'.vp-refnote{display:flex;align-items:center;gap:6px;width:100%;padding:6px 8px;border-radius:7px;' +
|
|
202
|
+
'border:1px solid rgba(75,140,247,.32);background:rgba(75,140,247,.07);color:inherit;' +
|
|
203
|
+
'font:12px/1.4 system-ui,sans-serif;text-align:left;cursor:pointer}',
|
|
204
|
+
'.vp-refnote:hover{background:rgba(75,140,247,.13)}',
|
|
205
|
+
'.vp-refnote .r{flex:none;font:600 10.5px/1 ui-monospace,SFMono-Regular,Menlo,monospace;padding:2px 4px;' +
|
|
206
|
+
'border-radius:3px;background:rgba(75,140,247,.18);color:#2f6fd0}',
|
|
207
|
+
'html[data-theme="dark"] .vp-refnote .r,.dark .vp-refnote .r{color:#9cc2ff}',
|
|
208
|
+
'.vp-refnote .n{margin-left:auto;font-size:11px;color:var(--vp-muted);white-space:nowrap}',
|
|
209
|
+
'.vp-refnote .go{flex:none;font-size:11.5px;color:var(--vp-accent);white-space:nowrap}',
|
|
210
|
+
'.vp-pairs{display:flex;flex-direction:column;gap:10px}',
|
|
211
|
+
/* 两栏表头:左「改动」右「参照」。两栏之间靠一条竖线分开——以前只留 8px 空档,
|
|
212
|
+
左卡又是 3px 左边框、右卡是 1px 四边,两栏文字起点差 2px,看起来就是「没隔开也没对齐」。 */
|
|
213
|
+
'.vp-colhead{display:grid;grid-template-columns:1fr 1fr;gap:0;align-items:stretch;' +
|
|
214
|
+
'border-bottom:1px solid var(--vp-border)}',
|
|
215
|
+
'.vp-colhead .col{min-width:0;display:flex;flex-direction:column;gap:2px;' +
|
|
216
|
+
'padding:0 12px 7px 0;box-sizing:border-box}',
|
|
217
|
+
'.vp-colhead .col+.col{padding:0 0 7px 12px;border-left:1px solid var(--vp-border)}',
|
|
218
|
+
'.vp-chead{display:flex;align-items:center;gap:4px;min-width:0}',
|
|
219
|
+
'.vp-chead .k{flex:none;font:600 10.5px/1 system-ui,sans-serif;padding:2px 5px;border-radius:4px;' +
|
|
220
|
+
'background:var(--vp-target-weak);color:var(--vp-target)}',
|
|
221
|
+
'.vp-chead .k.ref{background:rgba(75,140,247,.16);color:#2f6fd0}',
|
|
222
|
+
'.vp-chead .num{flex:none;font:600 10px/1 system-ui,sans-serif;padding:2px 5px;border-radius:999px;' +
|
|
223
|
+
'background:var(--vp-surface-2);color:var(--vp-muted)}',
|
|
224
|
+
'html[data-theme="dark"] .vp-chead .k.ref,.dark .vp-chead .k.ref{color:#9cc2ff}',
|
|
225
|
+
/* 左右两栏:左栏改动(每条改动一张卡,卡下挂它参照的标注),右栏参照平铺。
|
|
226
|
+
竖线与表头同一条线:两栏的栅格线只在 gap 是 0 时才重合,所以分隔靠每列的内距 + 第二列边框。 */
|
|
227
|
+
'.vp-cols{display:grid;grid-template-columns:1fr 1fr;gap:0;align-items:stretch}',
|
|
228
|
+
'.vp-col{display:flex;flex-direction:column;gap:8px;min-width:0;' + 'padding:0 12px 0 0;box-sizing:border-box}',
|
|
229
|
+
'.vp-col+.vp-col{padding:0 0 0 12px;border-left:1px solid var(--vp-border)}',
|
|
230
|
+
'.vp-col>*{min-width:0}',
|
|
231
|
+
'.vp-grpwrap{display:flex;flex-direction:column;gap:6px}',
|
|
232
|
+
/* position:relative 给「选择参照」浮层当定位父级(见 .vp-refmenu)。 */
|
|
233
|
+
'.vp-tcell{position:relative;display:flex;flex-direction:column;gap:6px;min-width:0}',
|
|
234
|
+
// 卡下那条关系行(左=配了哪些参照,右=归属谁):两栏都得有、且同高,否则逐行必错位
|
|
235
|
+
'.vp-relrow{display:flex;align-items:center;gap:6px;height:26px;min-width:0;flex:none;overflow:hidden}',
|
|
236
|
+
'.vp-relrow .vp-cell-badge{margin-left:0;max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
|
|
237
|
+
'.vp-tcell.drop .vp-cell{border-color:var(--vp-accent);box-shadow:inset 0 0 0 1px var(--vp-accent-weak)}',
|
|
238
|
+
'.vp-empty-hint{padding:9px 10px;border-radius:8px;border:1px dashed var(--vp-border);' +
|
|
239
|
+
'font-size:11.5px;line-height:1.5;color:var(--vp-muted)}',
|
|
240
|
+
/* 普通模式只列改动:有参照时给一条入口,别让「标了却看不见」变成悬案。 */
|
|
241
|
+
'.vp-refs-note{display:flex;align-items:center;gap:8px;padding:7px 9px;border-radius:8px;' +
|
|
242
|
+
'border:1px solid rgba(75,140,247,.32);background:rgba(75,140,247,.08);' +
|
|
243
|
+
'font-size:11.5px;line-height:1.4;color:var(--vp-muted)}',
|
|
244
|
+
'.vp-refs-note b{color:#2f6fd0;font-variant-numeric:tabular-nums}',
|
|
245
|
+
'.vp-refs-note button{flex:none;margin-left:auto;padding:3px 8px;border-radius:6px;cursor:pointer;' +
|
|
246
|
+
'font-size:11.5px;color:#2f6fd0;background:transparent;border:1px solid rgba(75,140,247,.4)}',
|
|
247
|
+
'.vp-refs-note button:hover{background:rgba(75,140,247,.12)}',
|
|
248
|
+
'.vp-cell-badge{flex:none;display:inline-flex;align-items:center;margin-left:auto;height:17px;' +
|
|
249
|
+
'font:600 10px/1 ui-monospace,SFMono-Regular,Menlo,monospace;padding:0 6px;' +
|
|
250
|
+
'border-radius:999px;background:rgba(75,140,247,.14);color:#2f6fd0;white-space:nowrap}',
|
|
251
|
+
/* 参照卡上的归属 chip 用改动色:它指向的是左栏哪一条改动。 */
|
|
252
|
+
'.vp-cell-badge.owner{background:var(--vp-target-weak);color:var(--vp-target);font-weight:700;' +
|
|
253
|
+
'border:1px solid color-mix(in srgb,var(--vp-target) 40%,transparent)}',
|
|
254
|
+
'html[data-theme="dark"] .vp-cell-badge,.dark .vp-cell-badge{color:#9cc2ff}',
|
|
255
|
+
'.vp-addref{display:flex;align-items:center;justify-content:center;margin-top:auto;height:34px;padding:0 8px;' +
|
|
256
|
+
'border-radius:8px;border:1px dashed rgba(75,140,247,.5);background:transparent;color:#2f6fd0;' +
|
|
257
|
+
'font:11.5px/1.3 system-ui,sans-serif;cursor:pointer;text-align:center;box-sizing:border-box}',
|
|
258
|
+
'html[data-theme="dark"] .vp-addref,.dark .vp-addref{color:#9cc2ff}',
|
|
259
|
+
'.vp-addref:hover{background:rgba(75,140,247,.1)}',
|
|
260
|
+
'.vp-addref.arm{border-style:solid;border-color:#4b8cf7;background:rgba(75,140,247,.14);font-weight:600}',
|
|
261
|
+
'.vp-dimchip.arm{border-color:rgba(75,140,247,.6);background:rgba(75,140,247,.14);color:#2f6fd0}',
|
|
262
|
+
'.vp-dimchip.on{border-color:rgba(75,140,247,.6);background:rgba(75,140,247,.14);color:#2f6fd0;font-weight:600}',
|
|
263
|
+
'.vp-cell.drop{border-color:var(--vp-accent);box-shadow:inset 0 0 0 1px var(--vp-accent-weak)}',
|
|
264
|
+
'.vp-cell[draggable="true"]{cursor:grab}',
|
|
265
|
+
// 参考维度并到说明那一行的右端:另起一行会让参照卡比改动卡高一行。
|
|
266
|
+
'.vp-cell-spec{flex:none;max-width:52%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;' +
|
|
267
|
+
'font-size:10.5px;line-height:1.6;padding:0 6px;border-radius:999px;background:rgba(75,140,247,.14);' +
|
|
268
|
+
'color:#2f6fd0}',
|
|
269
|
+
'html[data-theme="dark"] .vp-cell-spec,.dark .vp-cell-spec{background:rgba(75,140,247,.2);color:#9cc2ff}',
|
|
270
|
+
'.vp-reflist{display:flex;flex-wrap:wrap;align-items:center;gap:4px;row-gap:6px}',
|
|
271
|
+
'.vp-reflist.vp-relrow{flex-wrap:nowrap;height:26px;overflow:hidden}',
|
|
272
|
+
'.vp-reflist .cap{font-size:11px;color:var(--vp-muted)}',
|
|
273
|
+
'.vp-refchip{display:inline-flex;align-items:center;gap:2px;height:22px;padding:0 2px 0 6px;border-radius:999px;' +
|
|
274
|
+
'background:rgba(75,140,247,.14);color:#2f6fd0;font:600 10.5px/1 ui-monospace,SFMono-Regular,Menlo,monospace}',
|
|
275
|
+
'html[data-theme="dark"] .vp-refchip,.dark .vp-refchip{color:#9cc2ff}',
|
|
276
|
+
'.vp-refchip button{width:16px;height:16px;border:0;border-radius:50%;background:transparent;color:inherit;' +
|
|
277
|
+
'font-size:12px;line-height:1;cursor:pointer}',
|
|
278
|
+
'.vp-refchip button:hover{background:rgba(75,140,247,.24)}',
|
|
279
|
+
/* 目标卡下的「选择参照」下拉:列出已标注、未挂到这条改动的参照,点一下就配对。
|
|
280
|
+
必须是浮层(绝对定位):留在文档流里会把左栏撑高,展开的下拉还长得像右栏卡片的复制品,
|
|
281
|
+
用户看到的就是「左边区域和右边区域重叠」。 */
|
|
282
|
+
'.vp-refmenu{position:absolute;left:0;right:0;top:calc(100% + 4px);z-index:30;' +
|
|
283
|
+
'padding:4px;border-radius:8px;border:1px solid var(--vp-border);' +
|
|
284
|
+
'background:var(--dsw-specific-menu-bg,Canvas);box-shadow:0 12px 28px -12px rgba(0,0,0,.45);' +
|
|
285
|
+
'display:flex;flex-direction:column;gap:2px;max-height:240px;overflow:auto}',
|
|
286
|
+
'.vp-refmenu button{display:flex;align-items:center;gap:6px;padding:5px 7px;border:0;border-radius:5px;' +
|
|
287
|
+
'background:transparent;color:inherit;font-size:12px;text-align:left;cursor:pointer}',
|
|
288
|
+
'.vp-refmenu button:hover{background:var(--vp-surface-2)}',
|
|
289
|
+
'.vp-refmenu button .t{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
|
|
290
|
+
'.vp-refmenu .hint{padding:5px 7px;font-size:11.5px;color:var(--vp-muted)}',
|
|
291
|
+
// 一颗标注 = 定高的一格:两栏卡片同高,右栏「+ 添加参照」才和左栏「+ 新增改动」落在同一条线上。
|
|
292
|
+
'.vp-cell{display:flex;flex-direction:column;gap:4px;min-width:0;height:56px;box-sizing:border-box;' +
|
|
293
|
+
'padding:6px 8px;border-radius:8px;overflow:hidden;' +
|
|
294
|
+
'border:1px solid var(--vp-border);background:var(--vp-surface);cursor:pointer;text-align:left;' +
|
|
295
|
+
'color:inherit;font:inherit}',
|
|
296
|
+
'.vp-cell:hover{background:var(--vp-surface-2)}',
|
|
297
|
+
/* 一处改动 = 一张带框的卡:左侧暖橙竖线 + 同色描边,右栏参照保持蓝色,
|
|
298
|
+
两栏在视觉上不再靠「一条细边框」区分。多出的 2px 左边框用 padding-left 补回去,
|
|
299
|
+
否则左栏文字比右栏往右缩 2px,两栏一起看就是歪的。 */
|
|
300
|
+
'.vp-cell.t{border-left:3px solid var(--vp-target);padding-left:6px;' +
|
|
301
|
+
'border-color:color-mix(in srgb,var(--vp-target) 32%,var(--vp-border))}',
|
|
302
|
+
'.vp-cell.sel{border-color:color-mix(in srgb,var(--vp-accent) 55%,var(--vp-border));' +
|
|
303
|
+
'box-shadow:inset 0 0 0 1px var(--vp-accent-weak)}',
|
|
304
|
+
'.vp-cell.ref{border-color:rgba(75,140,247,.38);background:rgba(75,140,247,.06)}',
|
|
305
|
+
'.vp-armbar{display:flex;align-items:center;gap:8px;margin:6px 12px 0;padding:7px 9px;border-radius:8px;' +
|
|
306
|
+
'border:1px solid color-mix(in srgb,var(--vp-accent) 45%,var(--vp-border));background:var(--vp-accent-weak);' +
|
|
307
|
+
'font-size:12px;line-height:1.45;flex:none}',
|
|
308
|
+
'.vp-armbar span{flex:1;min-width:0;word-break:break-word;color:var(--vp-accent)}',
|
|
309
|
+
'.vp-armbar button{flex:none;height:22px;padding:0 8px;border-radius:999px;' +
|
|
310
|
+
'border:1px solid var(--vp-border);background:transparent;color:inherit;font-size:11.5px;cursor:pointer}',
|
|
311
|
+
'.vp-sec{display:flex;align-items:baseline;gap:6px;margin:9px 0 6px;font-size:11.5px;color:var(--vp-muted)}',
|
|
312
|
+
'.vp-sub{border:0;background:none;padding:0;color:var(--vp-accent);font:11.5px/1.4 system-ui,sans-serif;' +
|
|
313
|
+
'cursor:pointer;text-align:left}',
|
|
314
|
+
'.vp-cell-main{display:flex;align-items:center;gap:10px;min-width:0}',
|
|
315
|
+
'.vp-cell-info{flex:1;min-width:0;display:flex;flex-direction:column;gap:4px}',
|
|
316
|
+
// 缩略图缩到 54×36 并加一圈内描边:原来 64×40 顶满卡片内容区、灰底直接贴住文字,
|
|
317
|
+
// 看着像一块图和一行字叠在一起;留出 10px 间距 + 细边,图与字之间才有过渡。
|
|
318
|
+
'.vp-cell-shot{width:54px;height:36px;border-radius:6px;overflow:hidden;background:var(--vp-surface-2);' +
|
|
319
|
+
'flex:none;box-shadow:inset 0 0 0 1px var(--vp-border)}',
|
|
320
|
+
'.vp-cell-shot img{width:100%;height:100%;object-fit:cover;object-position:top left;display:block}',
|
|
321
|
+
'.vp-cell-head{display:flex;align-items:center;gap:7px;min-width:0;height:18px}',
|
|
322
|
+
/* 序号是「第几处」的索引,不是主角:改成浅色底 + 同色字的低调徽标。原来实心色块
|
|
323
|
+
比正文还重,跟旁边的选择器一起抢视线;角色已经由左栏竖线与描边表达了。 */
|
|
324
|
+
'.vp-cell-head .n{flex:none;display:inline-flex;align-items:center;justify-content:center;min-width:18px;' +
|
|
325
|
+
'height:18px;padding:0 5px;border-radius:5px;background:var(--vp-target-soft);color:var(--vp-target);' +
|
|
326
|
+
'box-shadow:inset 0 0 0 1px color-mix(in srgb,var(--vp-target) 26%,transparent);' +
|
|
327
|
+
'font:700 11px/1 ui-monospace,SFMono-Regular,Menlo,monospace;letter-spacing:.02em;' +
|
|
328
|
+
'font-variant-numeric:tabular-nums}',
|
|
329
|
+
'.vp-cell-head .r{flex:none;display:inline-flex;align-items:center;justify-content:center;min-width:18px;' +
|
|
330
|
+
'height:18px;padding:0 5px;border-radius:5px;background:var(--vp-ref-soft);color:var(--vp-ref);' +
|
|
331
|
+
'box-shadow:inset 0 0 0 1px rgba(75,140,247,.26);' +
|
|
332
|
+
'font:700 10.5px/1 ui-monospace,SFMono-Regular,Menlo,monospace;letter-spacing:.02em;' +
|
|
333
|
+
'font-variant-numeric:tabular-nums}',
|
|
334
|
+
/* 选择器是给 agent 的定位信息,不是灰噪点:原来 11px 的 --vp-muted 在灰底上几乎读不出
|
|
335
|
+
#_SCROLL_EL_ID 这种全大写下划线 id,现在用正文色只压半档,字号提到 11.5。 */
|
|
336
|
+
'.vp-cell-sel{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;' +
|
|
337
|
+
'font:11.5px/1.4 ui-monospace,SFMono-Regular,Menlo,monospace;color:inherit;opacity:.82}',
|
|
338
|
+
// 说明只占一行,多的省略——要看全点开这张卡(行内编辑器里是全文本)。
|
|
339
|
+
// 以前两行截断,可右栏有参考维度、左栏没有,两栏卡片就一高一低。
|
|
340
|
+
'.vp-cell-note{display:flex;align-items:center;gap:6px;min-width:0;font-size:12px;line-height:1.45}',
|
|
341
|
+
'.vp-cell-note .t{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
|
|
342
|
+
'.vp-cell-note.none{color:var(--vp-muted)}',
|
|
343
|
+
'.vp-rowedit{grid-column:1/-1;display:flex;flex-direction:column;gap:6px;padding:8px;border-radius:8px;' +
|
|
344
|
+
'border:1px solid var(--vp-border);background:var(--vp-surface)}',
|
|
345
|
+
'.vp-rowedit .meta{display:flex;align-items:center;gap:6px;font-size:11.5px;color:var(--vp-muted);min-width:0}',
|
|
346
|
+
'.vp-rowedit .meta .sel{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;' +
|
|
347
|
+
'font-family:ui-monospace,SFMono-Regular,Menlo,monospace}',
|
|
348
|
+
'.vp-rowedit textarea{width:100%;box-sizing:border-box;min-height:44px;max-height:120px;padding:6px 8px;' +
|
|
349
|
+
'border-radius:6px;border:1px solid var(--vp-border);background:var(--dsw-specific-input-major,transparent);' +
|
|
350
|
+
'color:inherit;font:12px/1.5 system-ui,sans-serif;resize:vertical;outline:none}',
|
|
351
|
+
'.vp-rowedit textarea:focus{border-color:var(--vp-accent)}',
|
|
352
|
+
'.vp-dims{display:flex;flex-wrap:wrap;gap:4px}',
|
|
353
|
+
'.vp-dimchip{height:22px;padding:0 7px;border-radius:999px;border:1px solid var(--vp-border);background:transparent;' +
|
|
354
|
+
'color:var(--vp-muted);font-size:11px;cursor:pointer}',
|
|
355
|
+
'.vp-dimchip[aria-pressed="true"]{background:rgba(75,140,247,.16);border-color:rgba(75,140,247,.42);color:#2f6fd0;font-weight:600}',
|
|
356
|
+
'.vp-rowedit .actions{display:flex;align-items:center;gap:6px;flex-wrap:wrap}',
|
|
357
|
+
'html[data-theme="dark"] .vp-dims .vp-dimchip[aria-pressed="true"],.dark .vp-dims .vp-dimchip[aria-pressed="true"]{color:#9cc2ff}',
|
|
358
|
+
|
|
132
359
|
/* ---- pick mode --------------------------------------------------- */
|
|
133
|
-
'.vp-pick{display:flex;align-items:center;gap:10px;margin:2px 12px 0;padding:10px 12px;border-radius:10px;' +
|
|
134
|
-
'background:var(--vp-surface);border:1px solid var(--vp-border);flex:none}',
|
|
135
|
-
'.vp-pick.on{background:var(--vp-accent-weak);border-color:color-mix(in srgb,var(--vp-accent) 40%,transparent)}',
|
|
136
|
-
'.vp-pick .txt{flex:1;min-width:0;display:flex;flex-direction:column;gap:1px}',
|
|
137
|
-
'.vp-pick .t{font-size:13px;font-weight:600}',
|
|
138
|
-
'.vp-pick .s{font-size:12px;color:var(--vp-muted);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
|
|
139
360
|
'.vp-switch{position:relative;width:38px;height:22px;flex:none;padding:0;border-radius:999px;cursor:pointer;' +
|
|
140
361
|
'border:1px solid var(--vp-border);background:var(--vp-surface-2);transition:background .15s ease-out}',
|
|
141
362
|
'.vp-switch[aria-checked="true"]{background:var(--vp-accent);border-color:var(--vp-accent)}',
|
|
@@ -146,7 +367,7 @@ window.__ModuleLoader__.load({
|
|
|
146
367
|
'.vp-hint{padding:8px 12px 0;font-size:12px;color:var(--vp-muted);flex:none}',
|
|
147
368
|
|
|
148
369
|
/* ---- body -------------------------------------------------------- */
|
|
149
|
-
'.vp-body{flex:1;min-height:0;overflow:auto;padding:10px 12px 12px;display:flex;flex-direction:column;gap:
|
|
370
|
+
'.vp-body{flex:1;min-height:0;overflow:auto;padding:10px 12px 12px;display:flex;flex-direction:column;gap:10px}',
|
|
150
371
|
'.vp-empty{border:1px dashed var(--vp-border);border-radius:10px;padding:12px;display:flex;flex-direction:column;gap:6px}',
|
|
151
372
|
'.vp-step{display:flex;align-items:flex-start;gap:9px;padding:7px 8px;border-radius:8px;border:1px solid transparent;' +
|
|
152
373
|
'background:transparent;color:inherit;text-align:left;cursor:pointer;font-size:13px;line-height:1.5}',
|
|
@@ -200,6 +421,10 @@ window.__ModuleLoader__.load({
|
|
|
200
421
|
'.vp-toast button:hover{background:rgba(255,255,255,.16)}',
|
|
201
422
|
|
|
202
423
|
/* ---- container queries ------------------------------------------ */
|
|
424
|
+
'@container (max-width:560px){' +
|
|
425
|
+
'.vp-colhead{grid-template-columns:1fr}' +
|
|
426
|
+
'.vp-cols{grid-template-columns:1fr}' +
|
|
427
|
+
'}',
|
|
203
428
|
'@container (max-width:320px){' +
|
|
204
429
|
'.vp-card{flex-direction:column}' +
|
|
205
430
|
'.vp-thumb{width:100%;height:auto;aspect-ratio:16/9}' +
|
|
@@ -308,16 +533,106 @@ window.__ModuleLoader__.load({
|
|
|
308
533
|
return parts.join(' · ');
|
|
309
534
|
}
|
|
310
535
|
|
|
311
|
-
/**
|
|
536
|
+
/**
|
|
537
|
+
* The only insert shape: one marker line per pick with compact location; full details via the tool.
|
|
538
|
+
*
|
|
539
|
+
* 参考模式改的是首行与分组:首行明确「只改改动标注,参照那几处与它的代码不动」,
|
|
540
|
+
* 参考标注单独一段并标出维度。措辞必须和 agent 侧工具描述一致,否则模型仍可能去改参照元素。
|
|
541
|
+
*/
|
|
542
|
+
/**
|
|
543
|
+
* The only insert shape: one marker line per pick, full details via the tool.
|
|
544
|
+
*
|
|
545
|
+
* 参考对照把「改」与「照」写成同一组的两行,横向对应关系在文本里也保留;
|
|
546
|
+
* 边界只按标注划(参照可以与改动同页),措辞必须和 agent 侧工具描述一致。
|
|
547
|
+
*/
|
|
548
|
+
/** 一条改动可以参照好几处:pairIds 是权威,老数据只有单个 pairId 也要认。 */
|
|
549
|
+
function pairIdsOfPick(pick) {
|
|
550
|
+
var ids = Array.isArray(pick.pairIds) ? pick.pairIds.slice() : [];
|
|
551
|
+
var seen = ids.some((id) => String(id) === String(pick.pairId));
|
|
552
|
+
if (pick.pairId != null && !seen) ids.unshift(pick.pairId);
|
|
553
|
+
return ids;
|
|
554
|
+
}
|
|
555
|
+
|
|
312
556
|
function composeRefText(picks, imageCount, attached) {
|
|
313
|
-
var
|
|
557
|
+
var refs = picks.filter((pick) => pick.role === 'reference');
|
|
558
|
+
var targets = picks.filter((pick) => pick.role !== 'reference');
|
|
559
|
+
var codes = {};
|
|
560
|
+
var seen = {};
|
|
561
|
+
refs.forEach((pick) => {
|
|
562
|
+
var label = pick.refLabel || 'R';
|
|
563
|
+
var key = label + '|' + (pick.pageKey || '');
|
|
564
|
+
seen[key] = (seen[key] || 0) + 1;
|
|
565
|
+
codes[String(pick.id)] = label + '-' + seen[key];
|
|
566
|
+
});
|
|
567
|
+
var byId = {};
|
|
568
|
+
refs.forEach((pick) => {
|
|
569
|
+
byId[String(pick.id)] = pick;
|
|
570
|
+
});
|
|
571
|
+
var lines = [];
|
|
572
|
+
if (refs.length) {
|
|
573
|
+
lines.push(TASK_REFERENCE);
|
|
574
|
+
if (targets.length === 0) lines.push('(本次没有改动标注:按下面的参照规范新建。)');
|
|
575
|
+
} else lines.push(TASK_PLAIN);
|
|
314
576
|
if (imageCount > 0 && attached) lines.push('(' + imageCount + ' 张元素截图已作为附件插入)');
|
|
315
|
-
|
|
577
|
+
var marker = function (pick) {
|
|
578
|
+
return '[标注 #' + pick.id + ']';
|
|
579
|
+
};
|
|
580
|
+
var refLine = function (pick) {
|
|
581
|
+
var dims = Array.isArray(pick.spec) && pick.spec.length ? ' | 参考维度:' + pick.spec.join('、') : '';
|
|
316
582
|
var comment = String(pick.comment ?? '').trim();
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
583
|
+
return (
|
|
584
|
+
' ' +
|
|
585
|
+
marker(pick) +
|
|
586
|
+
'(' +
|
|
587
|
+
(codes[String(pick.id)] || '参考') +
|
|
588
|
+
')' +
|
|
589
|
+
(comment ? ' ' + comment : '') +
|
|
590
|
+
' | ' +
|
|
591
|
+
refLoc(pick) +
|
|
592
|
+
dims
|
|
593
|
+
);
|
|
594
|
+
};
|
|
595
|
+
if (refs.length) {
|
|
596
|
+
targets.forEach((target, index) => {
|
|
597
|
+
var comment = String(target.comment ?? '').trim();
|
|
598
|
+
lines.push('');
|
|
599
|
+
lines.push('对照 ' + (index + 1));
|
|
600
|
+
lines.push(
|
|
601
|
+
' 改动:' + marker(target) + (comment ? ' ' + comment : '(未填写修改要求)') + ' | ' + refLoc(target),
|
|
602
|
+
);
|
|
603
|
+
var linked = pairIdsOfPick(target)
|
|
604
|
+
.map((id) => byId[String(id)])
|
|
605
|
+
.filter(Boolean);
|
|
606
|
+
if (linked.length === 1) lines.push(' 参照:' + refLine(linked[0]));
|
|
607
|
+
else if (linked.length > 1) {
|
|
608
|
+
lines.push(' 参照以下几处(同一处改动,多个规范一并参照):');
|
|
609
|
+
linked.forEach((ref) => lines.push(refLine(ref)));
|
|
610
|
+
} else lines.push(' 参照:(未指定参照标注,可参照下方 R 编号的规范)');
|
|
611
|
+
});
|
|
612
|
+
var claimed = {};
|
|
613
|
+
targets.forEach((target) => {
|
|
614
|
+
pairIdsOfPick(target).forEach((id) => {
|
|
615
|
+
claimed[String(id)] = 1;
|
|
616
|
+
});
|
|
617
|
+
});
|
|
618
|
+
var loose = refs.filter((pick) => !claimed[String(pick.id)]);
|
|
619
|
+
if (loose.length) {
|
|
620
|
+
lines.push('');
|
|
621
|
+
lines.push(
|
|
622
|
+
loose.length === refs.length && !targets.length
|
|
623
|
+
? '参照以下标注新建:'
|
|
624
|
+
: '另有参照(没有对应改动,可参照其新建):',
|
|
625
|
+
);
|
|
626
|
+
loose.forEach((pick) => lines.push(refLine(pick)));
|
|
627
|
+
}
|
|
628
|
+
} else {
|
|
629
|
+
picks.forEach((pick) => {
|
|
630
|
+
var comment = String(pick.comment ?? '').trim();
|
|
631
|
+
var loc = refLoc(pick);
|
|
632
|
+
lines.push('[标注 #' + pick.id + ']' + (comment ? ' ' + comment : '') + (loc ? ' | ' + loc : ''));
|
|
633
|
+
});
|
|
634
|
+
}
|
|
635
|
+
lines.push('标注详情与截图由 dsh-annotator 插件的 visual_annotator_read 工具按 id 提供。');
|
|
321
636
|
return lines.join('\n');
|
|
322
637
|
}
|
|
323
638
|
|
|
@@ -542,6 +857,9 @@ window.__ModuleLoader__.load({
|
|
|
542
857
|
windowKept: false,
|
|
543
858
|
resumed: false,
|
|
544
859
|
markdown: '',
|
|
860
|
+
pages: [],
|
|
861
|
+
activePageKey: '',
|
|
862
|
+
summary: '',
|
|
545
863
|
error: null,
|
|
546
864
|
error_message: null,
|
|
547
865
|
hostRev: '',
|
|
@@ -568,6 +886,15 @@ window.__ModuleLoader__.load({
|
|
|
568
886
|
var [drafts, setDrafts] = useState({});
|
|
569
887
|
var [saved, setSaved] = useState({});
|
|
570
888
|
var [toast, setToast] = useState(null);
|
|
889
|
+
// 只有两个模式:普通标注(只改目标)与参考对照(左边改、右边照)。
|
|
890
|
+
var [viewMode, setViewMode] = useState('plain');
|
|
891
|
+
var [expandedId, setExpandedId] = useState('');
|
|
892
|
+
// 待落位:{ slot: 'target'|'reference', pairId }。点过空位之后,下一处标注自动配给这一行,
|
|
893
|
+
// 不用再靠「第一条未配对的目标」这种猜法。
|
|
894
|
+
var [arming, setArming] = useState(null);
|
|
895
|
+
// 已选中一条孤立参考,等着点左边某条改动把它配上(替代原来的下拉选择)。
|
|
896
|
+
var [assigning, setAssigning] = useState('');
|
|
897
|
+
var [slotMenu, setSlotMenu] = useState('');
|
|
571
898
|
var [menu, setMenu] = useState(false);
|
|
572
899
|
var [tabMenu, setTabMenu] = useState(false);
|
|
573
900
|
var urlRef = useRef(null);
|
|
@@ -575,6 +902,8 @@ window.__ModuleLoader__.load({
|
|
|
575
902
|
var saveTimers = useRef({});
|
|
576
903
|
// Host 推来的 pendingConsume token:只对没见过的 token 自动插入一次。
|
|
577
904
|
var pendingSeen = useRef(0);
|
|
905
|
+
// 最近一次「用户动手改落点」的时间:轮询可能带回改之前那一拍的值。
|
|
906
|
+
var armAt = useRef(0);
|
|
578
907
|
var sessionId = props.sessionId ?? null;
|
|
579
908
|
|
|
580
909
|
var cwd = props.useSessions
|
|
@@ -593,6 +922,31 @@ window.__ModuleLoader__.load({
|
|
|
593
922
|
if (kind === 'ok') toastTimer.current = setTimeout(() => setToast(null), ms || (action ? 6000 : 3200));
|
|
594
923
|
};
|
|
595
924
|
|
|
925
|
+
/**
|
|
926
|
+
* 落点属于 host:页面 HUD 上按 ⌥R 或点「改动 / 参照」开关时,面板要在下一次
|
|
927
|
+
* 轮询里跟上,否则 HUD 说「参照」、面板还停在改动栏,同一个动作两套说法。
|
|
928
|
+
* 只在值真的变了才写 state,避免每秒轮询都重渲染一条色条。
|
|
929
|
+
*/
|
|
930
|
+
// 上一拍从 host 读到的落点。切栏只认「这一拍才刚变成参照」的那一下:轮询每
|
|
931
|
+
// 1.5s 都无条件切一次的话,用户点回普通模式会在下一拍被无声拉回,等于不让人选。
|
|
932
|
+
var armSeen = useRef('');
|
|
933
|
+
var adoptArming = (raw) => {
|
|
934
|
+
var slot = raw && (raw.slot === 'target' || raw.slot === 'reference') ? raw.slot : '';
|
|
935
|
+
var pairId = slot && raw.pairId ? String(raw.pairId) : '';
|
|
936
|
+
// 刚点下去、POST 还没落到 host 的那一拍,轮询会带回旧值(null);短窗口内不回清。
|
|
937
|
+
if (!slot && Date.now() - (armAt.current || 0) < 1200) return;
|
|
938
|
+
var prevSlot = armSeen.current;
|
|
939
|
+
armSeen.current = slot;
|
|
940
|
+
setArming((prev) => {
|
|
941
|
+
var prevArmed = prev && prev.slot ? prev.slot : '';
|
|
942
|
+
if (prevArmed === slot && String((prev && prev.pairId) || '') === pairId) return prev;
|
|
943
|
+
return slot ? { slot: slot, pairId: pairId } : null;
|
|
944
|
+
});
|
|
945
|
+
// 从 HUD 第一次切到参照落点,顺手进参照模式(那里才有右栏可落):只在
|
|
946
|
+
// 「上一拍不是参照」时切,之后用户自己点回普通模式就不再被拉走。
|
|
947
|
+
if (slot === 'reference' && prevSlot !== 'reference') setViewMode('pair');
|
|
948
|
+
};
|
|
949
|
+
|
|
596
950
|
var apply = (data) => {
|
|
597
951
|
if (!data || (data.ok === false && data.error)) {
|
|
598
952
|
setState((prev) => Object.assign({}, prev, { error_message: data?.error ?? '请求失败' }));
|
|
@@ -616,12 +970,16 @@ window.__ModuleLoader__.load({
|
|
|
616
970
|
windowKept: data.windowKept ?? prev.windowKept,
|
|
617
971
|
resumed: data.resumed ?? prev.resumed,
|
|
618
972
|
markdown: data.markdown ?? prev.markdown,
|
|
973
|
+
pages: Array.isArray(data.pages) ? data.pages : prev.pages,
|
|
974
|
+
activePageKey: data.activePageKey ?? prev.activePageKey,
|
|
975
|
+
summary: data.summary ?? prev.summary,
|
|
619
976
|
pendingConsume: data.pendingConsume ?? prev.pendingConsume,
|
|
620
977
|
error: data.error ?? null,
|
|
621
978
|
error_message: null,
|
|
622
979
|
hostRev: data.rev ?? prev.hostRev,
|
|
623
980
|
}),
|
|
624
981
|
);
|
|
982
|
+
adoptArming(data.arming);
|
|
625
983
|
};
|
|
626
984
|
|
|
627
985
|
/** Build prefix the running host reports, e.g. 'v9' out of 'v9-1726544940000'. */
|
|
@@ -682,6 +1040,144 @@ window.__ModuleLoader__.load({
|
|
|
682
1040
|
);
|
|
683
1041
|
|
|
684
1042
|
var picks = state.picks ?? [];
|
|
1043
|
+
var pages = state.pages ?? [];
|
|
1044
|
+
var targets = picks.filter((pick) => pick.role !== 'reference');
|
|
1045
|
+
var refs = picks.filter((pick) => pick.role === 'reference');
|
|
1046
|
+
|
|
1047
|
+
/** 参考标注的显示编号 R1-1:同一参考页内按出现顺序。 */
|
|
1048
|
+
var refCodeOf = function (pick) {
|
|
1049
|
+
var key = pick.pageKey || '';
|
|
1050
|
+
var index = 0;
|
|
1051
|
+
for (var i = 0; i < refs.length; i++) {
|
|
1052
|
+
if ((refs[i].pageKey || '') !== key) continue;
|
|
1053
|
+
index += 1;
|
|
1054
|
+
if (String(refs[i].id) === String(pick.id)) break;
|
|
1055
|
+
}
|
|
1056
|
+
return (pick.refLabel || 'R') + '-' + index;
|
|
1057
|
+
};
|
|
1058
|
+
|
|
1059
|
+
var pairIdsOf = pairIdsOfPick;
|
|
1060
|
+
var isTargetId = (id) => targets.some((item) => String(item.id) === String(id));
|
|
1061
|
+
var isRefId = (id) => refs.some((item) => String(item.id) === String(id));
|
|
1062
|
+
var pairCount = (pick) => pairIdsOf(pick).length;
|
|
1063
|
+
|
|
1064
|
+
/** 一组「一条改动 + 它参照的若干条参考」;没人认领的参考单独成行。 */
|
|
1065
|
+
var pairRows = function () {
|
|
1066
|
+
var byId = {};
|
|
1067
|
+
refs.forEach((pick) => {
|
|
1068
|
+
byId[String(pick.id)] = pick;
|
|
1069
|
+
});
|
|
1070
|
+
var claimed = {};
|
|
1071
|
+
var rows = targets.map((target) => {
|
|
1072
|
+
var list = [];
|
|
1073
|
+
pairIdsOf(target).forEach((id) => {
|
|
1074
|
+
var ref = byId[String(id)];
|
|
1075
|
+
if (!ref || claimed[String(ref.id)]) return;
|
|
1076
|
+
claimed[String(ref.id)] = 1;
|
|
1077
|
+
list.push(ref);
|
|
1078
|
+
});
|
|
1079
|
+
return { target: target, refs: list, ref: list[0] || null };
|
|
1080
|
+
});
|
|
1081
|
+
refs.forEach((pick) => {
|
|
1082
|
+
if (!claimed[String(pick.id)]) rows.push({ target: null, refs: [], ref: pick });
|
|
1083
|
+
});
|
|
1084
|
+
return rows;
|
|
1085
|
+
};
|
|
1086
|
+
var rows = pairRows();
|
|
1087
|
+
// 参考标注插过一次就不再自动带上:同一份规范不该每轮重发。
|
|
1088
|
+
// 新参考自动带上;已经引用过的只在「它所照的那条改动本次要插入」时跟着走一遍,
|
|
1089
|
+
// 否则文本里会留下「参照:R1-1」却没有 R1-1 的定义。
|
|
1090
|
+
var linkedIds = {};
|
|
1091
|
+
targets.forEach((target) => {
|
|
1092
|
+
pairIdsOf(target).forEach((id) => {
|
|
1093
|
+
linkedIds[String(id)] = 1;
|
|
1094
|
+
});
|
|
1095
|
+
});
|
|
1096
|
+
// 已引用(上次插入留下的)参照默认不重发;用户在参照卡上点了「再次引用」
|
|
1097
|
+
// (included=true)后重新参与下一次插入,仍然挂在改动下的照常带上。
|
|
1098
|
+
var keepRefs = refs.filter((pick) => !pick.referencedAt || pick.included === true || linkedIds[String(pick.id)]);
|
|
1099
|
+
var insertable = viewMode === 'pair' ? targets.concat(keepRefs) : targets;
|
|
1100
|
+
// 「插入对照」的前提是真的有对照:只有「改动」、一条「参照」都还没有时按钮置灰。
|
|
1101
|
+
// 早先它照样能点,用户以为插的是对照,实际只把目标标注塞进了输入框——那时该走普通标注。
|
|
1102
|
+
var canInsert = insertable.length > 0 && (viewMode !== 'pair' || refs.length > 0);
|
|
1103
|
+
var ctaPicks = canInsert ? insertable : [];
|
|
1104
|
+
|
|
1105
|
+
/** options.move:把这条参考从原来那组挪过来,而不是让它同时挂在两处。 */
|
|
1106
|
+
var setPair = async (targetId, refId, options) => {
|
|
1107
|
+
try {
|
|
1108
|
+
var data = await post('/pair', {
|
|
1109
|
+
targetId: targetId,
|
|
1110
|
+
refId: refId,
|
|
1111
|
+
move: !!(options && options.move === true),
|
|
1112
|
+
});
|
|
1113
|
+
apply(data);
|
|
1114
|
+
if (data && data.ok === false) flash('err', String(data.message || data.error || '没有配上'));
|
|
1115
|
+
} catch (error) {
|
|
1116
|
+
flash('err', String((error && error.message) || error));
|
|
1117
|
+
}
|
|
1118
|
+
};
|
|
1119
|
+
|
|
1120
|
+
/** 单条标注改角色:拖到「照」栏表头就等于点这里。 */
|
|
1121
|
+
var setPickRole = async (id, role) => {
|
|
1122
|
+
try {
|
|
1123
|
+
var data = await post('/pick-role', { id: id, role: role });
|
|
1124
|
+
apply(data);
|
|
1125
|
+
if (data && data.ok === false) flash('err', String(data.message || data.error || '角色没有改成'));
|
|
1126
|
+
} catch (error) {
|
|
1127
|
+
flash('err', String((error && error.message) || error));
|
|
1128
|
+
}
|
|
1129
|
+
};
|
|
1130
|
+
|
|
1131
|
+
/**
|
|
1132
|
+
* 再次引用:插入后被保留的参照默认不再重发(included=false)。
|
|
1133
|
+
* 参照卡上点「再次引用」把它勾回来,下一次插入会一并带上(重发)。
|
|
1134
|
+
*/
|
|
1135
|
+
var reuseRef = async (ref, want) => {
|
|
1136
|
+
try {
|
|
1137
|
+
var data = await post('/pick-include', { id: ref.id, included: want === true });
|
|
1138
|
+
apply(data);
|
|
1139
|
+
if (data && data.ok === false) {
|
|
1140
|
+
flash('err', String(data.message || data.error || '没有改成'));
|
|
1141
|
+
return;
|
|
1142
|
+
}
|
|
1143
|
+
flash('ok', want ? '已勾选再次引用:这条参照会参与下一次插入' : '已取消再次引用');
|
|
1144
|
+
} catch (error) {
|
|
1145
|
+
flash('err', String((error && error.message) || error));
|
|
1146
|
+
}
|
|
1147
|
+
};
|
|
1148
|
+
|
|
1149
|
+
/** 只解开一组里的一条参考,别的配对不动。 */
|
|
1150
|
+
var unpairOne = async (targetId, refId) => {
|
|
1151
|
+
try {
|
|
1152
|
+
apply(await post('/unpair', { targetId: targetId, refId: refId }));
|
|
1153
|
+
} catch (error) {
|
|
1154
|
+
flash('err', String((error && error.message) || error));
|
|
1155
|
+
}
|
|
1156
|
+
};
|
|
1157
|
+
|
|
1158
|
+
var setPairAll = async (refId) => {
|
|
1159
|
+
try {
|
|
1160
|
+
var data = await post('/pair-all', { refId: refId });
|
|
1161
|
+
apply(data);
|
|
1162
|
+
if (data && data.ok === false) {
|
|
1163
|
+
flash('err', String(data.message || data.error || '没有套用'));
|
|
1164
|
+
} else if (data && data.paired) {
|
|
1165
|
+
flash('ok', '已套用到 ' + data.paired + ' 条还没配对的目标');
|
|
1166
|
+
} else {
|
|
1167
|
+
flash('info', '没有还需要配的目标了');
|
|
1168
|
+
}
|
|
1169
|
+
} catch (error) {
|
|
1170
|
+
flash('err', String((error && error.message) || error));
|
|
1171
|
+
}
|
|
1172
|
+
};
|
|
1173
|
+
|
|
1174
|
+
var setPickSpec = async (id, spec) => {
|
|
1175
|
+
try {
|
|
1176
|
+
apply(await post('/pick-spec', { id: id, spec: spec }));
|
|
1177
|
+
} catch (error) {
|
|
1178
|
+
flash('err', String((error && error.message) || error));
|
|
1179
|
+
}
|
|
1180
|
+
};
|
|
685
1181
|
|
|
686
1182
|
/** Attach screenshots as real composer image attachments. */
|
|
687
1183
|
var attachShots = async (list) => {
|
|
@@ -725,11 +1221,17 @@ window.__ModuleLoader__.load({
|
|
|
725
1221
|
return { ok: ok, count: ok ? files.length : 0 };
|
|
726
1222
|
};
|
|
727
1223
|
|
|
728
|
-
/**
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
1224
|
+
/**
|
|
1225
|
+
* Chip insert: one real composer chip per pick; expands to full location text at submit.
|
|
1226
|
+
* seq 是 [{pick, prefix}]:prefix 写「改动 N:」或「 参照 R1-1:」,谁参考谁在草稿里逐行对应。
|
|
1227
|
+
*/
|
|
1228
|
+
var insertViaChips = (ia, actx, seq, header) => {
|
|
1229
|
+
header = header || TASK_PLAIN;
|
|
1230
|
+
if (!ia.insertText(header + '\n', ia.captureInsertion())) return false;
|
|
1231
|
+
for (var i = 0; i < seq.length; i++) {
|
|
1232
|
+
var pick = seq[i].pick;
|
|
1233
|
+
var prefix = seq[i].prefix || '';
|
|
1234
|
+
if (prefix && !ia.insertText(prefix + '\n', ia.captureInsertion())) return false;
|
|
733
1235
|
var span = ia.captureInsertion();
|
|
734
1236
|
var applied = false;
|
|
735
1237
|
try {
|
|
@@ -750,13 +1252,18 @@ window.__ModuleLoader__.load({
|
|
|
750
1252
|
var comment = String(pick.comment ?? '').trim();
|
|
751
1253
|
if (comment && !ia.insertText(comment + '\n', ia.captureInsertion())) return false;
|
|
752
1254
|
}
|
|
753
|
-
if (
|
|
1255
|
+
if (
|
|
1256
|
+
!ia.insertText(
|
|
1257
|
+
'标注详情与截图由 dsh-annotator 插件的 visual_annotator_read 工具按 id 提供。',
|
|
1258
|
+
ia.captureInsertion(),
|
|
1259
|
+
)
|
|
1260
|
+
)
|
|
754
1261
|
return false;
|
|
755
1262
|
// Verify on the live composer: header text must show, and every chip must exist in the DOM.
|
|
756
1263
|
var tb = document.querySelector('[role="textbox"]');
|
|
757
|
-
if (!tb || !draftContains(['
|
|
1264
|
+
if (!tb || !draftContains([header.replace(/[::]\s*$/, '')])) return false;
|
|
758
1265
|
var chipCount = tb.querySelectorAll('[data-composer-chip="' + VP_SOURCE_NAME + '"]').length;
|
|
759
|
-
return chipCount >=
|
|
1266
|
+
return chipCount >= seq.length;
|
|
760
1267
|
};
|
|
761
1268
|
|
|
762
1269
|
/** Plain-text insert with landing verification and a setDraft fallback. */
|
|
@@ -923,12 +1430,41 @@ window.__ModuleLoader__.load({
|
|
|
923
1430
|
);
|
|
924
1431
|
var attached = await attachShots(withComment);
|
|
925
1432
|
var text = composeRefText(withComment, attached.count, attached.ok);
|
|
1433
|
+
var paired = withComment.some((pick) => pick.role === 'reference');
|
|
1434
|
+
var header = paired ? TASK_REFERENCE : TASK_PLAIN;
|
|
1435
|
+
// seq = [{pick, prefix}]:普通模式无前缀;对照模式按「改动 N → 参照 R…」成对展开,
|
|
1436
|
+
// 未被任何改动引用的参照单列一节,保证草稿里能看出谁参考谁。
|
|
1437
|
+
var seq;
|
|
1438
|
+
if (!paired) {
|
|
1439
|
+
seq = withComment.map((pick) => ({ pick: pick, prefix: '' }));
|
|
1440
|
+
} else {
|
|
1441
|
+
var refById = {};
|
|
1442
|
+
withComment.forEach((pick) => {
|
|
1443
|
+
if (pick.role === 'reference') refById[String(pick.id)] = pick;
|
|
1444
|
+
});
|
|
1445
|
+
var claimed = {};
|
|
1446
|
+
seq = [];
|
|
1447
|
+
withComment.forEach((pick) => {
|
|
1448
|
+
if (pick.role === 'reference') return;
|
|
1449
|
+
seq.push({ pick: pick, prefix: '改动 ' + (targets.indexOf(pick) + 1) + ':' });
|
|
1450
|
+
pairIdsOfPick(pick).forEach((id) => {
|
|
1451
|
+
var ref = refById[String(id)];
|
|
1452
|
+
if (!ref || claimed[String(ref.id)]) return;
|
|
1453
|
+
claimed[String(ref.id)] = true;
|
|
1454
|
+
seq.push({ pick: ref, prefix: ' 参照 ' + refCodeOf(ref) + ':' });
|
|
1455
|
+
});
|
|
1456
|
+
});
|
|
1457
|
+
withComment.forEach((pick) => {
|
|
1458
|
+
if (pick.role !== 'reference' || claimed[String(pick.id)]) return;
|
|
1459
|
+
seq.push({ pick: pick, prefix: ' 参照 ' + refCodeOf(pick) + '(未对应改动):' });
|
|
1460
|
+
});
|
|
1461
|
+
}
|
|
926
1462
|
var ia = resolveLiveActions(props.inputActions);
|
|
927
1463
|
var actx = ensureVpSource(props.ctx) ? resolveActx(props.ctx, sessionId) : null;
|
|
928
1464
|
var ok = false;
|
|
929
1465
|
if (actx && typeof actx.bail === 'function' && ia && typeof ia.captureInsertion === 'function') {
|
|
930
1466
|
try {
|
|
931
|
-
ok = insertViaChips(ia, actx,
|
|
1467
|
+
ok = insertViaChips(ia, actx, seq, header);
|
|
932
1468
|
} catch {
|
|
933
1469
|
ok = false;
|
|
934
1470
|
}
|
|
@@ -947,7 +1483,7 @@ window.__ModuleLoader__.load({
|
|
|
947
1483
|
var note = attached.ok ? ',含 ' + attached.count + ' 张截图' : ';截图未附上,定位详情在发送时展开';
|
|
948
1484
|
await consumeInserted(
|
|
949
1485
|
withComment.map((pick) => pick.id),
|
|
950
|
-
'已插入 ' + label + '标注' + note,
|
|
1486
|
+
(paired ? '已插入 ' : '已插入 ') + label + '标注' + note,
|
|
951
1487
|
attached.ok ? 'ok' : 'warn',
|
|
952
1488
|
);
|
|
953
1489
|
return true;
|
|
@@ -970,14 +1506,18 @@ window.__ModuleLoader__.load({
|
|
|
970
1506
|
function () {
|
|
971
1507
|
var token = state.pendingConsume || 0;
|
|
972
1508
|
if (!token || token === pendingSeen.current) return;
|
|
973
|
-
if (!
|
|
974
|
-
// token
|
|
1509
|
+
if (!canInsert) {
|
|
1510
|
+
// token 到达前列表已被清空,或者参考对照里只有「改」没有「照」:
|
|
1511
|
+
// 不插入、也不悬空重放,直接说清楚为什么,免得用户以为插了对照。
|
|
975
1512
|
pendingSeen.current = token;
|
|
1513
|
+
if (insertable.length && viewMode === 'pair') {
|
|
1514
|
+
flash('warn', '还没有参照标注:插入对照至少需要一处参照;仅插入改动请切换到普通模式');
|
|
1515
|
+
}
|
|
976
1516
|
return;
|
|
977
1517
|
}
|
|
978
1518
|
var previous = pendingSeen.current;
|
|
979
1519
|
pendingSeen.current = token;
|
|
980
|
-
Promise.resolve(insertOnce(
|
|
1520
|
+
Promise.resolve(insertOnce(ctaPicks, 'token', token)).then(
|
|
981
1521
|
(ok) => {
|
|
982
1522
|
if (!ok) pendingSeen.current = previous;
|
|
983
1523
|
},
|
|
@@ -986,7 +1526,7 @@ window.__ModuleLoader__.load({
|
|
|
986
1526
|
},
|
|
987
1527
|
);
|
|
988
1528
|
},
|
|
989
|
-
[state.pendingConsume, picks],
|
|
1529
|
+
[state.pendingConsume, picks, state.pages],
|
|
990
1530
|
);
|
|
991
1531
|
|
|
992
1532
|
// Keep chip serialization data fresh (submit-time codec reads the registry).
|
|
@@ -1093,18 +1633,20 @@ window.__ModuleLoader__.load({
|
|
|
1093
1633
|
* undo slot; an old host (pre-v14) still clears, but the batch undo does
|
|
1094
1634
|
* not exist there, so it walks /remove and the toast stops offering 撤销.
|
|
1095
1635
|
*/
|
|
1096
|
-
var clearAll = async () => {
|
|
1636
|
+
var clearAll = async (scope) => {
|
|
1097
1637
|
setMenu(false);
|
|
1098
|
-
|
|
1638
|
+
scope = scope === 'target' || scope === 'reference' ? scope : 'all';
|
|
1639
|
+
var doomed = scope === 'target' ? targets : scope === 'reference' ? refs : picks;
|
|
1640
|
+
var count = doomed.length;
|
|
1099
1641
|
if (!count) return;
|
|
1100
1642
|
var result = null;
|
|
1101
1643
|
try {
|
|
1102
|
-
result = await post('/clear', {});
|
|
1644
|
+
result = await post('/clear', { scope: scope });
|
|
1103
1645
|
} catch {
|
|
1104
1646
|
result = null;
|
|
1105
1647
|
}
|
|
1106
1648
|
if (!result || result.ok === false) {
|
|
1107
|
-
for (var pick of
|
|
1649
|
+
for (var pick of doomed) {
|
|
1108
1650
|
try {
|
|
1109
1651
|
var res = await post('/remove', { id: pick.id });
|
|
1110
1652
|
if (!res || res.ok === false) throw new Error('remove failed');
|
|
@@ -1282,7 +1824,9 @@ window.__ModuleLoader__.load({
|
|
|
1282
1824
|
? '已断开 · 浏览器保留'
|
|
1283
1825
|
: '未连接';
|
|
1284
1826
|
var insertLabel = '插入';
|
|
1285
|
-
|
|
1827
|
+
// CTA 说清楚这次到底插什么:只有参考 = 照参考新建;混合 = 目标 + 参考分开算。
|
|
1828
|
+
var ctaLabel =
|
|
1829
|
+
viewMode === 'pair' ? '插入对照(' + insertable.length + ' 条)' : '全部插入(' + insertable.length + ' 条)';
|
|
1286
1830
|
var tabs = state.tabs ?? [];
|
|
1287
1831
|
// 标签条平铺:一行放不下就折行,最多直接给 10 枚,剩下的收进「更多」弹层,
|
|
1288
1832
|
// 免得 5 个标签就把这条挤出横向滚动条。
|
|
@@ -1307,6 +1851,17 @@ window.__ModuleLoader__.load({
|
|
|
1307
1851
|
},
|
|
1308
1852
|
h('b', null, tab.active ? '●' : '○'),
|
|
1309
1853
|
h('span', null, String(tab.title || tab.url || tab.targetId).slice(0, wide ? 80 : 24)),
|
|
1854
|
+
// 这一页里没有标注层:明确标出来,别让用户对着一个「没反应」的页面猜。
|
|
1855
|
+
tab.hud === false
|
|
1856
|
+
? h(
|
|
1857
|
+
'b',
|
|
1858
|
+
{
|
|
1859
|
+
className: 'vp-tab-warn',
|
|
1860
|
+
title: '这个标签页里没有标注层(host 会自动重试)。点一下这个标签页可再试一次。',
|
|
1861
|
+
},
|
|
1862
|
+
'!',
|
|
1863
|
+
)
|
|
1864
|
+
: null,
|
|
1310
1865
|
);
|
|
1311
1866
|
};
|
|
1312
1867
|
|
|
@@ -1322,12 +1877,21 @@ window.__ModuleLoader__.load({
|
|
|
1322
1877
|
return;
|
|
1323
1878
|
}
|
|
1324
1879
|
if (mod && event.key === 'Enter') {
|
|
1325
|
-
if (
|
|
1880
|
+
if (!canInsert) return;
|
|
1326
1881
|
event.preventDefault();
|
|
1327
|
-
insertOnce(
|
|
1882
|
+
insertOnce(ctaPicks, 'key', event);
|
|
1328
1883
|
return;
|
|
1329
1884
|
}
|
|
1330
1885
|
if (event.key === 'Escape') {
|
|
1886
|
+
if (expandedId) {
|
|
1887
|
+
event.preventDefault();
|
|
1888
|
+
setExpandedId('');
|
|
1889
|
+
return;
|
|
1890
|
+
}
|
|
1891
|
+
if (slotMenu) {
|
|
1892
|
+
setSlotMenu('');
|
|
1893
|
+
return;
|
|
1894
|
+
}
|
|
1331
1895
|
if (menu) {
|
|
1332
1896
|
setMenu(false);
|
|
1333
1897
|
return;
|
|
@@ -1343,107 +1907,1074 @@ window.__ModuleLoader__.load({
|
|
|
1343
1907
|
window.removeEventListener('keydown', onKey);
|
|
1344
1908
|
};
|
|
1345
1909
|
},
|
|
1346
|
-
[state.mode, picks, menu],
|
|
1910
|
+
[state.mode, picks, state.pages, menu, expandedId, slotMenu],
|
|
1347
1911
|
);
|
|
1348
1912
|
|
|
1349
|
-
|
|
1350
|
-
|
|
1351
|
-
|
|
1352
|
-
|
|
1353
|
-
|
|
1913
|
+
/** 参考维度快捷标签:和 host 侧 page-roles 的 SPEC_DIMS 保持一致。 */
|
|
1914
|
+
var SPEC_DIMS = ['布局', '间距', '配色', '字体', '字号', '圆角', '交互', '文案'];
|
|
1915
|
+
|
|
1916
|
+
/** 两个模式:普通模式(一处一条)/ 参照模式(左「改动」右「参照」)。 */
|
|
1917
|
+
var modeTabs = function () {
|
|
1918
|
+
if (!ready || !pages.length) return null;
|
|
1919
|
+
return h(
|
|
1354
1920
|
'div',
|
|
1355
|
-
{ className: 'vp-
|
|
1356
|
-
h('span', { className: 'vp-title' }, '指哪改哪'),
|
|
1921
|
+
{ className: 'vp-mode', role: 'tablist' },
|
|
1357
1922
|
h(
|
|
1358
|
-
'
|
|
1923
|
+
'button',
|
|
1359
1924
|
{
|
|
1360
|
-
|
|
1361
|
-
'
|
|
1362
|
-
|
|
1363
|
-
title:
|
|
1364
|
-
|
|
1365
|
-
|
|
1366
|
-
|
|
1367
|
-
|
|
1368
|
-
|
|
1925
|
+
role: 'tab',
|
|
1926
|
+
'aria-selected': viewMode === 'plain',
|
|
1927
|
+
className: viewMode === 'plain' ? 'on' : '',
|
|
1928
|
+
title: '普通模式:只列需要修改的标注,一处一条',
|
|
1929
|
+
onClick: () => {
|
|
1930
|
+
setArming(null);
|
|
1931
|
+
setAssigning('');
|
|
1932
|
+
setViewMode('plain');
|
|
1933
|
+
},
|
|
1369
1934
|
},
|
|
1370
|
-
h('
|
|
1371
|
-
|
|
1935
|
+
h('span', { className: 'dot' }),
|
|
1936
|
+
'普通模式',
|
|
1937
|
+
h('span', { className: 'n' }, targets.length),
|
|
1372
1938
|
),
|
|
1373
|
-
h('span', { className: 'vp-spacer' }),
|
|
1374
1939
|
h(
|
|
1375
1940
|
'button',
|
|
1376
1941
|
{
|
|
1377
|
-
|
|
1378
|
-
'aria-
|
|
1379
|
-
'
|
|
1380
|
-
title: '
|
|
1381
|
-
onClick: () =>
|
|
1942
|
+
role: 'tab',
|
|
1943
|
+
'aria-selected': viewMode === 'pair',
|
|
1944
|
+
className: (viewMode === 'pair' ? 'on' : '') + ' ref',
|
|
1945
|
+
title: '参照模式:左侧为改动、右侧为参照,一条改动可参照多处',
|
|
1946
|
+
onClick: () => setViewMode('pair'),
|
|
1382
1947
|
},
|
|
1383
|
-
h(
|
|
1948
|
+
h('span', { className: 'dot' }),
|
|
1949
|
+
'参照模式',
|
|
1950
|
+
h('span', { className: 'n' }, rows.length),
|
|
1384
1951
|
),
|
|
1385
|
-
)
|
|
1386
|
-
|
|
1387
|
-
|
|
1952
|
+
);
|
|
1953
|
+
};
|
|
1954
|
+
|
|
1955
|
+
/** 栏头不提页面:一条标注属于哪一栏由落标时点的按钮决定,与它出自哪个标签页无关。 */
|
|
1956
|
+
var colHeads = function () {
|
|
1957
|
+
return h(
|
|
1958
|
+
'div',
|
|
1959
|
+
{ className: 'vp-colhead' },
|
|
1960
|
+
h(
|
|
1961
|
+
'div',
|
|
1962
|
+
{ className: 'col' },
|
|
1963
|
+
h(
|
|
1388
1964
|
'div',
|
|
1389
|
-
{ className: 'vp-
|
|
1390
|
-
h(
|
|
1391
|
-
|
|
1392
|
-
|
|
1393
|
-
|
|
1394
|
-
|
|
1395
|
-
|
|
1396
|
-
|
|
1397
|
-
|
|
1398
|
-
|
|
1399
|
-
|
|
1965
|
+
{ className: 'vp-chead' },
|
|
1966
|
+
h('span', { className: 'k' }, '改动区'),
|
|
1967
|
+
h('span', { className: 'num' }, String(targets.length)),
|
|
1968
|
+
),
|
|
1969
|
+
),
|
|
1970
|
+
h(
|
|
1971
|
+
'div',
|
|
1972
|
+
// 拖「改动」到「参照」栏 = 这条改成参照:换个身份比翻菜单快。
|
|
1973
|
+
{
|
|
1974
|
+
className: 'col',
|
|
1975
|
+
title: '将左侧任一条改动拖到这里,即可将其改为参照',
|
|
1976
|
+
onDragOver: (event) => {
|
|
1977
|
+
event.preventDefault();
|
|
1978
|
+
},
|
|
1979
|
+
onDrop: (event) => {
|
|
1980
|
+
event.preventDefault();
|
|
1981
|
+
var raw = '';
|
|
1982
|
+
try {
|
|
1983
|
+
raw = String(
|
|
1984
|
+
event.dataTransfer.getData('application/x-vp-pick') ||
|
|
1985
|
+
event.dataTransfer.getData('text/plain') ||
|
|
1986
|
+
'',
|
|
1987
|
+
);
|
|
1988
|
+
} catch {
|
|
1989
|
+
raw = '';
|
|
1990
|
+
}
|
|
1991
|
+
var pick = picks.filter((item) => String(item.id) === raw)[0];
|
|
1992
|
+
if (!pick) return;
|
|
1993
|
+
if (pick.role === 'reference') {
|
|
1994
|
+
flash('info', '该标注已经是参照');
|
|
1995
|
+
return;
|
|
1996
|
+
}
|
|
1997
|
+
setPickRole(pick.id, 'reference');
|
|
1998
|
+
flash('ok', '该标注已改为参照');
|
|
1999
|
+
},
|
|
2000
|
+
},
|
|
2001
|
+
h(
|
|
1400
2002
|
'div',
|
|
1401
|
-
{ className: 'vp-
|
|
1402
|
-
h('span',
|
|
1403
|
-
h('
|
|
1404
|
-
|
|
1405
|
-
|
|
1406
|
-
|
|
1407
|
-
|
|
1408
|
-
|
|
1409
|
-
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1413
|
-
|
|
1414
|
-
|
|
1415
|
-
|
|
1416
|
-
|
|
2003
|
+
{ className: 'vp-chead' },
|
|
2004
|
+
h('span', { className: 'k ref' }, '参照区'),
|
|
2005
|
+
h('span', { className: 'num' }, String(refs.length)),
|
|
2006
|
+
),
|
|
2007
|
+
),
|
|
2008
|
+
);
|
|
2009
|
+
};
|
|
2010
|
+
|
|
2011
|
+
/**
|
|
2012
|
+
* 设落点:下一处标注进哪一栏。落点是粘性的——点一次「+ 新增改动」,之后
|
|
2013
|
+
* 在任意标签页上连点五处都在「改动」栏,不用每标一处回来按一次;再点一次取消。
|
|
2014
|
+
* 角色在 host 落标那一刻就定下来,面板不再事后纠正(以前按页面角色落、再纠正,
|
|
2015
|
+
* 页签一多就必然对不上,用户看到的就是「选的页签和标注不符」)。
|
|
2016
|
+
*/
|
|
2017
|
+
var armFor = function (slot, pairId) {
|
|
2018
|
+
armAt.current = Date.now();
|
|
2019
|
+
setArming({ slot: slot, pairId: pairId ? String(pairId) : '' });
|
|
2020
|
+
// 同步给 host:新标注当场归这一栏;落点落在已标注元素上时复用那一条。
|
|
2021
|
+
post('/arm', { slot: slot, pairId: pairId ? String(pairId) : null });
|
|
2022
|
+
setAssigning('');
|
|
2023
|
+
// 开标注模式这一步代劳掉:点完就能直接在页面上点元素。
|
|
2024
|
+
if (!picking) toggleMode();
|
|
2025
|
+
// 等待提示不再走 toast(会盖住卡片):固定显示在标签页下方的 vp-armbar 色条里。
|
|
2026
|
+
};
|
|
2027
|
+
|
|
2028
|
+
var cancelArm = function () {
|
|
2029
|
+
armAt.current = Date.now();
|
|
2030
|
+
setArming(null);
|
|
2031
|
+
post('/arm', null);
|
|
2032
|
+
};
|
|
2033
|
+
|
|
2034
|
+
var pairCell = function (pick, role, opts) {
|
|
2035
|
+
var extra = opts || {};
|
|
2036
|
+
// 序号只写数字(改动)或 R 码(参照),外面那圈实心块负责「显眼」。
|
|
2037
|
+
var code = role === 'reference' ? refCodeOf(pick) : String(targets.indexOf(pick) + 1);
|
|
2038
|
+
var comment = drafts[pick.id] !== undefined ? drafts[pick.id] : (pick.comment ?? '');
|
|
2039
|
+
var text = String(comment || '').trim();
|
|
2040
|
+
var open = expandedId === String(pick.id);
|
|
2041
|
+
var toggle = function () {
|
|
2042
|
+
setExpandedId(open ? '' : String(pick.id));
|
|
2043
|
+
};
|
|
2044
|
+
var droppable = typeof extra.onDrop === 'function';
|
|
2045
|
+
var assignHere = !!assigning && role === 'target';
|
|
2046
|
+
return h(
|
|
2047
|
+
'div',
|
|
2048
|
+
{
|
|
2049
|
+
className:
|
|
2050
|
+
'vp-cell' + (role === 'reference' ? ' ref' : ' t') + (open ? ' sel' : '') + (assignHere ? ' drop' : ''),
|
|
2051
|
+
role: 'button',
|
|
2052
|
+
tabIndex: 0,
|
|
2053
|
+
'aria-expanded': open,
|
|
2054
|
+
draggable: true,
|
|
2055
|
+
title:
|
|
2056
|
+
(role === 'reference'
|
|
2057
|
+
? '点一下展开看全并编辑 · 双击定位 · 拖到左侧改动卡上即可建立对照'
|
|
2058
|
+
: '点一下展开看全并编辑 · 双击定位 · 拖到右侧参照卡上即可建立对照') +
|
|
2059
|
+
(assignHere ? ' · 点击即为该改动配对这条参照' : ''),
|
|
2060
|
+
onClick: () => {
|
|
2061
|
+
// 正在「配给某条改动」:点一下就配,不必再开编辑器。
|
|
2062
|
+
if (assignHere) {
|
|
2063
|
+
var refId = String(assigning);
|
|
2064
|
+
setAssigning('');
|
|
2065
|
+
setPair(pick.id, refId);
|
|
2066
|
+
return;
|
|
2067
|
+
}
|
|
2068
|
+
toggle();
|
|
2069
|
+
},
|
|
2070
|
+
onDblClick: () => focusPick(pick.id),
|
|
2071
|
+
onKeyDown: (event) => {
|
|
2072
|
+
if (event.key === 'Enter' || event.key === ' ') {
|
|
2073
|
+
event.preventDefault();
|
|
2074
|
+
toggle();
|
|
2075
|
+
}
|
|
2076
|
+
},
|
|
2077
|
+
onDragStart: (event) => {
|
|
2078
|
+
event.dataTransfer.effectAllowed = 'link';
|
|
2079
|
+
try {
|
|
2080
|
+
event.dataTransfer.setData('application/x-vp-pick', String(pick.id));
|
|
2081
|
+
} catch {
|
|
2082
|
+
/* 个别浏览器只认 text/plain,下面兜底 */
|
|
2083
|
+
}
|
|
2084
|
+
event.dataTransfer.setData('text/plain', String(pick.id));
|
|
2085
|
+
},
|
|
2086
|
+
onDragOver: droppable
|
|
2087
|
+
? (event) => {
|
|
2088
|
+
event.preventDefault();
|
|
2089
|
+
event.stopPropagation();
|
|
2090
|
+
}
|
|
2091
|
+
: undefined,
|
|
2092
|
+
onDrop: droppable ? extra.onDrop : undefined,
|
|
2093
|
+
},
|
|
2094
|
+
h(
|
|
2095
|
+
'div',
|
|
2096
|
+
{ className: 'vp-cell-main' },
|
|
2097
|
+
pick.shotUrl
|
|
2098
|
+
? h('div', { className: 'vp-cell-shot' }, h('img', { src: pick.shotUrl, alt: '元素截图 ' + pick.id }))
|
|
2099
|
+
: null,
|
|
2100
|
+
h(
|
|
1417
2101
|
'div',
|
|
1418
|
-
{ className: 'vp-
|
|
2102
|
+
{ className: 'vp-cell-info' },
|
|
1419
2103
|
h(
|
|
1420
|
-
'
|
|
1421
|
-
|
|
1422
|
-
|
|
1423
|
-
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
2104
|
+
'div',
|
|
2105
|
+
{ className: 'vp-cell-head' },
|
|
2106
|
+
h(
|
|
2107
|
+
'span',
|
|
2108
|
+
{
|
|
2109
|
+
className: role === 'reference' ? 'r' : 'n',
|
|
2110
|
+
title: role === 'reference' ? '参照 ' + code : '改动 ' + code,
|
|
2111
|
+
},
|
|
2112
|
+
code,
|
|
2113
|
+
),
|
|
2114
|
+
h('span', { className: 'vp-cell-sel' }, String(pick.selector || pick.tag || '元素')),
|
|
2115
|
+
extra.badge
|
|
2116
|
+
? h(
|
|
2117
|
+
'span',
|
|
2118
|
+
{ className: 'vp-cell-badge' + (extra.badgeTone === 'owner' ? ' owner' : '') },
|
|
2119
|
+
extra.badge,
|
|
2120
|
+
)
|
|
2121
|
+
: null,
|
|
2122
|
+
pick.pageClosed
|
|
2123
|
+
? h(
|
|
2124
|
+
'span',
|
|
2125
|
+
{ className: 'vp-closed', title: '这一页已经关了;标注还在,重新打开同一地址会自动挂回' },
|
|
2126
|
+
'页面已关闭',
|
|
2127
|
+
)
|
|
2128
|
+
: null,
|
|
1427
2129
|
),
|
|
1428
|
-
)
|
|
1429
|
-
: null,
|
|
1430
|
-
noBrowsers
|
|
1431
|
-
? h(
|
|
1432
|
-
'div',
|
|
1433
|
-
{ className: 'vp-banner warn' },
|
|
1434
2130
|
h(
|
|
1435
|
-
'
|
|
1436
|
-
|
|
1437
|
-
|
|
2131
|
+
'div',
|
|
2132
|
+
{ className: 'vp-cell-note' + (text ? '' : ' none') },
|
|
2133
|
+
h(
|
|
2134
|
+
'span',
|
|
2135
|
+
{ className: 't', title: text || undefined },
|
|
2136
|
+
text || (role === 'reference' ? '需要参照此处的哪些特征?' : '需要修改成什么?'),
|
|
2137
|
+
),
|
|
2138
|
+
role === 'reference' && (pick.spec || []).length
|
|
2139
|
+
? h('span', { className: 'vp-cell-spec', title: pick.spec.join(' · ') }, pick.spec.join(' · '))
|
|
2140
|
+
: null,
|
|
1438
2141
|
),
|
|
1439
|
-
)
|
|
1440
|
-
|
|
1441
|
-
|
|
1442
|
-
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
|
|
2142
|
+
),
|
|
2143
|
+
),
|
|
2144
|
+
);
|
|
2145
|
+
};
|
|
2146
|
+
|
|
2147
|
+
/** 行内编辑器:全宽展开,评论 + 参考维度 + 这组已配的参考 + 定位/插入/删除。 */
|
|
2148
|
+
var rowEditor = function (row) {
|
|
2149
|
+
var pick = row.target || row.ref;
|
|
2150
|
+
// 一条参照可能被好几条改动引用:编辑器头部也列全,别只报第一条
|
|
2151
|
+
var owners =
|
|
2152
|
+
pick.role === 'reference'
|
|
2153
|
+
? targets
|
|
2154
|
+
.map(function (item, index) {
|
|
2155
|
+
return pairIdsOf(item).some(function (pid) {
|
|
2156
|
+
return String(pid) === String(pick.id);
|
|
2157
|
+
})
|
|
2158
|
+
? index + 1
|
|
2159
|
+
: 0;
|
|
2160
|
+
})
|
|
2161
|
+
.filter(function (index) {
|
|
2162
|
+
return index > 0;
|
|
2163
|
+
})
|
|
2164
|
+
: [];
|
|
2165
|
+
var comment = drafts[pick.id] !== undefined ? drafts[pick.id] : (pick.comment ?? '');
|
|
2166
|
+
var saveInfo = saved[pick.id];
|
|
2167
|
+
var saveText =
|
|
2168
|
+
saveInfo === 'saving' ? '保存中…' : saveInfo === 'saved' ? '已保存' : saveInfo === 'error' ? '保存失败' : '';
|
|
2169
|
+
// 一条参考常要落到好几处;这里算「还没配对的其他目标」,给一键套用。
|
|
2170
|
+
var rest = row.ref
|
|
2171
|
+
? targets.filter(function (item) {
|
|
2172
|
+
if (pairCount(item) > 0) return false;
|
|
2173
|
+
return !row.target || String(item.id) !== String(row.target.id);
|
|
2174
|
+
}).length
|
|
2175
|
+
: 0;
|
|
2176
|
+
return h(
|
|
2177
|
+
'div',
|
|
2178
|
+
{ className: 'vp-rowedit' },
|
|
2179
|
+
h(
|
|
2180
|
+
'div',
|
|
2181
|
+
{ className: 'meta' },
|
|
2182
|
+
h(
|
|
2183
|
+
'span',
|
|
2184
|
+
null,
|
|
2185
|
+
pick.role === 'reference'
|
|
2186
|
+
? '参照 ' + refCodeOf(pick) + (owners.length ? ' · 改动 ' + owners.join('、') : ' · 未配对')
|
|
2187
|
+
: '改动 #' + (targets.indexOf(pick) + 1),
|
|
2188
|
+
),
|
|
2189
|
+
h('span', { className: 'sel' }, String(pick.selector || pick.tag || '')),
|
|
2190
|
+
pick.pageClosed ? h('span', { className: 'vp-closed' }, '页面已关闭') : null,
|
|
2191
|
+
h('span', { className: 'vp-spacer' }),
|
|
2192
|
+
h('span', { className: 'vp-saved', role: 'status' }, saveText),
|
|
2193
|
+
),
|
|
2194
|
+
h('textarea', {
|
|
2195
|
+
placeholder:
|
|
2196
|
+
pick.role === 'reference'
|
|
2197
|
+
? '需要参照此处的哪些特征?例如:间距 16px、卡片圆角、按钮配色'
|
|
2198
|
+
: '需要修改成什么?例如:字号调整为 16px、按钮改用主色',
|
|
2199
|
+
'aria-label': pick.role === 'reference' ? '参照说明' : '修改要求',
|
|
2200
|
+
value: comment,
|
|
2201
|
+
onChange: (event) => editComment(pick.id, event.target.value),
|
|
2202
|
+
onBlur: (event) => persistComment(pick.id, event.target.value),
|
|
2203
|
+
}),
|
|
2204
|
+
pick.role === 'reference'
|
|
2205
|
+
? h(
|
|
2206
|
+
'div',
|
|
2207
|
+
{ className: 'vp-dims', role: 'group', 'aria-label': '参考维度' },
|
|
2208
|
+
SPEC_DIMS.map((dim) =>
|
|
2209
|
+
h(
|
|
2210
|
+
'button',
|
|
2211
|
+
{
|
|
2212
|
+
key: dim,
|
|
2213
|
+
className: 'vp-dimchip',
|
|
2214
|
+
'aria-pressed': (pick.spec || []).indexOf(dim) >= 0,
|
|
2215
|
+
onClick: () => {
|
|
2216
|
+
var spec = (pick.spec || []).slice();
|
|
2217
|
+
var at = spec.indexOf(dim);
|
|
2218
|
+
if (at >= 0) spec.splice(at, 1);
|
|
2219
|
+
else spec.push(dim);
|
|
2220
|
+
setPickSpec(pick.id, spec);
|
|
2221
|
+
},
|
|
2222
|
+
},
|
|
2223
|
+
dim,
|
|
2224
|
+
),
|
|
2225
|
+
),
|
|
2226
|
+
(pick.spec || []).length
|
|
2227
|
+
? h(
|
|
2228
|
+
'button',
|
|
2229
|
+
{
|
|
2230
|
+
key: '__clear',
|
|
2231
|
+
className: 'vp-dimchip clear',
|
|
2232
|
+
type: 'button',
|
|
2233
|
+
title: '一键取消这条参照已选的全部 ' + pick.spec.length + ' 个维度',
|
|
2234
|
+
onClick: () => setPickSpec(pick.id, []),
|
|
2235
|
+
},
|
|
2236
|
+
'清空 (' + pick.spec.length + ')',
|
|
2237
|
+
)
|
|
2238
|
+
: null,
|
|
2239
|
+
)
|
|
2240
|
+
: row.target
|
|
2241
|
+
? h(
|
|
2242
|
+
'div',
|
|
2243
|
+
{ className: 'vp-reflist' },
|
|
2244
|
+
h('span', { className: 'cap' }, '参照:'),
|
|
2245
|
+
(row.refs || []).map((ref) =>
|
|
2246
|
+
h(
|
|
2247
|
+
'span',
|
|
2248
|
+
{
|
|
2249
|
+
key: ref.id,
|
|
2250
|
+
className: 'vp-refchip',
|
|
2251
|
+
title: String(ref.comment || ref.selector || ''),
|
|
2252
|
+
},
|
|
2253
|
+
h('span', null, refCodeOf(ref)),
|
|
2254
|
+
h(
|
|
2255
|
+
'button',
|
|
2256
|
+
{
|
|
2257
|
+
type: 'button',
|
|
2258
|
+
'aria-label': '解除 ' + refCodeOf(ref) + ' 与此改动的关联',
|
|
2259
|
+
onClick: () => unpairOne(row.target.id, ref.id),
|
|
2260
|
+
},
|
|
2261
|
+
'×',
|
|
2262
|
+
),
|
|
2263
|
+
),
|
|
2264
|
+
),
|
|
2265
|
+
h(
|
|
2266
|
+
'button',
|
|
2267
|
+
{ className: 'vp-dimchip', type: 'button', onClick: () => armFor('reference', row.target.id) },
|
|
2268
|
+
'+ 添加参照',
|
|
2269
|
+
),
|
|
2270
|
+
)
|
|
2271
|
+
: null,
|
|
2272
|
+
h(
|
|
2273
|
+
'div',
|
|
2274
|
+
{ className: 'actions' },
|
|
2275
|
+
h(
|
|
2276
|
+
'button',
|
|
2277
|
+
{ className: 'vp-btn sm', title: '在浏览器中定位', onClick: () => focusPick(pick.id) },
|
|
2278
|
+
'在页面中定位',
|
|
2279
|
+
),
|
|
2280
|
+
row.target
|
|
2281
|
+
? h(
|
|
2282
|
+
'button',
|
|
2283
|
+
{
|
|
2284
|
+
className: 'vp-btn sm pri',
|
|
2285
|
+
title: '插入此组(改动及其全部参照)',
|
|
2286
|
+
onClick: () => insertOnce([row.target].concat(row.refs || (row.ref ? [row.ref] : [])), 'click'),
|
|
2287
|
+
},
|
|
2288
|
+
'插入此组',
|
|
2289
|
+
)
|
|
2290
|
+
: null,
|
|
2291
|
+
rest
|
|
2292
|
+
? h(
|
|
2293
|
+
'button',
|
|
2294
|
+
{
|
|
2295
|
+
className: 'vp-btn sm',
|
|
2296
|
+
title: '将此参照应用到其余 ' + rest + ' 条尚未配对的改动',
|
|
2297
|
+
onClick: () => setPairAll(row.ref.id),
|
|
2298
|
+
},
|
|
2299
|
+
'应用到其余 ' + rest + ' 条改动',
|
|
2300
|
+
)
|
|
2301
|
+
: null,
|
|
2302
|
+
row.groupTargetId && row.ref
|
|
2303
|
+
? h(
|
|
2304
|
+
'button',
|
|
2305
|
+
{
|
|
2306
|
+
className: 'vp-btn sm',
|
|
2307
|
+
title: '仅解除此参照与该改动的关联,标注本身保留',
|
|
2308
|
+
onClick: () => unpairOne(row.groupTargetId, row.ref.id),
|
|
2309
|
+
},
|
|
2310
|
+
'解除关联',
|
|
2311
|
+
)
|
|
2312
|
+
: null,
|
|
2313
|
+
h('span', { className: 'vp-spacer' }),
|
|
2314
|
+
h(
|
|
2315
|
+
'button',
|
|
2316
|
+
{ className: 'vp-btn sm danger', title: '删除这条标注', onClick: () => removePick(pick.id) },
|
|
2317
|
+
'删除标注',
|
|
2318
|
+
),
|
|
2319
|
+
),
|
|
2320
|
+
);
|
|
2321
|
+
};
|
|
2322
|
+
|
|
2323
|
+
/**
|
|
2324
|
+
* 参考对照主体:左右两栏。左栏「改动」每条一处,卡下挂着它参照的标注(1:N);
|
|
2325
|
+
* 右栏「参照」平铺全部参照标注,卡片徽标写明归属。对照关系三个方向都能拖:
|
|
2326
|
+
* 参照卡拖到改动卡 / 改动卡拖到参照卡 / 参照卡拖到另一张参照卡(归入同一改动)。
|
|
2327
|
+
*/
|
|
2328
|
+
var pairView = function () {
|
|
2329
|
+
if (!pages.length) {
|
|
2330
|
+
return h('div', { className: 'vp-empty' }, h('span', null, '先打开浏览器,再开始标注。'));
|
|
2331
|
+
}
|
|
2332
|
+
var draggedId = function (event) {
|
|
2333
|
+
try {
|
|
2334
|
+
return String(
|
|
2335
|
+
event.dataTransfer.getData('application/x-vp-pick') || event.dataTransfer.getData('text/plain') || '',
|
|
2336
|
+
);
|
|
2337
|
+
} catch {
|
|
2338
|
+
return '';
|
|
2339
|
+
}
|
|
2340
|
+
};
|
|
2341
|
+
/** 一条参照当前被哪几条改动引用:返回序号数组(1 起)。多对多,一条参照可以同时挂给好几条改动。 */
|
|
2342
|
+
var ownerIndexesOf = function (ref) {
|
|
2343
|
+
var id = String(ref.id);
|
|
2344
|
+
return targets
|
|
2345
|
+
.map(function (item, index) {
|
|
2346
|
+
return pairIdsOf(item).some(function (pid) {
|
|
2347
|
+
return String(pid) === id;
|
|
2348
|
+
})
|
|
2349
|
+
? index + 1
|
|
2350
|
+
: 0;
|
|
2351
|
+
})
|
|
2352
|
+
.filter(function (index) {
|
|
2353
|
+
return index > 0;
|
|
2354
|
+
});
|
|
2355
|
+
};
|
|
2356
|
+
/** 第一条归属(拖拽落点、展开编辑器用):未配对返回 0。 */
|
|
2357
|
+
var ownerIndexOf = function (ref) {
|
|
2358
|
+
return ownerIndexesOf(ref)[0] || 0;
|
|
2359
|
+
};
|
|
2360
|
+
var onDropRef = function (targetId, event) {
|
|
2361
|
+
event.preventDefault();
|
|
2362
|
+
event.stopPropagation();
|
|
2363
|
+
var id = draggedId(event);
|
|
2364
|
+
if (!id || !isRefId(id)) return;
|
|
2365
|
+
var target = targets.filter((item) => String(item.id) === String(targetId))[0];
|
|
2366
|
+
var already =
|
|
2367
|
+
target &&
|
|
2368
|
+
pairIdsOf(target).some(function (item) {
|
|
2369
|
+
return String(item) === id;
|
|
2370
|
+
});
|
|
2371
|
+
if (already) {
|
|
2372
|
+
flash('info', '该参照已在此组中');
|
|
2373
|
+
return;
|
|
2374
|
+
}
|
|
2375
|
+
setPair(targetId, id);
|
|
2376
|
+
flash('ok', '已为该改动配对一条参照');
|
|
2377
|
+
};
|
|
2378
|
+
var onDropTarget = function (refId, event) {
|
|
2379
|
+
event.preventDefault();
|
|
2380
|
+
event.stopPropagation();
|
|
2381
|
+
var id = draggedId(event);
|
|
2382
|
+
if (!id || !isTargetId(id)) return;
|
|
2383
|
+
setPair(id, refId);
|
|
2384
|
+
flash('ok', '已为该参照配对一条改动');
|
|
2385
|
+
};
|
|
2386
|
+
// 参照卡叠到参照卡 = 归入同一改动:右栏内部也能靠拖拽整理归属。
|
|
2387
|
+
var onDropRefOnRef = function (dropRefId, event) {
|
|
2388
|
+
event.preventDefault();
|
|
2389
|
+
event.stopPropagation();
|
|
2390
|
+
var id = draggedId(event);
|
|
2391
|
+
if (!id || !isRefId(id) || String(id) === String(dropRefId)) return;
|
|
2392
|
+
var dropRef = refs.filter((item) => String(item.id) === String(dropRefId))[0];
|
|
2393
|
+
var owner = dropRef ? ownerIndexOf(dropRef) : 0;
|
|
2394
|
+
var target = owner ? targets[owner - 1] : targets[0];
|
|
2395
|
+
if (!target) {
|
|
2396
|
+
flash('warn', '还没有改动标注:请先在左侧点击「+ 新增改动」');
|
|
2397
|
+
return;
|
|
2398
|
+
}
|
|
2399
|
+
var already = pairIdsOf(target).some(function (pid) {
|
|
2400
|
+
return String(pid) === id;
|
|
2401
|
+
});
|
|
2402
|
+
if (already) {
|
|
2403
|
+
flash('info', '该参照已在此组中');
|
|
2404
|
+
return;
|
|
2405
|
+
}
|
|
2406
|
+
setPair(target.id, id);
|
|
2407
|
+
flash('ok', owner ? '已将该参照归入改动 #' + owner : '已将该参照配给改动 #' + (targets.indexOf(target) + 1));
|
|
2408
|
+
};
|
|
2409
|
+
/** 左栏一张改动卡:卡片本身接收参照拖入,卡下的 chips 写清它参照了哪些标注。 */
|
|
2410
|
+
var targetCard = function (target) {
|
|
2411
|
+
var tid = String(target.id);
|
|
2412
|
+
var linkedRefs = refs.filter(function (item) {
|
|
2413
|
+
return pairIdsOf(target).some(function (pid) {
|
|
2414
|
+
return String(pid) === String(item.id);
|
|
2415
|
+
});
|
|
2416
|
+
});
|
|
2417
|
+
var openTarget = expandedId === tid;
|
|
2418
|
+
var armedHere = arming && arming.slot === 'reference' && String(arming.pairId) === tid;
|
|
2419
|
+
var refMenuOpen = slotMenu === 'refs-' + tid;
|
|
2420
|
+
// 已标注、但还没挂到这条改动上的参照:下拉里直接勾选即可配对,不必去页面重新标注。
|
|
2421
|
+
var looseRefs = refs.filter(function (item) {
|
|
2422
|
+
return !pairIdsOf(target).some(function (pid) {
|
|
2423
|
+
return String(pid) === String(item.id);
|
|
2424
|
+
});
|
|
2425
|
+
});
|
|
2426
|
+
return h(
|
|
2427
|
+
'div',
|
|
2428
|
+
{ className: 'vp-grpwrap', key: tid },
|
|
2429
|
+
h(
|
|
2430
|
+
'div',
|
|
2431
|
+
{
|
|
2432
|
+
className: 'vp-tcell',
|
|
2433
|
+
onDragOver: (event) => {
|
|
2434
|
+
if (draggedId(event)) event.preventDefault();
|
|
2435
|
+
},
|
|
2436
|
+
onDrop: (event) => onDropRef(target.id, event),
|
|
2437
|
+
},
|
|
2438
|
+
pairCell(target, 'target'),
|
|
2439
|
+
h(
|
|
2440
|
+
'div',
|
|
2441
|
+
{ className: 'vp-reflist vp-relrow' },
|
|
2442
|
+
h('span', { className: 'cap' }, linkedRefs.length ? '参照:' : '参照:未选择'),
|
|
2443
|
+
linkedRefs.map((ref) =>
|
|
2444
|
+
h(
|
|
2445
|
+
'span',
|
|
2446
|
+
{ key: ref.id, className: 'vp-refchip', title: String(ref.comment || ref.selector || '') },
|
|
2447
|
+
h('span', null, refCodeOf(ref)),
|
|
2448
|
+
h(
|
|
2449
|
+
'button',
|
|
2450
|
+
{
|
|
2451
|
+
type: 'button',
|
|
2452
|
+
'aria-label': '解除 ' + refCodeOf(ref) + ' 与此改动的关联',
|
|
2453
|
+
onClick: () => unpairOne(target.id, ref.id),
|
|
2454
|
+
},
|
|
2455
|
+
'×',
|
|
2456
|
+
),
|
|
2457
|
+
),
|
|
2458
|
+
),
|
|
2459
|
+
h(
|
|
2460
|
+
'button',
|
|
2461
|
+
{
|
|
2462
|
+
className: 'vp-dimchip' + (armedHere ? ' arm' : '') + (refMenuOpen ? ' on' : ''),
|
|
2463
|
+
type: 'button',
|
|
2464
|
+
'aria-expanded': refMenuOpen,
|
|
2465
|
+
title: '从已标注的参照里选一条挂上来;也可以在任意标签页新标一处参照',
|
|
2466
|
+
onClick: () => setSlotMenu(refMenuOpen ? '' : 'refs-' + tid),
|
|
2467
|
+
},
|
|
2468
|
+
armedHere ? '正在等待标注…' : '+ 添加参照 ▾',
|
|
2469
|
+
),
|
|
2470
|
+
),
|
|
2471
|
+
refMenuOpen
|
|
2472
|
+
? h(
|
|
2473
|
+
'div',
|
|
2474
|
+
{ className: 'vp-refmenu', role: 'menu', 'aria-label': '选择参照' },
|
|
2475
|
+
looseRefs.length
|
|
2476
|
+
? looseRefs.map((item) => {
|
|
2477
|
+
var note = String(item.comment || item.selector || '').trim();
|
|
2478
|
+
if (note.length > 34) note = note.slice(0, 34) + '…';
|
|
2479
|
+
return h(
|
|
2480
|
+
'button',
|
|
2481
|
+
{
|
|
2482
|
+
key: item.id,
|
|
2483
|
+
role: 'menuitem',
|
|
2484
|
+
title: note ? refCodeOf(item) + ' · ' + note : refCodeOf(item),
|
|
2485
|
+
onClick: () => {
|
|
2486
|
+
setSlotMenu('');
|
|
2487
|
+
setPair(target.id, item.id);
|
|
2488
|
+
},
|
|
2489
|
+
},
|
|
2490
|
+
h('span', { className: 't' }, refCodeOf(item) + (note ? ' · ' + note : '')),
|
|
2491
|
+
);
|
|
2492
|
+
})
|
|
2493
|
+
: h('div', { className: 'hint' }, '现有参照都已挂在这条改动上'),
|
|
2494
|
+
h(
|
|
2495
|
+
'button',
|
|
2496
|
+
{
|
|
2497
|
+
role: 'menuitem',
|
|
2498
|
+
title: '点击后,下一处参照标注自动配给这条改动(任意标签页都可)',
|
|
2499
|
+
onClick: () => {
|
|
2500
|
+
setSlotMenu('');
|
|
2501
|
+
armFor('reference', target.id);
|
|
2502
|
+
},
|
|
2503
|
+
},
|
|
2504
|
+
h('span', { className: 't' }, '+ 新标注一处参照'),
|
|
2505
|
+
),
|
|
2506
|
+
)
|
|
2507
|
+
: null,
|
|
2508
|
+
),
|
|
2509
|
+
openTarget ? rowEditor({ target: target, refs: linkedRefs, ref: linkedRefs[0] || null }) : null,
|
|
2510
|
+
);
|
|
2511
|
+
};
|
|
2512
|
+
/** 右栏一张参照卡:徽标写明归属;已引用的带「再次引用」开关;展开的编辑器就地渲染在卡片下面。 */
|
|
2513
|
+
var refCard = function (ref) {
|
|
2514
|
+
var owners = ownerIndexesOf(ref);
|
|
2515
|
+
var owner = owners[0] || 0;
|
|
2516
|
+
var open = expandedId === String(ref.id);
|
|
2517
|
+
var used = Boolean(ref.referencedAt);
|
|
2518
|
+
var again = used && ref.included === true;
|
|
2519
|
+
return h(
|
|
2520
|
+
'div',
|
|
2521
|
+
{ className: 'vp-grpwrap', key: 'ref-' + ref.id },
|
|
2522
|
+
h(
|
|
2523
|
+
'div',
|
|
2524
|
+
{
|
|
2525
|
+
className: 'vp-tcell',
|
|
2526
|
+
onDragOver: (event) => {
|
|
2527
|
+
if (draggedId(event)) event.preventDefault();
|
|
2528
|
+
},
|
|
2529
|
+
onDrop: (event) => {
|
|
2530
|
+
// 落点既可能是「改动拖到参照」也可能是「参照叠到参照」:按拖起来的身份分发。
|
|
2531
|
+
var id = draggedId(event);
|
|
2532
|
+
if (id && isRefId(id)) onDropRefOnRef(ref.id, event);
|
|
2533
|
+
else onDropTarget(ref.id, event);
|
|
2534
|
+
},
|
|
2535
|
+
},
|
|
2536
|
+
pairCell(ref, 'reference'),
|
|
2537
|
+
// 右栏也有一条关系行:写明这条参照归给哪条改动;有就对齐,没有就空着同高
|
|
2538
|
+
h(
|
|
2539
|
+
'div',
|
|
2540
|
+
{ className: 'vp-relrow' },
|
|
2541
|
+
h(
|
|
2542
|
+
'span',
|
|
2543
|
+
{
|
|
2544
|
+
className: 'vp-cell-badge' + (owners.length ? ' owner' : ''),
|
|
2545
|
+
title: owners.length
|
|
2546
|
+
? '被改动 ' + owners.join('、') + ' 引用:一条参照可以同时挂给多条改动'
|
|
2547
|
+
: '还没有配给任何改动:拖到左侧改动卡上,或点开这条参照配',
|
|
2548
|
+
},
|
|
2549
|
+
owners.length ? '→ 改动 ' + owners.join('、') : used ? '已引用' : '未配对',
|
|
2550
|
+
),
|
|
2551
|
+
h('span', { className: 'vp-spacer' }),
|
|
2552
|
+
used
|
|
2553
|
+
? h(
|
|
2554
|
+
'button',
|
|
2555
|
+
{
|
|
2556
|
+
className: 'vp-dimchip' + (again ? ' on' : ''),
|
|
2557
|
+
type: 'button',
|
|
2558
|
+
title: again
|
|
2559
|
+
? '这条参照会在下一次插入时一并重发;点一下取消'
|
|
2560
|
+
: '这条参照在上次插入中已引用:点一下让它参与下一次插入',
|
|
2561
|
+
onClick: () => reuseRef(ref, !again),
|
|
2562
|
+
},
|
|
2563
|
+
again ? '✓ 将再次引用' : '再次引用',
|
|
2564
|
+
)
|
|
2565
|
+
: null,
|
|
2566
|
+
),
|
|
2567
|
+
),
|
|
2568
|
+
open
|
|
2569
|
+
? rowEditor({
|
|
2570
|
+
target: null,
|
|
2571
|
+
ref: ref,
|
|
2572
|
+
refs: [],
|
|
2573
|
+
groupTargetId: owner ? String(targets[owner - 1].id) : '',
|
|
2574
|
+
})
|
|
2575
|
+
: null,
|
|
2576
|
+
);
|
|
2577
|
+
};
|
|
2578
|
+
if (!targets.length && !refs.length) {
|
|
2579
|
+
return h(
|
|
2580
|
+
'div',
|
|
2581
|
+
{ className: 'vp-pairs' },
|
|
2582
|
+
colHeads(),
|
|
2583
|
+
h(
|
|
2584
|
+
'div',
|
|
2585
|
+
{ className: 'vp-empty' },
|
|
2586
|
+
h(
|
|
2587
|
+
'button',
|
|
2588
|
+
{ className: 'vp-step' + (picking ? ' done' : ''), disabled: !ready, onClick: toggleMode },
|
|
2589
|
+
h('span', { className: 'n' }, picking ? '✓' : '1'),
|
|
2590
|
+
h('span', null, '开启标注模式,在任意标签页点击需要修改的元素'),
|
|
2591
|
+
),
|
|
2592
|
+
h(
|
|
2593
|
+
'div',
|
|
2594
|
+
{ className: 'vp-step', style: { cursor: 'default' } },
|
|
2595
|
+
h('span', { className: 'n' }, '2'),
|
|
2596
|
+
h(
|
|
2597
|
+
'span',
|
|
2598
|
+
null,
|
|
2599
|
+
'再用「+ 新增改动」「+ 添加参照」决定下一处进哪一栏',
|
|
2600
|
+
h('br'),
|
|
2601
|
+
h('small', { style: { opacity: 0.75 } }, '任意标签页都能标;一条改动可参照多处'),
|
|
2602
|
+
),
|
|
2603
|
+
),
|
|
2604
|
+
),
|
|
2605
|
+
);
|
|
2606
|
+
}
|
|
2607
|
+
return h(
|
|
2608
|
+
'div',
|
|
2609
|
+
{ className: 'vp-pairs' },
|
|
2610
|
+
colHeads(),
|
|
2611
|
+
h(
|
|
2612
|
+
'div',
|
|
2613
|
+
{ className: 'vp-cols' },
|
|
2614
|
+
h(
|
|
2615
|
+
'div',
|
|
2616
|
+
{ className: 'vp-col' },
|
|
2617
|
+
targets.length
|
|
2618
|
+
? null
|
|
2619
|
+
: h(
|
|
2620
|
+
'div',
|
|
2621
|
+
{ className: 'vp-empty-hint' },
|
|
2622
|
+
'还没有改动标注:点击下方按钮,在任意标签页标注需要修改的元素',
|
|
2623
|
+
),
|
|
2624
|
+
targets.map(targetCard),
|
|
2625
|
+
h(
|
|
2626
|
+
'button',
|
|
2627
|
+
{
|
|
2628
|
+
className: 'vp-addref' + (arming && arming.slot === 'target' ? ' arm' : ''),
|
|
2629
|
+
type: 'button',
|
|
2630
|
+
title: '点击后,在任意标签页点的元素都归入「改动」;可连续标多处,再点一次取消',
|
|
2631
|
+
onClick: () =>
|
|
2632
|
+
arming && arming.slot === 'target' && !arming.pairId ? cancelArm() : armFor('target'),
|
|
2633
|
+
},
|
|
2634
|
+
arming && arming.slot === 'target' ? '正在等待标注…' : '+ 新增改动',
|
|
2635
|
+
),
|
|
2636
|
+
),
|
|
2637
|
+
h(
|
|
2638
|
+
'div',
|
|
2639
|
+
{ className: 'vp-col' },
|
|
2640
|
+
refs.length
|
|
2641
|
+
? null
|
|
2642
|
+
: h(
|
|
2643
|
+
'div',
|
|
2644
|
+
{ className: 'vp-empty-hint' },
|
|
2645
|
+
'还没有参照标注:点击下方按钮,在任意标签页标注需要参照的元素',
|
|
2646
|
+
),
|
|
2647
|
+
refs.map(refCard),
|
|
2648
|
+
h(
|
|
2649
|
+
'button',
|
|
2650
|
+
{
|
|
2651
|
+
className: 'vp-addref' + (arming && arming.slot === 'reference' && !arming.pairId ? ' arm' : ''),
|
|
2652
|
+
type: 'button',
|
|
2653
|
+
title: '点击后,在任意标签页点的元素都归入「参照」;可连续标多处,再点一次取消',
|
|
2654
|
+
onClick: () =>
|
|
2655
|
+
arming && arming.slot === 'reference' && !arming.pairId ? cancelArm() : armFor('reference'),
|
|
2656
|
+
},
|
|
2657
|
+
arming && arming.slot === 'reference' && !arming.pairId ? '正在等待标注…' : '+ 添加参照',
|
|
2658
|
+
),
|
|
2659
|
+
),
|
|
2660
|
+
),
|
|
2661
|
+
);
|
|
2662
|
+
};
|
|
2663
|
+
/** 普通模式:只列要改的标注,一条一处,写清怎么改就行。 */
|
|
2664
|
+
var plainList = function () {
|
|
2665
|
+
if (!targets.length) {
|
|
2666
|
+
return h(
|
|
2667
|
+
'div',
|
|
2668
|
+
{ className: 'vp-empty' },
|
|
2669
|
+
h(
|
|
2670
|
+
'button',
|
|
2671
|
+
{ className: 'vp-step', onClick: () => urlRef.current && urlRef.current.focus() },
|
|
2672
|
+
h('span', { className: 'n' }, '1'),
|
|
2673
|
+
h('span', null, '打开要修改的页面', h('br'), h('small', { style: { opacity: 0.75 } }, '填地址 → 启动')),
|
|
2674
|
+
),
|
|
2675
|
+
h(
|
|
2676
|
+
'button',
|
|
2677
|
+
{ className: 'vp-step' + (picking ? ' done' : ''), disabled: !ready, onClick: toggleMode },
|
|
2678
|
+
h('span', { className: 'n' }, picking ? '✓' : '2'),
|
|
2679
|
+
h(
|
|
2680
|
+
'span',
|
|
2681
|
+
null,
|
|
2682
|
+
'开启标注模式',
|
|
2683
|
+
h('br'),
|
|
2684
|
+
h('small', { style: { opacity: 0.75 } }, '在页面点击元素,或按 ' + HOTKEY + ' 开启标注'),
|
|
2685
|
+
),
|
|
2686
|
+
),
|
|
2687
|
+
h(
|
|
2688
|
+
'button',
|
|
2689
|
+
{ className: 'vp-step', disabled: true },
|
|
2690
|
+
h('span', { className: 'n' }, '3'),
|
|
2691
|
+
h(
|
|
2692
|
+
'span',
|
|
2693
|
+
null,
|
|
2694
|
+
'写评论并插入对话',
|
|
2695
|
+
h('br'),
|
|
2696
|
+
h('small', { style: { opacity: 0.75 } }, '截图、定位与评论一起发送'),
|
|
2697
|
+
),
|
|
2698
|
+
),
|
|
2699
|
+
);
|
|
2700
|
+
}
|
|
2701
|
+
var cards = targets.map(function (pick, index) {
|
|
2702
|
+
var comment = drafts[pick.id] !== undefined ? drafts[pick.id] : (pick.comment ?? '');
|
|
2703
|
+
var saveInfo = saved[pick.id];
|
|
2704
|
+
var saveText =
|
|
2705
|
+
saveInfo === 'saving'
|
|
2706
|
+
? '保存中…'
|
|
2707
|
+
: saveInfo === 'saved'
|
|
2708
|
+
? '已保存'
|
|
2709
|
+
: saveInfo === 'error'
|
|
2710
|
+
? '保存失败'
|
|
2711
|
+
: '';
|
|
2712
|
+
return h(
|
|
2713
|
+
'div',
|
|
2714
|
+
{ className: 'vp-card', key: pick.id },
|
|
2715
|
+
h(
|
|
2716
|
+
'button',
|
|
2717
|
+
{
|
|
2718
|
+
className: 'vp-thumb' + (pick.shotUrl ? '' : ' none'),
|
|
2719
|
+
title: pick.shotUrl ? '在浏览器中定位这个元素' : '无截图',
|
|
2720
|
+
'aria-label': '在浏览器中定位这个元素',
|
|
2721
|
+
onClick: () => (pick.shotUrl ? focusPick(pick.id) : null),
|
|
2722
|
+
},
|
|
2723
|
+
pick.shotUrl ? h('img', { src: pick.shotUrl, alt: '元素截图 ' + pick.id }) : '无截图',
|
|
2724
|
+
),
|
|
2725
|
+
h(
|
|
2726
|
+
'div',
|
|
2727
|
+
{ className: 'vp-meta' },
|
|
2728
|
+
h(
|
|
2729
|
+
'div',
|
|
2730
|
+
{ className: 'vp-card-head' },
|
|
2731
|
+
h('span', { className: 'vp-idx' }, '#' + (index + 1)),
|
|
2732
|
+
h('span', { className: 'vp-tag' }, String(pick.tag || '元素')),
|
|
2733
|
+
h('span', { className: 'vp-host', title: pick.url }, hostOf(pick.url) || ''),
|
|
2734
|
+
h('span', { className: 'vp-spacer' }),
|
|
2735
|
+
h(
|
|
2736
|
+
'button',
|
|
2737
|
+
{
|
|
2738
|
+
className: 'vp-icon-btn',
|
|
2739
|
+
title: '在浏览器中定位',
|
|
2740
|
+
'aria-label': '在浏览器中定位',
|
|
2741
|
+
onClick: () => focusPick(pick.id),
|
|
2742
|
+
},
|
|
2743
|
+
h(IconTarget),
|
|
2744
|
+
),
|
|
2745
|
+
h(
|
|
2746
|
+
'button',
|
|
2747
|
+
{
|
|
2748
|
+
className: 'vp-icon-btn',
|
|
2749
|
+
title: '删除这条标注',
|
|
2750
|
+
'aria-label': '删除这条标注',
|
|
2751
|
+
onClick: () => removePick(pick.id),
|
|
2752
|
+
},
|
|
2753
|
+
h(IconX),
|
|
2754
|
+
),
|
|
2755
|
+
),
|
|
2756
|
+
h(
|
|
2757
|
+
'button',
|
|
2758
|
+
{
|
|
2759
|
+
className: 'vp-sel',
|
|
2760
|
+
title: '点击复制选择器\n' + (pick.selector || ''),
|
|
2761
|
+
onClick: () => {
|
|
2762
|
+
try {
|
|
2763
|
+
navigator.clipboard?.writeText(String(pick.selector || ''));
|
|
2764
|
+
flash('ok', '选择器已复制');
|
|
2765
|
+
} catch {
|
|
2766
|
+
flash('err', '复制失败');
|
|
2767
|
+
}
|
|
2768
|
+
},
|
|
2769
|
+
},
|
|
2770
|
+
String(pick.selector || '(无选择器)'),
|
|
2771
|
+
),
|
|
2772
|
+
pick.text ? h('div', { className: 'vp-text', title: pick.text }, pick.text) : null,
|
|
2773
|
+
h('textarea', {
|
|
2774
|
+
className: 'vp-comment',
|
|
2775
|
+
placeholder: '想怎么改?例如:字号调大到 16px、按钮改成主色',
|
|
2776
|
+
'aria-label': '标注评论',
|
|
2777
|
+
value: comment,
|
|
2778
|
+
onChange: (event) => editComment(pick.id, event.target.value),
|
|
2779
|
+
onBlur: (event) => persistComment(pick.id, event.target.value),
|
|
2780
|
+
}),
|
|
2781
|
+
h(
|
|
2782
|
+
'div',
|
|
2783
|
+
{ className: 'vp-actions' },
|
|
2784
|
+
h('span', { className: 'vp-saved', role: 'status' }, saveText),
|
|
2785
|
+
h(
|
|
2786
|
+
'button',
|
|
2787
|
+
{
|
|
2788
|
+
className: 'vp-btn sm pri',
|
|
2789
|
+
title: '插入这条标注,并从列表移除',
|
|
2790
|
+
onClick: () => insertOnce([pick], 'click'),
|
|
2791
|
+
},
|
|
2792
|
+
insertLabel,
|
|
2793
|
+
),
|
|
2794
|
+
),
|
|
2795
|
+
),
|
|
2796
|
+
);
|
|
2797
|
+
});
|
|
2798
|
+
return h('div', { className: 'vp-plain' }, cards);
|
|
2799
|
+
};
|
|
2800
|
+
|
|
2801
|
+
// host 复用「已标注的那一条」时列表不会增长,这里单独收复用通知:让用户知道
|
|
2802
|
+
// 点的是旧标注、不是新标了一条。落点保持不动(粘性),接着标下一处即可。
|
|
2803
|
+
var reuseSeen = useRef(0);
|
|
2804
|
+
useEffect(
|
|
2805
|
+
function () {
|
|
2806
|
+
var notice = state.reuseNotice;
|
|
2807
|
+
if (!notice || notice.ts === reuseSeen.current) return;
|
|
2808
|
+
reuseSeen.current = notice.ts;
|
|
2809
|
+
flash(
|
|
2810
|
+
'ok',
|
|
2811
|
+
notice.role === 'reference'
|
|
2812
|
+
? '已复用那条已标注的元素:归入「参照」'
|
|
2813
|
+
: '已复用那条已标注的元素:归入「改动」',
|
|
2814
|
+
);
|
|
2815
|
+
},
|
|
2816
|
+
[state, arming],
|
|
2817
|
+
);
|
|
2818
|
+
|
|
2819
|
+
/* ---- render --------------------------------------------------- */
|
|
2820
|
+
return h(
|
|
2821
|
+
'div',
|
|
2822
|
+
{ className: 'vp-root' },
|
|
2823
|
+
h(
|
|
2824
|
+
'div',
|
|
2825
|
+
{ className: 'vp-head' },
|
|
2826
|
+
h('span', { className: 'vp-title' }, '指哪改哪'),
|
|
2827
|
+
h(
|
|
2828
|
+
'span',
|
|
2829
|
+
{
|
|
2830
|
+
className: 'vp-pill',
|
|
2831
|
+
'data-state': pillState,
|
|
2832
|
+
role: 'status',
|
|
2833
|
+
title: [
|
|
2834
|
+
state.browser ? browserLabels[state.browser] || state.browser : '',
|
|
2835
|
+
state.activeTitle || state.activeUrl || '',
|
|
2836
|
+
]
|
|
2837
|
+
.filter(Boolean)
|
|
2838
|
+
.join(' · '),
|
|
2839
|
+
},
|
|
2840
|
+
h('i', { className: 'dot' }),
|
|
2841
|
+
h('span', null, pillText),
|
|
2842
|
+
),
|
|
2843
|
+
h('span', { className: 'vp-spacer' }),
|
|
2844
|
+
h(
|
|
2845
|
+
'span',
|
|
2846
|
+
{ className: 'vp-headmode' },
|
|
2847
|
+
// 开关旁带可见名称:光一个小滑块看不出它管什么。
|
|
2848
|
+
h('span', { className: 'vp-switch-label' + (picking ? ' on' : '') }, picking ? '标注中' : '标注'),
|
|
2849
|
+
h(
|
|
2850
|
+
'button',
|
|
2851
|
+
{
|
|
2852
|
+
className: 'vp-switch',
|
|
2853
|
+
role: 'switch',
|
|
2854
|
+
'aria-checked': picking,
|
|
2855
|
+
'aria-label': '标注模式',
|
|
2856
|
+
disabled: !ready || busy === 'mode',
|
|
2857
|
+
title: !ready
|
|
2858
|
+
? '先打开浏览器'
|
|
2859
|
+
: picking
|
|
2860
|
+
? '标注模式开启中:在页面里点击元素 · Esc 退出(' + HOTKEY + ')'
|
|
2861
|
+
: '开启标注模式(' + HOTKEY + ')',
|
|
2862
|
+
onClick: toggleMode,
|
|
2863
|
+
},
|
|
2864
|
+
h('span', { className: 'knob' }),
|
|
2865
|
+
),
|
|
2866
|
+
),
|
|
2867
|
+
h(
|
|
2868
|
+
'button',
|
|
2869
|
+
{
|
|
2870
|
+
className: 'vp-icon-btn' + (menu ? ' on' : ''),
|
|
2871
|
+
'aria-label': '更多操作',
|
|
2872
|
+
'aria-expanded': menu,
|
|
2873
|
+
title: '更多操作',
|
|
2874
|
+
onClick: () => setMenu(!menu),
|
|
2875
|
+
},
|
|
2876
|
+
h(IconMore),
|
|
2877
|
+
),
|
|
2878
|
+
),
|
|
2879
|
+
menu
|
|
2880
|
+
? h(
|
|
2881
|
+
'div',
|
|
2882
|
+
{ className: 'vp-menu', role: 'menu' },
|
|
2883
|
+
h(
|
|
2884
|
+
'button',
|
|
2885
|
+
{ role: 'menuitem', onClick: detachBrowser, disabled: !ready || busy === 'close' },
|
|
2886
|
+
h('span', null, state.reused ? '断开连接(外部浏览器保留)' : '断开连接(保留浏览器)'),
|
|
2887
|
+
h('span', { className: 'kbd' }, ready ? '' : '未连接'),
|
|
2888
|
+
),
|
|
2889
|
+
// 清空按角色分三种,只在参照模式出现;普通模式的菜单和 0.5.5 一致,只有断开连接。
|
|
2890
|
+
viewMode === 'pair'
|
|
2891
|
+
? [
|
|
2892
|
+
h(
|
|
2893
|
+
'button',
|
|
2894
|
+
{
|
|
2895
|
+
role: 'menuitem',
|
|
2896
|
+
className: 'danger',
|
|
2897
|
+
disabled: targets.length === 0,
|
|
2898
|
+
onClick: () => clearAll('target'),
|
|
2899
|
+
},
|
|
2900
|
+
h('span', null, '清空目标标注'),
|
|
2901
|
+
h('span', { className: 'kbd' }, String(targets.length)),
|
|
2902
|
+
),
|
|
2903
|
+
h(
|
|
2904
|
+
'button',
|
|
2905
|
+
{
|
|
2906
|
+
role: 'menuitem',
|
|
2907
|
+
className: 'danger',
|
|
2908
|
+
disabled: refs.length === 0,
|
|
2909
|
+
onClick: () => clearAll('reference'),
|
|
2910
|
+
},
|
|
2911
|
+
h('span', null, '清空参照标注'),
|
|
2912
|
+
h('span', { className: 'kbd' }, String(refs.length)),
|
|
2913
|
+
),
|
|
2914
|
+
h(
|
|
2915
|
+
'button',
|
|
2916
|
+
{
|
|
2917
|
+
role: 'menuitem',
|
|
2918
|
+
className: 'danger',
|
|
2919
|
+
disabled: picks.length === 0,
|
|
2920
|
+
onClick: () => clearAll('all'),
|
|
2921
|
+
},
|
|
2922
|
+
h('span', null, '清空全部标注'),
|
|
2923
|
+
h('span', { className: 'kbd' }, String(picks.length)),
|
|
2924
|
+
),
|
|
2925
|
+
]
|
|
2926
|
+
: null,
|
|
2927
|
+
)
|
|
2928
|
+
: null,
|
|
2929
|
+
state.error_message
|
|
2930
|
+
? h(
|
|
2931
|
+
'div',
|
|
2932
|
+
{ className: 'vp-banner error', role: 'alert' },
|
|
2933
|
+
h('span', null, state.error_message),
|
|
2934
|
+
h('button', { className: 'vp-btn sm', onClick: () => request('/state').then(apply) }, '重试'),
|
|
2935
|
+
h(
|
|
2936
|
+
'button',
|
|
2937
|
+
{
|
|
2938
|
+
className: 'vp-icon-btn',
|
|
2939
|
+
'aria-label': '关闭提示',
|
|
2940
|
+
onClick: () => setState((prev) => Object.assign({}, prev, { error_message: null })),
|
|
2941
|
+
},
|
|
2942
|
+
h(IconX),
|
|
2943
|
+
),
|
|
2944
|
+
)
|
|
2945
|
+
: null,
|
|
2946
|
+
hostStale
|
|
2947
|
+
? h(
|
|
2948
|
+
'div',
|
|
2949
|
+
{ className: 'vp-banner warn', role: 'status' },
|
|
2950
|
+
h(
|
|
2951
|
+
'span',
|
|
2952
|
+
null,
|
|
2953
|
+
'插件版本不一致:host ' +
|
|
2954
|
+
hostBuild +
|
|
2955
|
+
' / 面板 ' +
|
|
2956
|
+
PANEL_BUILD +
|
|
2957
|
+
'。定位与撤销暂不可用,重启 DSH Desktop 后重新打开面板即可。',
|
|
2958
|
+
),
|
|
2959
|
+
)
|
|
2960
|
+
: null,
|
|
2961
|
+
noBrowsers
|
|
2962
|
+
? h(
|
|
2963
|
+
'div',
|
|
2964
|
+
{ className: 'vp-banner warn' },
|
|
2965
|
+
h(
|
|
2966
|
+
'span',
|
|
2967
|
+
null,
|
|
2968
|
+
'未检测到 Chrome / Edge / ego lite。可设置 DSH_VISUAL_ANNOTATOR_CHROME、DSH_VISUAL_ANNOTATOR_EDGE、DSH_VISUAL_ANNOTATOR_EGO 指向可执行文件。',
|
|
2969
|
+
),
|
|
2970
|
+
)
|
|
2971
|
+
: null,
|
|
2972
|
+
h(
|
|
2973
|
+
'div',
|
|
2974
|
+
{ className: 'vp-connect' },
|
|
2975
|
+
// 注册表里只有一个浏览器时才不摆选择器:其余情况至少要让人看见「edge 支持但没装」。
|
|
2976
|
+
browserChoices.length > 1
|
|
2977
|
+
? h(
|
|
1447
2978
|
'select',
|
|
1448
2979
|
{
|
|
1449
2980
|
className: 'vp-select',
|
|
@@ -1559,6 +3090,7 @@ window.__ModuleLoader__.load({
|
|
|
1559
3090
|
: null,
|
|
1560
3091
|
)
|
|
1561
3092
|
: null,
|
|
3093
|
+
modeTabs(),
|
|
1562
3094
|
ready && tabs.length > 0
|
|
1563
3095
|
? h(
|
|
1564
3096
|
'div',
|
|
@@ -1603,179 +3135,36 @@ window.__ModuleLoader__.load({
|
|
|
1603
3135
|
: null,
|
|
1604
3136
|
)
|
|
1605
3137
|
: null,
|
|
1606
|
-
|
|
1607
|
-
|
|
1608
|
-
|
|
1609
|
-
|
|
1610
|
-
|
|
1611
|
-
|
|
1612
|
-
|
|
1613
|
-
|
|
1614
|
-
|
|
1615
|
-
|
|
1616
|
-
|
|
1617
|
-
|
|
1618
|
-
|
|
1619
|
-
|
|
1620
|
-
|
|
1621
|
-
|
|
1622
|
-
: '在页面里点击元素,写一句想怎么改',
|
|
1623
|
-
),
|
|
1624
|
-
),
|
|
1625
|
-
h(
|
|
1626
|
-
'button',
|
|
1627
|
-
{
|
|
1628
|
-
className: 'vp-switch',
|
|
1629
|
-
role: 'switch',
|
|
1630
|
-
'aria-checked': picking,
|
|
1631
|
-
'aria-label': '标注模式',
|
|
1632
|
-
disabled: !ready || busy === 'mode',
|
|
1633
|
-
onClick: toggleMode,
|
|
1634
|
-
},
|
|
1635
|
-
h('span', { className: 'knob' }),
|
|
1636
|
-
),
|
|
1637
|
-
),
|
|
3138
|
+
picking || arming
|
|
3139
|
+
? h(
|
|
3140
|
+
'div',
|
|
3141
|
+
{ className: 'vp-armbar', role: 'status' },
|
|
3142
|
+
h(
|
|
3143
|
+
'span',
|
|
3144
|
+
null,
|
|
3145
|
+
arming
|
|
3146
|
+
? arming.slot === 'reference'
|
|
3147
|
+
? '落点「参照」:在任意标签页点元素都进右栏,可连续标多处'
|
|
3148
|
+
: '落点「改动」:在任意标签页点元素都进左栏,可连续标多处'
|
|
3149
|
+
: '标注模式开启中:在页面里点击元素 · Esc 退出',
|
|
3150
|
+
),
|
|
3151
|
+
arming ? h('button', { type: 'button', onClick: cancelArm }, '取消') : null,
|
|
3152
|
+
)
|
|
3153
|
+
: null,
|
|
1638
3154
|
h(
|
|
1639
3155
|
'div',
|
|
1640
3156
|
{ className: 'vp-body' },
|
|
1641
|
-
|
|
1642
|
-
|
|
3157
|
+
// 普通模式只列改动。有参照标注(HUD 的参照落点标出来的)时它是看不见的,
|
|
3158
|
+
// 更不会参与插入:不提示就等于这几处标注凭空消失。
|
|
3159
|
+
viewMode === 'pair' || !refs.length
|
|
3160
|
+
? null
|
|
3161
|
+
: h(
|
|
1643
3162
|
'div',
|
|
1644
|
-
{ className: 'vp-
|
|
1645
|
-
h(
|
|
1646
|
-
|
|
1647
|
-
|
|
1648
|
-
|
|
1649
|
-
h(
|
|
1650
|
-
'span',
|
|
1651
|
-
null,
|
|
1652
|
-
'打开要修改的页面',
|
|
1653
|
-
h('br'),
|
|
1654
|
-
h('small', { style: { opacity: 0.75 } }, '填地址 → 启动'),
|
|
1655
|
-
),
|
|
1656
|
-
),
|
|
1657
|
-
h(
|
|
1658
|
-
'button',
|
|
1659
|
-
{ className: 'vp-step' + (picking ? ' done' : ''), disabled: !ready, onClick: toggleMode },
|
|
1660
|
-
h('span', { className: 'n' }, picking ? '✓' : '2'),
|
|
1661
|
-
h(
|
|
1662
|
-
'span',
|
|
1663
|
-
null,
|
|
1664
|
-
'开启标注模式',
|
|
1665
|
-
h('br'),
|
|
1666
|
-
h('small', { style: { opacity: 0.75 } }, '在页面点击元素,或按 ' + HOTKEY + ' 开启标注'),
|
|
1667
|
-
),
|
|
1668
|
-
),
|
|
1669
|
-
h(
|
|
1670
|
-
'button',
|
|
1671
|
-
{ className: 'vp-step', disabled: true },
|
|
1672
|
-
h('span', { className: 'n' }, '3'),
|
|
1673
|
-
h(
|
|
1674
|
-
'span',
|
|
1675
|
-
null,
|
|
1676
|
-
'写评论并插入对话',
|
|
1677
|
-
h('br'),
|
|
1678
|
-
h('small', { style: { opacity: 0.75 } }, '截图、定位与评论一起发送'),
|
|
1679
|
-
),
|
|
1680
|
-
),
|
|
1681
|
-
)
|
|
1682
|
-
: picks.map((pick, index) => {
|
|
1683
|
-
var comment = drafts[pick.id] !== undefined ? drafts[pick.id] : (pick.comment ?? '');
|
|
1684
|
-
var saveInfo = saved[pick.id];
|
|
1685
|
-
var saveText =
|
|
1686
|
-
saveInfo === 'saving'
|
|
1687
|
-
? '保存中…'
|
|
1688
|
-
: saveInfo === 'saved'
|
|
1689
|
-
? '已保存'
|
|
1690
|
-
: saveInfo === 'error'
|
|
1691
|
-
? '保存失败'
|
|
1692
|
-
: '';
|
|
1693
|
-
return h(
|
|
1694
|
-
'div',
|
|
1695
|
-
{ className: 'vp-card', key: pick.id },
|
|
1696
|
-
h(
|
|
1697
|
-
'button',
|
|
1698
|
-
{
|
|
1699
|
-
className: 'vp-thumb' + (pick.shotUrl ? '' : ' none'),
|
|
1700
|
-
title: pick.shotUrl ? '在浏览器中定位这个元素' : '无截图',
|
|
1701
|
-
'aria-label': '在浏览器中定位这个元素',
|
|
1702
|
-
onClick: () => (pick.shotUrl ? focusPick(pick.id) : null),
|
|
1703
|
-
},
|
|
1704
|
-
pick.shotUrl ? h('img', { src: pick.shotUrl, alt: '元素截图 ' + pick.id }) : '无截图',
|
|
1705
|
-
),
|
|
1706
|
-
h(
|
|
1707
|
-
'div',
|
|
1708
|
-
{ className: 'vp-meta' },
|
|
1709
|
-
h(
|
|
1710
|
-
'div',
|
|
1711
|
-
{ className: 'vp-card-head' },
|
|
1712
|
-
h('span', { className: 'vp-idx' }, '#' + (index + 1)),
|
|
1713
|
-
h('span', { className: 'vp-tag' }, String(pick.tag || '元素')),
|
|
1714
|
-
h('span', { className: 'vp-host', title: pick.url }, hostOf(pick.url) || ''),
|
|
1715
|
-
h('span', { className: 'vp-spacer' }),
|
|
1716
|
-
h(
|
|
1717
|
-
'button',
|
|
1718
|
-
{
|
|
1719
|
-
className: 'vp-icon-btn',
|
|
1720
|
-
title: '在浏览器中定位',
|
|
1721
|
-
'aria-label': '在浏览器中定位',
|
|
1722
|
-
onClick: () => focusPick(pick.id),
|
|
1723
|
-
},
|
|
1724
|
-
h(IconTarget),
|
|
1725
|
-
),
|
|
1726
|
-
h(
|
|
1727
|
-
'button',
|
|
1728
|
-
{
|
|
1729
|
-
className: 'vp-icon-btn',
|
|
1730
|
-
title: '删除这条标注',
|
|
1731
|
-
'aria-label': '删除这条标注',
|
|
1732
|
-
onClick: () => removePick(pick.id),
|
|
1733
|
-
},
|
|
1734
|
-
h(IconX),
|
|
1735
|
-
),
|
|
1736
|
-
),
|
|
1737
|
-
h(
|
|
1738
|
-
'button',
|
|
1739
|
-
{
|
|
1740
|
-
className: 'vp-sel',
|
|
1741
|
-
title: '点击复制选择器\n' + (pick.selector || ''),
|
|
1742
|
-
onClick: () => {
|
|
1743
|
-
try {
|
|
1744
|
-
navigator.clipboard?.writeText(String(pick.selector || ''));
|
|
1745
|
-
flash('ok', '选择器已复制');
|
|
1746
|
-
} catch {
|
|
1747
|
-
flash('err', '复制失败');
|
|
1748
|
-
}
|
|
1749
|
-
},
|
|
1750
|
-
},
|
|
1751
|
-
String(pick.selector || '(无选择器)'),
|
|
1752
|
-
),
|
|
1753
|
-
pick.text ? h('div', { className: 'vp-text', title: pick.text }, pick.text) : null,
|
|
1754
|
-
h('textarea', {
|
|
1755
|
-
className: 'vp-comment',
|
|
1756
|
-
placeholder: '想怎么改?例如:字号调大到 16px、按钮改成主色',
|
|
1757
|
-
'aria-label': '标注评论',
|
|
1758
|
-
value: comment,
|
|
1759
|
-
onChange: (event) => editComment(pick.id, event.target.value),
|
|
1760
|
-
onBlur: (event) => persistComment(pick.id, event.target.value),
|
|
1761
|
-
}),
|
|
1762
|
-
h(
|
|
1763
|
-
'div',
|
|
1764
|
-
{ className: 'vp-actions' },
|
|
1765
|
-
h('span', { className: 'vp-saved', role: 'status' }, saveText),
|
|
1766
|
-
h(
|
|
1767
|
-
'button',
|
|
1768
|
-
{
|
|
1769
|
-
className: 'vp-btn sm pri',
|
|
1770
|
-
title: '插入这条标注,并从列表移除',
|
|
1771
|
-
onClick: () => insertOnce([pick], 'click'),
|
|
1772
|
-
},
|
|
1773
|
-
insertLabel,
|
|
1774
|
-
),
|
|
1775
|
-
),
|
|
1776
|
-
),
|
|
1777
|
-
);
|
|
1778
|
-
}),
|
|
3163
|
+
{ className: 'vp-refs-note', role: 'status' },
|
|
3164
|
+
h('span', null, '还有 ', h('b', null, String(refs.length)), ' 处参照不在普通模式里显示'),
|
|
3165
|
+
h('button', { type: 'button', onClick: () => setViewMode('pair') }, '切到参照模式'),
|
|
3166
|
+
),
|
|
3167
|
+
viewMode === 'pair' ? pairView() : plainList(),
|
|
1779
3168
|
),
|
|
1780
3169
|
h(
|
|
1781
3170
|
'div',
|
|
@@ -1787,9 +3176,14 @@ window.__ModuleLoader__.load({
|
|
|
1787
3176
|
'button',
|
|
1788
3177
|
{
|
|
1789
3178
|
className: 'vp-btn pri block',
|
|
1790
|
-
disabled:
|
|
1791
|
-
title:
|
|
1792
|
-
|
|
3179
|
+
disabled: !canInsert,
|
|
3180
|
+
title:
|
|
3181
|
+
!canInsert && viewMode === 'pair'
|
|
3182
|
+
? '还没有参照标注:建立对照后方可插入'
|
|
3183
|
+
: viewMode === 'pair'
|
|
3184
|
+
? '将每组「改动 → 参照」一并插入输入框;参照只读,不会被修改'
|
|
3185
|
+
: '把这 ' + insertable.length + ' 条标注一起插入输入框,并从列表移除',
|
|
3186
|
+
onClick: () => insertOnce(ctaPicks, 'click'),
|
|
1793
3187
|
},
|
|
1794
3188
|
ctaLabel,
|
|
1795
3189
|
),
|
|
@@ -1798,8 +3192,11 @@ window.__ModuleLoader__.load({
|
|
|
1798
3192
|
{
|
|
1799
3193
|
className: 'vp-btn',
|
|
1800
3194
|
disabled: picks.length === 0,
|
|
1801
|
-
title:
|
|
1802
|
-
|
|
3195
|
+
title:
|
|
3196
|
+
viewMode === 'pair'
|
|
3197
|
+
? '清空标注:只清改动 / 只清参照 / 全部清空(可撤销)'
|
|
3198
|
+
: '一键清空全部标注(可撤销)',
|
|
3199
|
+
onClick: () => clearAll('all'),
|
|
1803
3200
|
},
|
|
1804
3201
|
'清空',
|
|
1805
3202
|
),
|
|
@@ -1818,7 +3215,11 @@ window.__ModuleLoader__.load({
|
|
|
1818
3215
|
h(
|
|
1819
3216
|
'p',
|
|
1820
3217
|
{ className: 'vp-foot-hint' },
|
|
1821
|
-
picks.length === 0
|
|
3218
|
+
picks.length === 0
|
|
3219
|
+
? '开启标注模式后,在浏览器里点击想改的元素'
|
|
3220
|
+
: viewMode === 'pair'
|
|
3221
|
+
? '左侧为改动、右侧为参照;插入后参照保留并标「已引用」,点卡片上的「再次引用」可重发'
|
|
3222
|
+
: '插入后自动清空;清空或误删都能一键撤销',
|
|
1822
3223
|
),
|
|
1823
3224
|
),
|
|
1824
3225
|
toast
|